diff options
| author | David Lehman <dlehman@redhat.com> | 2009-03-04 20:45:57 -0600 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-03-04 20:45:57 -0600 |
| commit | db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3 (patch) | |
| tree | 0279b0573115d6d79f5b4c1892fdd55cb5f7f41b /iw | |
| parent | 78b1415591a1db738d0c09b9de50e501e2048c28 (diff) | |
| parent | 270003cd1f0c09a77608c4b0a07687c822f56274 (diff) | |
| download | anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.tar.gz anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.tar.xz anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.zip | |
Merge branch 'master' into storage
Conflicts:
anaconda
fsset.py
iutil.py
iw/partition_gui.py
partedUtils.py
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/congrats_gui.py | 33 | ||||
| -rw-r--r-- | iw/network_gui.py | 1 |
2 files changed, 27 insertions, 7 deletions
diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py index 18667dc99..b5f0101cf 100644 --- a/iw/congrats_gui.py +++ b/iw/congrats_gui.py @@ -20,7 +20,6 @@ import gtk import gui -import iutil from iw_gui import * from constants import * import os @@ -40,6 +39,8 @@ class CongratulationWindow (InstallWindow): # force buttonbar on in case release notes viewer is running ics.cw.mainxml.get_widget("buttonBar").set_sensitive(True) + self.rebootButton = ics.cw.mainxml.get_widget("rebootButton") + # this mucks around a bit, but it's the weird case and it's # better than adding a lot of complication to the normal ics.cw.mainxml.get_widget("nextButton").hide() @@ -47,6 +48,8 @@ class CongratulationWindow (InstallWindow): ics.cw.mainxml.get_widget("closeButton").show() ics.cw.mainxml.get_widget("closeButton").grab_focus() else: + self.rebootButton.show() + self.rebootButton.grab_focus() ics.cw.mainxml.get_widget("rebootButton").show() ics.cw.mainxml.get_widget("rebootButton").grab_focus() @@ -66,11 +69,29 @@ class CongratulationWindow (InstallWindow): a.set_size_request(200, -1) hbox.pack_start (a, False, False, 36) - txt = _("Congratulations, your %s installation is complete.\n\n" - "Please reboot to use the installed system. " - "Note that updates may be available to ensure the proper " - "functioning of your system and installation of these " - "updates is recommended after the reboot.") %(productName,) + if iutil.isS390(): + txt = _("Congratulations, your %s installation is complete.\n\n") % (productName,) + + if not anaconda.canReIPL: + self.rebootButton.set_label(_("Shutdown")) + + txt = txt + _("Please shutdown to use the installed system.\n") + else: + txt = txt + _("Please reboot to use the installed system.\n") + + if not anaconda.reIPLMessage is None: + txt = txt + "\n" + anaconda.reIPLMessage + "\n\n" + + txt = txt + _("Note that updates may be available to ensure the proper " + "functioning of your system and installation of these " + "updates is recommended after the reboot.") + else: + txt = _("Congratulations, your %s installation is complete.\n\n" + "Please reboot to use the installed system. " + "Note that updates may be available to ensure the proper " + "functioning of your system and installation of these " + "updates is recommended after the reboot.") %(productName,) + label = gui.WrappingLabel(txt) label.set_size_request(250, -1) diff --git a/iw/network_gui.py b/iw/network_gui.py index 90ee1237b..365333ac3 100644 --- a/iw/network_gui.py +++ b/iw/network_gui.py @@ -25,7 +25,6 @@ import string from iw_gui import * import gui import network -import socket from constants import * import gettext |