diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-12-14 16:44:42 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-12-14 16:44:42 +0000 |
| commit | b877eceb38d9a2cf4adf0e6ac150c67b4fb19fc0 (patch) | |
| tree | c3d8deb9d81ddee3b1f194ebec86c8657ab131ea | |
| parent | c7c6303f505f1edac48ed5cf2d464e0797c8f316 (diff) | |
| download | anaconda-b877eceb38d9a2cf4adf0e6ac150c67b4fb19fc0.tar.gz anaconda-b877eceb38d9a2cf4adf0e6ac150c67b4fb19fc0.tar.xz anaconda-b877eceb38d9a2cf4adf0e6ac150c67b4fb19fc0.zip | |
2004-12-14 Jeremy Katz <katzj@redhat.com>
* dispatch.py (installSteps): Pass new arg to desktopchoice
* iw/desktop_choice_gui.py (DesktopChoiceWindow.getNext): Reset
package selection to defaults if selected (#142415)
* textw/desktop_choice_text.py (DesktopChoiceWindow): Likewise.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | dispatch.py | 2 | ||||
| -rw-r--r-- | iw/desktop_choice_gui.py | 7 | ||||
| -rw-r--r-- | textw/desktop_choice_text.py | 4 |
4 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2004-12-14 Jeremy Katz <katzj@redhat.com> + + * dispatch.py (installSteps): Pass new arg to desktopchoice + + * iw/desktop_choice_gui.py (DesktopChoiceWindow.getNext): Reset + package selection to defaults if selected (#142415) + * textw/desktop_choice_text.py (DesktopChoiceWindow): Likewise. + 2004-12-13 Jeremy Katz <katzj@redhat.com> * loader2/module-info: Add tcmscsim (#142692) diff --git a/dispatch.py b/dispatch.py index a9c1da8e2..6e170cfd4 100644 --- a/dispatch.py +++ b/dispatch.py @@ -107,7 +107,7 @@ installSteps = [ ("accounts", ("intf", "id.rootPassword")), ("authentication", ("id.auth",)), ("readcomps", readPackages, ("intf", "method", "id")), - ("desktopchoice", ("intf", "id.instClass", "dispatch")), + ("desktopchoice", ("intf", "id.instClass", "dispatch", "id.grpset")), ("findpackages", upgradeFindPackages, ("intf", "method", "id", "instPath", "dir")), ("selectlangpackages", selectLanguageSupportGroups, ("id.grpset","id.langSupport")), diff --git a/iw/desktop_choice_gui.py b/iw/desktop_choice_gui.py index 4098ae776..b1838a7f2 100644 --- a/iw/desktop_choice_gui.py +++ b/iw/desktop_choice_gui.py @@ -35,14 +35,19 @@ class DesktopChoiceWindow (InstallWindow): 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): + def getScreen (self, intf, instclass, dispatch, grpset): self.intf = intf self.dispatch = dispatch + self.instclass = instclass + self.grpset = grpset vbox = gtk.VBox (gtk.FALSE, 0) vbox.set_border_width (5) diff --git a/textw/desktop_choice_text.py b/textw/desktop_choice_text.py index 18bc99354..f7d871f42 100644 --- a/textw/desktop_choice_text.py +++ b/textw/desktop_choice_text.py @@ -17,7 +17,7 @@ from rhpl.translate import _ from constants import productName class DesktopChoiceWindow: - def __call__(self, screen, intf, instclass, dispatch): + def __call__(self, screen, intf, instclass, dispatch, grpset): bb = ButtonBar (screen, (TEXT_OK_BUTTON, TEXT_BACK_BUTTON)) @@ -48,6 +48,8 @@ class DesktopChoiceWindow: dispatch.skipStep("package-selection", skip = 0) else: dispatch.skipStep("package-selection") + instclass.setGroupSelection(grpset, intf) + instclass.setPackageSelection(grpset.hdrlist, intf) screen.popWindow() |