i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Search the license files in the standard user/common/system licenses

Browse Source 
directories.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30681 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-05-09 17:00:41 +00:00
parent 9f463a1917
commit ff74dc2e8b
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/aboutsystem/AboutSystem.cpp
+29 -18
View File
@@ -100,7 +100,8 @@ class AboutView : public BView {
void PickRandomHaiku(); void PickRandomHaiku();
private: private:
status_t _GetLicensesPath(BPath& path); status_t _GetLicensePath(const char* license,
BPath& path);
void _AddCopyrightsFromAttribute(); void _AddCopyrightsFromAttribute();
BStringView* fMemView; BStringView* fMemView;
@@ -562,11 +563,8 @@ AboutView::AboutView(const BRect &rect)
// copyrights for various projects we use // copyrights for various projects we use
BPath licensesPath; BPath mitPath;
_GetLicensesPath(licensesPath); _GetLicensePath("MIT", mitPath);
BPath mitPath(licensesPath);
mitPath.Append("MIT");
font.SetSize(be_bold_font->Size() + 4); font.SetSize(be_bold_font->Size() + 4);
font.SetFace(B_BOLD_FACE); font.SetFace(B_BOLD_FACE);
@@ -1014,9 +1012,6 @@ AboutView::AddCopyrightEntry(const char *name, const char *text,
fCreditsView->Insert(text); fCreditsView->Insert(text);
fCreditsView->Insert("\n"); fCreditsView->Insert("\n");
BPath licensesPath;
_GetLicensesPath(licensesPath);
if (licenses.CountLicenses() > 0) { if (licenses.CountLicenses() > 0) {
if (licenses.CountLicenses() > 1) if (licenses.CountLicenses() > 1)
fCreditsView->Insert("Licenses: "); fCreditsView->Insert("Licenses: ");
@@ -1025,14 +1020,16 @@ AboutView::AddCopyrightEntry(const char *name, const char *text,
for (int32 i = 0; i < licenses.CountLicenses(); i++) { for (int32 i = 0; i < licenses.CountLicenses(); i++) {
const char* license = licenses.LicenseAt(i); const char* license = licenses.LicenseAt(i);
BString licensePath(licensesPath.Path());
licensePath << '/' << license;
if (i > 0) if (i > 0)
fCreditsView->Insert(", "); fCreditsView->Insert(", ");
fCreditsView->InsertHyperText(license, BPath licensePath;
new OpenFileAction(licensePath)); if (_GetLicensePath(license, licensePath) == B_OK) {
fCreditsView->InsertHyperText(license,
new OpenFileAction(licensePath.Path()));
} else
fCreditsView->Insert(license);
} }
fCreditsView->Insert("\n"); fCreditsView->Insert("\n");
@@ -1123,13 +1120,27 @@ AboutView::PickRandomHaiku()
status_t status_t
AboutView::_GetLicensesPath(BPath& path) AboutView::_GetLicensePath(const char* license, BPath& path)
{ {
status_t status = find_directory(B_SYSTEM_DATA_DIRECTORY, &path); static const directory_which directoryConstants[] = {
if (status != B_OK) B_USER_DATA_DIRECTORY,
return status; B_COMMON_DATA_DIRECTORY,
B_SYSTEM_DATA_DIRECTORY
};
static const int dirCount = 3;
return path.Append("licenses"); for (int i = 0; i < dirCount; i++) {
struct stat st;
status_t error = find_directory(directoryConstants[i], &path);
if (error == B_OK && path.Append("licenses") == B_OK
&& path.Append(license) == B_OK
&& lstat(path.Path(), &st) == 0) {
return B_OK;
}
}
path.Unset();
return B_ENTRY_NOT_FOUND;
} }