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

* Tweaked text here and there (also thanks to Alexandre for proof-reading!)

Browse Source 
* Renamed _UpdateMenus() to _UpdateControls().


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30380 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-04-24 15:45:34 +00:00
parent b4eca493bb
commit 7a65816a64
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/installer/InstallerApp.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ static const char* kInfoText =
"This is alpha-quality software! It means there is a high risk of loosing " "This is alpha-quality software! It means there is a high risk of loosing "
"important data. Make frequent backups! You have been warned.\n\n" "important data. Make frequent backups! You have been warned.\n\n"
"1) If you are installing Haiku onto real hardware (not inside an emulation) " "1) If you are installing Haiku onto real hardware (not inside an emulator) "
"you need to have prepared a harddisk partition. The Installer and the " "you need to have prepared a harddisk partition. The Installer and the "
"DriveSetup tool will only offer to initialize existing partitions with the " "DriveSetup tool will only offer to initialize existing partitions with the "
"Haiku native filesystem. We recommend using the GParted Live-CD, it can also " "Haiku native filesystem. We recommend using the GParted Live-CD, it can also "
src/apps/installer/InstallerWindow.cpp
+8 -7
View File
@@ -351,7 +351,7 @@ InstallerWindow::MessageReceived(BMessage *msg)
switch (fInstallStatus) { switch (fInstallStatus) {
case kReadyForInstall: case kReadyForInstall:
{ {
BList *list = new BList(); BList* list = new BList();
int32 size = 0; int32 size = 0;
fPackagesView->GetPackagesToInstall(list, &size); fPackagesView->GetPackagesToInstall(list, &size);
fCopyEngine->SetPackagesList(list); fCopyEngine->SetPackagesList(list);
@@ -380,10 +380,10 @@ InstallerWindow::MessageReceived(BMessage *msg)
break; break;
case SRC_PARTITION: case SRC_PARTITION:
_PublishPackages(); _PublishPackages();
_UpdateMenus(); _UpdateControls();
break; break;
case TARGET_PARTITION: case TARGET_PARTITION:
_UpdateMenus(); _UpdateControls();
break; break;
case SETUP_MESSAGE: case SETUP_MESSAGE:
_LaunchDriveSetup(); _LaunchDriveSetup();
@@ -424,7 +424,7 @@ InstallerWindow::MessageReceived(BMessage *msg)
_DisableInterface(fDriveSetupLaunched); _DisableInterface(fDriveSetupLaunched);
if (fDriveSetupLaunched) if (fDriveSetupLaunched)
_SetStatusMessage("Running DriveSetup" B_UTF8_ELLIPSIS _SetStatusMessage("Running DriveSetup" B_UTF8_ELLIPSIS
"\nClose DriveSetup to continue with the\n" "\n\nClose DriveSetup to continue with the "
"installation."); "installation.");
else else
_ScanPartitions(); _ScanPartitions();
@@ -443,7 +443,7 @@ InstallerWindow::QuitRequested()
{ {
if (fDriveSetupLaunched) { if (fDriveSetupLaunched) {
(new BAlert("driveSetup", (new BAlert("driveSetup",
"Please close the DriveSetup window before closing the\n" "Please close the DriveSetup window before closing the "
"Installer window.", "OK"))->Go(); "Installer window.", "OK"))->Go();
return false; return false;
} }
@@ -515,12 +515,12 @@ InstallerWindow::_ScanPartitions()
if (fSrcMenu->ItemAt(0)) { if (fSrcMenu->ItemAt(0)) {
_PublishPackages(); _PublishPackages();
} }
_UpdateMenus(); _UpdateControls();
} }
void void
InstallerWindow::_UpdateMenus() InstallerWindow::_UpdateControls()
{ {
PartitionMenuItem* srcItem = (PartitionMenuItem*)fSrcMenu->FindMarked(); PartitionMenuItem* srcItem = (PartitionMenuItem*)fSrcMenu->FindMarked();
BString label; BString label;
@@ -558,6 +558,7 @@ InstallerWindow::_UpdateMenus()
label = "Please Choose Target"; label = "Please Choose Target";
} }
fDestMenuField->MenuItem()->SetLabel(label.String()); fDestMenuField->MenuItem()->SetLabel(label.String());
if (srcItem && dstItem) { if (srcItem && dstItem) {
char message[255]; char message[255];
sprintf(message, "Press the Begin button to install from '%s' onto " sprintf(message, "Press the Begin button to install from '%s' onto "
src/apps/installer/InstallerWindow.h
+1 -1
View File
@@ -52,7 +52,7 @@ private:
void _LaunchDriveSetup(); void _LaunchDriveSetup();
void _DisableInterface(bool disable); void _DisableInterface(bool disable);
void _ScanPartitions(); void _ScanPartitions();
void _UpdateMenus(); void _UpdateControls();
void _PublishPackages(); void _PublishPackages();
void _SetStatusMessage(const char* text); void _SetStatusMessage(const char* text);