From dc7bdd559776bb8525203698cc64f8de806234b2 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 18 Nov 2014 15:10:49 +0100 Subject: [PATCH] BootMan: Don't rename the "Install" button to "Quit" ... when there are no installable disks. The button is disabled anyway, and it is not useful to rename it. The program can be exited by closing the window anyway, so a "Quit" button is useless. --- src/apps/bootmanager/DrivesPage.cpp | 32 +++++++++++------------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/apps/bootmanager/DrivesPage.cpp b/src/apps/bootmanager/DrivesPage.cpp index 8c1c204898..0326b3b9bd 100644 --- a/src/apps/bootmanager/DrivesPage.cpp +++ b/src/apps/bootmanager/DrivesPage.cpp @@ -314,28 +314,20 @@ void DrivesPage::_UpdateWizardButtons(DriveItem* item) { fWizardView->SetPreviousButtonHidden(!fHasInstallableItems); - if (fHasInstallableItems) { - fWizardView->SetPreviousButtonLabel( - B_TRANSLATE_COMMENT("Uninstall", "Button")); - if (item == NULL) { - fWizardView->SetPreviousButtonEnabled(false); - fWizardView->SetNextButtonEnabled(false); - } else { - fWizardView->SetPreviousButtonEnabled( - item->CanBeInstalled() && item->IsInstalled()); - fWizardView->SetNextButtonEnabled(item->CanBeInstalled()); - - fWizardView->SetNextButtonLabel( - item->IsInstalled() && item->CanBeInstalled() - ? B_TRANSLATE_COMMENT("Update", "Button") - : B_TRANSLATE_COMMENT("Install", "Button")); - } - } else { - fWizardView->SetNextButtonLabel( - B_TRANSLATE_COMMENT("Quit", "Button")); + fWizardView->SetPreviousButtonLabel( + B_TRANSLATE_COMMENT("Uninstall", "Button")); + if (item == NULL) { fWizardView->SetPreviousButtonEnabled(false); fWizardView->SetNextButtonEnabled(false); - return; + } else { + fWizardView->SetPreviousButtonEnabled( + item->CanBeInstalled() && item->IsInstalled()); + fWizardView->SetNextButtonEnabled(item->CanBeInstalled()); + + fWizardView->SetNextButtonLabel( + item->IsInstalled() && item->CanBeInstalled() + ? B_TRANSLATE_COMMENT("Update", "Button") + : B_TRANSLATE_COMMENT("Install", "Button")); } }