Ticket #6926: activitymonitor.patch

src/apps/activitymonitor/ActivityMonitor.cpp

@@ -14 +14 @@
 
 #include "ActivityWindow.h"
 
+#include <Catalog.h>
+#include <Language.h>
+#include <Locale.h>
+#include <LocaleRoster.h>
 
 const char* kSignature = "application/x-vnd.Haiku-ActivityMonitor";
 
@@ -61 +65 @@
 /*static*/ void
 ActivityMonitor::ShowAbout()
 {
-    BAlert *alert = new BAlert("about", "ActivityMonitor\n"
+    BAlert *alert = new BAlert("about", B_TRANSLATE("ActivityMonitor\n"
         "\twritten by Axel Dörfler\n"
-        "\tCopyright 2008, Haiku Inc.\n", "OK");
+        "\tCopyright 2008, Haiku Inc.\n"), B_TRANSLATE("OK"));
     BTextView *view = alert->TextView();
     BFont font;
 

src/apps/activitymonitor/ActivityWindow.cpp

@@ -25 +25 @@
 #include "DataSource.h"
 #include "SettingsWindow.h"
 
+#include <Catalog.h>
+#include <Language.h>
+#include <Locale.h>
+#include <LocaleRoster.h>
 
 static const uint32 kMsgAddView = 'advw';
 static const uint32 kMsgShowSettings = 'shst';
 
 
 ActivityWindow::ActivityWindow()
-    : BWindow(BRect(100, 100, 500, 350), "ActivityMonitor", B_TITLED_WINDOW,
-        B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE)
+    : BWindow(BRect(100, 100, 500, 350), B_TRANSLATE("ActivityMonitor"), 
+        B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE)
 {
     BMessage settings;
     _LoadSettings(settings);
@@ -113 +117 @@
     // add menu
 
     // "File" menu
-    BMenu* menu = new BMenu("File");
+    BMenu* menu = new BMenu(B_TRANSLATE("File"));
     BMenuItem* item;
 
-    menu->AddItem(new BMenuItem("Add graph", new BMessage(kMsgAddView)));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Add graph"), 
+        new BMessage(kMsgAddView)));
     menu->AddSeparatorItem();
 
-    menu->AddItem(item = new BMenuItem("About ActivityMonitor" B_UTF8_ELLIPSIS,
+    menu->AddItem(item = new BMenuItem(
+        B_TRANSLATE("About ActivityMonitor" B_UTF8_ELLIPSIS),
         new BMessage(B_ABOUT_REQUESTED)));
     menu->AddSeparatorItem();
 
-    menu->AddItem(new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED), 'Q'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), 
+        new BMessage(B_QUIT_REQUESTED), 'Q'));
     menu->SetTargetForItems(this);
     item->SetTarget(be_app);
     menuBar->AddItem(menu);
 
     // "Settings" menu
-    menu = new BMenu("Settings");
-    menu->AddItem(new BMenuItem("Settings" B_UTF8_ELLIPSIS,
+    menu = new BMenu(B_TRANSLATE("Settings"));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS),
         new BMessage(kMsgShowSettings)));
     menu->SetTargetForItems(this);
     menuBar->AddItem(menu);

src/apps/activitymonitor/ActivityView.cpp

@@ -33 +33 @@
 #include "SystemInfo.h"
 #include "SystemInfoHandler.h"
 
