diff options
| author | Mike Fulbright <msf@redhat.com> | 2002-11-26 21:16:42 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2002-11-26 21:16:42 +0000 |
| commit | b171d60c98b4c9a558b2126b87c0c48b93626b39 (patch) | |
| tree | 27b4687480bdf62bfd4290ac66b3a636cc15986b /iw | |
| parent | 73bbcffc222c509104c63305c5d6db9ef028a04a (diff) | |
| download | anaconda-b171d60c98b4c9a558b2126b87c0c48b93626b39.tar.gz anaconda-b171d60c98b4c9a558b2126b87c0c48b93626b39.tar.xz anaconda-b171d60c98b4c9a558b2126b87c0c48b93626b39.zip | |
remove unneeded code supporting testing X setup as well as adding code to impose sane mode defaults
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/xconfig_gui.py | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index c63458a1d..016940c4e 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -89,10 +89,9 @@ class XCustomWindow (InstallWindow): return 0 def depth_cb (self, widget, data): - print "in depth_cb" self.ignore_res_cb = 1 loc = self.depth_combo.list.child_position (data) - print "seldepth, loc, avail[loc] = ",self.selectedDepth, loc, self.avail_depth[loc] + if self.selectedDepth == self.avail_depth[loc]: self.ignore_res_cb = 0 return @@ -113,7 +112,6 @@ class XCustomWindow (InstallWindow): def res_cb (self, widget, data): if self.ignore_res_cb: - print "ignored" return newres = self.res_combo.list.child_position (data) @@ -198,6 +196,10 @@ class XCustomWindow (InstallWindow): self.videocard = videocard self.desktop = desktop + if not xsetup.imposed_sane_default: + xsetup.xhwstate.choose_sane_default() + xsetup.imposed_sane_default = 1 + # save so we can restore if necessary going back self.origres = self.xsetup.xhwstate.get_resolution() self.origdepth = self.xsetup.xhwstate.get_colordepth() @@ -282,20 +284,6 @@ class XCustomWindow (InstallWindow): self.box.pack_start (hbox1, gtk.FALSE) - # cannot reliably test on i810 or Voodoo driver, or on Suns who dont - # need it since they are fixed resolution - self.cantprobe = not self.videocard.primaryCard().canTestSafely() - # just disable X testing altogether -- too many combinations of - # videocards not wanting to run multiple servers and mice - # not liking protocol changes to reliably do this -# if not self.cantprobe: - if 0: - test = gtk.Alignment (.9, 0, 0, 0) - button = gtk.Button (_(" _Test Setting ")) - button.connect ("clicked", self.testPressed) - test.add (button) - self.box.pack_start (test, gtk.FALSE) - #--If both KDE and GNOME are selected if comps: gnomeSelected = (comps.packages.has_key('gnome-session') |