[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] No one likes the welcome step anymore, so remove it.



---
 pyanaconda/__init__.py           |   21 ------------
 pyanaconda/dispatch.py           |    1 -
 pyanaconda/gui.py                |    1 -
 pyanaconda/installclass.py       |    1 -
 pyanaconda/iw/welcome_gui.py     |   68 --------------------------------------
 pyanaconda/kickstart.py          |    1 -
 pyanaconda/text.py               |    1 -
 pyanaconda/textw/welcome_text.py |   47 --------------------------
 pyanaconda/upgrade.py            |    1 -
 9 files changed, 0 insertions(+), 142 deletions(-)
 delete mode 100644 pyanaconda/iw/welcome_gui.py
 delete mode 100644 pyanaconda/textw/welcome_text.py

diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py
index c52e4f7..b167bd5 100644
--- a/pyanaconda/__init__.py
+++ b/pyanaconda/__init__.py
@@ -285,27 +285,6 @@ class Anaconda(object):
         else:
             self.methodstr = methodstr
 
-    def requiresNetworkInstall(self):
-        fail = False
-        numNetDevs = isys.getNetworkDeviceCount()
-
-        if self.methodstr is not None:
-            if (self.methodstr.startswith("http") or \
-                self.methodstr.startswith("ftp://";) or \
-                self.methodstr.startswith("nfs:")) and \
-               numNetDevs == 0:
-                fail = True
-        elif self.stage2 is not None:
-            if self.stage2.startswith("cdrom://") and \
-               not os.path.isdir("/mnt/stage2/Packages") and \
-               numNetDevs == 0:
-                fail = True
-
-        if fail:
-            log.error("network install required, but no network devices available")
-
-        return fail
-
     def write(self):
         self.writeXdriver()
         self.instLanguage.write(self.rootPath)
