Ticket #5563: ShowImageUpdate.patch

src/apps/showimage/ShowImageView.cpp

@@ -23 +23 @@
 #include <Application.h>
 #include <Bitmap.h>
 #include <BitmapStream.h>
+#include <Catalog.h>
 #include <Clipboard.h>
 #include <Debug.h>
 #include <Directory.h>
 #include <Entry.h>
 #include <File.h>
+#include <Locale.h>
 #include <MenuBar.h>
 #include <MenuItem.h>
 #include <Message.h>
@@ -1244 +1246 @@
     return found;
 }
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "SaveToFile"
 
 void
 ShowImageView::SaveToFile(BDirectory* dir, const char* name, BBitmap* bitmap,
@@ -1278 +1282 @@
     if (loop) {
         // If loop terminated because of a break, there was an error
         BString errText;
-        errText << "Sorry, the file '" << name << "' could not be written.";
-        BAlert *palert = new BAlert(NULL, errText.String(), "OK");
+        errText << TR("Sorry, the file '") << name 
+            << TR("' could not be written.");
+        BAlert *palert = new BAlert(NULL, errText.String(), TR("OK"));
         palert->Go();
     }
 

src/apps/showimage/ShowImageStatusView.cpp

@@ -9 +9 @@
 
 #include "ShowImageStatusView.h"
 
+#include <Catalog.h>
 #include <Entry.h>
+#include <Locale.h>
 #include <MenuItem.h>
 #include <Path.h>
 #include <PopUpMenu.h>
@@ -73 +75 @@
         floorf(b.top + b.Height() / 2.0 + fh.ascent / 2.0)));
 }
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "MouseDown"
 
 void
 ShowImageStatusView::MouseDown(BPoint where)
@@ -84 +88 @@
     BPath path;
     path.SetTo(window->GetShowImageView()->Image());
 
-    BPopUpMenu popup("no title");
+    BPopUpMenu popup(TR("no title"));
     popup.SetFont(be_plain_font);
 
     while (path.GetParent(&path) == B_OK && path != "/") {

src/apps/showimage/ProgressWindow.cpp

@@ -9 +9 @@
 #include <stdio.h>
 
 #include <Autolock.h>
+#include <Catalog.h>
+#include <Locale.h>
 #include <MessageRunner.h>
 #include <Screen.h>
 #include <StatusBar.h>
@@ -18 +20 @@
 
 static const uint32 kMsgShow = 'show';
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "ProgressWindow"
 
 ProgressWindow::ProgressWindow(BWindow* referenceWindow, bool center)
     :
-    BWindow(BRect(0, 0, 250, 100), "Progress monitor",
+    BWindow(BRect(0, 0, 250, 100), TR("Progress monitor"),
         B_MODAL_WINDOW_LOOK, B_FLOATING_APP_WINDOW_FEEL,
         B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS),
     fRunner(NULL)
@@ -33 +37 @@
     AddChild(view);
 
     rect = view->Bounds().InsetByCopy(5, 5);
-    fStatusBar = new BStatusBar(rect, "status", NULL, NULL);
+    fStatusBar = new BStatusBar(rect, TR("status"), NULL, NULL);
     float width, height;
     fStatusBar->GetPreferredSize(&width, &height);
     fStatusBar->ResizeTo(rect.Width(), height);