[PATCH 3/3] Update icon names used within python code.

David Shea dshea at redhat.com
Thu Jul 10 21:50:33 UTC 2014


Avoid legacy icon names, since legacy icon names may not be available.
In the NTP server config dialog, since gtk-yes and gtk-no are
deprecated, use emblem-default, which is a green circle with a white
check mark, and dialog-error.
---
 pyanaconda/ui/gui/helpers.py               | 2 +-
 pyanaconda/ui/gui/spokes/datetime_spoke.py | 6 +++---
 pyanaconda/ui/gui/spokes/lib/passphrase.py | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pyanaconda/ui/gui/helpers.py b/pyanaconda/ui/gui/helpers.py
index dfde9d5..11b4b15 100644
--- a/pyanaconda/ui/gui/helpers.py
+++ b/pyanaconda/ui/gui/helpers.py
@@ -67,7 +67,7 @@ class GUIDialogInputCheckHandler(GUIInputCheckHandler):
             inputcheck.input_obj.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, "")
         else:
             inputcheck.input_obj.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY,
-                    "gtk-dialog-error")
+                    "dialog-error")
             inputcheck.input_obj.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY,
                 inputcheck.check_status)
 
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py
index 5504f95..c2b3d06 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.py
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py
@@ -151,11 +151,11 @@ class NTPconfigDialog(GUIObject, GUIDialogInputCheckHandler):
         value = model[itr][1]
 
         if value == SERVER_QUERY:
-            renderer.set_property("icon-name", "gtk-dialog-question")
+            renderer.set_property("icon-name", "dialog-question")
         elif value == SERVER_OK:
-            renderer.set_property("icon-name", "gtk-yes")
+            renderer.set_property("icon-name", "emblem-default")
         else:
-            renderer.set_property("icon-name", "gtk-no")
+            renderer.set_property("icon-name", "dialog-error")
 
     def initialize(self):
         self.window.set_size_request(500, 400)
diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py
index a32299b..685d711 100644
--- a/pyanaconda/ui/gui/spokes/lib/passphrase.py
+++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py
@@ -154,13 +154,13 @@ class PassphraseDialog(GUIObject, GUIInputCheckHandler):
         passphrase = self.get_input(inputcheck.input_obj)
 
         if passphrase and any(char not in PW_ASCII_CHARS for char in passphrase):
-            return ("gtk-dialog-warning", _("Passphrase contains non-ASCII characters"))
+            return ("dialog-warning", _("Passphrase contains non-ASCII characters"))
         else:
             return InputCheck.CHECK_OK
 
     def _checkStrength(self, inputcheck):
         if self._pwq_error:
-            return ("gtk-dialog-error", _(ERROR_WEAK) % self._pwq_error)
+            return ("dialog-error", _(ERROR_WEAK) % self._pwq_error)
         else:
             return InputCheck.CHECK_OK
 
@@ -168,7 +168,7 @@ class PassphraseDialog(GUIObject, GUIInputCheckHandler):
         passphrase = self._passphrase_entry.get_text()
         confirm = self._confirm_entry.get_text()
         if passphrase != confirm:
-            result = ("gtk-dialog-error", _(ERROR_NOT_MATCHING))
+            result = ("dialog-error", _(ERROR_NOT_MATCHING))
         else:
             result = InputCheck.CHECK_OK
 
-- 
2.0.0



More information about the anaconda-patches mailing list