diff options
| author | Jeremy Katz <katzj@redhat.com> | 2007-04-04 20:25:20 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2007-04-04 20:25:20 +0000 |
| commit | 0c02e100c8885845370facfea2323a786716ea1f (patch) | |
| tree | bb0f955725d4a722eebebc62cb366e74f0937516 | |
| parent | 49a55e465ad119dd83ecf299eef406927d2b5437 (diff) | |
| download | anaconda-0c02e100c8885845370facfea2323a786716ea1f.tar.gz anaconda-0c02e100c8885845370facfea2323a786716ea1f.tar.xz anaconda-0c02e100c8885845370facfea2323a786716ea1f.zip | |
2007-04-04 Jeremy Katz <katzj@redhat.com>
* iw/congrats_gui.py (CongratulationWindow.__init__): Add support
for close button to be used with the live install (#225168)
* ui/anaconda.glade: Likewise.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | iw/congrats_gui.py | 12 | ||||
| -rw-r--r-- | ui/anaconda.glade | 15 |
3 files changed, 26 insertions, 5 deletions
@@ -5,6 +5,10 @@ 2007-04-04 Jeremy Katz <katzj@redhat.com> + * iw/congrats_gui.py (CongratulationWindow.__init__): Add support + for close button to be used with the live install (#225168) + * ui/anaconda.glade: Likewise. + * liveinst/liveinst.xinit: Work with changes for running from RAM/usb stick diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py index 6f962f5c6..82741cfc2 100644 --- a/iw/congrats_gui.py +++ b/iw/congrats_gui.py @@ -18,6 +18,7 @@ from iw_gui import * from rhpl.translate import _, N_ from constants import * import iutil +import os class CongratulationWindow (InstallWindow): @@ -34,8 +35,12 @@ class CongratulationWindow (InstallWindow): # 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() - ics.cw.mainxml.get_widget("rebootButton").show() - ics.cw.mainxml.get_widget("rebootButton").grab_focus() + if os.path.exists("/dev/live-osimg"): + ics.cw.mainxml.get_widget("closeButton").show() + ics.cw.mainxml.get_widget("closeButton").grab_focus() + else: + ics.cw.mainxml.get_widget("rebootButton").show() + ics.cw.mainxml.get_widget("rebootButton").grab_focus() def getNext(self): # XXX - copy any screenshots over @@ -54,12 +59,13 @@ class CongratulationWindow (InstallWindow): hbox.pack_start (a, False, False, 36) bootstr = "" - if rhpl.getArch() == "s390": + if rhpl.getArch() == "s390" or os.path.exists("/dev/live-osimg"): floppystr = "" else: floppystr = _("Press the \"Reboot\" button to reboot your system." "\n\n") + txt = _("Congratulations, the installation is complete.\n\n" "%s%s") %(floppystr, bootstr) label = gui.WrappingLabel(txt) diff --git a/ui/anaconda.glade b/ui/anaconda.glade index d8e3aa0b8..ce6a0caf2 100644 --- a/ui/anaconda.glade +++ b/ui/anaconda.glade @@ -51,7 +51,7 @@ <property name="border_width">12</property> <property name="visible">True</property> <property name="n_rows">1</property> - <property name="n_columns">1</property> + <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">0</property> <property name="column_spacing">0</property> @@ -88,7 +88,6 @@ <property name="bottom_attach">1</property> </packing> </child> - </widget> <packing> <property name="padding">0</property> @@ -437,6 +436,18 @@ </child> </widget> </child> + + <child> + <widget class="GtkButton" id="closeButton"> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_closeButton_clicked" last_modification_time="Wed, 04 Apr 2007 20:23:13 GMT"/> + </widget> + </child> </widget> <packing> <property name="padding">0</property> |