monitor list

2 files changed, 37 insertions, 1 deletions

diff --git a/iw/xconfig.py b/iw/xconfig.py
index 48d33cdd4..cbe6cef70 100644
--- a/iw/xconfig.py
+++ b/iw/xconfig.py
@@ -94,6 +94,12 @@ class XConfigWindow (InstallWindow):
         self.didTest = 0
 
     def getNext (self):
+        if self.monlist:
+            if self.monlist.selection:
+                row = self.monlist.selection[0]
+                setting = self.monlist.get_row_data (row)
+                self.todo.x.setMonitor (setting)
+
         if self.custom.get_active () and not self.skip.get_active ():
             return XCustomWindow
         return None
@@ -152,6 +158,31 @@ class XConfigWindow (InstallWindow):
         result.set_justify (JUSTIFY_LEFT)
         self.autoBox.pack_start (result, FALSE)
 
+        self.todo.x.monName = None
+        self.monlist = None
+        if not self.todo.x.monName:
+            label = GtkLabel (_("Your monitor could not be "
+                                "autodetected. Please choose it "
+                                "from the list below:"))
+            label.set_alignment (0.0, 0.5)
+            label.set_justify (JUSTIFY_LEFT)
+            label.set_line_wrap (TRUE)        
+            self.autoBox.pack_start (label, FALSE)
+
+            monitors = self.todo.x.monitors ()
+            keys = monitors.keys ()
+            keys.sort ()
+            self.monlist = GtkCList ()
+            self.monlist.set_selection_mode (SELECTION_BROWSE)
+                    
+            for monitor in keys:
+                index = self.monlist.append ((monitor,))
+                self.monlist.set_row_data (index, (monitor, monitors[monitor]))
+            sw = GtkScrolledWindow ()
+            sw.add (self.monlist)
+            sw.set_policy (POLICY_NEVER, POLICY_AUTOMATIC)
+            self.autoBox.pack_start (sw, TRUE)
+
         test = GtkAlignment ()
         button = GtkButton (_("Test this configuration"))
         button.connect ("pressed", self.testPressed)
diff --git a/xf86config.py b/xf86config.py
index 4642b9393..db79ba598 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -106,10 +106,15 @@ class XF86Config:
             if line and line[0] == '#':
                 continue
             fields = string.split (line, ';')
-            print fields
             monitors [fields[0]] = (fields[2], fields[3])
         return monitors
 
+    def setMonitor (self, (monitor, (hrange, vrange))):
+        self.monName = monitor
+        self.monID = monitor
+        self.monHoriz = hrange
+        self.monVert = vrange
+        
     def setVidcard (self, card):
         self.vidCards.append (card)