many gui enhancements

10 files changed, 228 insertions, 130 deletions

diff --git a/gui.py b/gui.py
index 0c21e8eb5..478cae1f2 100755
--- a/gui.py
+++ b/gui.py
@@ -351,6 +351,7 @@ class InstallControlWindow (Thread):
         table.attach (self.helpFrame, 0, 1, 0, 1)
 
         self.installFrame = GtkFrame ()
+#        self.installFrame.set_shadow_type (SHADOW_NONE)
 
         self.windowList = []
 
@@ -431,6 +432,17 @@ class InstallControlState:
             return TRUE
         return FALSE
 
+    def readPixmap (self, file):
+        try:
+            im = GdkImlib.Image ("/usr/share/anaconda/pixmaps/" + file)
+        except:
+            try:
+                im = GdkImlib.Image ("pixmaps/" + file)
+            except:
+                print "Unable to load", file
+                return None
+        return im
+
     def readHTML (self, file):
         text = None
         for path in self.searchPath:
diff --git a/installclass.py b/installclass.py
index a5e1879d4..47eb99db6 100644
--- a/installclass.py
+++ b/installclass.py
@@ -214,7 +214,7 @@ class Workstation(InstallClass):
 	InstallClass.__init__(self)
 	self.setHostname("localhost.localdomain")
 	self.addToSkipList("lilo")
-	self.addToSkipList("network")
+#	self.addToSkipList("network")
 	self.addToSkipList("authentication")
 	self.addToSkipList("bootdisk")
 	self.addToSkipList("partition")
@@ -247,7 +247,7 @@ class Server(InstallClass):
 	InstallClass.__init__(self)
 	self.setHostname("localhost.localdomain")
 	self.addToSkipList("lilo")
-	self.addToSkipList("network")
+#	self.addToSkipList("network")
 	self.addToSkipList("package-selection")
 	self.addToSkipList("authentication")
 	self.addToSkipList("bootdisk")
diff --git a/iw/account.py b/iw/account.py
index 126fcc1ee..68934e627 100644
--- a/iw/account.py
+++ b/iw/account.py
@@ -25,8 +25,8 @@ class AccountWindow (InstallWindow):
 	accounts = []
 	for n in range(len(self.passwords.keys())):
 	    accounts.append((self.userList.get_text(n, 0),
-			      self.userList.get_text(n, 1),
-			      self.passwords[self.userList.get_text(n, 0)]))
+                             self.userList.get_text(n, 1),
+                             self.passwords[self.userList.get_text(n, 0)]))
 	self.todo.setUserList(accounts)
         return None
 
@@ -74,17 +74,21 @@ class AccountWindow (InstallWindow):
 
     def addUser(self, widget, *args):
 	accountName = self.accountName.get_text()
-	password = self.userPass1.get_text()
+	password1 = self.userPass1.get_text()
+        password2 = self.userPass2.get_text()
 	fullName = self.fullName.get_text()
 
+        if not (accountName and password1 and (password1 == password2)):
+            return
+
         if (self.editingUser != None):
 	    index = self.editingUser
 	    self.userList.set_text(index, 0, accountName)
 	    self.userList.set_text(index, 1, fullName)
 	else:
 	    index = self.userList.append((accountName, fullName))
-	    
-	self.passwords[accountName] = password
+        self.accountName.grab_focus ()
+	self.passwords[accountName] = password1
 	self.newUser()
 
     def deleteUser(self, *args):
@@ -112,8 +116,14 @@ class AccountWindow (InstallWindow):
         forward = lambda widget, box=box: box.focus (DIR_TAB_FORWARD)
 
         table = GtkTable (2, 2)
-        table.attach (GtkLabel (_("Root Password: ")), 0, 1, 0, 1)
-        table.attach (GtkLabel (_("Confirm: ")), 0, 1, 1, 2)
+        table.set_row_spacings(5)
+
+        pass1 = GtkLabel (_("Root Password: "))
+        pass1.set_alignment (0.0, 0.5)
+        table.attach (pass1, 0, 1, 0, 1, FILL, 0, 10)
+        pass2 = GtkLabel (_("Confirm: "))
+        pass2.set_alignment (0.0, 0.5)
+        table.attach (pass2, 0, 1, 1, 2, FILL, 0, 10)
         self.pw = GtkEntry (8)
         self.pw.connect ("activate", forward)
         self.pw.connect ("changed", self.rootPasswordsMatch)
