[haiku-commits] r40476 - haiku/trunk/src/apps/launchbox
- From: zharik@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 13 Feb 2011 11:26:06 +0100 (CET)
Author: siarzhuk
Date: 2011-02-13 11:26:06 +0100 (Sun, 13 Feb 2011)
New Revision: 40476
Changeset: http://dev.haiku-os.org/changeset/40476
Ticket: http://dev.haiku-os.org/ticket/7157
Modified:
haiku/trunk/src/apps/launchbox/App.cpp
haiku/trunk/src/apps/launchbox/MainWindow.cpp
Log:
Fixes #7157.
- Masked strings are presented in more consistent way;
- Trailing spaces in localized strings are supressed.
Modified: haiku/trunk/src/apps/launchbox/App.cpp
===================================================================
--- haiku/trunk/src/apps/launchbox/App.cpp 2011-02-13 09:39:44 UTC (rev
40475)
+++ haiku/trunk/src/apps/launchbox/App.cpp 2011-02-13 10:26:06 UTC (rev
40476)
@@ -54,8 +54,8 @@
BMessage windowMessage;
for (int32 i = 0; settings.FindMessage("window", i,
&windowMessage)
>= B_OK; i++) {
- BString name(B_TRANSLATE("Pad "));
- name << i + 1;
+ BString name(B_TRANSLATE("Pad"));
+ name << " " << i + 1;
BMessage* windowSettings = new BMessage(windowMessage);
MainWindow* window = new MainWindow(name.String(),
frame,
windowSettings);
@@ -80,8 +80,8 @@
case MSG_ADD_WINDOW: {
BMessage* settings = new BMessage('sett');
bool wasCloned = message->FindMessage("window",
settings) == B_OK;
- BString name(B_TRANSLATE("Pad "));
- name << CountWindows() + 1;
+ BString name(B_TRANSLATE("Pad"));
+ name << " " << CountWindows() + 1;
MainWindow* window = new MainWindow(name.String(),
BRect(50.0, 50.0, 65.0, 100.0), settings);
if (wasCloned)
Modified: haiku/trunk/src/apps/launchbox/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/launchbox/MainWindow.cpp 2011-02-13 09:39:44 UTC
(rev 40475)
+++ haiku/trunk/src/apps/launchbox/MainWindow.cpp 2011-02-13 10:26:06 UTC
(rev 40476)
@@ -142,13 +142,14 @@
} else {
status_t ret =
be_roster->Launch(button->Ref());
if (ret < B_OK && ret !=
B_ALREADY_RUNNING) {
- errorMessage =
B_TRANSLATE("Failed to launch '");
+ BString
errStr(B_TRANSLATE("Failed to launch '%1'.\n"
+ "\nError:"));
BPath path(button->Ref());
if (path.InitCheck() >= B_OK)
- errorMessage <<
path.Path();
+
errStr.ReplaceFirst("%1", path.Path());
else
- errorMessage <<
button->Ref()->name;
- errorMessage <<
B_TRANSLATE("'.\n\nError: ");
+
errStr.ReplaceFirst("%1", button->Ref()->name);
+ errorMessage << errStr.String()
<< " ";
errorMessage << strerror(ret);
} else
launchedByRef = true;
@@ -157,10 +158,10 @@
if (!launchedByRef && button->AppSignature()) {
status_t ret =
be_roster->Launch(button->AppSignature());
if (ret != B_OK && ret != B_ALREADY_RUNNING) {
- errorMessage = B_TRANSLATE("Failed to
launch application"
- " with signature '");
- errorMessage << button->AppSignature()
<<
- B_TRANSLATE("'.\n\nError: ");
+ BString errStr(B_TRANSLATE("Failed to
launch application "
+ "with signature
'%2'.\n\nError:"));
+ errStr.ReplaceFirst("%2",
button->AppSignature());
+ errorMessage << errStr.String() << " ";
errorMessage << strerror(ret);
} else {
// clear error message on success
(might have been
@@ -212,8 +213,8 @@
// message comes from pad view
entry_ref* ref = button->Ref();
if (ref) {
- BString
helper(B_TRANSLATE("Description for '"));
- helper << ref->name << "'";
+ BString
helper(B_TRANSLATE("Description for '%3'"));
+ helper.ReplaceFirst("%3",
ref->name);
make_sure_frame_is_on_screen(fNamePanelFrame, this);
new NamePanel(helper.String(),
button->Description(),
this, this, new
BMessage(*message),
Other related posts:
