[haiku-commits] r39267 - haiku/trunk/src/apps/showimage
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 2 Nov 2010 03:22:29 +0100 (CET)
Author: anevilyak
Date: 2010-11-02 03:22:29 +0100 (Tue, 02 Nov 2010)
New Revision: 39267
Changeset: http://dev.haiku-os.org/changeset/39267
Modified:
haiku/trunk/src/apps/showimage/ImageFileNavigator.h
haiku/trunk/src/apps/showimage/ShowImageWindow.cpp
Log:
Build fixes mostly due to usage of a translation macro that isn't (currently)
available in the source tree.
Modified: haiku/trunk/src/apps/showimage/ImageFileNavigator.h
===================================================================
--- haiku/trunk/src/apps/showimage/ImageFileNavigator.h 2010-11-02 00:37:21 UTC
(rev 39266)
+++ haiku/trunk/src/apps/showimage/ImageFileNavigator.h 2010-11-02 02:22:29 UTC
(rev 39267)
@@ -72,7 +72,7 @@
private:
bool _IsImage(const
entry_ref& ref);
bool _FindNextImage(const
entry_ref& current,
-
entry_ref& next, bool next,
+
entry_ref& ref, bool next,
bool
rewind);
status_t _LoadNextImage(bool
next, bool rewind);
void
_SetTrackerSelectionToCurrent();
Modified: haiku/trunk/src/apps/showimage/ShowImageWindow.cpp
===================================================================
--- haiku/trunk/src/apps/showimage/ShowImageWindow.cpp 2010-11-02 00:37:21 UTC
(rev 39266)
+++ haiku/trunk/src/apps/showimage/ShowImageWindow.cpp 2010-11-02 02:22:29 UTC
(rev 39267)
@@ -126,6 +126,10 @@
// #pragma mark -- ShowImageWindow
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Menus"
+
+
ShowImageWindow::ShowImageWindow(const entry_ref* ref,
const BMessenger& trackerMessenger)
:
@@ -201,7 +205,7 @@
}
// add View menu here so it can access ShowImageView methods
- BMenu* menu = new BMenu(B_TRANSLATE_WITH_CONTEXT("View", "Menus"));
+ BMenu* menu = new BMenu(B_TRANSLATE("View"));
_BuildViewMenu(menu, false);
fBar->AddItem(menu);
@@ -891,10 +895,9 @@
{
// TODO: give a better error message!
BAlert* alert = new BAlert(B_TRANSLATE("ShowImage"),
- 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_TRANSLATE("Could not load image! Either the "
+ "file or an image translator for it does not exist."),
+ B_TRANSLATE("OK"), NULL, NULL,
B_WIDTH_AS_USUAL, B_INFO_ALERT);
alert->Go();
}
Other related posts:
