2006-01-30 Jeremy Katz <katzj@redhat.com>

	* gui.py: Remove desktop_choice
	* iw/desktop_choice_gui.py: Remove
	* textw/desktop_choice_text.py: Likewise.

3 files changed, 0 insertions, 153 deletions

diff --git a/gui.py b/gui.py
index 902f6a198..b64b27d78 100755
--- a/gui.py
+++ b/gui.py
@@ -73,7 +73,6 @@ stepToClass = {
     "network" : ("network_gui", "NetworkWindow"),
     "timezone" : ("timezone_gui", "TimezoneWindow"),
     "accounts" : ("account_gui", "AccountWindow"),
-    "desktopchoice": ("desktop_choice_gui", "DesktopChoiceWindow"),
     "tasksel": ("task_gui", "TaskWindow"),    
     "group-selection": ("package_gui", "GroupSelectionWindow"),
     "confirminstall" : ("confirm_gui", "InstallConfirmWindow"),
diff --git a/iw/desktop_choice_gui.py b/iw/desktop_choice_gui.py
deleted file mode 100644
index 3cbf49204..000000000
--- a/iw/desktop_choice_gui.py
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# desktop_choice_gui.py: choose desktop
-#
-# Copyright 2002 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
-import gobject
-import string
-import gui
-from iw_gui import *
-from rhpl.translate import _, N_
-from constants import productName
-from flags import flags
-
-class DesktopChoiceWindow (InstallWindow):		
-
-    windowTitle = N_("Package Defaults")
-    htmlTag = "pkg-default"
-
-    def __init__ (self, ics):
-	InstallWindow.__init__ (self, ics)
-        ics.setGrabNext (1)
-	self.ics = ics
-
-    def getNext(self):
-	if self.customizeRadio.get_active():
-	    self.dispatch.skipStep("package-selection", skip = 0)
-	else:
-	    self.dispatch.skipStep("package-selection", skip = 1)
-            self.instclass.setGroupSelection(self.grpset, self.intf)
-            self.instclass.setPackageSelection(self.grpset.hdrlist, self.intf)
-            
-
-	return None
-    
-    # WelcomeWindow tag="wel"
-    def getScreen (self, intf, instclass, dispatch, grpset):
-
-	self.intf = intf
-	self.dispatch = dispatch
-        self.instclass = instclass
-        self.grpset = grpset
-
-	vbox = gtk.VBox (False, 0)
-	vbox.set_border_width (5)
-	hbox = gtk.HBox (False, 0)
-
-        header = _("The default installation environment includes our "
-                   "recommended package selection, including:\n\n")
-        footer = _("\n\nAfter installation, additional software can be "
-                   "added or removed using the 'system-config-packages' "
-                   "tool.\n\n"
-                   "If you are familiar with %s, you may have specific "
-                   "packages you would like to install or avoid "
-                   "installing. Check the box below to "
-                   "customize your installation.") %(productName,)
-
-        if len(instclass.pkgstext) > 0:
-            labeltxt = header + _(instclass.pkgstext) + footer
-        else:
-	    labeltxt = _(
-		"If you would like to change the default package set to be "
-		"installed you can choose to customize this below.")
-	    
-	label = gui.WrappingLabel(labeltxt)
-
-	hbox.pack_start (label, False, False, 0)
-	vbox.pack_start (hbox, False, False, 0)
-	
-	self.acceptRadio = gtk.RadioButton (None, _("_Install default software packages"))
-	self.customizeRadio = gtk.RadioButton (self.acceptRadio, _("_Customize software packages to be installed"))
-	vbox2 = gtk.VBox (False)
-	vbox2.pack_start (self.acceptRadio, False, False, 0)
-	vbox2.pack_start (self.customizeRadio, False, False, 0)
-	al = gtk.Alignment(0.5, 0)
-	al.add (vbox2)
-	
-	vbox.pack_start (al, False, False, 25)
-	custom = not self.dispatch.stepInSkipList("package-selection")
-	if custom:
-	    self.customizeRadio.set_active(1)
-	else:
-	    self.acceptRadio.set_active(0)
-	    
-	big_al = gtk.Alignment (0.5, 0.2)
-	big_al.add (vbox)
-	return big_al
diff --git a/textw/desktop_choice_text.py b/textw/desktop_choice_text.py
deleted file mode 100644
index f7d871f42..000000000
--- a/textw/desktop_choice_text.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# desktop_choice_text.py: choose desktop
-#
-# Copyright 2002 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.
-#
-
-from snack import *
-from constants_text import *
-from rhpl.translate import _
-from constants import productName
-
-class DesktopChoiceWindow:
-    def __call__(self, screen, intf, instclass, dispatch, grpset):
-
-	bb = ButtonBar (screen, (TEXT_OK_BUTTON, TEXT_BACK_BUTTON))
-	
-	toplevel = GridFormHelp (screen, _("Package Defaults"),
-				 "wsdefaults", 1, 5)
-
-	labeltxt = N_("The default installation environment includes our "
-                      "recommended package selection.  After installation, "
-                      "additional software can be added or removed using the "
-                      "'system-config-packages' tool.\n\n"
-		      "However %s ships with many more applications, and "
-		      "you may customize the selection of software "
-		      "installed if you want.")
-			  
-	toplevel.add (TextboxReflowed(55, _(labeltxt) % (productName,)), 0, 0, (0, 0, 0, 1))
-	custom = not dispatch.stepInSkipList("package-selection")
-	customize = Checkbox (_("Customize software selection"), custom)
-	toplevel.add (customize, 0, 3, (0, 0, 0, 1))	 
-	toplevel.add (bb, 0, 4, (0, 0, 0, 0), growx = 1)
-
-	result = toplevel.run()
-        rc = bb.buttonPressed (result)
-	if rc == TEXT_BACK_CHECK:
-	    screen.popWindow()
-	    return INSTALL_BACK
-
-	if customize.selected():
-	    dispatch.skipStep("package-selection", skip = 0)
-	else:
-	    dispatch.skipStep("package-selection")
-            instclass.setGroupSelection(grpset, intf)
-            instclass.setPackageSelection(grpset.hdrlist, intf)
-	    
-	screen.popWindow()
-				 
-        return INSTALL_OK
-