summaryrefslogtreecommitdiffstats
path: root/iw
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>1999-09-03 14:14:36 +0000
committerMatt Wilson <msw@redhat.com>1999-09-03 14:14:36 +0000
commit7610b7bbbc0cab742f31a1ea5837ccd7a44565a3 (patch)
tree9cb8a844eada2f7fe25b4ebcc86d165972b1a030 /iw
parentcc898966043edfed5ff29400607919b7fe6b6130 (diff)
downloadanaconda-7610b7bbbc0cab742f31a1ea5837ccd7a44565a3.tar.gz
anaconda-7610b7bbbc0cab742f31a1ea5837ccd7a44565a3.tar.xz
anaconda-7610b7bbbc0cab742f31a1ea5837ccd7a44565a3.zip
read help screens from html files
Diffstat (limited to 'iw')
-rw-r--r--iw/account.py9
-rw-r--r--iw/auth.py5
-rw-r--r--iw/format.py3
-rw-r--r--iw/installpath.py2
-rw-r--r--iw/keyboard.py5
-rw-r--r--iw/language.py3
-rw-r--r--iw/lilo.py2
-rw-r--r--iw/mouse.py5
-rw-r--r--iw/network.py2
-rw-r--r--iw/package.py10
-rw-r--r--iw/progress.py1
-rw-r--r--iw/rootpartition.py3
-rw-r--r--iw/timezone.py3
-rw-r--r--iw/welcome.py20
-rw-r--r--iw/xconfig.py5
15 files changed, 46 insertions, 32 deletions
diff --git a/iw/account.py b/iw/account.py
index 7c650f6e8..126fcc1ee 100644
--- a/iw/account.py
+++ b/iw/account.py
@@ -12,10 +12,11 @@ class AccountWindow (InstallWindow):
self.todo = ics.getToDo ()
ics.setTitle (_("Account Configuration"))
- 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>")
+ 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
diff --git a/iw/auth.py b/iw/auth.py
index 9373095c2..f202a927f 100644
--- a/iw/auth.py
+++ b/iw/auth.py
@@ -9,8 +9,9 @@ class AuthWindow (InstallWindow):
self.todo = ics.getToDo ()
ics.setTitle (_("Authentication Configuration"))
- ics.setHTML ("<HTML><BODY>Select authentication methods"
- "</BODY></HTML>")
+## ics.setHTML ("<HTML><BODY>Select authentication methods"
+## "</BODY></HTML>")
+ ics.readHTML ("authconf")
ics.setNextEnabled (TRUE)
def setSensitivities (self, *args):
diff --git a/iw/format.py b/iw/format.py
index 3fd84fc7c..3d0b1a696 100644
--- a/iw/format.py
+++ b/iw/format.py
@@ -11,7 +11,8 @@ class FormatWindow (InstallWindow):
self.todo = ics.getToDo ()
ics.setTitle (_("Choose partitions to Format"))
ics.setNextEnabled (1)
- ics.setHTML ("<HTML><BODY>Choose partitions to Format</BODY></HTML>")
+## ics.setHTML ("<HTML><BODY>Choose partitions to Format</BODY></HTML>")
+ ics.readHTML ("format")
def getScreen (self):
def toggled (widget, (todo, mount)):
diff --git a/iw/installpath.py b/iw/installpath.py
index 233006e21..b08b90fbf 100644
--- a/iw/installpath.py
+++ b/iw/installpath.py
@@ -61,6 +61,8 @@ class InstallPathWindow (InstallWindow):
def __init__ (self, ics):
InstallWindow.__init__ (self, ics)
+ ics.readHTML ("instpath")
+
self.commonSteps = [ ( LanguageWindow, "language" ),
( KeyboardWindow, "keyboard" ),
( MouseWindow, "mouse" ),
diff --git a/iw/keyboard.py b/iw/keyboard.py
index ed667c42d..b44bf3f1b 100644
--- a/iw/keyboard.py
+++ b/iw/keyboard.py
@@ -9,8 +9,9 @@ class KeyboardWindow (InstallWindow):
InstallWindow.__init__ (self, ics)
ics.setTitle (_("Keyboard Configuration"))
- ics.setHTML ("<HTML><BODY>Select your keyboard."
- "</BODY></HTML>")
+## ics.setHTML ("<HTML><BODY>Select your keyboard."
+## "</BODY></HTML>")
+ ics.readHTML ("kybd")
ics.setNextEnabled (TRUE)
self.kb = xkb.XKB ()
self.rules = self.kb.getRules ()
diff --git a/iw/language.py b/iw/language.py
index 6c02fe9e3..dd1539d55 100644
--- a/iw/language.py
+++ b/iw/language.py
@@ -10,9 +10,8 @@ class LanguageWindow (InstallWindow):
ics.setTitle (_("Language Selection"))
ics.setPrevEnabled (0)
ics.setNextEnabled (1)
- ics.setHTML ("<HTML><BODY>Select which language you would like"
+ ics.setHTML ("<HTML><BODY BGCOLOR=\"#FFFFFF\">Select which language you would like"
"to use for the system default.</BODY></HTML>")
-
self.question = (_("What language should be used during the "
"installation process?"))
diff --git a/iw/lilo.py b/iw/lilo.py
index 7f904db56..269106169 100644
--- a/iw/lilo.py
+++ b/iw/lilo.py
@@ -13,6 +13,8 @@ class LiloWindow (InstallWindow):
def __init__ (self, ics):
InstallWindow.__init__ (self, ics)
+ ics.readHTML ("lilo")
+
ics.setTitle (_("Lilo Configuration"))
ics.setNextEnabled (1)
self.type = None
diff --git a/iw/mouse.py b/iw/mouse.py
index 0d84c42db..07e009b63 100644
--- a/iw/mouse.py
+++ b/iw/mouse.py
@@ -68,8 +68,9 @@ class MouseWindow (InstallWindow):
InstallWindow.__init__ (self, ics)
ics.setTitle ("Mouse Configuration")
- ics.setHTML ("<HTML><BODY>Select your mouse."
- "</BODY></HTML>")
+## ics.setHTML ("<HTML><BODY>Select your mouse."
+## "</BODY></HTML>")
+ ics.readHTML ("mouse")
ics.setNextEnabled (TRUE)
def getCurrentKey (self):
diff --git a/iw/network.py b/iw/network.py
index dc99bee55..e172c99fe 100644
--- a/iw/network.py
+++ b/iw/network.py
@@ -10,10 +10,10 @@ class NetworkWindow (InstallWindow):
ics.setTitle ("Network Configuration")
ics.setNextEnabled (1)
+ ics.readHTML ("netconf")
self.todo = ics.getToDo ()
self.calcNMHandler = None
-
def getNext (self):
if not self.__dict__.has_key("gw"):
return None
diff --git a/iw/package.py b/iw/package.py
index 9381144cc..5e8f2a5e1 100644
--- a/iw/package.py
+++ b/iw/package.py
@@ -19,8 +19,9 @@ class IndividualPackageSelectionWindow (InstallWindow):
self.todo = ics.getToDo ()
ics.setTitle (_("Individual Package Selection"))
ics.setNextEnabled (1)
- ics.setHTML ("<HTML><BODY>Next you must select which packages to install."
- "</BODY></HTML>")
+ ics.readHTML ("sel-indiv")
+## ics.setHTML ("<HTML><BODY>Next you must select which packages to install."
+## "</BODY></HTML>")
ics.setHelpEnabled (FALSE)
self.DIR = 0
self.DIR_UP = 1
@@ -375,8 +376,9 @@ class PackageSelectionWindow (InstallWindow):
self.todo = ics.getToDo ()
ics.setTitle (_("Package Group Selection"))
ics.setNextEnabled (1)
- ics.setHTML ("<HTML><BODY>Next you must select which package groups to install."
- "</BODY></HTML>")
+ ics.readHTML ("sel-group")
+## ics.setHTML ("<HTML><BODY>Next you must select which package groups to install."
+## "</BODY></HTML>")
def getNext (self):
if not self.__dict__.has_key("individualPackages"):
diff --git a/iw/progress.py b/iw/progress.py
index b1d89cb35..7fc0115e4 100644
--- a/iw/progress.py
+++ b/iw/progress.py
@@ -25,6 +25,7 @@ class InstallProgressWindow (InstallWindow):
ics.setTitle (_("Installing Packages"))
ics.setPrevEnabled (0)
+ ics.readHTML ("installing")
self.todo = ics.getToDo ()
self.numComplete = 0
diff --git a/iw/rootpartition.py b/iw/rootpartition.py
index a38e483f7..6b6459601 100644
--- a/iw/rootpartition.py
+++ b/iw/rootpartition.py
@@ -10,8 +10,7 @@ class ConfirmPartitionWindow (InstallWindow):
self.todo = ics.getToDo ()
ics.setTitle (_("Confirm Partitioning Selection"))
- ics.setHTML ("<HTML><BODY>Select a root partition"
- "</BODY></HTML>")
+ ics.readHTML ("partition")
ics.setNextEnabled (TRUE)
def getScreen (self):
diff --git a/iw/timezone.py b/iw/timezone.py
index 545140222..683a65ea0 100644
--- a/iw/timezone.py
+++ b/iw/timezone.py
@@ -28,7 +28,8 @@ class TimezoneWindow (InstallWindow):
ics.setTitle (_("Time Zone Selection"))
ics.setNextEnabled (1)
- ics.setHTML ("<HTML><BODY>Select your current location</BODY></HTML>")
+ ics.readHTML ("timezone")
+## ics.setHTML ("<HTML><BODY>Select your current location</BODY></HTML>")
self.timeZones = ("-12:00",
"-11:00",
diff --git a/iw/welcome.py b/iw/welcome.py
index a4eab0a57..44971cfc2 100644
--- a/iw/welcome.py
+++ b/iw/welcome.py
@@ -9,15 +9,17 @@ class WelcomeWindow (InstallWindow):
ics.setTitle (_("Welcome to Red Hat Linux!"))
ics.setNextEnabled (1)
- ics.setHTML("<HTML><BODY><CENTER><H2>Welcome to<br>Red Hat Linux!</H2></CENTER>"
- ""
- "<P>This installation process is outlined in detail in the "
- "Official Red Hat Linux Installation Guide available from "
- "Red Hat Software. If you have access to this manual, you "
- "should read the installation section before continuing.</P><P>"
- "If you have purchased Official Red Hat Linux, be sure to "
- "register your purchase through our web site, "
- "http://www.redhat.com/.</BODY></HTML>")
+ ics.readHTML ("wel")
+## ics.setHTML("<HTML><BODY><CENTER><H2>Welcome to<br>Red Hat Linux!</H2></CENTER>"
+## ""
+## "<P>This installation process is outlined in detail in the "
+## "Official Red Hat Linux Installation Guide available from "
+## "Red Hat Software. If you have access to this manual, you "
+## "should read the installation section before continuing.</P><P>"
+## "If you have purchased Official Red Hat Linux, be sure to "
+## "register your purchase through our web site, "
+## "http://www.redhat.com/.</BODY></HTML>")
+
def getScreen (self):
label = GtkLabel ("(insert neat logo graphic here)")
diff --git a/iw/xconfig.py b/iw/xconfig.py
index 94289361a..920d409f6 100644
--- a/iw/xconfig.py
+++ b/iw/xconfig.py
@@ -89,8 +89,9 @@ class XConfigWindow (InstallWindow):
self.todo = ics.getToDo ()
ics.setTitle (_("X Configuration"))
- ics.setHTML ("<HTML><BODY>This is the X configuration screen<</BODY></HTML>")
-
+## ics.setHTML ("<HTML><BODY>This is the X configuration screen<</BODY></HTML>")
+ ics.readHTML ("xconf")
+
self.didTest = 0
def getNext (self):