start of mouse dialog

4 files changed, 163 insertions, 50 deletions

diff --git a/Makefile b/Makefile
index 849fe9c81..5f7554dfc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = rpmmodule isys balkan loader po
+SUBDIRS = rpmmodule isys balkan loader po libfdisk
 TOPDIR = ../../..
 DESTDIR = $(TOPDIR)/RedHat/instimage/usr/bin
 CATALOGS = po/anaconda-text.pot
diff --git a/po/anaconda-text.pot b/po/anaconda-text.pot
index b8c3443a1..9a33da289 100644
--- a/po/anaconda-text.pot
+++ b/po/anaconda-text.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-07-30 14:10-0400\n"
+"POT-Creation-Date: 1999-08-03 14:18-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"
@@ -14,23 +14,68 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../text.py:21 ../text.py:363
+#: ../text.py:24 ../text.py:545
 msgid "Language Selection"
 msgstr ""
 
-#: ../text.py:22
+#: ../text.py:25
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 
-#: ../text.py:24 ../text.py:46
+#: ../text.py:27 ../text.py:95 ../text.py:345 ../text.py:513
 msgid "Ok"
 msgstr ""
 
-#: ../text.py:37
+#: ../text.py:39 ../text.py:549
+msgid "Root Password"
+msgstr ""
+
+#: ../text.py:41
+msgid ""
+"Pick a root password. You must type it twice to ensure you know what it is "
+"and didn't make a mistake in typing. Remember that the root password is a "
+"critical part of system security!"
+msgstr ""
+
+#: ../text.py:50
+msgid "Password:"
+msgstr ""
+
+#: ../text.py:51
+msgid "Password (again):"
+msgstr ""
+
+#: ../text.py:56 ../text.py:72 ../text.py:77 ../text.py:176 ../text.py:230
+#: ../text.py:252 ../text.py:316
+msgid "OK"
+msgstr ""
+
+#: ../text.py:56 ../text.py:95 ../text.py:97 ../text.py:176 ../text.py:230
+#: ../text.py:232 ../text.py:252 ../text.py:316 ../text.py:345 ../text.py:346
+msgid "Back"
+msgstr ""
+
+#: ../text.py:69
+msgid "Password Length"
+msgstr ""
+
+#: ../text.py:70
+msgid "The root password must be at least 6 characters long."
+msgstr ""
+
+#: ../text.py:74
+msgid "Password Mismatch"
+msgstr ""
+
+#: ../text.py:75
+msgid "The passwords you entered were different. Please try again."
+msgstr ""
+
+#: ../text.py:86
 msgid "Red Hat Linux"
 msgstr ""
 
-#: ../text.py:38
+#: ../text.py:87
 msgid ""
 "Welcome to Red Hat Linux!\n"
 "\n"
@@ -42,101 +87,134 @@ msgid ""
 "purchase through our web site, http://www.redhat.com/."
 msgstr ""
 
-#: ../text.py:46 ../text.py:48 ../text.py:222 ../text.py:224 ../text.py:244
-#: ../text.py:308
-msgid "Back"
+#: ../text.py:148
+msgid "Use bootp/dhcp"
+msgstr ""
+
+#: ../text.py:153
+msgid "IP address:"
+msgstr ""
+
+#: ../text.py:154
+msgid "Netmask:"
+msgstr ""
+
+#: ../text.py:155
+msgid "Default gateway (IP):"
+msgstr ""
+
+#: ../text.py:156
+msgid "Primary nameserver:"
+msgstr ""
+
+#: ../text.py:178
+msgid "Network Configuration"
 msgstr ""
 
-#: ../text.py:109
+#: ../text.py:227
+msgid "Root Partition"
+msgstr ""
+
+#: ../text.py:228
+msgid "What partition would you like to use for your root partition?"
+msgstr ""
+
+#: ../text.py:250
+msgid "Select individual packages"
+msgstr ""
+
+#: ../text.py:254 ../text.py:318
+msgid "Package Group Selection"
+msgstr ""
+
+#: ../text.py:341
+msgid "Installation to begin"
+msgstr ""
+
+#: ../text.py:342
+msgid ""
+"A complete log of your installation will be in /tmp/install.log after "
+"rebooting your system. You may want to keep this file for later reference."
+msgstr ""
+
+#: ../text.py:399 ../text.py:400 ../text.py:406 ../text.py:407
 msgid "Package Installation"
 msgstr ""
 
-#: ../text.py:111
+#: ../text.py:409
 msgid "Name   : "
 msgstr ""
 
-#: ../text.py:112 ../text.py:120
+#: ../text.py:410
 msgid "Size   : "
 msgstr ""
 
-#: ../text.py:113
+#: ../text.py:411
 msgid "Summary: "
 msgstr ""
 
-#: ../text.py:139
+#: ../text.py:437
 msgid "    Packages"
 msgstr ""
 
-#: ../text.py:140
+#: ../text.py:438
 msgid "       Bytes"
 msgstr ""
 
-#: ../text.py:141
+#: ../text.py:439
 msgid "        Time"
 msgstr ""
 
-#: ../text.py:143
+#: ../text.py:441
 msgid "Total    :"
 msgstr ""
 
-#: ../text.py:150
+#: ../text.py:448
 msgid "Completed:   "
 msgstr ""
 
-#: ../text.py:160
+#: ../text.py:458
 msgid "Remaining:  "
 msgstr ""
 
