* iw/xconfig_gui.py: Remove dead code.

	* textw/xconfig_text.py: Likewise.
	* iw/bootdisk_gui.py: Likewise.
	* iw/bootdisk_text.py: Likewise.

2 files changed, 0 insertions, 782 deletions

diff --git a/textw/bootdisk_text.py b/textw/bootdisk_text.py
deleted file mode 100644
index ede7b97f5..000000000
--- a/textw/bootdisk_text.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# bootdisk_text.py: text mode bootdisk creation
-#
-# Copyright 2000-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 iutil
-from rhpl.translate import _
-from snack import *
-from constants_text import *
-from constants import *
-
-class BootDiskWindow:
-    def __call__(self, screen, dir, disp, fsset):
-	buttons = [ _("Yes"), _("No") ]
-
-	text = _("The boot diskette allows you to boot your %s "
-                 "system from a floppy diskette.  A boot diskette "
-		 "allows you to boot your system in the event your "
-		 "bootloader configuration stops working.\n\nIt is "
-		 "highly recommended you create a boot diskette.\n\n"
-		 "Would you like to create a boot diskette?") % (productName,)
-
-	rc = ButtonChoiceWindow(screen, _("Boot Diskette"), text,
-                                buttons=buttons,
-				help="bootdiskquery")
-
-	if rc == string.lower (_("No")):
-	    disp.skipStep("makebootdisk")
-	else:
-	    disp.skipStep("makebootdisk", skip=0)
-	
-
-	return INSTALL_OK
-
diff --git a/textw/xconfig_text.py b/textw/xconfig_text.py
deleted file mode 100644
index 327b91b1e..000000000
--- a/textw/xconfig_text.py
+++ /dev/null
@@ -1,740 +0,0 @@
-#
-# xconfig_text.py: text mode X Windows System setup dialogs
-#
-# Copyright 2001-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 copy
-import iutil
-from snack import *
-from constants_text import *
-from desktop import ENABLE_DESKTOP_CHOICE
-from rhpl.translate import _
-from rhpl.monitor import isValidSyncRange
-
-ddc_monitor_string = _("DDC Probed Monitor")
-unprobed_monitor_string = _("Unprobed Monitor")
-
-class XCustomWindow:
-
-    def depthchangeCB(self, screen):
-	availdepths = self.xsetup.xhwstate.available_color_depths()
-
-	# newt list want a list of strings, but availdepths is list of ints
-	depthlist = []
-	for d in availdepths:
-	    depthlist.append(str(d))
-	    
-        (button, result) = ListboxChoiceWindow(screen, _("Color Depth"),
-                            _("Please select the color depth you "
-                            "would like to use:") , depthlist,
-                            [ TEXT_OK_BUTTON, TEXT_CANCEL_BUTTON],
-                            scroll = 0, height = 3, help = "colordepthsel",
-                            default = availdepths.index(self.selectedDepth))
-
-        if button != TEXT_CANCEL_CHECK:
-            self.selectedDepth = self.bit_depth[result]
-	    self.xsetup.xhwstate.set_colordepth(self.selectedDepth)
-
-	    self.selectedRes = self.xsetup.xhwstate.get_resolution()
-	    newmodes = self.xsetup.xhwstate.available_resolutions()
-
-	    if not self.selectedRes in newmodes:
-                self.selectedRes = newmodes[-1]
-
-    def reschangeCB(self, screen):
-	availmodes = self.xsetup.xhwstate.available_resolutions()
-	try:
-            sel = availmodes.index(self.selectedRes)
-        except:
-            sel = len(availmodes)
-            
-        (button, result) = ListboxChoiceWindow(screen, _("Resolution"),
-                            _("Please select the resolution you "
-                            "would like to use:") , availmodes,
-                            [ TEXT_OK_BUTTON, TEXT_CANCEL_BUTTON],
-                            scroll = (len(availmodes) > 7), height = 7,
-			    help = "resdepthsel", default = sel)
-
-        if button != TEXT_CANCEL_CHECK:
-            self.selectedRes = availmodes[result]
-        
-    def loginCB(self, widget):
-        if widget == self.graphrb:
-            self.selectedRunLevel = 5
-        elif widget == self.textrb:
-            self.selectedRunLevel = 3
-        else:
-            print "Invalid widget in xconfig_text::loginCB"
-        
-
-    def desktopCB(self, widget):
-        if widget == self.gnomerb:
-            self.selectedDesktop = "GNOME"
-        elif widget == self.kderb:
-            self.selectedDesktop = "KDE"
-        else:
-            print "Invalid widget in xconfig_text::desktopCB"
-
-
-    def __call__(self, screen, xsetup, monitor, videocard, desktop, grpset,
-                 instClass, instPath):
-
-        self.instPath = instPath
-        self.xsetup = xsetup
-	self.origres = self.xsetup.xhwstate.get_resolution()
-	self.origdepth = self.xsetup.xhwstate.get_colordepth()
-
-        # dont do anything on ppc - we want to use default fb setting
-        if iutil.getArch() != "ppc":
-            if not xsetup.imposed_sane_default:
-                xsetup.xhwstate.choose_sane_default()
-                xsetup.imposed_sane_default = 1
-
-        availableRes    = self.xsetup.xhwstate.available_resolutions()
-	availableDepths = self.xsetup.xhwstate.available_color_depths()
-        self.selectedDepth = self.xsetup.xhwstate.get_colordepth()
-        self.selectedRes   = self.xsetup.xhwstate.get_resolution()
-
-        depth_list = [(_("256 Colors (8 Bit)")),
-		      (_("High Color (16 Bit)")),
-		      (_("True Color (24 Bit)"))]
-        self.bit_depth = [8, 16, 24]
-        self.avail_depths = depth_list[:len(availableDepths)]
-        self.res_list = ["640x480", "800x600", "1024x768", "1152x864",
-			 "1280x960", "1280x1024", "1400x1050", "1600x1200",
-			 "1920x1440", "2048x1536"]
-	       
-        #--If both KDE and GNOME are selected
-        if grpset:
-            gnomeSelected = (grpset.hdrlist.has_key('gnome-session')
-                             and grpset.hdrlist['gnome-session'].isSelected())
-            kdeSelected = (grpset.hdrlist.has_key('kdebase')
-                           and grpset.hdrlist['kdebase'].isSelected())
-        else:
-            gnomeSelected = 0
-            kdeSelected = 0
-
-        self.selectedDesktop = desktop.getDefaultDesktop()
-        self.selectedRunLevel = desktop.getDefaultRunLevel()
-
-        while 1:
-            bb = ButtonBar (screen, (TEXT_OK_BUTTON, TEXT_BACK_BUTTON))
-
-            toplevel = GridFormHelp (screen, _("X Customization"),
-                                     "custom", 1, 5)
-
-            text = _("Select the color depth and video mode you want to "
-                     "use for your system. ")
-	    
-            customgrid = Grid(3,2)
-            label = Label(_("Color Depth:"))
-            customgrid.setField(label, 0, 0, (0, 0, 0, 1), anchorLeft = 1)
-            field = Textbox(20, 1, depth_list[self.bit_depth.index(self.selectedDepth)])
-            customgrid.setField(field, 1, 0, (0, 0, 0, 1), anchorLeft = 1)
-            depthchangebutton = CompactButton(_("Change"))
-            customgrid.setField (depthchangebutton, 2, 0, (0, 0, 0, 1),
-                                 anchorLeft = 1)
-            label = Label(_("Resolution:"))
-            customgrid.setField(label, 0, 1, (0, 0, 0, 1), anchorLeft = 1)
-            field = Textbox(14, 1, self.selectedRes)
-            customgrid.setField(field, 1, 1, (0, 0, 0, 1), anchorLeft = 1)
-            reschangebutton = CompactButton(_("Change"))
-            customgrid.setField (reschangebutton, 2, 1, (0, 0, 0, 1),
-                                 anchorLeft = 1)
-
-            if (ENABLE_DESKTOP_CHOICE) and (gnomeSelected or kdeSelected):
-                desktopgrid = Grid(3,2)
-                label = Label(_("Default Desktop:"))
-                desktopgrid.setField(label, 0, 1, (0, 0, 0, 1), anchorLeft = 1)
-
-                if gnomeSelected and kdeSelected:
-                    self.gnomerb = SingleRadioButton(_("GNOME"), None,
-                                                     self.selectedDesktop == "GNOME")
-                    self.kderb = SingleRadioButton(_("KDE"), self.gnomerb,
-                                                   self.selectedDesktop == "KDE")
-                    self.gnomerb.setCallback(self.desktopCB, self.gnomerb)
-                    self.kderb.setCallback(self.desktopCB, self.kderb)
-                    desktopgrid.setField(self.gnomerb, 1, 1, (0, 0, 0, 1), anchorLeft = 1)
-                    desktopgrid.setField(self.kderb, 2, 1, (0, 0, 0, 1), anchorLeft = 1)
-                elif gnomeSelected:
-                    desktopgrid.setField(Textbox(10, 1, _("GNOME")), 1, 1, (0, 0, 0, 1), anchorLeft = 1)
-                elif kdeSelected:
-                    desktopgrid.setField(Textbox(10, 1, _("KDE")), 1, 1, (0, 0, 0, 1), anchorLeft = 1)
-            else:
-                desktopgrid = None
-
-	    if instClass.showLoginChoice:
-		runlevelgrid = Grid(3,2)
-		label = Label(_("Default Login:"))
-		runlevelgrid.setField(label, 0, 1, (0, 0, 0, 1), anchorLeft = 1)
-		self.graphrb = SingleRadioButton(_("Graphical"), None,
-						 (self.selectedRunLevel == 5))
-		self.textrb = SingleRadioButton(_("Text"), self.graphrb,
-						(self.selectedRunLevel == 3))
-		self.graphrb.setCallback(self.loginCB, self.graphrb)
-		self.textrb.setCallback(self.loginCB, self.textrb)
-		runlevelgrid.setField(self.graphrb, 1, 1, (0, 0, 0, 1),
-				      anchorLeft = 1)
-		runlevelgrid.setField(self.textrb, 2, 1, (0, 0, 0, 1),
-				      anchorLeft = 1)
-	    else:
-		# if no choice to be given, assume run level of 5
-		runlevelgrid = None
-		self.selectRunLevel = 5
-		
-            toplevel.add(TextboxReflowed(55, text), 0, 0, (0, 0, 0, 1))
-            toplevel.add(customgrid, 0, 1, (0, 0, 0, 0), growx = 1)
-            if desktopgrid:
-                toplevel.add(desktopgrid, 0, 2, (0, 0, 0, 0), growx = 1)
-	    if runlevelgrid:
-		toplevel.add(runlevelgrid, 0, 3, (0, 0, 0, 0), growx = 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
-            elif rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK:
-                screen.popWindow()
-                break
-            elif result == depthchangebutton:
-                self.depthchangeCB(screen)
-            elif result == reschangebutton:
-                self.reschangeCB(screen)
-
-            screen.popWindow()
-
-        # store results
-        self.xsetup.xhwstate.set_colordepth(self.selectedDepth)
-	self.xsetup.xhwstate.set_resolution(self.selectedRes)
-
-        desktop.setDefaultDesktop (self.selectedDesktop)
-        desktop.setDefaultRunLevel(self.selectedRunLevel)
-
-        return INSTALL_OK
- 
-class MonitorWindow:
-    def monchangeCB(self, screen):
-        (button, result) = ListboxChoiceWindow(screen, _("Monitor"),
-                            _("Please select the monitor attached to your "
-                            "system.") , self.monitorsnames,
-                            [ TEXT_OK_BUTTON, TEXT_CANCEL_BUTTON],
-                            scroll = 1, height = 12, help = "monitor",
-                            default = self.currentMonitor)
-
-        if button != TEXT_CANCEL_CHECK:
-            self.currentMonitor = self.monitorsnames[result]
-            selMonitorName = self.currentMonitor
-	    if selMonitorName[:len(ddc_monitor_string)] == ddc_monitor_string:
-		selMonitor = self.ddcmon
-	    elif selMonitorName == unprobed_monitor_string:
-		selMonitor = (unprobed_monitor_string, unprobed_monitor_string,
-			      "31.5", "50-61")
-	    else:
-		selMonitor = self.monitor.lookupMonitorByName(selMonitorName)
-
-	    if selMonitor:
-		self.hsync = selMonitor[3]
-		self.vsync = selMonitor[2]
-
-    def sanityCheckSyncRates(self, screen, hval, vval):
-	hgood = isValidSyncRange(hval)
-	vgood = isValidSyncRange(vval)
-	if not hgood:
-	    badtitle = _("horizontal")
-	    badone = hval
-	elif not vgood:
-	    badtitle = _("vertical")
-	    badone = vval
-
-	if not (hgood and vgood):
-	    ButtonChoiceWindow(screen, _("Invalid Sync Rates"),
-			       _("The %s sync rate is invalid:\n\n      %s\n\n"
-				 "A valid sync rate can be of the form:\n\n"
-				 "      31.5                   a single number\n"
-				 "    50.1-90.2                a range of numbers\n"
-				 "31.5,35.0,39.3-40.0          a list of numbers/ranges\n") % (badtitle, badone),
-			       buttons = [ TEXT_OK_BUTTON ], width = 45)
-	    return 0
-	
-	return 1
-                    
-
-    def syncchangeCB(self, screen):
-        bb = ButtonBar(screen, (TEXT_OK_BUTTON, TEXT_CANCEL_BUTTON))
-
-        toplevel = GridFormHelp(screen, _("Monitor Sync Rates"),
-                                "monitorsyncrates", 1, 5)
-
-        syncgrid = Grid(2,2)
-
-        text = _("Please enter the sync rates for your monitor. \n\nNOTE - "
-                 "it is not usually necessary to edit sync rates manually, "
-                 "and care should be taken to "
-                 "make sure the values entered are accurate.")
-
-        label = Label(_("HSync Rate: "))
-        syncgrid.setField(label, 0, 0, (0, 0, 0, 1), anchorLeft = 1)
-        hentry = Entry(30)
-        hentry.set(self.hsync)
-        syncgrid.setField(hentry, 1, 0, (0, 0, 0, 1), anchorLeft = 1)
-        label = Label(_("VSync Rate: "))
-        syncgrid.setField(label, 0, 1, (0, 0, 0, 1), anchorLeft = 1)
-        ventry = Entry(30)
-        ventry.set(self.vsync)
-        syncgrid.setField(ventry, 1, 1, (0, 0, 0, 1), anchorLeft = 1)
-
-        toplevel.add(TextboxReflowed(55, text), 0, 0, (0, 0, 0, 0))
-        toplevel.add(syncgrid, 0, 1, (0, 1, 0, 1), growx = 1)
-        toplevel.add(bb, 0, 3, (0, 0, 0, 0), growx = 1)
-
-        while 1:
-            result = toplevel.run()
-            rc = bb.buttonPressed(result)
-
-	    if rc == TEXT_CANCEL_CHECK:
-		screen.popWindow()
-		return
-            elif rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK:
-                if hentry.value() and ventry.value():
-                    hval = hentry.value()
-                    vval = ventry.value()
-
-		    if self.sanityCheckSyncRates(screen, hval, vval):
-                        self.hsync = hval
-                        self.vsync = vval
-                        screen.popWindow()
-                        return
-
-    def resetCB(self, screen):
-        self.hsync = self.origHsync
-        self.vsync = self.origVsync
-        self.currentMonitor = self.origMonitorName
-        
-    def __call__(self, screen, xsetup, monitor, intf):
-
-	self.intf = intf
-        self.xsetup = xsetup
-        self.monitor = monitor
-
-        self.origMonitorID = self.monitor.getMonitorID()
-	self.origMonitorName = self.monitor.getMonitorName()
-	if not self.origMonitorName:
-	    self.origMonitorName = self.origMonitorID
-
-        self.origHsync = self.monitor.getMonitorHorizSync()
-        self.origVsync = self.monitor.getMonitorVertSync()
-
-	self.ddcmon = self.monitor.getDDCProbeResults()
-
-        self.monitorslist = {}
-	self.monitorsnames = []
-
-	# now read in monitors database
-        self.monDB = self.monitor.monitorsDB()
-
-	# put generic LCD and CRTs first so easy to find
-	genericnames = []
-	for desiredmanf in ['Generic LCD Display', 'Generic CRT Display']:
-	    if desiredmanf in self.monDB.keys():
-		for mon in self.monDB[desiredmanf]:
-		    if self.ddcmon and string.upper(self.ddcmon[0]) == string.upper(mon[1]):
-			continue
-		    self.monitorslist[mon[0]] = mon
-		    genericnames.append(mon[0])
-	    
-	# now the rest
-	remainingnames = []
-        for man in self.monDB.keys():
-	    # already inserted these
-	    if man in ['Generic LCD Display', 'Generic CRT Display']:
-		continue
-
-            for mon in self.monDB[man]:
-		if self.ddcmon and string.upper(self.ddcmon[0]) == string.upper(mon[1]):
-		    continue
-		self.monitorslist[mon[0]] = mon
-                remainingnames.append(mon[0])
-
-	remainingnames.sort()
-        self.monitorsnames = genericnames + remainingnames
-
-        # Insert DDC probed monitor if it had no match in database
-        # or otherwise if we did not detect a monitor at all
-        #--Add a category for a DDC probed monitor if a DDC monitor was probed
-	self.ddcmon = self.monitor.getDDCProbeResults()
-	if self.ddcmon:
-	    title = ddc_monitor_string + " - " + self.ddcmon[1]
-	else:
-	    title = unprobed_monitor_string
-
-	man = title
-	self.monitorslist[title] = self.ddcmon
-	self.monitorsnames.insert(0, title)
-	
-	# set as current monitor if necessary
-	if self.origMonitorID == "DDCPROBED" or self.origMonitorID == "Unprobed Monitor":
-	    self.currentMonitor = title
-	    self.origMonitorName = title
-	else:
-	    self.currentMonitor = self.origMonitorName
-
-        self.hsync = self.monitor.getMonitorHorizSync()
-        self.vsync = self.monitor.getMonitorVertSync()
-
-	while 1:
-            selMonitorName = self.currentMonitor
-	    if selMonitorName[:len(ddc_monitor_string)] == ddc_monitor_string:
-		selMonitor = (self.ddcmon[1], self.ddcmon[0],
-			      self.ddcmon[2], self.ddcmon[3])
-	    elif selMonitorName == unprobed_monitor_string:
-		selMonitor = (unprobed_monitor_string, unprobed_monitor_string,
-			      "31.5", "50-61")
-	    else:
-		selMonitor = self.monitor.lookupMonitorByName(selMonitorName)
-
-		# if lookup failed fail back to unprobed monitor
-		# should fix reports of tracebacks because selMonitor was None
-		if selMonitor is None:
-		    selMonitor = (unprobed_monitor_string,
-				  unprobed_monitor_string,
-				  "31.5", "50-61")
-            
-            bb = ButtonBar (screen, (TEXT_OK_BUTTON, (_("Default"), "default"),
-                                     TEXT_BACK_BUTTON))
-
-            toplevel = GridFormHelp (screen, _("Monitor Configuration"),
-                                     "monitor", 1, 5)
-
-            text = _("Select the monitor for your system.  Use the '%s' "
-                     "button to reset to the probed values.") % (_("Default"))
-
-            videogrid = Grid(3, 3)
-            label = Label(_("Monitor:"))
-            videogrid.setField (label, 0, 0, (0, 0, 0, 1), anchorLeft = 1)
-            monlabel = Textbox(20, 1, (selMonitor[0]))
-            videogrid.setField (monlabel, 1, 0, (0, 0, 0, 1), anchorLeft = 1)
-            monchangebutton = CompactButton(_("Change"))
-            videogrid.setField (monchangebutton, 2, 0, (0, 0, 0, 1), anchorLeft = 1)
-        
-            label = Label(_("HSync Rate:"))
-            videogrid.setField (label, 0, 1, (0, 0, 0, 0), anchorLeft = 1)
-            if self.hsync:
-                synctext = self.hsync
-            else:
-                synctext = "Unknown"
-            synclabel = Textbox(20, 1, synctext)
-            videogrid.setField (synclabel, 1, 1, (0, 0, 0, 0), anchorLeft = 1)
-            syncchangebutton = CompactButton(_("Change"))
-            videogrid.setField (syncchangebutton, 2, 1, (0, 0, 0, 0), anchorLeft = 1)
-            label = Label(_("VSync Rate:"))
-            videogrid.setField (label, 0, 2, (0, 0, 0, 0), anchorLeft = 1)
-            if self.vsync:
-                synctext = self.vsync
-            else:
-                synctext = "Unknown"
-            synclabel = Textbox(20, 1, synctext)
-            videogrid.setField (synclabel, 1, 2, (0, 0, 0, 0), anchorLeft = 1)
-
-            toplevel.add(TextboxReflowed(60, text), 0, 0, (0, 0, 0, 0))
-            toplevel.add(videogrid, 0, 1, (0, 1, 0, 1), growx = 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
-            elif rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK:
-		# test sync rates
-		hval = self.hsync
-		vval = self.vsync
-
-                screen.popWindow()
-
-		if self.currentMonitor == "Unprobed Monitor":
-		    unspecrc = intf.messageWindow(_("Monitor Unspecified"),
-			    _("You have not selected a monitor type.  It is "
-			      "recommended you choose the closest matching "
-			      "model in order to have the highest possible "
-			      "display quality."),
-					    type="custom",
-					    custom_buttons = [ _("Choose monitor type"), _("Proceed")],
-					    custom_icon="warning")
-		    if not unspecrc:
-			continue
-
-		if not self.sanityCheckSyncRates(screen, hval, vval):
-		    continue
-
-                break
-            elif rc == "default":
-                self.resetCB(screen)
-            elif result == monchangebutton:
-                self.monchangeCB(screen)
-            elif result == syncchangebutton:
-                self.syncchangeCB(screen)
-            
-            screen.popWindow()
-
-        # store results
-        selMonitorName = self.currentMonitor
-	if selMonitorName[:len(ddc_monitor_string)] == ddc_monitor_string:
-	    selMonitor = ("DDCPROBED",) + self.ddcmon[1:]
-
-	elif selMonitorName == unprobed_monitor_string:
-	    selMonitor = (unprobed_monitor_string, unprobed_monitor_string,
-			  "31.5", "50-61")
-	else:
-	    selMonitor = self.monitor.lookupMonitorByName(selMonitorName)
-
-	    # field 1 and two are reverse apparently from what ddcmon returns?!
-	    selMonitor = (selMonitor[1], selMonitor[0], selMonitor[2], selMonitor[3])
-	if selMonitor:
-	    self.monitor.setSpecs(hval, vval, id=selMonitor[0],
-				  name=selMonitor[1])
-        
-	    # shove into hw state object, force it to recompute available modes
-	    self.xsetup.xhwstate.monitor = self.monitor
-	    self.xsetup.xhwstate.set_monitor_name(selMonitor[0])
-	    self.xsetup.xhwstate.set_hsync(hval)
-	    self.xsetup.xhwstate.set_vsync(vval)
-	    self.xsetup.xhwstate.recalc_mode()
-       
-        return INSTALL_OK
-
-class XConfigWindowCard:
-
-    # try to match card currently selected, then a generic VGA if card not
-    # found, then just first in list
-    def findCardInList(self, current_cardsel):
-        index = 0
-        backupindex = None
-        for card in self.cardslist:
-            if card == current_cardsel:
-                self.curcardindex = index
-                break
-            elif card == "Generic VGA compatible":
-                backupindex = index
-            index = index + 1
-
-        if index < len(self.cardslist):
-            return index
-        elif backupindex:
-            return backupindex
-        else:
-            return 0
-
-
-    def cardchangeCB(self, screen):
-        
-        while 1:
-            (button, result) = ListboxChoiceWindow(screen, _("Video Card"),
-                          _("Please select the video card present in your "
-                            "system.  Choose '%s' to reset the selection to "
-                            "the card the installer detected in your "
-                            "system.") % (_("Default")) , self.cardslist,
-                          [ TEXT_OK_BUTTON, (_("Default"), "default")],
-                          scroll = 1, height = 7, help = "videocardsel",
-                          default = self.selectedCard)
-
-            if button == 'default':
-                self.selectedCard = self.origCard
-            else:
-                break
-            
-        self.selectedCard = result
-
-    def ramchangeCB(self, screen):
-
-        while 1:
-            (button, result) = ListboxChoiceWindow(screen, _("Video RAM"),
-                          _("Please select the amount of video RAM present "
-                            "on your video card. "
-                            "Choose '%s' to reset the selection to "
-                            "the amount the installer detected on your "
-                            "card.") % (_("Default")) , self.ramlist,
-                          [ TEXT_OK_BUTTON, (_("Default"), "default")],
-                          scroll = 1, height = 7, help = "videocardsel",
-                          default = self.selectedRam)
-
-            if button == 'default':
-                self.selectedRam = self.origRam
-            else:
-                break
-            
-        self.selectedRam = result
-            
-
-    
-    def __call__(self, screen, dispatch, xsetup, videocard, intf):
-        
-        self.dispatch = dispatch
-        self.videocard = videocard
-        self.xsetup = xsetup
-
-        # setup database and list of possible cards
-        self.cards = self.videocard.cardsDB()
-        self.cardslist = self.cards.keys()
-        self.cardslist.sort()
-
-	# yuck on fb driver works on ppc currently
-	self.force_ppc_fb = iutil.getArch() == "ppc"
-
-        self.ramlist = []
-        for ram in self.videocard.possible_ram_sizes():
-            self.ramlist.append(str(ram))
-
-        carddata = self.videocard.primaryCard().getCardData(dontResolve=1)
-        if carddata:
-            self.selectedCard = self.findCardInList(carddata["NAME"])
-        else:
-            self.selectedCard = None
-
-        carddata = self.videocard.primaryCard(useProbed=1).getCardData(dontResolve=1)
-        if carddata:
-            self.origCard = self.findCardInList(carddata["NAME"])
-        else:
-            self.origCard = None
-
-        try:
-            vidRam = string.atoi(self.videocard.primaryCard().getVideoRam())
-        except:
-            vidRam = 1024
-
-        self.selectedRam = self.videocard.index_closest_ram_size(vidRam)
-
-        try:
-            vidRam = string.atoi(self.videocard.primaryCard(useProbed=1).getVideoRam())
-        except:
-            vidRam = 1024
-
-        count = 0
-        self.origRam = self.videocard.index_closest_ram_size(vidRam)
-            
-        skipx = 0
-	while 1:
-            bb = ButtonBar (screen, (TEXT_OK_BUTTON,
-                                     (_("Skip X Configuration"), "skipx")))
-
-            toplevel = GridFormHelp (screen, _("Video Card Configuration"),
-                                     "videocard", 1, 5)
-
-            videogrid = Grid(3, 2)
-
-	    if self.force_ppc_fb:
-		text = _("Your system will be setup to "
-		  "use the frame buffer driver for "
-		  "the X Window System.  If you do "
-		  "not want to setup the X Window "
-		  "System, choose "
-		  "'Skip X Configuration' below.")
-		
-	    else:
-		text = _("Select the video card and video RAM for your system.")
-
-		label = Label(_("Video Card:"))
-		videogrid.setField (label, 0, 0, (0, 0, 0, 1), anchorLeft = 1)
-		if self.selectedCard != None:
-		    cardlbl =  self.cardslist[self.selectedCard]
-		else:
-		    cardlbl = _("Unknown card")
-                
-		cardlabel = Textbox(28, 1, cardlbl)
-                
-		videogrid.setField (cardlabel, 1, 0, (0, 0, 0, 1), anchorLeft = 1)
-		cardchangebutton = CompactButton(_("Change"))
-		videogrid.setField (cardchangebutton, 2, 0, (0, 0, 0, 1), anchorLeft = 1)
-        
-		label = Label(_("Video RAM:"))
-		videogrid.setField (label, 0, 1, (0, 0, 0, 0), anchorLeft = 1)
-		ramlabel = Textbox(12, 1, self.ramlist[self.selectedRam])
-		videogrid.setField (ramlabel, 1, 1, (0, 0, 0, 0), anchorLeft = 1)
-		ramchangebutton = CompactButton(_("Change"))
-		videogrid.setField (ramchangebutton, 2, 1, (0, 0, 0, 0), anchorLeft = 1)
-		
-            toplevel.add(TextboxReflowed(60, text), 0, 0, (0, 0, 0, 0))
-
-	    # tweak packing
-	    if not self.force_ppc_fb:
-		toplevel.add(videogrid, 0, 1, (0, 1, 0, 1), growx = 1)
-		toplevel.add(bb, 0, 4, (0, 0, 0, 0), growx = 1)
-	    else:
-		toplevel.add(bb, 0, 4, (0, 1, 0, 1), growx = 1)
-		
-
-	    result = toplevel.run ()
-	    rc = bb.buttonPressed (result)
-
-            if rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK:
-                # we're done
-                # see if they have not specified card yet
-                if self.selectedCard == None:
-                    intf.messageWindow(_("Unspecified video card"),
-                                    _("You need to pick a video card before "
-                                      "X configuration can continue.  If you "
-                                      "want to skip X configuration entirely "
-                                  "choose the 'Skip X Configuration' button."))
-                    continue
-                break
-            elif rc == "skipx":
-                skipx = 1
-                break
-            elif result == cardchangebutton:
-                self.cardchangeCB(screen)
-            elif result == ramchangebutton:
-                self.ramchangeCB(screen)
-            
-            screen.popWindow()
-
-        screen.popWindow()
-        if skipx == 1:
-            self.dispatch.skipStep("monitor")
-            self.dispatch.skipStep("xcustom")
-            self.dispatch.skipStep("writexconfig")
-            self.xsetup.skipx = 1
-            return INSTALL_OK
-        else:
-            self.dispatch.skipStep("monitor", skip = 0)
-            self.dispatch.skipStep("xcustom", skip = 0)
-            self.dispatch.skipStep("writexconfig", skip = 0)
-            self.xsetup.skipx = 0
-
-	# bail at this point if we're doing ppc configuration
-	if self.force_ppc_fb:
-	    return INSTALL_OK
-
-        # store selected videocard
-        selection = self.cards[self.cardslist[self.selectedCard]]
-        primary_card = self.videocard.primaryCard()
-        primary_card.setCardData(selection)
-        primary_card.setDevID (selection["NAME"])
-        primary_card.setDescription (selection["NAME"])
-
-        # pull out resolved version of card data
-        card_data = primary_card.getCardData()
-        if (card_data.has_key("DRIVER") and
-            not card_data.has_key("UNSUPPORTED")):
-            server = "Xorg"
-        else:
-            server = "XF86_" + card_data["SERVER"]
-
-        primary_card.setXServer(server)
-
-        # store selected ram
-        vidram = self.videocard.possible_ram_sizes()[self.selectedRam]
-        self.videocard.primaryCard().setVideoRam(str(vidram))
-        self.xsetup.xhwstate.set_videocard_card(self.videocard.primaryCard())
-
-        return INSTALL_OK