+#include <Catalog.h>
+#include <Language.h>
+#include <Locale.h>
+#include <LocaleRoster.h>
 
 template<typename ObjectType>
 class ListAddDeleter {
@@ -991 +995 @@
     BPopUpMenu *menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
     menu->SetFont(be_plain_font);
 
-    BMenu* additionalMenu = new BMenu("Additional items");
+    BMenu* additionalMenu = new BMenu(B_TRANSLATE("Additional items"));
     additionalMenu->SetFont(be_plain_font);
 
     SystemInfo info;
@@ -1018 +1022 @@
 
     menu->AddItem(new BMenuItem(additionalMenu));
     menu->AddSeparatorItem();
-    menu->AddItem(new BMenuItem(fShowLegend ? "Hide legend" : "Show legend",
+    menu->AddItem(new BMenuItem(fShowLegend ? B_TRANSLATE("Hide legend") 
+        : B_TRANSLATE("Show legend"),
         new BMessage(kMsgToggleLegend)));
 
     menu->SetTargetForItems(this);
@@ -1029 +1034 @@
         menu->AddSeparatorItem();
         BMessage* message = new BMessage(kMsgRemoveView);
         message->AddPointer("view", this);
-        menu->AddItem(item = new BMenuItem("Remove graph", message));
+        menu->AddItem(item = new BMenuItem(B_TRANSLATE("Remove graph"), 
+            message));
         item->SetTarget(window);
     }
 

src/apps/activitymonitor/SettingsWindow.cpp

@@ -14 +14 @@
 #include <Slider.h>
 #include <String.h>
 
+#include <Catalog.h>
+#include <Language.h>
+#include <Locale.h>
+#include <LocaleRoster.h>
 
 static const uint32 kMsgUpdateTimeInterval = 'upti';
 
@@ -70 +74 @@
 
         bigtime_t interval = kUpdateIntervals[level];
         if ((interval % 1000) == 0)
-            snprintf(fText, sizeof(fText), "%lld sec.", interval / 1000);
+            snprintf(fText, sizeof(fText), B_TRANSLATE("%lld sec."), interval / 1000);
         else
-            snprintf(fText, sizeof(fText), "%lld ms", interval);
+            snprintf(fText, sizeof(fText), B_TRANSLATE("%lld ms"), interval);
 
         return fText;
     }
@@ -85 +89 @@
 
 
 SettingsWindow::SettingsWindow(ActivityWindow* target)
-    : BWindow(_RelativeTo(target), "Settings", B_FLOATING_WINDOW,
+    : BWindow(_RelativeTo(target), B_TRANSLATE("Settings"), B_FLOATING_WINDOW,
         B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
     fTarget(target)
 {
     SetLayout(new BGroupLayout(B_VERTICAL));
 
-    fIntervalSlider = new IntervalSlider("Update time interval:",
+    fIntervalSlider = new IntervalSlider(B_TRANSLATE("Update time interval:"),
         new BMessage(kMsgUpdateTimeInterval), kNumUpdateIntervals);
     fIntervalSlider->SetInterval(target->RefreshInterval());
 

src/apps/activitymonitor/DataSource.cpp

@@ -14 +14 @@
 
 #include "SystemInfo.h"
 
+#include <Catalog.h>
+#include <Language.h>
+#include <Locale.h>
+#include <LocaleRoster.h>
 
 const DataSource* kSources[] = {
     new UsedMemoryDataSource(),
@@ -286 +290 @@
 MemoryDataSource::Print(BString& text, int64 value) const
 {
     char buffer[32];
-    snprintf(buffer, sizeof(buffer), "%.1f MB", value / 1048576.0);
+    snprintf(buffer, sizeof(buffer), B_TRANSLATE("%.1f MB"), 
+        value / 1048576.0);
 
     text = buffer;
 }
@@ -295 +300 @@
 const char*
 MemoryDataSource::Unit() const
 {
-    return "MB";
+    return B_TRANSLATE("MB");
 }
 
 
@@ -329 +334 @@
 const char*
 UsedMemoryDataSource::Label() const
 {
-    return "Used memory";
+    return B_TRANSLATE("Used memory");
 }
 
 
 const char*
 UsedMemoryDataSource::ShortLabel() const
 {
-    return "Memory";
+    return B_TRANSLATE("Memory");
 }
 
 
@@ -378 +383 @@
 const char*
 CachedMemoryDataSource::Label() const
 {
-    return "Cached memory";
+    return B_TRANSLATE("Cached memory");
 }
 
 
 const char*
 CachedMemoryDataSource::ShortLabel() const
 {
-    return "Cache";
+    return B_TRANSLATE("Cache");
 }
 
 
@@ -430 +435 @@
 const char*
 SwapSpaceDataSource::Label() const
 {
-    return "Swap space";
+    return B_TRANSLATE("Swap space");
 }
 
 
 const char*
 SwapSpaceDataSource::ShortLabel() const
 {
-    return "Swap";
+    return B_TRANSLATE("Swap");
 }
 
 
@@ -485 +490 @@
 const char*
 BlockCacheDataSource::Label() const
 {
-    return "Block cache memory";
+    return B_TRANSLATE("Block cache memory");
 }
 
 
 const char*
 BlockCacheDataSource::ShortLabel() const
 {
-    return "Block cache";
+    return B_TRANSLATE("Block cache");
 }
 
 
@@ -532 +537 @@
 const char*
 SemaphoresDataSource::Label() const
 {
-    return "Semaphores";
+    return B_TRANSLATE("Semaphores");
 }
 
 
 const char*
 SemaphoresDataSource::ShortLabel() const
 {
-    return "Sems";
+    return B_TRANSLATE("Sems");
 }
 
 
@@ -586 +591 @@
 const char*
 PortsDataSource::Label() const
 {
-    return "Ports";
+    return B_TRANSLATE("Ports");
 }
 
 
@@ -633 +638 @@
 const char*
 ThreadsDataSource::Label() const
 {
-    return "Threads";
+    return B_TRANSLATE("Threads");
 }
 
 
@@ -680 +685 @@
 const char*
 TeamsDataSource::Label() const
 {
-    return "Teams";
+    return B_TRANSLATE("Teams");
 }
 
 
@@ -727 +732 @@
 const char*
 RunningAppsDataSource::Label() const
 {
-    return "Running applications";
+    return B_TRANSLATE("Running applications");
 }
 
 
 const char*
 RunningAppsDataSource::ShortLabel() const
 {
-    return "Apps";
+    return B_TRANSLATE("Apps");
 }
 
 
@@ -839 +844 @@
 const char*
 CPUUsageDataSource::Name() const
 {
-    return "CPU usage";
+    return B_TRANSLATE("CPU usage");
 }
 
 
@@ -868 +873 @@
 CPUUsageDataSource::_SetCPU(int32 cpu)
 {
     fCPU = cpu;
-    fLabel = "CPU";
+    fLabel = B_TRANSLATE("CPU");
     if (SystemInfo().CPUCount() > 1)
         fLabel << " " << cpu + 1;
 
     fShortLabel = fLabel;
-    fLabel << " usage";
+    fLabel << B_TRANSLATE(" usage");
 
     const rgb_color kColors[B_MAX_CPU_COUNT] = {
         // TODO: find some better defaults...
@@ -967 +972 @@
 const char*
 CPUCombinedUsageDataSource::Label() const
 {
-    return "CPU usage";
+    return B_TRANSLATE("CPU usage");
 }
 
 
 const char*
 CPUCombinedUsageDataSource::ShortLabel() const
 {
-    return "CPU";
+    return B_TRANSLATE("CPU");
 }
 
 
 const char*
 CPUCombinedUsageDataSource::Name() const
 {
-    return "CPU usage (combined)";
+    return B_TRANSLATE("CPU usage (combined)");
 }
 
 
@@ -1041 +1046 @@
 PageFaultsDataSource::Print(BString& text, int64 value) const
 {
     char buffer[32];
-    snprintf(buffer, sizeof(buffer), "%.1f faults/s", value / 1024.0);
+    snprintf(buffer, sizeof(buffer), B_TRANSLATE("%.1f faults/s"), value / 1024.0);
 
     text = buffer;
 }
@@ -1065 +1070 @@
 const char*
 PageFaultsDataSource::Label() const
 {
-    return "Page faults";
+    return B_TRANSLATE("Page faults");
 }
 
 
 const char*
 PageFaultsDataSource::ShortLabel() const
 {
-    return "P-faults";
+    return B_TRANSLATE("P-faults");
 }
 
 
 const char*
 PageFaultsDataSource::Name() const
 {
-    return "Page faults";
+    return B_TRANSLATE("Page faults");
 }
 
 
@@ -1142 +1147 @@
 NetworkUsageDataSource::Print(BString& text, int64 value) const
 {
     char buffer[32];
-    snprintf(buffer, sizeof(buffer), "%.1f KB/s", value / 1024.0);
+    snprintf(buffer, sizeof(buffer), B_TRANSLATE("%.1f KB/s"), value / 1024.0);
 
     text = buffer;
 }
@@ -1166 +1171 @@
 const char*
 NetworkUsageDataSource::Label() const
 {
-    return fIn ? "Receiving" : "Sending";
+    return fIn ? B_TRANSLATE("Receiving") : B_TRANSLATE("Sending");
 }
 
 
@@ -1180 +1185 @@
 const char*
 NetworkUsageDataSource::Name() const
 {
-    return fIn ? "Network receive" : "Network send";
+    return fIn ? B_TRANSLATE("Network receive") : B_TRANSLATE("Network send");
 }
 
 
@@ -1250 +1255 @@
 const char*
 ClipboardSizeDataSource::Label() const
 {
-    return fText ? "Text clipboard size" : "Raw clipboard size";
+    return fText ? B_TRANSLATE("Text clipboard size") 
+        : B_TRANSLATE("Raw clipboard size");
 }
 
 
 const char*
 ClipboardSizeDataSource::Unit() const
 {
-    return "bytes"/*"KB"*/;
+    return B_TRANSLATE("bytes")/*"KB"*/;
 }
 
 
@@ -1304 +1310 @@
 const char*
 MediaNodesDataSource::Label() const
 {
-    return "Media nodes";
+    return B_TRANSLATE("Media nodes");
 }