[haiku-commits] r39282 - haiku/trunk/src/apps/showimage

  • From: axeld@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 3 Nov 2010 21:00:50 +0100 (CET)

Author: axeld
Date: 2010-11-03 21:00:49 +0100 (Wed, 03 Nov 2010)
New Revision: 39282
Changeset: http://dev.haiku-os.org/changeset/39282
Ticket: http://dev.haiku-os.org/ticket/6771

Modified:
   haiku/trunk/src/apps/showimage/ShowImageWindow.cpp
Log:
* Reverted Rene's fix for the broken build - it's no longer necessary. Thank
  you for cleaning up behind me!
* Fixed bug #6771 by adding the shift key to the page shortcuts.


Modified: haiku/trunk/src/apps/showimage/ShowImageWindow.cpp
===================================================================
--- haiku/trunk/src/apps/showimage/ShowImageWindow.cpp  2010-11-03 19:53:10 UTC 
(rev 39281)
+++ haiku/trunk/src/apps/showimage/ShowImageWindow.cpp  2010-11-03 20:00:49 UTC 
(rev 39282)
@@ -126,10 +126,6 @@
 //     #pragma mark -- ShowImageWindow
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Menus"
-
-
 ShowImageWindow::ShowImageWindow(const entry_ref* ref,
        const BMessenger& trackerMessenger)
        :
@@ -205,7 +201,7 @@
        }
 
        // add View menu here so it can access ShowImageView methods
-       BMenu* menu = new BMenu(B_TRANSLATE("View"));
+       BMenu* menu = new BMenu(B_TRANSLATE_WITH_CONTEXT("View", "Menus"));
        _BuildViewMenu(menu, false);
        fBar->AddItem(menu);
 
@@ -636,7 +632,7 @@
                                        strCaption << i;
 
                                        BMenuItem* item = new 
BMenuItem(strCaption.String(), goTo,
-                                               shortcut);
+                                               B_SHIFT_KEY, shortcut);
                                        if (currentPage == i)
                                                item->SetMarked(true);
                                        fGoToPageMenu->AddItem(item);
@@ -895,9 +891,10 @@
 {
        // TODO: give a better error message!
        BAlert* alert = new BAlert(B_TRANSLATE("ShowImage"),
-               B_TRANSLATE("Could not load image! Either the "
-                       "file or an image translator for it does not exist."),
-               B_TRANSLATE("OK"), NULL, NULL,
+               B_TRANSLATE_WITH_CONTEXT("Could not load image! Either the "
+                       "file or an image translator for it does not exist.",
+                       "LoadAlerts"),
+               B_TRANSLATE_WITH_CONTEXT("OK", "Alerts"), NULL, NULL,
                B_WIDTH_AS_USUAL, B_INFO_ALERT);
        alert->Go();
 }


Other related posts:

  • » [haiku-commits] r39282 - haiku/trunk/src/apps/showimage - axeld