[rhel7-branch] Display a EULA-related warning on the progress hub at the end of installation. Related: rhbz#909309

Chris Lumens clumens at redhat.com
Mon Nov 4 20:30:14 UTC 2013


---
 pyanaconda/ui/gui/hubs/progress.glade |  2 ++
 pyanaconda/ui/gui/hubs/progress.py    | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pyanaconda/ui/gui/hubs/progress.glade b/pyanaconda/ui/gui/hubs/progress.glade
index cb52685..e22f7cb 100644
--- a/pyanaconda/ui/gui/hubs/progress.glade
+++ b/pyanaconda/ui/gui/hubs/progress.glade
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Mon Nov  4 15:14:27 2013 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires AnacondaWidgets 1.0 -->
@@ -67,6 +68,7 @@
                           <object class="GtkSpinner" id="progressSpinner">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
                             <property name="active">True</property>
                           </object>
                           <packing>
diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py
index 3dbed22..f627d71 100644
--- a/pyanaconda/ui/gui/hubs/progress.py
+++ b/pyanaconda/ui/gui/hubs/progress.py
@@ -117,7 +117,6 @@ class ProgressHub(Hub):
 
         return True
 
-
     def _configuration_done(self):
         # Configuration done, remove ransom notes timer
         # and switch to the Reboot page
@@ -125,11 +124,13 @@ class ProgressHub(Hub):
         GLib.source_remove(self._rnotes_id)
         self._progressNotebook.set_current_page(1)
 
+        self.set_warning(_("Use of this product is subject to the license agreement found at /usr/share/doc/redhat-release/EULA"))
+        self.window.show_all()
+
         # kickstart install, continue automatically if reboot or shutdown selected
         if flags.automatedInstall and self.data.reboot.action in [KS_REBOOT, KS_SHUTDOWN]:
             self.continueButton.emit("clicked")
 
-
     def _install_done(self):
         # package installation done, check personalization spokes
         # and start the configuration step if all is ready
@@ -204,6 +205,9 @@ class ProgressHub(Hub):
         self._progressLabel = self.builder.get_object("progressLabel")
         self._progressNotebook = self.builder.get_object("progressNotebook")
 
+        self._spinner = self.builder.get_object("progressSpinner")
+        self._spinner.show()
+
         lbl = self.builder.get_object("configurationLabel")
         lbl.set_text(lbl.get_text() % productName)
 
@@ -270,15 +274,13 @@ class ProgressHub(Hub):
 
     @gtk_action_nowait
     def _restart_spinner(self):
-        spinner = self.builder.get_object("progressSpinner")
-        spinner.show()
-        spinner.start()
+        self._spinner.show()
+        self._spinner.start()
 
     @gtk_action_nowait
     def _progress_bar_complete(self):
         self._progressBar.set_fraction(1.0)
         self._progressLabel.set_text(_("Complete!"))
 
-        spinner = self.builder.get_object("progressSpinner")
-        spinner.stop()
-        spinner.hide()
+        self._spinner.stop()
+        self._spinner.hide()
-- 
1.8.3.1



More information about the anaconda-patches mailing list