|
 |
acc58b |
From f8b8191dcc340e237a23580c60a72382cb68f596 Mon Sep 17 00:00:00 2001
|
|
|
acc58b |
From: Martin Kolman <mkolman@redhat.com>
|
|
|
acc58b |
Date: Fri, 26 Sep 2014 14:02:02 +0200
|
|
|
acc58b |
Subject: [PATCH] Replace Finish with Done on the next button (#1107887)
|
|
|
acc58b |
|
|
|
acc58b |
By default Firstboot displays the "Forward" label on the next-button
|
|
|
acc58b |
if there are any modules following the current module.
|
|
|
acc58b |
|
|
|
acc58b |
Once it reaches the last module, it currently tries to decide
|
|
|
acc58b |
if it should show keep the "Forward" label or switch to the
|
|
|
acc58b |
"Finish" label due to the given screen being the last.
|
|
|
acc58b |
|
|
|
acc58b |
Unfortunately, some multi-page modules, such as Subscription Manager
|
|
|
acc58b |
do not provide any feedback to Firstboot if the given page is the last page.
|
|
|
acc58b |
One Subscription Manager page even has a combo box that decides if the module quits
|
|
|
acc58b |
or continues to the next page and there is no feedback provided about
|
|
|
acc58b |
this.
|
|
|
acc58b |
|
|
|
acc58b |
The lack of feedback is not an issue if such a module is not the last
|
|
|
acc58b |
one as all the labels would just be "Forward", but if the module is the
|
|
|
acc58b |
last one as the only one, Firstboot does not have enough information
|
|
|
acc58b |
to decide which label to use.
|
|
|
acc58b |
|
|
|
acc58b |
Given the lack of any other option, just set the next button label to
|
|
|
acc58b |
"Done" for all pages on the last (or possibly only) Firstboot module.
|
|
|
acc58b |
|
|
|
acc58b |
Resolves: rhbz#1107887
|
|
|
acc58b |
Signed-off-by: Martin Kolman <mkolman@redhat.com>
|
|
|
acc58b |
---
|
|
|
acc58b |
firstboot/interface.py | 4 ++--
|
|
|
acc58b |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
acc58b |
|
|
|
acc58b |
diff --git a/firstboot/interface.py b/firstboot/interface.py
|
|
|
acc58b |
index 6fda66d..60d4800 100644
|
|
|
acc58b |
--- a/firstboot/interface.py
|
|
|
acc58b |
+++ b/firstboot/interface.py
|
|
|
acc58b |
@@ -87,7 +87,7 @@ class Interface(object):
|
|
|
acc58b |
|
|
|
acc58b |
# If we were previously on the last page, we need to set the Next
|
|
|
acc58b |
# button's label back to normal.
|
|
|
acc58b |
- if self.nextButton.get_label() == _("_Finish"):
|
|
|
acc58b |
+ if self.nextButton.get_label() == _("_Done"):
|
|
|
acc58b |
self.nextButton.set_label("gtk-go-forward")
|
|
|
acc58b |
|
|
|
acc58b |
self._control.currentPage = self._control.history.pop()
|
|
|
acc58b |
@@ -163,7 +163,7 @@ class Interface(object):
|
|
|
acc58b |
# ModuleSet), it's time to kill the interface.
|
|
|
acc58b |
if len(self._controlStack) == 1:
|
|
|
acc58b |
if self._control.currentPage == len(self.moduleList)-1:
|
|
|
acc58b |
- self.nextButton.set_label(_("_Finish"))
|
|
|
acc58b |
+ self.nextButton.set_label(_("_Done"))
|
|
|
acc58b |
elif self._control.currentPage == len(self.moduleList):
|
|
|
acc58b |
self.checkReboot()
|
|
|
acc58b |
self.destroy()
|
|
|
acc58b |
--
|
|
|
acc58b |
1.9.3
|
|
|
acc58b |
|