i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Changed some kind of broken translation strings (like replacements with a

Browse Source 
fixed order).
* Style cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40111 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2011-01-04 18:00:43 +00:00
parent 415b188949
commit 38109ac999
5 changed files with 161 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/bootman/BootManager.cpp
+18 -18
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2008-2009, Haiku, Inc. All rights reserved. * Copyright 2008-2010, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -7,6 +7,7 @@
* Axel Dörfler <[email protected]> * Axel Dörfler <[email protected]>
*/ */
#include "BootManagerWindow.h" #include "BootManagerWindow.h"
#include <Alert.h> #include <Alert.h>
@@ -20,21 +21,21 @@
#define B_TRANSLATE_CONTEXT "BootManager" #define B_TRANSLATE_CONTEXT "BootManager"
static const char* kSignature = "application/x-vnd.Haiku-bootman"; static const char* kSignature = "application/x-vnd.Haiku-BootManager";
class BootManager : public BApplication { class BootManager : public BApplication {
public: public:
BootManager(); BootManager();
virtual void ReadyToRun(); virtual void ReadyToRun();
virtual void AboutRequested();
virtual void AboutRequested();
}; };
BootManager::BootManager() BootManager::BootManager()
: BApplication(kSignature) :
BApplication(kSignature)
{ {
} }
@@ -42,7 +43,7 @@ BootManager::BootManager()
void void
BootManager::ReadyToRun() BootManager::ReadyToRun()
{ {
BootManagerWindow * window = new BootManagerWindow(); BootManagerWindow* window = new BootManagerWindow();
window->Show(); window->Show();
} }
@@ -51,16 +52,15 @@ void
BootManager::AboutRequested() BootManager::AboutRequested()
{ {
BString aboutText; BString aboutText;
const char* title = B_TRANSLATE_COMMENT("Haiku Boot Manager", const char* title = B_TRANSLATE_COMMENT("BootManager", "Application name");
"About text title"); aboutText << title << "\n\n"
aboutText << << B_TRANSLATE("written by")
title << "\n\n" << << "\n"
B_TRANSLATE("written by") << "\n" "\tDavid Dengg\n"
"\tDavid Dengg\n" "\tMichael Pfeiffer\n"
"\tMichael Pfeiffer\n" "\n"
"\n" << << B_TRANSLATE_COMMENT("Copyright %year, Haiku Inc.\n",
B_TRANSLATE_COMMENT("Copyright %year, Haiku Inc.\n", "Leave %year untranslated");
"Leave %year untranslated");
aboutText.ReplaceLast("%year", "2008-2010"); aboutText.ReplaceLast("%year", "2008-2010");
BAlert *alert = new BAlert("about", BAlert *alert = new BAlert("about",
aboutText.String(), B_TRANSLATE("OK")); aboutText.String(), B_TRANSLATE("OK"));
src/apps/bootman/BootManagerController.cpp
+92 -97
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 20082009, Haiku, Inc. All rights reserved. * Copyright 2008-2010, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -9,23 +9,6 @@
#include "BootManagerController.h" #include "BootManagerController.h"
#include "WizardView.h"
#include "EntryPage.h"
#include "PartitionsPage.h"
#include "DefaultPartitionPage.h"
#include "DescriptionPage.h"
#include "FileSelectionPage.h"
#include "LegacyBootDrive.h"
#define USE_TEST_BOOT_DRIVE 0
#if USE_TEST_BOOT_DRIVE
#include "TestBootDrive.h"
#endif
#include <Alert.h> #include <Alert.h>
#include <Application.h> #include <Application.h>
#include <Catalog.h> #include <Catalog.h>
@@ -35,6 +18,21 @@
#include <Path.h> #include <Path.h>
#include <String.h> #include <String.h>
#include "DefaultPartitionPage.h"
#include "DescriptionPage.h"
#include "EntryPage.h"
#include "FileSelectionPage.h"
#include "LegacyBootDrive.h"
#include "PartitionsPage.h"
#include "WizardView.h"
#define USE_TEST_BOOT_DRIVE 0
#if USE_TEST_BOOT_DRIVE
# include "TestBootDrive.h"
#endif
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "BootManagerController" #define B_TRANSLATE_CONTEXT "BootManagerController"
@@ -90,19 +88,19 @@ BootManagerController::NextState(int32 state)
{ {
switch (state) { switch (state) {
case kStateEntry: case kStateEntry:
{ {
bool install; bool install;
fSettings.FindBool("install", &install); fSettings.FindBool("install", &install);
if (install) { if (install) {
if (fBootDrive->IsBootMenuInstalled(&fSettings)) if (fBootDrive->IsBootMenuInstalled(&fSettings))
return kStatePartitions; return kStatePartitions;
else
return kStateSaveMBR; return kStateSaveMBR;
}
else
return kStateUninstall;
} }
return kStateUninstall;
}
case kStateErrorEntry: case kStateErrorEntry:
be_app->PostMessage(B_QUIT_REQUESTED); be_app->PostMessage(B_QUIT_REQUESTED);
break; break;
@@ -150,7 +148,8 @@ bool
BootManagerController::_HasSelectedPartitions() BootManagerController::_HasSelectedPartitions()
{ {
BMessage message; BMessage message;
for (int32 i = 0; fSettings.FindMessage("partition", i, &message) == B_OK; i ++) { for (int32 i = 0; fSettings.FindMessage("partition", i, &message) == B_OK;
i++) {
bool show; bool show;
if (message.FindBool("show", &show) == B_OK && show) if (message.FindBool("show", &show) == B_OK && show)
return true; return true;
@@ -168,16 +167,17 @@ BootManagerController::_HasSelectedPartitions()
bool bool
BootManagerController::_WriteBootMenu() BootManagerController::_WriteBootMenu()
{ {
BAlert* alert = new BAlert("confirm", B_TRANSLATE("About to write the " BAlert* alert = new BAlert("confirm", B_TRANSLATE("About to write the "
"boot menu to disk. Are you sure you want to continue?"), "boot menu to disk. Are you sure you want to continue?"),
B_TRANSLATE_COMMENT("Write boot menu", "Button"), B_TRANSLATE_COMMENT("Write boot menu", "Button"),
B_TRANSLATE_COMMENT("Back", "Button"), NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); B_TRANSLATE_COMMENT("Back", "Button"), NULL, B_WIDTH_AS_USUAL,
B_WARNING_ALERT);
if (alert->Go() == 1) if (alert->Go() == 1)
return false; return false;
fWriteBootMenuStatus = fBootDrive->WriteBootMenu(&fSettings); fWriteBootMenuStatus = fBootDrive->WriteBootMenu(&fSettings);
return true; return true;
} }
@@ -279,19 +279,19 @@ BootManagerController::_CreateErrorEntryPage(BRect frame)
{ {
BString description; BString description;
if (fReadPartitionsStatus == kErrorBootSectorTooSmall) if (fReadPartitionsStatus == kErrorBootSectorTooSmall) {
description << description << B_TRANSLATE_COMMENT("Partition table not compatible",
B_TRANSLATE_COMMENT("Partition table not compatible", "Title") << "Title") << "\n\n"
"\n\n" << << B_TRANSLATE("The partition table of the first hard disk is not "
B_TRANSLATE("The partition table of the first hard disk is not " "compatible with Boot Manager.\n"
"compatible with Boot Manager.\n" "Boot Manager needs 2 KB available space before the first "
"Boot Manager needs 2 KB available space before the first " "partition.");
"partition."); } else {
else description << B_TRANSLATE_COMMENT("Error reading partition table",
description << "Title") << "\n\n"
B_TRANSLATE_COMMENT("Error reading partition table", "Title") << << B_TRANSLATE("Boot Manager is unable to read the partition "
"\n\n" << "table!");
B_TRANSLATE("Boot Manager is unable to read the partition table!"); }
return new DescriptionPage(frame, "errorEntry", description.String(), true); return new DescriptionPage(frame, "errorEntry", description.String(), true);
} }
@@ -304,15 +304,15 @@ BootManagerController::_CreateSaveMBRPage(BRect frame)
BString disk; BString disk;
fSettings.FindString("disk", &disk); fSettings.FindString("disk", &disk);
description << description << B_TRANSLATE_COMMENT("Backup Master Boot Record", "Title")
B_TRANSLATE_COMMENT("Backup Master Boot Record", "Title") << "\n\n" << << "\n\n" << B_TRANSLATE("The Master Boot Record (MBR) of the boot "
B_TRANSLATE("The Master Boot Record (MBR) of the boot device:\n" "device:\n"
"\t%s\n" "\t%s\n"
"will now be saved to disk. Please select a file to " "will now be saved to disk. Please select a file to "
"save the MBR into.\n\n" "save the MBR into.\n\n"
"If something goes wrong with the installation or if " "If something goes wrong with the installation or if "
"you later wish to remove the boot menu, simply run the " "you later wish to remove the boot menu, simply run the "
"bootman program and choose the 'Uninstall' option."); "bootman program and choose the 'Uninstall' option.");
description.ReplaceFirst("%s", disk); description.ReplaceFirst("%s", disk);
return new FileSelectionPage(&fSettings, frame, "saveMBR", return new FileSelectionPage(&fSettings, frame, "saveMBR",
@@ -329,17 +329,15 @@ BootManagerController::_CreateMBRSavedPage(BRect frame)
fSettings.FindString("file", &file); fSettings.FindString("file", &file);
if (fSaveMBRStatus == B_OK) { if (fSaveMBRStatus == B_OK) {
description << description << B_TRANSLATE_COMMENT("Old Master Boot Record saved",
B_TRANSLATE_COMMENT("Old Master Boot Record saved", "Title") << "Title") << "\n\n"
"\n\n" << << B_TRANSLATE("The old Master Boot Record was successfully "
B_TRANSLATE("The old Master Boot Record was successfully saved to " "saved to %s.") << "\n";
"%s.") << "\n";
} else { } else {
description << description << B_TRANSLATE_COMMENT("Old Master Boot Record Saved "
B_TRANSLATE_COMMENT("Old Master Boot Record Saved failure", "Title") << "failure", "Title") << "\n\n"
"\n\n" << << B_TRANSLATE("The old Master Boot Record could not be saved "
B_TRANSLATE("The old Master Boot Record could not be saved to %s") << "to %s") << "\n";
"\n";
} }
description.ReplaceFirst("%s", file); description.ReplaceFirst("%s", file);
@@ -354,16 +352,15 @@ BootManagerController::_CreateInstallSummaryPage(BRect frame)
BString disk; BString disk;
fSettings.FindString("disk", &disk); fSettings.FindString("disk", &disk);
description << description << B_TRANSLATE_COMMENT("Summary", "Title") << "\n\n"
B_TRANSLATE_COMMENT("Summary", "Title") << "\n\n" << << B_TRANSLATE("About to write the following boot menu to the boot "
B_TRANSLATE("About to write the following boot menu to the boot disk " "disk (%s). Please verify the information below before continuing.")
"(%s). Please verify the information below before continuing.") << << "\n\n";
"\n\n";
description.ReplaceFirst("%s", disk); description.ReplaceFirst("%s", disk);
BMessage message; BMessage message;
for (int32 i = 0; fSettings.FindMessage("partition", i, &message) == B_OK; i ++) { for (int32 i = 0; fSettings.FindMessage("partition", i, &message) == B_OK;
i++) {
bool show; bool show;
if (message.FindBool("show", &show) != B_OK || !show) if (message.FindBool("show", &show) != B_OK || !show)
continue; continue;
@@ -390,14 +387,14 @@ BootManagerController::_CreateInstalledPage(BRect frame)
BString description; BString description;
if (fWriteBootMenuStatus == B_OK) { if (fWriteBootMenuStatus == B_OK) {
description << description << B_TRANSLATE_COMMENT("Installation of boot menu "
B_TRANSLATE_COMMENT("Installation of boot menu completed", "Title") << "\n\n" << "completed", "Title") << "\n\n"
B_TRANSLATE("The boot manager has been successfully installed " << B_TRANSLATE("The boot manager has been successfully installed "
"on your system."); "on your system.");
} else { } else {
description << description << B_TRANSLATE_COMMENT("Installation of boot menu failed",
B_TRANSLATE_COMMENT("Installation of boot menu failed", "Title") << "\n\n" << "Title") << "\n\n"
B_TRANSLATE("An error occurred writing the boot menu. " << B_TRANSLATE("An error occurred writing the boot menu. "
"The Master Boot Record might be destroyed, " "The Master Boot Record might be destroyed, "
"you should restore the MBR now!"); "you should restore the MBR now!");
} }
@@ -410,11 +407,10 @@ WizardPageView*
BootManagerController::_CreateUninstallPage(BRect frame) BootManagerController::_CreateUninstallPage(BRect frame)
{ {
BString description; BString description;
description << B_TRANSLATE_COMMENT("Uninstall boot manager", "Title")
description << << "\n\n"
B_TRANSLATE_COMMENT("Uninstall boot manager", "Title") << "\n\n" << << B_TRANSLATE("Please locate the Master Boot Record (MBR) save file "
B_TRANSLATE("Please locate the Master Boot Record (MBR) save file to " "to restore from. This is the file that was created when the "
"restore from. This is the file that was created when the "
"boot manager was first installed."); "boot manager was first installed.");
return new FileSelectionPage(&fSettings, frame, "restoreMBR", return new FileSelectionPage(&fSettings, frame, "restoreMBR",
@@ -432,17 +428,16 @@ BootManagerController::_CreateUninstalledPage(BRect frame)
fSettings.FindString("file", &file); fSettings.FindString("file", &file);
if (fRestoreMBRStatus == B_OK) { if (fRestoreMBRStatus == B_OK) {
description << description << B_TRANSLATE_COMMENT("Uninstallation of boot menu "
B_TRANSLATE_COMMENT("Uninstallation of boot menu completed", "Title") << "completed", "Title") << "\n\n"
"\n\n" << << B_TRANSLATE("The Master Boot Record of the boot device "
B_TRANSLATE("The Master Boot Record of the boot device " "(%DISK) has been successfully restored from %FILE.");
"(%s) has been successfully restored from %s."); description.ReplaceFirst("%DISK", disk);
description.ReplaceFirst("%s", disk); description.ReplaceFirst("%FILE", file);
description.ReplaceLast("%s", file);
} else { } else {
description << description << B_TRANSLATE_COMMENT("Uninstallation of boot menu "
B_TRANSLATE_COMMENT("Uninstallation of boot menu failed", "Title") << "\n\n" << "failed", "Title") << "\n\n"
B_TRANSLATE("The Master Boot Record could not be restored!"); << B_TRANSLATE("The Master Boot Record could not be restored!");
} }
return new DescriptionPage(frame, "summary", description.String(), true); return new DescriptionPage(frame, "summary", description.String(), true);
src/apps/bootman/BootManagerController.h
+37 -37
View File
@@ -1,49 +1,49 @@
/* /*
* Copyright 2008, Haiku, Inc. All rights reserved. * Copyright 2008-2010, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Michael Pfeiffer <[email protected]> * Michael Pfeiffer <[email protected]>
*/ */
#ifndef BOOT_MANAGER_CONTROLLER_H #ifndef BOOT_MANAGER_CONTROLLER_H
#define BOOT_MANAGER_CONTROLLER_H #define BOOT_MANAGER_CONTROLLER_H
#include "WizardController.h" #include "WizardController.h"
#include <Message.h> #include <Message.h>
class BootDrive; class BootDrive;
class WizardView; class WizardView;
class WizardPageView; class WizardPageView;
class BRect; class BRect;
/*
Remainder of Settings Message Format: /* Remainder of Settings Message Format:
(See also BootDrive.h) (See also BootDrive.h)
"install" bool (whether install or uninstall should be performed) "install" bool (whether install or uninstall should be performed)
"file" String (the file where the backup of the MBR is saved) "file" String (the file where the backup of the MBR is saved)
"defaultPartition" int32 (index of default partition) "defaultPartition" int32 (index of default partition)
"timeout" int32 (timeout in seconds, -1 for no timeout) "timeout" int32 (timeout in seconds, -1 for no timeout)
*/ */
class BootManagerController : public WizardController class BootManagerController : public WizardController {
{
public: public:
BootManagerController(); BootManagerController();
virtual ~BootManagerController(); virtual ~BootManagerController();
protected: protected:
virtual int32 InitialState(); virtual int32 InitialState();
virtual int32 NextState(int32 state); virtual int32 NextState(int32 state);
virtual WizardPageView* CreatePage(int32 state, WizardView* wizard); virtual WizardPageView* CreatePage(int32 state, WizardView* wizard);
private: private:
enum State { enum State {
kStateEntry, kStateEntry,
kStateErrorEntry, kStateErrorEntry,
// Install states // Install states
kStateSaveMBR, kStateSaveMBR,
kStateMBRSaved, kStateMBRSaved,
@@ -51,32 +51,32 @@ private:
kStateDefaultPartitions, kStateDefaultPartitions,
kStateInstallSummary, kStateInstallSummary,
kStateInstalled, kStateInstalled,
// Uninstall states // Uninstall states
kStateUninstall, kStateUninstall,
kStateUninstalled kStateUninstalled
}; };
bool _HasSelectedPartitions(); bool _HasSelectedPartitions();
bool _WriteBootMenu(); bool _WriteBootMenu();
bool _SaveMBR(); bool _SaveMBR();
bool _RestoreMBR(); bool _RestoreMBR();
WizardPageView* _CreateErrorEntryPage(BRect frame); WizardPageView* _CreateErrorEntryPage(BRect frame);
WizardPageView* _CreateSaveMBRPage(BRect frame); WizardPageView* _CreateSaveMBRPage(BRect frame);
WizardPageView* _CreateMBRSavedPage(BRect frame); WizardPageView* _CreateMBRSavedPage(BRect frame);
WizardPageView* _CreateInstallSummaryPage(BRect frame); WizardPageView* _CreateInstallSummaryPage(BRect frame);
WizardPageView* _CreateInstalledPage(BRect frame); WizardPageView* _CreateInstalledPage(BRect frame);
WizardPageView* _CreateUninstallPage(BRect frame); WizardPageView* _CreateUninstallPage(BRect frame);
WizardPageView* _CreateUninstalledPage(BRect frame); WizardPageView* _CreateUninstalledPage(BRect frame);
BMessage fSettings; BMessage fSettings;
BootDrive* fBootDrive; BootDrive* fBootDrive;
status_t fReadPartitionsStatus; status_t fReadPartitionsStatus;
status_t fWriteBootMenuStatus; status_t fWriteBootMenuStatus;
status_t fSaveMBRStatus; status_t fSaveMBRStatus;
status_t fRestoreMBRStatus; status_t fRestoreMBRStatus;
}; };
src/apps/bootman/BootManagerWindow.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
BootManagerWindow::BootManagerWindow() BootManagerWindow::BootManagerWindow()
: :
BWindow(BRect(100, 100, 500, 400), B_TRANSLATE_COMMENT("Boot Manager", BWindow(BRect(100, 100, 500, 400), B_TRANSLATE_COMMENT("BootManager",
"Window Title"), "Window Title"),
B_TITLED_WINDOW, B_TITLED_WINDOW,
B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE) B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE)
src/apps/bootman/BootManagerWindow.h
+13 -12
View File
@@ -1,7 +1,7 @@
/* /*
* Copyright 2008, Haiku, Inc. All rights reserved. * Copyright 2008-2010, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Michael Pfeiffer <[email protected]> * Michael Pfeiffer <[email protected]>
*/ */
@@ -13,21 +13,22 @@
#include "BootManagerController.h" #include "BootManagerController.h"
class WizardView; class WizardView;
class BootManagerWindow : public BWindow
{ class BootManagerWindow : public BWindow {
public: public:
BootManagerWindow(); BootManagerWindow();
virtual ~BootManagerWindow(); virtual ~BootManagerWindow();
virtual void MessageReceived(BMessage* message);
virtual bool QuitRequested();
virtual void MessageReceived(BMessage* message);
virtual bool QuitRequested();
private: private:
BootManagerController fController;
BootManagerController fController; WizardView* fWizardView;
WizardView* fWizardView;
}; };
#endif // BOOT_MANAGER_WINDOW_H #endif // BOOT_MANAGER_WINDOW_H