diff options
| author | Matt Wilson <msw@redhat.com> | 1999-09-14 22:46:02 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-09-14 22:46:02 +0000 |
| commit | 02626424a982cd16518d53875366a49059dbe74e (patch) | |
| tree | 4b1f83b6ec565edefaddc324d8ac42669e6330d8 | |
| parent | bd17bf0eb3535fb4d1d1e8770a5a89fbb9693bc3 (diff) | |
| download | anaconda-02626424a982cd16518d53875366a49059dbe74e.tar.gz anaconda-02626424a982cd16518d53875366a49059dbe74e.tar.xz anaconda-02626424a982cd16518d53875366a49059dbe74e.zip | |
swapon as we find swap parts in our search
| -rw-r--r-- | iw/account.py | 13 | ||||
| -rw-r--r-- | iw/bootdisk.py | 1 | ||||
| -rw-r--r-- | iw/dependencies.py | 1 | ||||
| -rw-r--r-- | iw/examine.py | 1 | ||||
| -rw-r--r-- | iw/keyboard.py | 4 | ||||
| -rw-r--r-- | iw/language.py | 37 | ||||
| -rw-r--r-- | iw/timezone.py | 9 | ||||
| -rw-r--r-- | pixmaps/splash.png | bin | 24993 -> 28587 bytes | |||
| -rw-r--r-- | text.py | 1 | ||||
| -rw-r--r-- | todo.py | 9 | ||||
| -rw-r--r-- | xf86config.py | 14 |
11 files changed, 65 insertions, 25 deletions
diff --git a/iw/account.py b/iw/account.py index e76605d2c..bd7de338a 100644 --- a/iw/account.py +++ b/iw/account.py @@ -13,10 +13,6 @@ class AccountWindow (InstallWindow): self.todo = ics.getToDo () ics.setTitle (_("Account Configuration")) ics.readHTML ("accts") -## ics.setHTML ("<HTML><BODY>Enter a root password. The password " -## "must be at least six characters in length." -## "<p>The \"Next\" button will become enabled when both entry fields match." -## "</BODY></HTML>") def getNext (self): if not self.__dict__.has_key("pw"): return None @@ -116,6 +112,15 @@ class AccountWindow (InstallWindow): self.editingUser = None box = GtkVBox () + im = self.ics.readPixmap ("root-password.png") + if im: + im.render () + pix = im.make_pixmap () + a = GtkAlignment () + a.add (pix) + a.set (0.0, 0.0, 0.0, 0.0) + box.pack_start (a, FALSE) + forward = lambda widget, box=box: box.focus (DIR_TAB_FORWARD) table = GtkTable (2, 2) diff --git a/iw/bootdisk.py b/iw/bootdisk.py index c33fb2a26..b32b75da6 100644 --- a/iw/bootdisk.py +++ b/iw/bootdisk.py @@ -10,6 +10,7 @@ class BootdiskWindow (InstallWindow): ics.setTitle (_("Bootdisk Creation")) ics.setPrevEnabled (0) ics.setNextEnabled (1) + ics.readHTML ("bootdisk") BootdiskWindow.initial = 1 self.bootdisk = None diff --git a/iw/dependencies.py b/iw/dependencies.py index 0954d9861..f86d696b2 100644 --- a/iw/dependencies.py +++ b/iw/dependencies.py @@ -8,6 +8,7 @@ class UnresolvedDependenciesWindow (InstallWindow): InstallWindow.__init__ (self, ics) ics.setTitle (_("Unresolved Dependencies")) ics.setNextEnabled (1) + ics.readHTML ("depend") self.dependCB = None def getNext (self): diff --git a/iw/examine.py b/iw/examine.py index 87aed4138..51189e1a7 100644 --- a/iw/examine.py +++ b/iw/examine.py @@ -15,7 +15,6 @@ class UpgradeExamineWindow (InstallWindow): def getNext (self): threads_leave () - self.todo.makeFilesystems (createFs = 0) self.todo.upgradeFindPackages (self.root) threads_enter () diff --git a/iw/keyboard.py b/iw/keyboard.py index 872afa75f..f29c1f376 100644 --- a/iw/keyboard.py +++ b/iw/keyboard.py @@ -85,6 +85,10 @@ class KeyboardWindow (InstallWindow): sw.add (self.variantList) box.pack_start (sw, FALSE) + label = GtkLabel (_("Test your selection here:")) + label.set_alignment (0.0, 0.5) + box.pack_start (label, FALSE) + entry = GtkEntry () box.pack_start (entry, FALSE) diff --git a/iw/language.py b/iw/language.py index c6e67470a..b1d29ae89 100644 --- a/iw/language.py +++ b/iw/language.py @@ -22,21 +22,34 @@ class LanguageWindow (InstallWindow): label = GtkLabel (self.question) label.set_alignment (0.5, 0.5) - box = GtkVBox (FALSE, 10) - language_keys = self.todo.language.available ().keys () - language1 = GtkRadioButton (None, language_keys[0]) - language1.connect ("clicked", self.languageSelected, language_keys[0]) - self.todo.language.set (language_keys[0]) - box.pack_start (language1, FALSE) +## box = GtkVBox (FALSE, 5) +## language_keys = self.todo.language.available ().keys () +## language1 = GtkRadioButton (None, language_keys[0]) +## language1.connect ("clicked", self.languageSelected, language_keys[0]) +## self.todo.language.set (language_keys[0]) + +## box.pack_start (language1, FALSE) +## for locale in language_keys[1:]: +## language = GtkRadioButton (language1, locale) +## language.connect ("clicked", self.languageSelected, locale) +## box.pack_start (language, FALSE) + + language_keys = self.todo.language.available ().keys () + + self.language = GtkCList () + self.language.set_selection_mode (SELECTION_BROWSE) for locale in language_keys[1:]: - language = GtkRadioButton (language1, locale) - language.connect ("clicked", self.languageSelected, locale) - box.pack_start (language, FALSE) + self.language.append ((locale,)) - align = GtkAlignment (0.5, 0.5) - align.add (box) + print self.todo.language.available ().values () + self.language.select_row (self.todo.language.available ().values ().index ((self.todo.language.get ())) - 1, 0) + sw = GtkScrolledWindow () + sw.set_border_width (5) + sw.set_policy (POLICY_NEVER, POLICY_NEVER) + sw.add (self.language) + mainBox.pack_start (label, FALSE, FALSE, 10) - mainBox.pack_start (align) + mainBox.pack_start (sw, TRUE) return mainBox diff --git a/iw/timezone.py b/iw/timezone.py index ddc0838d0..469b35982 100644 --- a/iw/timezone.py +++ b/iw/timezone.py @@ -91,6 +91,7 @@ class TimezoneWindow (InstallWindow): nb = GtkNotebook () mainBox = GtkVBox (FALSE, 5) + tz = timezonemap.new (path) self.tz = tz map = Map (tz.map) @@ -111,6 +112,14 @@ class TimezoneWindow (InstallWindow): hbox = GtkHBox (FALSE, 5) hbox.pack_start (label, FALSE) hbox.pack_start (views, FALSE) + im = self.ics.readPixmap ("timezone.png") + if im: + im.render () + pix = im.make_pixmap () + a = GtkAlignment () + a.add (pix) + a.set (1.0, 0.0, 0.0, 0.0) + hbox.pack_start (a, TRUE) frame = GtkFrame () frame.set_shadow_type (SHADOW_IN) diff --git a/pixmaps/splash.png b/pixmaps/splash.png Binary files differindex 25a88d2b4..2896bd9c2 100644 --- a/pixmaps/splash.png +++ b/pixmaps/splash.png @@ -214,7 +214,6 @@ class UpgradeExamineWindow: else: root = parts[0] - todo.makeFilesystems (createFs = 0) todo.upgradeFindPackages (root) class CustomizeUpgradeWindow: @@ -982,7 +982,14 @@ class ToDo: rootparts.append (dev) isys.umount('/mnt/sysimage') os.remove ('/tmp/' + dev) - + if size and type == 5: + dev = drive + str (i + 1) + isys.makeDevInode(dev, '/tmp/' + dev) + try: + isys.swapon (dev) + except: + self.log ("Error turning on swap on %s", dev) + os.remove ('/tmp/' + dev) os.remove ('/tmp/' + drive) win.pop () return rootparts diff --git a/xf86config.py b/xf86config.py index d9402c055..b149085d0 100644 --- a/xf86config.py +++ b/xf86config.py @@ -542,22 +542,24 @@ Section "Monitor" Modeline "512x384" 22 512 528 592 640 384 385 388 404 -HSync -VSync +# -- 640x400 -- +# 640x400 @ 70 Hz, 31.5 kHz hsync + Modeline "640x400" 25.175 640 664 760 800 + 400 409 411 450 +# 640x400 @ 85 Hz, 37.86 kHz hsync + Modeline "640x400" 31.5 640 672 736 832 + 400 401 404 445 -HSync +VSync + # --- 640x480 --- # 640x480 @ 60 Hz, 31.5 kHz hsync Modeline "640x480" 25.175 640 664 760 800 480 491 493 525 -# 640x400 @ 70 Hz, 31.5 kHz hsync - Modeline "640x400" 25.175 640 664 760 800 - 400 409 411 450 # 640x480 @ 72 Hz, 36.5 kHz hsync Modeline "640x480" 31.5 640 680 720 864 480 488 491 521 # 640x480 @ 75 Hz, 37.50 kHz hsync ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -HSync -VSync -# 640x400 @ 85 Hz, 37.86 kHz hsync - Modeline "640x400" 31.5 640 672 736 832 - 400 401 404 445 -HSync +VSync # 640x480 @ 85 Hz, 43.27 kHz hsync Modeline "640x480" 36 640 696 752 832 480 481 484 509 -HSync -VSync |
