diff options
| -rw-r--r-- | dispatch.py | 2 | ||||
| -rwxr-xr-x | gui.py | 2 | ||||
| -rw-r--r-- | iw/confirm_gui.py | 97 | ||||
| -rw-r--r-- | text.py | 2 | ||||
| -rw-r--r-- | textw/confirm_text.py | 74 |
5 files changed, 0 insertions, 177 deletions
diff --git a/dispatch.py b/dispatch.py index ac4b4a0f5..1c0c2fb6c 100644 --- a/dispatch.py +++ b/dispatch.py @@ -95,8 +95,6 @@ installSteps = [ ("tasksel", ), ("group-selection", ), ("postselection", doPostSelection, ), - ("confirminstall", ), - ("confirmupgrade", ), ("install", ), ("setuptime", setupTimezone, ), ("preinstallconfig", doPreInstall, ), @@ -71,8 +71,6 @@ stepToClass = { "accounts" : ("account_gui", "AccountWindow"), "tasksel": ("task_gui", "TaskWindow"), "group-selection": ("package_gui", "GroupSelectionWindow"), - "confirminstall" : ("confirm_gui", "InstallConfirmWindow"), - "confirmupgrade" : ("confirm_gui", "UpgradeConfirmWindow"), "install" : ("progress_gui", "InstallProgressWindow"), "complete" : ("congrats_gui", "CongratulationWindow"), } diff --git a/iw/confirm_gui.py b/iw/confirm_gui.py deleted file mode 100644 index 62162fbc5..000000000 --- a/iw/confirm_gui.py +++ /dev/null @@ -1,97 +0,0 @@ -# -# confirm_gui.py: install/upgrade point of no return screen. -# -# Copyright 2000-2003 Red Hat, Inc. -# -# This software may be freely redistributed under the terms of the GNU -# library public license. -# -# You should have received a copy of the GNU Library Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -import gtk -from iw_gui import * -from rhpl.translate import _, N_ -from constants import * -from upgrade import queryUpgradeContinue -from image import presentRequiredMediaMessage -import gui -import sys - -class ConfirmWindow (InstallWindow): - - def getNext(self): - if self.anaconda.methodstr.startswith("cdrom://") and not self.anaconda.isKickstart: - rc = presentRequiredMediaMessage(self.anaconda) - if rc == 0: - rc2 = self.anaconda.intf.messageWindow(_("Reboot?"), - _("The system will be rebooted now."), - type="custom", custom_icon="warning", - custom_buttons=[_("_Back"), _("_Reboot")]) - if rc2 == 1: - sys.exit(0) - else: - raise gui.StayOnScreen - elif rc == 1: # they asked to go back - self.anaconda.intf.icw.prevClicked() - raise gui.StayOnScreen - return DISPATCH_BACK - - # ConfirmWindow tag="aboutupgrade" or "aboutinstall" - def getScreen (self, labelText, longText): - hbox = gtk.HBox (True, 5) - box = gtk.VBox (False, 5) - - pix = gui.readImageFromFile ("about-to-install.png") - if pix: - a = gtk.Alignment () - a.add (pix) - a.set (0.5, 0.5, 1.0, 1.0) - hbox.pack_start (a, False) - - label = gtk.Label (labelText) - label.set_line_wrap (True) - label.set_size_request(190, -1) - - label2 = gtk.Label (longText) - label2.set_line_wrap (True) - label2.set_size_request(190, -1) - - box.pack_start (label, False) - box.pack_start (label2, False) - box.set_border_width (5) - - a = gtk.Alignment () - a.add (box) - a.set (0.5, 0.5, 0.0, 0.0) - - hbox.pack_start (a) - return hbox - -class InstallConfirmWindow (ConfirmWindow): - windowTitle = N_("About to Install") - - def getScreen(self, anaconda): - self.anaconda = anaconda - - return ConfirmWindow.getScreen(self, - _("Click next to begin installation of %s.") % (productName,), - _("A complete log of the installation can be found in " - "the file '%s' after rebooting your system.\n\n" - "A kickstart file containing the installation options " - "selected can be found in the file '%s' after rebooting the " - "system.") % (u'/root/install.log', '/root/anaconda-ks.cfg')) - -class UpgradeConfirmWindow (ConfirmWindow): - windowTitle = N_("About to Upgrade") - - def getScreen(self, anaconda): - self.anaconda = anaconda - - return ConfirmWindow.getScreen(self, - _("Click next to begin upgrade of %s.") % (productName,), - _("A complete log of the upgrade can be found in " - "the file '%s' after rebooting your system.") % (u'/root/upgrade.log',)) - @@ -63,8 +63,6 @@ stepToClasses = { "accounts" : ("userauth_text", "RootPasswordWindow"), "tasksel": ("task_text", "TaskWindow"), "group-selection": ("grpselect_text", "GroupSelectionWindow"), - "confirminstall" : ("confirm_text", "BeginInstallWindow"), - "confirmupgrade" : ("confirm_text", "BeginUpgradeWindow"), "install" : ("progress_text", "setupForInstall"), "complete" : ("complete_text", "FinishedWindow"), } diff --git a/textw/confirm_text.py b/textw/confirm_text.py deleted file mode 100644 index 2bb7f3d98..000000000 --- a/textw/confirm_text.py +++ /dev/null @@ -1,74 +0,0 @@ -# -# confirm_text.py: text mode install/upgrade confirmation window -# -# Copyright 2001-2003 Red Hat, Inc. -# -# This software may be freely redistributed under the terms of the GNU -# library public license. -# -# You should have received a copy of the GNU Library Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -import sys - -from snack import * -from constants_text import * -from rhpl.translate import _ -from image import presentRequiredMediaMessage - -class BeginInstallWindow: - def __call__ (self, screen, anaconda): - rc = ButtonChoiceWindow (screen, _("Installation to begin"), - _("A complete log of your installation will be in " - "%s after rebooting your system. You " - "may want to keep this file for later reference.") %("/root/install.log",), - buttons = [ _("OK"), _("Back") ], - help = "begininstall") - if rc == string.lower (_("Back")): - return INSTALL_BACK - - if anaconda.methodstr.startswith("cdrom://") and not anaconda.isKickstart: - rc = presentRequiredMediaMessage(anaconda) - - if rc == 0: - rc2 = anaconda.intf.messageWindow(_("Reboot?"), - _("The system will be rebooted now."), - type="custom", custom_icon="warning", - custom_buttons=[_("_Back"), _("_Reboot")]) - if rc2 == 1: - sys.exit(0) - else: - return INSTALL_BACK - elif rc == 1: # they asked to go back - return INSTALL_BACK - - return INSTALL_OK - -class BeginUpgradeWindow: - def __call__ (self, screen, anaconda): - rc = ButtonChoiceWindow (screen, _("Upgrade to begin"), - _("A complete log of your upgrade will be in " - "%s after rebooting your system. You " - "may want to keep this file for later reference." %("/root/upgrade.log",)), - buttons = [ _("OK"), _("Back") ], - help = "beginupgrade") - if rc == string.lower (_("Back")): - return INSTALL_BACK - - if anaconda.methodstr.startswith("cdrom://") and not anaconda.isKickstart: - rc = presentRequiredMediaMessage(anaconda) - - if rc == 0: - rc2 = anaconda.intf.messageWindow(_("Reboot?"), - _("The system will be rebooted now."), - type="custom", custom_icon="warning", - custom_buttons=[_("_Back"), _("_Reboot")]) - if rc2 == 1: - sys.exit(0) - else: - return INSTALL_BACK - elif rc == 1: # they asked to go back - return INSTALL_BACK - - return INSTALL_OK |