And then these two fixes are just to make the UI a little nicer, and can just go on master.
- Chris
--- pyanaconda/ui/gui/spokes/lib/detailederror.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/detailederror.py b/pyanaconda/ui/gui/spokes/lib/detailederror.py index 2ccb7c8..e0acd94 100644 --- a/pyanaconda/ui/gui/spokes/lib/detailederror.py +++ b/pyanaconda/ui/gui/spokes/lib/detailederror.py @@ -50,7 +50,7 @@ class DetailedErrorDialog(GUIObject): GUIObject.__init__(self, *args, **kwargs)
if not buttons: - self.window.add_button(_("_Cancel"), 0) + widget = self.window.add_button(_("_Cancel"), 0) else: buttonbox = self.builder.get_object("detailedButtonBox") i = 0 @@ -64,6 +64,9 @@ class DetailedErrorDialog(GUIObject):
i += 1
+ widget.set_can_default(True) + widget.grab_default() + if label: self.builder.get_object("detailedLabel").set_text(label)
--- pyanaconda/ui/gui/spokes/lib/passphrase.py | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py index c629cd7..1c41738 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.py +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py @@ -61,6 +61,7 @@ class PassphraseDialog(GUIObject): self._confirm_entry.add_events(Gdk.EventMask.FOCUS_CHANGE_MASK)
self._save_button = self.builder.get_object("passphrase_save_button") + self._save_button.set_can_default(True)
# add the passphrase strength meter self._strength_bar = Gtk.LevelBar() @@ -155,6 +156,8 @@ class PassphraseDialog(GUIObject): if not self._save_button.get_sensitive() and \ entry.get_text() == self._passphrase_entry.get_text(): self._save_button.set_sensitive(True) + self._save_button.grab_focus() + self._save_button.grab_default() self._set_entry_icon(entry, "", "")
def on_confirm_editing_done(self, entry, *args): @@ -168,6 +171,7 @@ class PassphraseDialog(GUIObject): self._save_button.set_sensitive(False) else: self._save_button.grab_focus() + self._save_button.grab_default()
def on_save_clicked(self, button): self.passphrase = self._passphrase_entry.get_text()
anaconda-patches@lists.fedorahosted.org