diff options
| author | Mike Fulbright <msf@redhat.com> | 2001-02-14 17:39:30 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2001-02-14 17:39:30 +0000 |
| commit | 661172bd09c270a768988520a3f572f79da76156 (patch) | |
| tree | 87e9cdb7df4aeac0a67e750c6e83257c58f477ed /iw | |
| parent | 6a9bab966c9607333cca5ca800cca7f3b16b7637 (diff) | |
| download | anaconda-661172bd09c270a768988520a3f572f79da76156.tar.gz anaconda-661172bd09c270a768988520a3f572f79da76156.tar.xz anaconda-661172bd09c270a768988520a3f572f79da76156.zip | |
make default for text/graphical login depend on whether GNOME/KDE exist or not
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/xconfig_gui.py | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index 6f3f1b919..96462d35c 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -399,11 +399,11 @@ class XCustomWindow (InstallWindow): #--If both KDE and GNOME are selected - if ((self.todo.hdList.has_key('gnome-core') - and self.todo.hdList['gnome-core'].selected) - and (self.todo.hdList.has_key('kdebase') - and self.todo.hdList['kdebase'].selected)): - + gnomeSelected = (self.todo.hdList.has_key('gnome-core') + and self.todo.hdList['gnome-core'].selected) + kdeSelected = (self.todo.hdList.has_key('kdebase') + and self.todo.hdList['kdebase'].selected) + if gnomeSelected and kdeSelected: hsep = GtkHSeparator () self.box.pack_start (hsep) @@ -454,11 +454,7 @@ class XCustomWindow (InstallWindow): kde_radio.connect ("clicked", self.desktop_cb, "KDE") self.box.pack_start (hbox3, FALSE, TRUE, 2) - elif ((self.todo.hdList.has_key('gnome-core') - and self.todo.hdList['gnome-core'].selected) - or (self.todo.hdList.has_key('kdebase') - and self.todo.hdList['kdebase'].selected)): - + elif gnomeSelected or kdeSelected: hsep = GtkHSeparator () self.box.pack_start (hsep) @@ -471,7 +467,7 @@ class XCustomWindow (InstallWindow): # vbox3 = GtkVBox() # self.vbox4 = GtkVBox() - if self.todo.hdList['gnome-core'].selected: + if gnomeSelected: self.newDesktop = "GNOME" im = self.ics.readPixmap ("gnome.png") if im: @@ -485,7 +481,7 @@ class XCustomWindow (InstallWindow): label = GtkLabel (_("GNOME")) self.hbox4.pack_start (label, TRUE, FALSE, 2) - elif self.todo.hdList['kdebase'].selected: + elif kdeSelected: self.newDesktop = "KDE" im = self.ics.readPixmap ("kde.png") if im: @@ -519,6 +515,14 @@ class XCustomWindow (InstallWindow): self.text = GtkRadioButton (None, (_("Text"))) self.graphical = GtkRadioButton (self.text, (_("Graphical"))) + + # see if we've ever set initState + if self.todo.initState == 0: + if gnomeSelected or kdeSelected: + self.todo.initState = 5 + else: + self.todo.initState = 3 + if self.todo.initState == 3: self.text.set_active (TRUE) elif self.todo.initState == 5: |