@@ -122,8 +132,8 @@ class AccountWindow (InstallWindow):
         self.confirm.connect ("activate", forward)
         self.confirm.set_visibility (FALSE)
         self.confirm.connect ("changed", self.rootPasswordsMatch)
-        table.attach (self.pw, 1, 2, 0, 1)
-        table.attach (self.confirm, 1, 2, 1, 2)
+        table.attach (self.pw,      1, 2, 0, 1, FILL|EXPAND)
+        table.attach (self.confirm, 1, 2, 1, 2, FILL|EXPAND)
 
 	pw = self.todo.rootpassword.getPure()
 	if pw:
@@ -140,8 +150,9 @@ class AccountWindow (InstallWindow):
         table.set_col_spacings(5)
 
         entrytable = GtkTable (4, 4)
-        entrytable.set_row_spacings(10)
-        entrytable.set_col_spacings(10)
+        entrytable.set_row_spacings(5)
+        entrytable.set_col_spacings(5)
+        self.entrytable = entrytable
 
         self.accountName = GtkEntry (8)
         self.accountName.connect ("activate", forward)
@@ -161,15 +172,22 @@ class AccountWindow (InstallWindow):
         self.userPass1.set_usize (50, -1)
         self.userPass2.set_usize (50, -1)
 
-        entrytable.attach (GtkLabel (_("Account Name")), 0, 1, 0, 1)        
-        entrytable.attach (self.accountName,                  1, 2, 0, 1)
-        entrytable.attach (GtkLabel (_("Password")),  0, 1, 1, 2)                
-        entrytable.attach (self.userPass1,                     1, 2, 1, 2)
-        entrytable.attach (GtkLabel (_("Password (confirm)")),   2, 3, 1, 2)                
-        entrytable.attach (self.userPass2,                     3, 4, 1, 2)
-        
-        entrytable.attach (GtkLabel (_("Full Name")), 0, 1, 2, 3)        
-        entrytable.attach (self.fullName,                  1, 4, 2, 3)
+        label = GtkLabel (_("Account Name") + ": ")
+        label.set_alignment (0.0, 0.5)
+        entrytable.attach (label,            0, 1, 0, 1, FILL, 0, 10)
+        entrytable.attach (self.accountName, 1, 2, 0, 1, FILL|EXPAND)
+        label = GtkLabel (_("Password") + ": ")
+        label.set_alignment (0.0, 0.5)
+        entrytable.attach (label,            0, 1, 1, 2, FILL, 0, 10)               
+        entrytable.attach (self.userPass1,   1, 2, 1, 2, FILL|EXPAND)
+        label = GtkLabel (_("Password (confirm)") + ": ")
+        label.set_alignment (0.0, 0.5)        
+        entrytable.attach (label,            2, 3, 1, 2, FILL, 0, 10)               
+        entrytable.attach (self.userPass2,   3, 4, 1, 2, FILL|EXPAND)
+        label = GtkLabel (_("Full Name") + ": ")
+        label.set_alignment (0.0, 0.5)
+        entrytable.attach (label,            0, 1, 2, 3, FILL, 0, 10)
+        entrytable.attach (self.fullName,    1, 4, 2, 3, FILL|EXPAND)
 
         table.attach (entrytable, 0, 4, 0, 1,
                       xoptions = EXPAND | FILL,
@@ -184,12 +202,23 @@ class AccountWindow (InstallWindow):
         new = GtkButton (_("New"))
 	new.connect("clicked", self.newUser)
 
-        table.attach (self.add,    0, 1, 1, 2, xoptions = FILL)
-        table.attach (self.edit,   1, 2, 1, 2, xoptions = FILL)
-        table.attach (delete, 2, 3, 1, 2, xoptions = FILL)
-        table.attach (new, 3, 4, 1, 2, xoptions = FILL)
+        bb = GtkHButtonBox ()
+        bb.set_border_width (5)
+        bb.pack_start (self.add)
+        bb.pack_start (self.edit)
+        bb.pack_start (delete)
+        bb.pack_start (new)
+        
+##         table.attach (self.add,    0, 1, 1, 2, xoptions = FILL)
+##         table.attach (self.edit,   1, 2, 1, 2, xoptions = FILL)
+##         table.attach (delete, 2, 3, 1, 2, xoptions = FILL)
+##         table.attach (new, 3, 4, 1, 2, xoptions = FILL)
         box.pack_start (table, FALSE)
+        box.pack_start (bb, FALSE)
         self.userList = GtkCList (2, (_("Account Name"), _("Full Name")))
+        for x in range (2):
+            self.userList.set_selectable (x, FALSE)
+
 	self.userList.connect("select_row", self.userSelected)
         box.pack_start (self.userList, TRUE)
 
diff --git a/iw/installpath.py b/iw/installpath.py
index d4e20cf9e..96989b49c 100644
--- a/iw/installpath.py
+++ b/iw/installpath.py
@@ -32,10 +32,10 @@ SERVER = 5
 
 class InstallPathWindow (InstallWindow):		
 
-    installTypes = ((WORKSTATION_GNOME, _("GNOME Workstation")),
-                    (WORKSTATION_KDE, _("KDE Workstation")),
-                    (SERVER, _("Server")),
-                    (CUSTOM, _("Custom")))
+    installTypes = ((WORKSTATION_GNOME, _("GNOME Workstation"), "gnome.png"),
+                    (WORKSTATION_KDE, _("KDE Workstation"), "kde.png"),
+                    (SERVER, _("Server"), "server.png"),
+                    (CUSTOM, _("Custom"), "custom.png"))
 
     installSteps = [ ( AutoPartitionWindow, "partition" ),
 		     ( PartitionWindow, "partition" ),
@@ -73,6 +73,7 @@ class InstallPathWindow (InstallWindow):
 
         ics.setTitle (_("Install Type"))
         ics.setNextEnabled (1)
+        self.ics = ics
 
     def getNext(self):
 	if not self.__dict__.has_key("upgradeButton"):
@@ -108,6 +109,22 @@ class InstallPathWindow (InstallWindow):
         elif type == UPGRADE:
 	    self.installBox.set_sensitive(0)
 
+    def pixRadioButton (self, group, label, pixmap):
+        im = self.ics.readPixmap (pixmap)
+        if im:
+            im.render ()
+            pix = im.make_pixmap ()
+            hbox = GtkHBox (FALSE, 5)
+            hbox.pack_start (pix, FALSE, FALSE, 0)
+            label = GtkLabel (label)
+            label.set_alignment (0.0, 0.5)
+            hbox.pack_start (label, TRUE, TRUE, 15)
+            button = GtkRadioButton (group)
+            button.add (hbox)
+        else:
+            button = GtkRadioButton (group, label)
+        return button
+
     def getScreen (self):
 	if (self.todo.instClass.installType == "install"):
             self.ics.getICW ().setStateList (self.commonSteps + 
@@ -121,9 +138,10 @@ class InstallPathWindow (InstallWindow):
 	    return None
 
 	box = GtkVBox (FALSE, 5)
-	installButton = GtkRadioButton (None, _("Install"))
+
+	installButton = self.pixRadioButton (None, _("Install"), "install.png")
         installButton.connect ("toggled", self.toggled, INSTALL)
-	self.upgradeButton = GtkRadioButton (installButton, _("Upgrade"))
+	self.upgradeButton = self.pixRadioButton (installButton, _("Upgrade"), "upgrade.png")
         self.upgradeButton.connect ("toggled", self.toggled, UPGRADE)
 
 	if (self.todo.upgrade):
@@ -140,18 +158,18 @@ class InstallPathWindow (InstallWindow):
 	    elif isinstance(instClass, installclass.Server):
 		default = SERVER
 
-        self.installBox = GtkVBox (FALSE)
+        self.installBox = GtkVBox (FALSE, 0)
         group = None
 	self.installClasses = []
-	for (type, name) in self.installTypes:
-            group = GtkRadioButton (group, name)
+	for (type, name, pixmap) in self.installTypes:
+            group = self.pixRadioButton (group, name, pixmap)
             self.installBox.pack_start (group, FALSE)
 	    self.installClasses.append ((group, type))
 	    if (type == default):
 		group.set_active (1)
 
 	spacer = GtkLabel("")
-	spacer.set_usize(15, 1)
+	spacer.set_usize(60, 1)
 
 	table = GtkTable(2, 3)
         table.attach(installButton, 0, 2, 0, 1)
diff --git a/iw/keyboard.py b/iw/keyboard.py
index b44bf3f1b..5ba54a699 100644
--- a/iw/keyboard.py
+++ b/iw/keyboard.py
@@ -23,7 +23,15 @@ class KeyboardWindow (InstallWindow):
     def getScreen (self):
 #        print self.todo.keyboard.available ()
 	box = GtkVBox (FALSE)
-        
+        im = self.ics.readPixmap ("gnome-keyboard.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)
+
 	box.pack_start (GtkLabel (_("Model")), FALSE)
         sw = GtkScrolledWindow ()
         sw.set_border_width (5)
diff --git a/iw/mouse.py b/iw/mouse.py
index 4e02179b0..6ea3c5f77 100644
--- a/iw/mouse.py
+++ b/iw/mouse.py
@@ -208,7 +208,16 @@ class MouseWindow (InstallWindow):
         align = GtkAlignment ()
         align.add (self.emulate3)
         align.set_border_width (5)
-        
+
+        im = self.ics.readPixmap ("gnome-mouse.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)
+            
         box.pack_start (sw)
         box.pack_start (self.locList, FALSE)
         box.pack_start (align, FALSE)
diff --git a/iw/network.py b/iw/network.py
index e172c99fe..6bcf293ba 100644
--- a/iw/network.py
+++ b/iw/network.py
@@ -113,6 +113,10 @@ class NetworkWindow (InstallWindow):
         if (new_nm != nm.get_text ()):
             nm.set_text (new_nm)
 
+    def DHCPtoggled (self, widget, table):
+        table.set_sensitive (not widget.get_active ())
+        self.ipTable.set_sensitive (not widget.get_active ())
+
     def getScreen (self):
         box = GtkVBox ()
         box.set_border_width (5)
@@ -126,6 +130,7 @@ class NetworkWindow (InstallWindow):
                 align = GtkAlignment ()
                 DHCPcb = GtkCheckButton (_("Configure using DHCP"))
                 DHCPcb.set_active (devs[i].get ("bootproto") == "dhcp")
+        
                 align.add (DHCPcb)
                 devbox.pack_start (align, FALSE)
                 
@@ -142,11 +147,13 @@ class NetworkWindow (InstallWindow):
                 options = [_("IP Address"), _("Netmask"), _("Network"), _("Broadcast")]
                 ipTable = GtkTable (len (options), 2)
 
+                DHCPcb.connect ("toggled", self.DHCPtoggled, ipTable)
+
 		forward = lambda widget, box=box: box.focus (DIR_TAB_FORWARD)
 
                 for t in range (len (options)):
                     label = GtkLabel ("%s:" % (options[t],))
-                    label.set_alignment (0.0, 0.0)
+                    label.set_alignment (0.0, 0.5)
                     ipTable.attach (label, 0, 1, t, t+1, FILL, 0, 10)
                     entry = GtkEntry (15)
                     # entry.set_usize (gdk_char_width (entry.get_style ().font, '0')*15, -1)
@@ -196,6 +203,8 @@ class NetworkWindow (InstallWindow):
                 ipTable.attach (align, 1, 2, i, i+1, FILL, 0)
             ipTable.set_row_spacing (0, 5)
 
+            self.ipTable = ipTable
+            
             self.hostname = options[0]
             self.gw = options[1]
             self.ns = options[2]
diff --git a/iw/rootpartition.py b/iw/rootpartition.py
index b2a64a196..fd88f7877 100644
--- a/iw/rootpartition.py
+++ b/iw/rootpartition.py
@@ -24,7 +24,7 @@ class PartitionWindow (InstallWindow):
 	InstallWindow.__init__ (self, ics)
 
         self.todo = ics.getToDo ()
-        ics.setTitle (_("Root Partition Selection"))
+        ics.setTitle (_("Disk Druid"))
         ics.readHTML ("partition")
 	ics.setNextEnabled (FALSE)
 	self.skippedScreen = 0
diff --git a/iw/welcome.py b/iw/welcome.py
index 59baca422..bbad8e1ca 100644
--- a/iw/welcome.py
+++ b/iw/welcome.py
@@ -1,31 +1,26 @@
 from gtk import *
 from iw import *
 from gui import _
-import GdkImlib
 
 class WelcomeWindow (InstallWindow):		
 
     def __init__ (self, ics):
 	InstallWindow.__init__ (self, ics)
 
-        ics.setTitle (_("Welcome to Red Hat Linux!"))
+        ics.setTitle ("Welcome ")
         ics.setNextEnabled (1)
         ics.readHTML ("wel")
+        self.ics = ics
 
     def getScreen (self):
-        box = GtkVBox (FALSE, 10)
-        im = None
-        try:
-            im = GdkImlib.Image ("/usr/share/anaconda/pixmaps/splash.png")
-        except:
-            try:
-                im = GdkImlib.Image ("pixmaps/splash.png")
-            except:
-                print "Unable to load splash.png"
+        frame = GtkFrame ()
+        frame.set_shadow_type (SHADOW_IN)
+        im = self.ics.readPixmap ("splash.png")
+        
         if im:
             im.render ()
             pix = im.make_pixmap ()
-            box.pack_start (pix, TRUE, TRUE, 0)
+            frame.add (pix)
 
-        return box
+        return frame
 
diff --git a/po/anaconda.pot b/po/anaconda.pot
index b9e03498f..e2aee9460 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-12 13:09-0400\n"
+"POT-Creation-Date: 1999-09-13 01:32-0400\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"
@@ -22,10 +22,19 @@ msgstr ""
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 
-#: ../text.py:42 ../text.py:90 ../text.py:141 ../text.py:167 ../text.py:208
-#: ../text.py:253 ../text.py:343 ../text.py:363 ../text.py:394 ../text.py:435
-#: ../text.py:457 ../text.py:522 ../text.py:542 ../text.py:554 ../text.py:566
-#: ../text.py:744 ../text.py:787 ../text.py:791
+#: ../loader/cdrom.c:34 ../loader/devices.c:58 ../loader/devices.c:134
+#: ../loader/kickstart.c:56 ../loader/kickstart.c:66 ../loader/kickstart.c:105
+#: ../loader/lang.c:247 ../loader/lang.c:498 ../loader/loader.c:239
+#: ../loader/loader.c:451 ../loader/loader.c:461 ../loader/loader.c:610
+#: ../loader/loader.c:665 ../loader/loader.c:710 ../loader/loader.c:843
+#: ../loader/loader.c:848 ../loader/loader.c:934 ../loader/loader.c:1064
+#: ../loader/loader.c:1386 ../loader/net.c:162 ../loader/net.c:284
+#: ../loader/net.c:559 ../loader/urls.c:124 ../loader/urls.c:201
+#: ../loader/urls.c:206 ../loader/urls.c:322 ../text.py:42 ../text.py:90
+#: ../text.py:141 ../text.py:167 ../text.py:208 ../text.py:253 ../text.py:343
+#: ../text.py:363 ../text.py:394 ../text.py:435 ../text.py:457 ../text.py:522
+#: ../text.py:542 ../text.py:554 ../text.py:566 ../text.py:744 ../text.py:787
+#: ../text.py:791
 msgid "OK"
 msgstr ""
 
@@ -71,29 +80,22 @@ msgstr ""
 #: ../libfdisk/newtfsedit.c:545 ../libfdisk/newtfsedit.c:581
 #: ../libfdisk/newtfsedit.c:1297 ../libfdisk/newtfsedit.c:1305
 #: ../libfdisk/newtfsedit.c:1430 ../libfdisk/newtfsedit.c:1451
-#: ../libfdisk/newtfsedit.c:1545 ../loader/cdrom.c:34 ../loader/devices.c:58
-#: ../loader/devices.c:134 ../loader/kickstart.c:56 ../loader/kickstart.c:66
-#: ../loader/kickstart.c:105 ../loader/lang.c:234 ../loader/loader.c:239
-#: ../loader/loader.c:451 ../loader/loader.c:461 ../loader/loader.c:610
-#: ../loader/loader.c:665 ../loader/loader.c:710 ../loader/loader.c:843
-#: ../loader/loader.c:848 ../loader/loader.c:934 ../loader/loader.c:1046
-#: ../loader/loader.c:1356 ../loader/net.c:162 ../loader/net.c:284
-#: ../loader/net.c:559 ../loader/urls.c:124 ../loader/urls.c:201
-#: ../loader/urls.c:206 ../loader/urls.c:322 ../text.py:74 ../text.py:469
+#: ../libfdisk/newtfsedit.c:1545 ../text.py:74 ../text.py:469
 msgid "Ok"
 msgstr ""
 
-#: ../gui.py:312 ../libfdisk/fsedit.c:955 ../libfdisk/newtfsedit.c:1297
+#: ../gui.py:316 ../libfdisk/fsedit.c:955 ../libfdisk/newtfsedit.c:1297
 #: ../libfdisk/newtfsedit.c:1305 ../loader/cdrom.c:34 ../loader/devices.c:58
-#: ../loader/devices.c:134 ../loader/loader.c:239 ../loader/loader.c:572
-#: ../loader/loader.c:610 ../loader/loader.c:710 ../loader/net.c:162
-#: ../loader/net.c:284 ../loader/urls.c:124 ../loader/urls.c:322 ../text.py:74
-#: ../text.py:75 ../text.py:90 ../text.py:113 ../text.py:141 ../text.py:144
-#: ../text.py:167 ../text.py:194 ../text.py:208 ../text.py:210 ../text.py:229
-#: ../text.py:231 ../text.py:253 ../text.py:255 ../text.py:343 ../text.py:394
-#: ../text.py:396 ../text.py:415 ../text.py:424 ../text.py:435 ../text.py:437
-#: ../text.py:457 ../text.py:460 ../text.py:469 ../text.py:522 ../text.py:523
-#: ../text.py:744 ../text.py:766
+#: ../loader/devices.c:134 ../loader/lang.c:498 ../loader/loader.c:239
+#: ../loader/loader.c:572 ../loader/loader.c:610 ../loader/loader.c:710
+#: ../loader/loader.c:1064 ../loader/net.c:162 ../loader/net.c:284
+#: ../loader/urls.c:124 ../loader/urls.c:322 ../text.py:74 ../text.py:75
+#: ../text.py:90 ../text.py:113 ../text.py:141 ../text.py:144 ../text.py:167
+#: ../text.py:194 ../text.py:208 ../text.py:210 ../text.py:229 ../text.py:231
+#: ../text.py:253 ../text.py:255 ../text.py:343 ../text.py:394 ../text.py:396
+#: ../text.py:415 ../text.py:424 ../text.py:435 ../text.py:437 ../text.py:457
+#: ../text.py:460 ../text.py:469 ../text.py:522 ../text.py:523 ../text.py:744
+#: ../text.py:766
 msgid "Back"
 msgstr ""
 
@@ -147,7 +149,7 @@ msgstr ""
 
 #: ../libfdisk/newtfsedit.c:1545 ../loader/loader.c:451 ../loader/loader.c:461
 #: ../loader/loader.c:665 ../loader/loader.c:710 ../loader/loader.c:843
-#: ../loader/loader.c:848 ../loader/loader.c:1356 ../loader/urls.c:201
+#: ../loader/loader.c:848 ../loader/loader.c:1386 ../loader/urls.c:201
 #: ../loader/urls.c:206 ../text.py:191 ../text.py:562
 msgid "Error"
 msgstr ""
@@ -253,7 +255,7 @@ msgid ""
 "a network, this may be assigned by your network administrator."
 msgstr ""
 
-#: ../iw/network.py:180 ../loader/net.c:460 ../loader/net.c:617 ../text.py:394
+#: ../iw/network.py:187 ../loader/net.c:460 ../loader/net.c:617 ../text.py:394
 msgid "Hostname"
 msgstr ""
 
@@ -509,23 +511,23 @@ msgstr ""
 msgid "Upgrade Complete"
 msgstr ""
 
-#: ../gui.py:306
+#: ../gui.py:310
 msgid "Red Hat Linux Installer"
 msgstr ""
 
-#: ../gui.py:315
+#: ../gui.py:319
 msgid "Finish"
 msgstr ""
 
-#: ../gui.py:316
+#: ../gui.py:320
 msgid "Hide Help"
 msgstr ""
 
-#: ../gui.py:317
+#: ../gui.py:321
 msgid "Show Help"
 msgstr ""
 
-#: ../gui.py:338
+#: ../gui.py:343
 msgid "Online Help"
 msgstr ""
 
@@ -533,45 +535,45 @@ msgstr ""
 msgid "Account Configuration"
 msgstr ""
 
-#: ../iw/account.py:115
+#: ../iw/account.py:122
 msgid "Root Password: "
 msgstr ""
 
-#: ../iw/account.py:116
+#: ../iw/account.py:125
 msgid "Confirm: "
 msgstr ""
 
-#: ../iw/account.py:164 ../iw/account.py:192
+#: ../iw/account.py:176 ../iw/account.py:219
 msgid "Account Name"
 msgstr ""
 
-#: ../iw/account.py:166
+#: ../iw/account.py:180
 msgid "Password"
 msgstr ""
 
-#: ../iw/account.py:168
+#: ../iw/account.py:184
 msgid "Password (confirm)"
 msgstr ""
 
-#: ../iw/account.py:171 ../iw/account.py:192
+#: ../iw/account.py:188 ../iw/account.py:219
 msgid "Full Name"
 msgstr ""
 
-#: ../iw/account.py:178 ../libfdisk/newtfsedit.c:1303
+#: ../iw/account.py:197 ../libfdisk/newtfsedit.c:1303
 msgid "Add"
 msgstr ""
 
-#: ../iw/account.py:180 ../libfdisk/newtfsedit.c:1296
+#: ../iw/account.py:199 ../libfdisk/newtfsedit.c:1296
 #: ../libfdisk/newtfsedit.c:1304
 msgid "Edit"
 msgstr ""
 
-#: ../iw/account.py:182 ../libfdisk/newtfsedit.c:1296
+#: ../iw/account.py:201 ../libfdisk/newtfsedit.c:1296
 #: ../libfdisk/newtfsedit.c:1304
 msgid "Delete"
 msgstr ""
 
-#: ../iw/account.py:184
+#: ../iw/account.py:203
 msgid "New"
 msgstr ""
 
@@ -649,6 +651,14 @@ msgstr ""
 msgid "Customize packages to be upgraded"
 msgstr ""
 
+#: ../iw/fdisk.py:11
+msgid "fdisk"
+msgstr ""
+
+#: ../iw/fdisk.py:42
+msgid "Select drive to run fdisk on"
+msgstr ""
+
 #: ../iw/format.py:12
 msgid "Choose partitions to Format"
 msgstr ""
@@ -657,52 +667,56 @@ msgstr ""
 msgid "Check for bad blocks while formatting"
 msgstr ""
 
-#: ../iw/installpath.py:34
+#: ../iw/installpath.py:35
 msgid "GNOME Workstation"
 msgstr ""
 
-#: ../iw/installpath.py:35
+#: ../iw/installpath.py:36
 msgid "KDE Workstation"
 msgstr ""
 
-#: ../iw/installpath.py:36 ../libfdisk/gnomefsedit.c:2196
+#: ../iw/installpath.py:37 ../libfdisk/gnomefsedit.c:2196
 #: ../libfdisk/gnomefsedit.c:2216
 msgid "Server"
 msgstr ""
 
-#: ../iw/installpath.py:37
+#: ../iw/installpath.py:38
 msgid "Custom"
 msgstr ""
 
-#: ../iw/installpath.py:73
+#: ../iw/installpath.py:74
 msgid "Install Type"
 msgstr ""
 
-#: ../iw/installpath.py:122
+#: ../iw/installpath.py:142
 msgid "Install"
 msgstr ""
 
-#: ../iw/installpath.py:124
+#: ../iw/installpath.py:144
 msgid "Upgrade"
 msgstr ""
 
+#: ../iw/installpath.py:183
+msgid "Use fdisk to format drives"
+msgstr ""
+
 #: ../iw/keyboard.py:11
 msgid "Keyboard Configuration"
 msgstr ""
 
-#: ../iw/keyboard.py:27
+#: ../iw/keyboard.py:35
 msgid "Model"
 msgstr ""
 
-#: ../iw/keyboard.py:39
+#: ../iw/keyboard.py:47
 msgid "Layout"
 msgstr ""
 
-#: ../iw/keyboard.py:53
+#: ../iw/keyboard.py:61
 msgid "Variant"
 msgstr ""
 
-#: ../iw/language.py:14 ../loader/lang.c:232
+#: ../iw/language.py:14 ../loader/lang.c:245
 msgid "What language should be used during the installation process?"
 msgstr ""
 
@@ -754,43 +768,43 @@ msgstr ""
 msgid "Boot label"
 msgstr ""
 
-#: ../iw/network.py:127
+#: ../iw/network.py:131
 msgid "Configure using DHCP"
 msgstr ""
 
-#: ../iw/network.py:133
+#: ../iw/network.py:138
 msgid "Activate on boot"
 msgstr ""
 
-#: ../iw/network.py:142
+#: ../iw/network.py:147
 msgid "IP Address"
 msgstr ""
 
-#: ../iw/network.py:142 ../loader/net.c:615
+#: ../iw/network.py:147 ../loader/net.c:615
 msgid "Netmask"
 msgstr ""
 
-#: ../iw/network.py:142 ../loader/loader.c:226
+#: ../iw/network.py:147 ../loader/loader.c:226
 msgid "Network"
 msgstr ""
 
-#: ../iw/network.py:142
+#: ../iw/network.py:147
 msgid "Broadcast"
 msgstr ""
 
-#: ../iw/network.py:181
+#: ../iw/network.py:188
 msgid "Gateway"
 msgstr ""
 
-#: ../iw/network.py:181
+#: ../iw/network.py:188
 msgid "Primary DNS"
 msgstr ""
 
-#: ../iw/network.py:181
+#: ../iw/network.py:188
 msgid "Secondary DNS"
 msgstr ""
 
-#: ../iw/network.py:181
+#: ../iw/network.py:188
 msgid "Ternary DNS"
 msgstr ""
 
@@ -867,7 +881,7 @@ msgid "Confirm Partitioning Selection"
 msgstr ""
 
 #: ../iw/rootpartition.py:27
-msgid "Root Partition Selection"
+msgid "Disk Druid"
 msgstr ""
 
 #: ../iw/rootpartition.py:86
@@ -912,10 +926,6 @@ msgstr ""
 msgid "System clock uses UTC"
 msgstr ""
 
-#: ../iw/welcome.py:11
-msgid "Welcome to Red Hat Linux!"
-msgstr ""
-
 #: ../iw/xconfig.py:9
 msgid "Video Card"
 msgstr ""
@@ -1538,7 +1548,7 @@ msgstr ""
 #: ../loader/devices.c:54
 msgid ""
 "This module can take parameters which affects its operation. If you don't "
-"know what parameters to supply, just skip this screen by pressing the \"Ok\" "
+"know what parameters to supply, just skip this screen by pressing the \"OK\" "
 "button now."
 msgstr ""
 
@@ -1574,10 +1584,18 @@ msgstr ""
 msgid "Error on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader/lang.c:232
+#: ../loader/lang.c:245
 msgid "Choose a Language"
 msgstr ""
 
+#: ../loader/lang.c:496
+msgid "Keyboard Type"
+msgstr ""
+
+#: ../loader/lang.c:497
+msgid "What type of keyboard do you have?"
+msgstr ""
+
 #: ../loader/loader.c:98
 msgid "Local CDROM"
 msgstr ""
@@ -1670,7 +1688,7 @@ msgstr ""
 #: ../loader/loader.c:711
 msgid ""
 "I could not find a Red Hat Linux CDROM in any of your CDROM drives. Please "
-"insert the Red Hat CD and press \"Ok\" to retry."
+"insert the Red Hat CD and press \"OK\" to retry."
 msgstr ""
 
 #: ../loader/loader.c:844
@@ -1689,31 +1707,31 @@ msgstr ""
 msgid "Unable to retrieve the second stage ramdisk"
 msgstr ""
 
-#: ../loader/loader.c:1038
+#: ../loader/loader.c:1056
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader/loader.c:1039
+#: ../loader/loader.c:1057
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader/loader.c:1041
+#: ../loader/loader.c:1059
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader/loader.c:1043
+#: ../loader/loader.c:1061
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader/loader.c:1357
+#: ../loader/loader.c:1387
 msgid "Cannot find ks.cfg on boot floppy."
 msgstr ""
 
-#: ../loader/loader.c:1466
+#: ../loader/loader.c:1496
 msgid "PC Card"
 msgstr ""
 
-#: ../loader/loader.c:1466
+#: ../loader/loader.c:1496
 msgid "Initializing PC Card Devices..."
 msgstr ""