diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-08-14 02:00:12 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-08-14 02:00:12 +0000 |
| commit | c540e134193f9759873ced09b0156c6219983101 (patch) | |
| tree | b36013fe219e6c3d8762bf2a0a32b538ac5c0373 /iw/desktop_choice_gui.py | |
| parent | 3f01dfc8e9d6b8bf25b79b1cbda94ca0ff4ada09 (diff) | |
| download | anaconda-c540e134193f9759873ced09b0156c6219983101.tar.gz anaconda-c540e134193f9759873ced09b0156c6219983101.tar.xz anaconda-c540e134193f9759873ced09b0156c6219983101.zip | |
merge from taroon-branch. all kinds of miscellaneous bugfixes, including
* firewall update
* iSeries PReP size
* ppc mediacheck
* tzdata stuff
* cmdline mode
* pkg defaults screen
Diffstat (limited to 'iw/desktop_choice_gui.py')
| -rw-r--r-- | iw/desktop_choice_gui.py | 63 |
1 files changed, 15 insertions, 48 deletions
diff --git a/iw/desktop_choice_gui.py b/iw/desktop_choice_gui.py index bdff77f38..ff853a5c3 100644 --- a/iw/desktop_choice_gui.py +++ b/iw/desktop_choice_gui.py @@ -22,8 +22,8 @@ from flags import flags class DesktopChoiceWindow (InstallWindow): - windowTitle = N_("Workstation Defaults") - htmlTag = "workstation-pkgs" + windowTitle = N_("Package Defaults") + htmlTag = "pkg-default" def __init__ (self, ics): InstallWindow.__init__ (self, ics) @@ -48,52 +48,19 @@ class DesktopChoiceWindow (InstallWindow): vbox.set_border_width (5) hbox = gtk.HBox (gtk.FALSE, 0) - # ugly hack - if instclass.id == "workstation": - self.windowTitle = N_("Workstation Defaults") - self.ics.setTitle (_(self.windowTitle)) - self.htmlTag = "workstation-pkgs" - self.ics.readHTML (self.htmlTag) - labeltxt = _( - "The default workstation environment includes our recommendations for " - "new users, including:\n\n" - "\tDesktop shell (GNOME)\n" - "\tOffice suite (OpenOffice)\n" - "\tWeb browser (Mozilla) \n" - "\tEmail (Evolution)\n" - "\tInstant messaging\n" - "\tSound and video applications\n" - "\tGames\n" - "\tSoftware Development Tools\n" - "\tAdministration Tools\n" - "\n" - "After installation, additional software can be added or removed using " - "the 'redhat-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,) - elif instclass.id == "personal desktop": - self.windowTitle = N_("Personal Desktop Defaults") - self.ics.setTitle (_(self.windowTitle)) - self.htmlTag = "pdesktop-pkgs" - self.ics.readHTML (self.htmlTag) - labeltxt = _( - "The default personal desktop environment includes our recommendations for " - "new users, including:\n\n" - "\tDesktop shell (GNOME)\n" - "\tOffice suite (OpenOffice)\n" - "\tWeb browser (Mozilla) \n" - "\tEmail (Evolution)\n" - "\tInstant messaging\n" - "\tSound and video applications\n" - "\tGames\n" - "\n" - "After installation, additional software can be added or removed using " - "the 'redhat-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,) - else: + 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 'redhat-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.") |