Author: phoudoin Date: 2010-12-17 16:52:52 +0100 (Fri, 17 Dec 2010) New Revision: 39880 Changeset: http://dev.haiku-os.org/changeset/39880 Modified: haiku/trunk/src/apps/activitymonitor/ActivityMonitor.cpp haiku/trunk/src/apps/activitymonitor/Jamfile Log: Switched ActivityMonitor to use the now localized BAboutWindow. Modified: haiku/trunk/src/apps/activitymonitor/ActivityMonitor.cpp =================================================================== --- haiku/trunk/src/apps/activitymonitor/ActivityMonitor.cpp 2010-12-17 15:48:52 UTC (rev 39879) +++ haiku/trunk/src/apps/activitymonitor/ActivityMonitor.cpp 2010-12-17 15:52:52 UTC (rev 39880) @@ -8,16 +8,11 @@ #include <stdlib.h> -#include <Alert.h> +#include <AboutWindow.h> #include <Application.h> -#include <Catalog.h> -#include <TextView.h> #include "ActivityWindow.h" -#undef B_TRANSLATE_CONTEXT -#define B_TRANSLATE_CONTEXT "ActivityMonitor" - const char* kSignature = "application/x-vnd.Haiku-ActivityMonitor"; @@ -64,24 +59,13 @@ /*static*/ void ActivityMonitor::ShowAbout() { - BString text; - text << kAppName << "\n" - << B_TRANSLATE("\twritten by Axel Dörfler\n" - "\tCopyright 2008, Haiku Inc.\n"); + const char* kAuthors[] = { + "Axel Dörfler", + NULL + }; - BAlert *alert = new BAlert(B_TRANSLATE("About"), - text.String(), B_TRANSLATE("OK")); - BTextView *view = alert->TextView(); - BFont font; - - view->SetStylable(true); - - view->GetFont(&font); - font.SetSize(18); - font.SetFace(B_BOLD_FACE); - view->SetFontAndColor(0, strlen(kAppName), &font); - - alert->Go(); + BAboutWindow aboutWindow(kAppName, 2008, kAuthors); + aboutWindow.Show(); } Modified: haiku/trunk/src/apps/activitymonitor/Jamfile =================================================================== --- haiku/trunk/src/apps/activitymonitor/Jamfile 2010-12-17 15:48:52 UTC (rev 39879) +++ haiku/trunk/src/apps/activitymonitor/Jamfile 2010-12-17 15:52:52 UTC (rev 39880) @@ -10,12 +10,9 @@ SettingsWindow.cpp SystemInfo.cpp SystemInfoHandler.cpp - - : - be tracker media libbnetapi.so $(TARGET_LIBSTDC++) $(TARGET_NETWORK_LIBS) - $(HAIKU_LOCALE_LIBS) - : - ActivityMonitor.rdef + : be tracker media libbnetapi.so libshared.a $(TARGET_LIBSTDC++) + $(TARGET_NETWORK_LIBS) $(HAIKU_LOCALE_LIBS) + : ActivityMonitor.rdef ; DoCatalogs ActivityMonitor :