[haiku-commits] r42239 - haiku/trunk/src/apps/installer

  • From: leavengood@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 19 Jun 2011 00:55:53 +0200 (CEST)

Author: leavengood
Date: 2011-06-19 00:55:53 +0200 (Sun, 19 Jun 2011)
New Revision: 42239
Changeset: https://dev.haiku-os.org/changeset/42239
Ticket: https://dev.haiku-os.org/ticket/7090

Modified:
   haiku/trunk/src/apps/installer/InstallerWindow.cpp
Log:
When called from the ReadOnlyBootPrompt, quitting the Installer will result in
restarting. So it makes sense to use the label Restart for the button instead
of Quit.

Fixes #7090.


Modified: haiku/trunk/src/apps/installer/InstallerWindow.cpp
===================================================================
--- haiku/trunk/src/apps/installer/InstallerWindow.cpp  2011-06-18 22:24:00 UTC 
(rev 42238)
+++ haiku/trunk/src/apps/installer/InstallerWindow.cpp  2011-06-18 22:55:53 UTC 
(rev 42239)
@@ -481,13 +481,12 @@
 
                        _SetCopyEngineCancelSemaphore(-1);
 
-                       fBeginButton->SetLabel(B_TRANSLATE("Quit"));
-
                        PartitionMenuItem* dstItem
                                = (PartitionMenuItem*)fDestMenu->FindMarked();
 
                        char status[1024];
                        if (be_roster->IsRunning(kDeskbarSignature)) {
+                               fBeginButton->SetLabel(B_TRANSLATE("Quit"));
                                snprintf(status, sizeof(status), 
B_TRANSLATE("Installation "
                                        "completed. Boot sector has been 
written to '%s'. Press "
                                        "Quit to leave the Installer or choose 
a new target "
@@ -495,9 +494,10 @@
                                        dstItem ? dstItem->Name() : 
B_TRANSLATE_COMMENT("???",
                                                "Unknown partition name"));
                        } else {
+                               fBeginButton->SetLabel(B_TRANSLATE("Restart"));
                                snprintf(status, sizeof(status), 
B_TRANSLATE("Installation "
                                        "completed. Boot sector has been 
written to '%s'. Press "
-                                       "Quit to restart the computer or choose 
a new target "
+                                       "Restart to restart the computer or 
choose a new target "
                                        "volume to perform another 
installation."),
                                        dstItem ? dstItem->Name() : 
B_TRANSLATE_COMMENT("???",
                                                "Unknown partition name"));


Other related posts:

  • » [haiku-commits] r42239 - haiku/trunk/src/apps/installer - leavengood