diff options
| -rwxr-xr-x | gui.py | 3 | ||||
| -rw-r--r-- | iw/language.py | 7 | ||||
| -rw-r--r-- | iw/welcome.py | 71 | ||||
| -rw-r--r-- | po/anaconda.pot | 36 |
4 files changed, 99 insertions, 18 deletions
@@ -215,7 +215,8 @@ class InstallInterface: commonSteps = [ ( LanguageWindow, "language" ), ] else: - commonSteps = [ ( LanguageWindow, "language" ), + commonSteps = [ ( ReconfigWelcomeWindow, "reconfig"), + ( LanguageWindow, "language" ), ( KeyboardWindow, "keyboard" ), ] diff --git a/iw/language.py b/iw/language.py index ac776f89a..8ca133127 100644 --- a/iw/language.py +++ b/iw/language.py @@ -8,7 +8,12 @@ class LanguageWindow (InstallWindow): InstallWindow.__init__ (self, ics) ics.setTitle (_("Language Selection")) - ics.setPrevEnabled (0) + + if self.todo.reconfigOnly: + ics.setPrevEnabled (1) + else: + ics.setPrevEnabled (0) + ics.setNextEnabled (1) ics.readHTML ("lang") self.ics = ics diff --git a/iw/welcome.py b/iw/welcome.py index a1a5aa145..aafc495f2 100644 --- a/iw/welcome.py +++ b/iw/welcome.py @@ -1,4 +1,5 @@ from gtk import * +from gnome.ui import * from iw import * from gui import _ @@ -29,3 +30,73 @@ class WelcomeWindow (InstallWindow): return frame +class ReconfigWelcomeWindow (InstallWindow): + + def __init__ (self, ics): + InstallWindow.__init__ (self, ics) + + ics.setTitle (_("Welcome")) + ics.setNextEnabled (1) + ics.readHTML ("welreconfig") + ics.setGrabNext (1) + self.beingDisplayed = 0 + self.ics = ics + + def getNext (self): + if not self.beingDisplayed: return + + if self.cancelChoice.get_active(): + import sys + + print "Exitting" + self.ics.ii.finishedTODO.set() + sys.exit(0) + else: + self.beingDisplay = 0 + return None + + def getScreen (self): + + label = GtkLabel(_("Do you want to configure your system?")) + + label.set_line_wrap(TRUE) + label.set_alignment(0.0, 0.0) + label.set_usize(400, -1) + + box = GtkVBox (FALSE) + box.pack_start(label, FALSE) + box.set_border_width (5) + + radioBox = GtkVBox (FALSE) + self.continueChoice = GtkRadioButton (None, _("Yes")) + radioBox.pack_start(self.continueChoice, FALSE) + self.cancelChoice = GtkRadioButton( + self.continueChoice, _("No")) + radioBox.pack_start(self.cancelChoice, FALSE) + + align = GtkAlignment() + align.add(radioBox) + align.set(0.5, 0.5, 0.0, 0.0) + + box.pack_start(align, TRUE, TRUE) + box.set_border_width (5) + self.beingDisplayed = 1 + return box + + +# frame = GtkFrame () +# frame.set_shadow_type (SHADOW_IN) +# im = self.ics.readPixmap ("splash.png") +# +# if im: +# im.render () +# box = GtkEventBox () +# pix = im.make_pixmap () +# style = box.get_style ().copy () +# style.bg[STATE_NORMAL] = style.white +# box.set_style (style) +# box.add (pix) +# frame.add (box) +# +# return frame + diff --git a/po/anaconda.pot b/po/anaconda.pot index 5e111ce22..cf5a412f2 100644 --- a/po/anaconda.pot +++ b/po/anaconda.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-01-07 16:32-0500\n" +"POT-Creation-Date: 2000-01-07 18:28-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -62,11 +62,11 @@ msgstr "" msgid "Error mounting %s: %s" msgstr "" -#: ../gui.py:269 ../gui.py:515 +#: ../gui.py:270 ../gui.py:516 msgid "Next" msgstr "" -#: ../gui.py:270 ../gui.py:514 ../libfdisk/newtfsedit.c:1292 +#: ../gui.py:271 ../gui.py:515 ../libfdisk/newtfsedit.c:1292 #: ../libfdisk/newtfsedit.c:1300 ../loader/cdrom.c:34 ../loader/devices.c:67 #: ../loader/devices.c:168 ../loader/devices.c:218 ../loader/lang.c:536 #: ../loader/loader.c:251 ../loader/loader.c:599 ../loader/loader.c:635 @@ -89,41 +89,41 @@ msgstr "" msgid "Back" msgstr "" -#: ../gui.py:271 ../gui.py:519 +#: ../gui.py:272 ../gui.py:520 msgid "Show Help" msgstr "" -#: ../gui.py:272 ../gui.py:518 +#: ../gui.py:273 ../gui.py:519 msgid "Hide Help" msgstr "" -#: ../gui.py:273 ../gui.py:517 +#: ../gui.py:274 ../gui.py:518 msgid "Finish" msgstr "" -#: ../gui.py:276 ../gui.py:540 +#: ../gui.py:277 ../gui.py:541 msgid "Online Help" msgstr "" -#: ../gui.py:277 ../iw/language.py:10 ../text.py:60 ../text.py:967 +#: ../gui.py:278 ../iw/language.py:10 ../text.py:60 ../text.py:967 #: ../text.py:996 msgid "Language Selection" msgstr "" -#: ../gui.py:481 +#: ../gui.py:482 msgid "Red Hat Linux Installer" msgstr "" -#: ../gui.py:485 +#: ../gui.py:486 msgid "Red Hat Linux Install Shell" msgstr "" -#: ../gui.py:496 +#: ../gui.py:497 #, c-format msgid "Red Hat Linux Installer on %s" msgstr "" -#: ../gui.py:497 +#: ../gui.py:498 #, c-format msgid "Red Hat Linux Install Shell on %s" msgstr "" @@ -292,7 +292,7 @@ msgid "" "like to customize the set of packages that will be upgraded?" msgstr "" -#: ../libfdisk/fsedit.c:696 ../libfdisk/gnomefsedit.c:602 +#: ../iw/welcome.py:71 ../libfdisk/fsedit.c:696 ../libfdisk/gnomefsedit.c:602 #: ../libfdisk/gnomefsedit.c:1003 ../libfdisk/gnomefsedit.c:1109 #: ../libfdisk/gnomefsedit.c:2046 ../libfdisk/gnomefsedit.c:2316 #: ../libfdisk/gnomefsedit.c:2369 ../libfdisk/newtfsedit.c:499 @@ -303,7 +303,7 @@ msgstr "" msgid "Yes" msgstr "" -#: ../libfdisk/fsedit.c:696 ../libfdisk/gnomefsedit.c:602 +#: ../iw/welcome.py:74 ../libfdisk/fsedit.c:696 ../libfdisk/gnomefsedit.c:602 #: ../libfdisk/gnomefsedit.c:1003 ../libfdisk/gnomefsedit.c:1109 #: ../libfdisk/gnomefsedit.c:2046 ../libfdisk/gnomefsedit.c:2316 #: ../libfdisk/gnomefsedit.c:2369 ../libfdisk/newtfsedit.c:499 @@ -550,7 +550,7 @@ msgid "" "screen" msgstr "" -#: ../iw/welcome.py:10 ../text.py:965 ../text.py:1000 +#: ../iw/welcome.py:11 ../iw/welcome.py:38 ../text.py:965 ../text.py:1000 msgid "Welcome" msgstr "" @@ -1019,7 +1019,7 @@ msgstr "" msgid "Test your selection here:" msgstr "" -#: ../iw/language.py:16 ../loader/lang.c:267 +#: ../iw/language.py:21 ../loader/lang.c:267 msgid "What language should be used during the installation process?" msgstr "" @@ -1272,6 +1272,10 @@ msgstr "" msgid "UTC Offset" msgstr "" +#: ../iw/welcome.py:60 +msgid "Do you want to configure your system?" +msgstr "" + #: ../iw/xconfig.py:13 msgid "Horizontal Frequency Range" msgstr "" |