diff --git a/pyanaconda/dispatch.py b/pyanaconda/dispatch.py
index 39aa2d9..a8becb7 100644
--- a/pyanaconda/dispatch.py
+++ b/pyanaconda/dispatch.py
@@ -66,7 +66,6 @@ log = logging.getLogger("anaconda")
 # All install steps take the anaconda object as their sole argument.  This
 # gets passed in when we call the function.
 installSteps = [
-    ("welcome", ),
     ("language", ),
     ("keyboard", ),
     ("betanag", betaNagScreen, ),
diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py
index e555ec7..16289fe 100755
--- a/pyanaconda/gui.py
+++ b/pyanaconda/gui.py
@@ -64,7 +64,6 @@ mainWindow = None
 stepToClass = {
     "language" : ("language_gui", "LanguageWindow"),
     "keyboard" : ("kbd_gui", "KeyboardWindow"),
-    "welcome" : ("welcome_gui", "WelcomeWindow"),
     "filtertype" : ("filter_type", "FilterTypeWindow"),
     "filter" : ("filter_gui", "FilterWindow"), 
     "zfcpconfig" : ("zfcp_gui", "ZFCPWindow"),
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index 197f1e7..8bc2e53 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -78,7 +78,6 @@ class BaseInstallClass(object):
 	dispatch.setStepList(
 		 "language",
 		 "keyboard",
-		 "welcome",
                  "filtertype",
                  "filter",
                  "storageinit",
diff --git a/pyanaconda/iw/welcome_gui.py b/pyanaconda/iw/welcome_gui.py
deleted file mode 100644
index c30aece..0000000
--- a/pyanaconda/iw/welcome_gui.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# welcome_gui.py: gui welcome screen.
-#
-# Copyright (C) 2000, 2001, 2002  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import gtk
-from pyanaconda import gui
-import sys
-from iw_gui import *
-
-from pyanaconda.constants import *
-import gettext
-_ = lambda x: gettext.ldgettext("anaconda", x)
-
-class WelcomeWindow (InstallWindow):
-
-    windowTitle = "" #N_("Welcome")
-
-    def __init__ (self, ics):
-        InstallWindow.__init__ (self, ics)
-        ics.setGrabNext (1)
-        self.anaconda = None
-
-    # WelcomeWindow tag="wel"
-    def getScreen (self, anaconda):
-        self.anaconda = anaconda
-        # this is a bit ugly... but scale the image if we're not at 800x600
-        (w, h) = self.ics.cw.window.get_size_request()
-        if w >= 800:
-            height = None
-            width = None
-        else:
-            width = 500
-            height = 258
-        pix = gui.readImageFromFile("splash.png", width, height, dither=False)
-        box = gtk.EventBox ()
-        box.add (pix)
-        return box
-
-    def getNext (self):
-        if self.anaconda.requiresNetworkInstall():
-            self.anaconda.intf.messageWindow(_("Network Install Required"),
-                                             _("Your installation source is set to "
-                                               "a network location, but no network "
-                                               "devices were found on your "
-                                               "system.  To avoid a network "
-                                               "installation, boot with the full "
-                                               "DVD, full CD set, or do not pass "
-                                               "a repo= parameter that specifies "
-                                               "a network source."),
-                                             type="custom",
-                                             custom_icon="error",
-                                             custom_buttons=[_("E_xit Installer")])
-            sys.exit(0)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 8df032e..bc1d8b6 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1449,7 +1449,6 @@ def setSteps(anaconda):
         anaconda.instClass.setSteps(anaconda)
         dispatch.skipStep("findrootparts")
 
-    dispatch.skipStep("welcome")
     dispatch.skipStep("betanag")
     dispatch.skipStep("network")
 
diff --git a/pyanaconda/text.py b/pyanaconda/text.py
index 3e52978..0605b08 100644
--- a/pyanaconda/text.py
+++ b/pyanaconda/text.py
@@ -50,7 +50,6 @@ log = logging.getLogger("anaconda")
 stepToClasses = {
     "language" : ("language_text", "LanguageWindow"),
     "keyboard" : ("keyboard_text", "KeyboardWindow"),
-    "welcome" : ("welcome_text", "WelcomeWindow"),
     "parttype" : ("partition_text", "PartitionTypeWindow"),
     "addswap" : ("upgrade_text", "UpgradeSwapWindow"),
     "upgrademigratefs" : ("upgrade_text", "UpgradeMigrateFSWindow"),
diff --git a/pyanaconda/textw/welcome_text.py b/pyanaconda/textw/welcome_text.py
deleted file mode 100644
index 3cddf17..0000000
--- a/pyanaconda/textw/welcome_text.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# welcome_text.py: text mode welcome window
-#
-# Copyright (C) 2001, 2002  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-from snack import *
-from constants_text import *
-from pyanaconda.constants import *
-import sys
-import gettext
-_ = lambda x: gettext.ldgettext("anaconda", x)
-
-class WelcomeWindow:
-    def __call__(self, screen, anaconda):
-        rc = ButtonChoiceWindow(screen, _("%s") % (productName,),
-                                _("Welcome to %s!\n\n")
-                                % (productName, ),
-                                buttons = [TEXT_OK_BUTTON], width = 50,
-                                help = "welcome")
-
-        if anaconda.requiresNetworkInstall():
-            anaconda.intf.messageWindow(_("Network Install Required"),
-                                        _("Your installation source is set to "
-                                          "a network location, but no network "
-                                          "devices were found on your "
-                                          "system.  To avoid a network "
-                                          "installation, boot with the full "
-                                          "DVD, full CD set, or do not pass "
-                                          "a repo= parameter that specifies "
-                                          "a network source."))
-            sys.exit(0)
-
-        return INSTALL_OK
diff --git a/pyanaconda/upgrade.py b/pyanaconda/upgrade.py
index 221a5c6..c2726fb 100644
--- a/pyanaconda/upgrade.py
+++ b/pyanaconda/upgrade.py
@@ -319,7 +319,6 @@ def setSteps(anaconda):
     dispatch.setStepList(
                 "language",
                 "keyboard",
-                "welcome",
                 "filtertype",
                 "filter",
                 "cleardiskssel",
-- 
1.7.1.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]