diff options
| author | Mike Fulbright <msf@redhat.com> | 2000-05-10 20:37:48 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2000-05-10 20:37:48 +0000 |
| commit | 1427eaaa0defa6dacf0343807c8291259cf39d10 (patch) | |
| tree | bc54159f27a0faeefe74ce9162520eb3e11264f6 /iw | |
| parent | 53bfa2d947846c689bcab22d82b2514c7384f05f (diff) | |
| download | anaconda-1427eaaa0defa6dacf0343807c8291259cf39d10.tar.gz anaconda-1427eaaa0defa6dacf0343807c8291259cf39d10.tar.xz anaconda-1427eaaa0defa6dacf0343807c8291259cf39d10.zip | |
added an about to upgrade screen to GUI and TUI
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/confirm_gui.py | 29 | ||||
| -rw-r--r-- | iw/installpath_gui.py | 1 |
2 files changed, 21 insertions, 9 deletions
diff --git a/iw/confirm_gui.py b/iw/confirm_gui.py index c940072b3..1431e6709 100644 --- a/iw/confirm_gui.py +++ b/iw/confirm_gui.py @@ -8,9 +8,13 @@ class ConfirmWindow (InstallWindow): InstallWindow.__init__ (self, ics) ics.setNextEnabled (1) ics.setPrevEnabled (1) - ics.setTitle (_("About to Install")) -# ics.setHelpEnabled (FALSE) - ics.readHTML ("aboutinstall") + + if self.ics.todo.upgrade: + ics.setTitle (_("About to Upgrade")) + ics.readHTML ("aboutupgrade") + else: + ics.setTitle (_("About to Install")) + ics.readHTML ("aboutinstall") def getScreen (self): hbox = GtkHBox (TRUE, 5) @@ -24,16 +28,23 @@ class ConfirmWindow (InstallWindow): a.add (pix) a.set (0.5, 0.5, 1.0, 1.0) hbox.pack_start (a, FALSE) - - label = GtkLabel (_("Click next to begin installation of Red Hat Linux.")) + + if self.ics.todo.upgrade: + label = GtkLabel (_("Click next to begin upgrade of Red Hat Linux.")) + else: + label = GtkLabel (_("Click next to begin installation of Red Hat Linux.")) label.set_line_wrap (TRUE) label.set_usize(190, -1) - - label2 = GtkLabel (_("A complete log of your installation will be in " + if self.ics.todo.upgrade: + label2 = GtkLabel (_("A complete log of your upgrade will be in " + "/tmp/upgrade.log after rebooting your system. You " + "may want to keep this file for later reference.")) + else: + label2 = GtkLabel (_("A complete log of your installation will be in " "/tmp/install.log after rebooting your system. You " "may want to keep this file for later reference.")) - + label2.set_line_wrap (TRUE) label2.set_usize(190, -1) @@ -43,7 +54,7 @@ class ConfirmWindow (InstallWindow): a = GtkAlignment () a.add (box) - a.set (0.5, 0.5, 0.0, 0.0) + a.set (0.5, 0.5, 0.0, 0.0) hbox.pack_start (a) return hbox diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py index 5804a8007..0db3b8f46 100644 --- a/iw/installpath_gui.py +++ b/iw/installpath_gui.py @@ -72,6 +72,7 @@ class InstallPathWindow (InstallWindow): ( UpgradeExamineWindow, "custom-upgrade"), ( BootloaderWindow, BootloaderSkipname ), UnresolvedDependenciesWindow, + ( ConfirmWindow, "confirm" ), InstallProgressWindow, ( BootdiskWindow, "bootdisk" ), CongratulationWindow |