-#: ../text.py:219
-msgid "Root Partition"
-msgstr ""
-
-#: ../text.py:220
-msgid "What partition would you like to use for your root partition?"
-msgstr ""
-
-#: ../text.py:222 ../text.py:244 ../text.py:308
-msgid "OK"
-msgstr ""
-
-#: ../text.py:242
-msgid "Select individual packages"
+#: ../text.py:527
+msgid "Exception occured"
 msgstr ""
 
-#: ../text.py:246 ../text.py:310
-msgid "Package Group Selection"
+#: ../text.py:528
+msgid "Exit"
 msgstr ""
 
-#: ../text.py:351
+#: ../text.py:534
 msgid "Red Hat Linux (C) 1999 Red Hat, Inc."
 msgstr ""
 
-#: ../text.py:353
+#: ../text.py:536
 msgid ""
 "  <Tab>/<Alt-Tab> between elements   |  <Space> selects   |  <F12> next "
 "screen"
 msgstr ""
 
-#: ../text.py:364
+#: ../text.py:546
 msgid "Welcome"
 msgstr ""
 
-#: ../text.py:365
+#: ../text.py:547
 msgid "Partition"
 msgstr ""
 
-#: ../text.py:366
-msgid "Packages"
+#: ../text.py:548
+msgid "Network Setup"
 msgstr ""
 
-#: ../text.py:367
-msgid "Individual Packages"
+#: ../text.py:550
+msgid "Package Groups"
 msgstr ""
 
-#: ../text.py:393
-msgid "Exception occured"
+#: ../text.py:551
+msgid "Individual Packages"
 msgstr ""
 
-#: ../text.py:394
-msgid "Exit"
+#: ../text.py:552
+msgid "Installation Begins"
 msgstr ""
diff --git a/text.py b/text.py
index 0417dfd0d..5b237d155 100644
--- a/text.py
+++ b/text.py
@@ -322,6 +322,25 @@ class IndividualPackageWindow:
 
         return INSTALL_OK
 
+
+class MouseConfigWindow:
+    def run(self, screen, todo):
+        mice = todo.mouse.available ()
+        mice.sort ()
+        current = todo.mouse.get ()
+
+        (button, choice) = \
+            ListboxChoiceWindow(screen, _("Mouse Selection"),
+                                _("Which model mouse is attached to this computer?"), mice, 
+                                buttons = [_("Ok"), _("Back")], width = 30, scroll = 1, height = 8)
+        
+        if button == string.lower (_("Back")):
+            return INSTALL_BACK
+        todo.mouse.set (mice[choice])
+        return INSTALL_OK
+
+
+
 class BeginInstallWindow:
     def run(self, screen, todo):
         rc = ButtonChoiceWindow(screen, _("Installation to begin"),
@@ -532,9 +551,10 @@ class InstallInterface:
             [_("Welcome"), WelcomeWindow, (self.screen,)],
             [_("Partition"), PartitionWindow, (self.screen, todo)],
             [_("Network Setup"), NetworkWindow, (self.screen, todo)],
-            [_("Root Password"), RootPasswordWindow, (self.screen, todo)],
             [_("Package Groups"), PackageGroupWindow, (self.screen, todo, individual)],
             [_("Individual Packages"), IndividualPackageWindow, (self.screen, todo, individual)],
+            [_("Mouse Configuration"), MouseConfigWindow, (self.screen, todo)],
+            [_("Root Password"), RootPasswordWindow, (self.screen, todo)],
             [_("Installation Begins"), BeginInstallWindow, (self.screen, todo)],
         ]
         
diff --git a/todo.py b/todo.py
index 54dec5a84..c03d657ef 100644
--- a/todo.py
+++ b/todo.py
@@ -163,7 +163,7 @@ class Mouse (SimpleConfigFile):
                     ("ps/2", "PS/2", "psaux"),
             "Generic 3 Button Mouse (PS/2)" :
 	            ("ps/2", "PS/2", "psaux"),
-            "Genius NetMouse (serial)",
+            "Genius NetMouse (serial)" :
         	   ("ms3", "IntelliMouse", "ttyS"),
             "Genius NetMouse (PS/2)" :
 	            ("netmouse", "NetMousePS/2", "psaux"),
@@ -209,11 +209,24 @@ class Mouse (SimpleConfigFile):
     def available (self):
         return self.mice.keys ()
 
+    def get (self):
+        if self.info.has_key ("FULLNAME"):
+            return self.info ("FULLNAME")
+
     def set (self, mouse):
         (gpm, x11, dev) = self.mice[mouse]
         self.info["MOUSETYPE"] = gpm
         self.info["XMOUSETYPE"] = x11
         self.info["FULLNAME"] = mouse
+
+class Authentication:
+    def __init__ (self):
+        self.domain = ""
+        self.useBroadcast = 0
+        self.server = ""
+        self.useNis = 0
+        self.useShadow = 1
+        self.useMD5 = 1
         
 class ToDo:
     def __init__(self, intf, method, rootPath, setupFilesystems = 1,
@@ -230,6 +243,7 @@ class ToDo:
         self.network = Network ()
         self.rootpassword = Password ()
         self.mouse = Mouse ()
+        self.auth = Authentication ()
 
     def umountFilesystems(self):
 	if (not self.setupFilesystems): return 
@@ -474,6 +488,7 @@ class ToDo:
         
 	self.writeFstab ()
         self.writeLanguage ()
+        self.writeMouse ()
         self.writeNetworkConfig ()
         self.writeRootPassword ()
 	self.installLilo ()