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

* Now prints "Revision X" instead of "rX"

Browse Source 
* I think we may have 2006 already
* Now makes sure the revision resource is null terminated (at least it returned an
  unterminated string under BeOS, it worked already fine under Haiku).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16250 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-02-06 14:47:06 +00:00
parent 8527f8ffbe
commit fa3685cf13
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/abouthaiku/AboutHaiku.cpp
+14 -10
View File
@@ -178,11 +178,15 @@ AboutView::AboutView(const BRect &rect)
// Add revision from resources // Add revision from resources
BResources* resources = be_app->AppResources(); BResources* resources = be_app->AppResources();
const char* versionString = (const char *)resources->LoadResource( char version[32];
B_STRING_TYPE, "SVN:REVISION", NULL); size_t size;
if (versionString != NULL && strcmp(versionString, "unknown") != 0) { const char* versionResource = (const char *)resources->LoadResource(
strlcat(string, " (r", sizeof(string)); B_STRING_TYPE, "SVN:REVISION", &size);
strlcat(string, versionString, sizeof(string)); if (versionResource != NULL)
strlcpy(version, versionResource, min_c(size + 1, sizeof(version)));
if (versionResource != NULL && strcmp(version, "unknown") != 0) {
strlcat(string, " (Revision ", sizeof(string));
strlcat(string, version, sizeof(string));
strlcat(string, ")", sizeof(string)); strlcat(string, ")", sizeof(string));
} }
@@ -311,7 +315,7 @@ AboutView::AboutView(const BRect &rect)
font.SetFace(B_BOLD_FACE | B_ITALIC_FACE); font.SetFace(B_BOLD_FACE | B_ITALIC_FACE);
fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &darkgrey); fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &darkgrey);
fCreditsView->Insert("Copyright " B_UTF8_COPYRIGHT "2001-2005 Haiku, Inc.\n\n"); fCreditsView->Insert("Copyright " B_UTF8_COPYRIGHT "2001-2006 Haiku, Inc.\n\n");
fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &haiku_orange); fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &haiku_orange);
fCreditsView->Insert("Team Leads:\n"); fCreditsView->Insert("Team Leads:\n");
@@ -412,20 +416,20 @@ AboutView::AboutView(const BRect &rect)
fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &haiku_yellow); fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &haiku_yellow);
fCreditsView->Insert("AntiGrain Geometry\n"); fCreditsView->Insert("AntiGrain Geometry\n");
fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &darkgrey); fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &darkgrey);
fCreditsView->Insert("Copyright (C) 2002-2005 Maxim Shemanarev (McSeem)\n\n"); fCreditsView->Insert("Copyright (C) 2002-2006 Maxim Shemanarev (McSeem)\n\n");
fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &haiku_yellow); fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &haiku_yellow);
fCreditsView->Insert("PDFLib\n"); fCreditsView->Insert("PDFLib\n");
fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &darkgrey); fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &darkgrey);
fCreditsView->Insert( fCreditsView->Insert(
"Copyright (c) 1997-2005 PDFlib GmbH and Thomas Merz. " "Copyright (c) 1997-2006 PDFlib GmbH and Thomas Merz. "
"All rights reserved.\n" "All rights reserved.\n"
"PDFlib and the PDFlib logo are registered trademarks of PDFlib GmbH.\n\n"); "PDFlib and the PDFlib logo are registered trademarks of PDFlib GmbH.\n\n");
fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &haiku_yellow); fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &haiku_yellow);
fCreditsView->Insert("FreeType2\n"); fCreditsView->Insert("FreeType2\n");
fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &darkgrey); fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &darkgrey);
fCreditsView->Insert("Portions of this software are copyright (C) 1996-2002 The FreeType" fCreditsView->Insert("Portions of this software are copyright (C) 1996-2006 The FreeType"
" Project (www.freetype.org). All rights reserved.\n\n"); " Project (www.freetype.org). All rights reserved.\n\n");
// Mesa3D (http://www.mesa3d.org) copyrights // Mesa3D (http://www.mesa3d.org) copyrights
@@ -433,7 +437,7 @@ AboutView::AboutView(const BRect &rect)
fCreditsView->Insert("Mesa\n"); fCreditsView->Insert("Mesa\n");
fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &darkgrey); fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &darkgrey);
fCreditsView->Insert( fCreditsView->Insert(
"Copyright (c) 1999-2005 Brian Paul. " "Copyright (c) 1999-2006 Brian Paul. "
"Mesa3D project (www.mesa3d.org). All rights reserved.\n\n"); "Mesa3D project (www.mesa3d.org). All rights reserved.\n\n");
// SGI's GLU implementation copyrights // SGI's GLU implementation copyrights