Fixed some bugs in the untested code.

philipstarkey · philipstarkey · commit 8937c658054b · 2012-06-08T01:33:17.000Z
Modified the interface slightly!

This is now usable!
diff --git a/__init__.py b/__init__.py
@@ -1,64 +1,77 @@
+import os
 import gtk
 
 
 # Create a generic interface for displaying pages of settings
 
 class Settings(object):
     
-    def __init__(self,page_classes):
+    def __init__(self,parent = None,page_classes = []):
         self.pages = {}
+        self.dialog_open = False
+        self.parent = parent
         for c in page_classes:
             self.add_settings_interface(c)
         
     # This function can be called to add a interface
     # Each one of these will display as a seperate page in the settings window
     # You can not add a class more than once!
-    # Classes must have unique names! (This might change later...)
+    # Classes must have unique Class.name attributes! (This might change later...)
     def add_settings_interface(self,setting_class):
         if setting_class.name in self.pages:
             return False
         self.pages[setting_class.name] = setting_class()   
         return True
         
     # A simple interface for accessing values in the settings interface
-    def get_value(self,settings_class,value_name)
+    def get_value(self,settings_class,value_name):
         return self.pages[settings_class.name].get_value(value_name)
         
     # goto_page should be the CLASS which you wish to go to!
-    def create_dialog(self,goto_page=None):        
-        builder = gtk.Builder()
-        builder.add_from_file('settings_interface.glade')
-        builder.connect_signals(self)
-        
-        self.notebook = builder.get_object('notebook')
-        
-        #sorted(a.items(),key=lambda x: x[1])
-        set_page = None
-        for name, c in sorted(self.pages.items()):
-            page = c.create_dialog(self.notebook)
+    def create_dialog(self,goto_page=None):
+        if not self.dialog_open:
+            builder = gtk.Builder()
+            builder.add_from_file(os.path.join(os.path.dirname(os.path.realpath(__file__)),'settings_interface.glade'))
+            builder.connect_signals(self)
             
-            if goto_page and isinstance(c,goto_page):
-                # this is the page we want to go to!
-                set_page = page
-    
-        # We do this here in case one of the settings pages specifically inserts itself in an out of order place (eg first)
-        # We hope that everything will be in alphabetical order, but maybe not!
-        if set_page:
-            self.notebook.set_current_page(self.notebook.page_num(set_page))
-        
-        self.window.show()
+            self.notebook = builder.get_object('notebook')
+            self.window = builder.get_object('window')
+            
+            #sorted(a.items(),key=lambda x: x[1])
+            set_page = None
+            for name, c in sorted(self.pages.items()):
+                page = c.create_dialog(self.notebook)
+                
+                if goto_page and isinstance(c,goto_page):
+                    # this is the page we want to go to!
+                    set_page = page
         
+            # We do this here in case one of the settings pages specifically inserts itself in an out of order place (eg first)
+            # We hope that everything will be in alphabetical order, but maybe not!
+            if set_page:
+                self.notebook.set_current_page(self.notebook.page_num(set_page))
+            
+            if self.parent:
+                self.window.set_transient_for(self.parent)
+            
+            self.window.show()
+            self.dialog_open = True
+        else:
+            self.window.present()
         
     def on_save(self,widget):
         # Save the settings
-        for page in self.pages:
+        for page in self.pages.values():
             page.save()    
+        self.close()
             
     def on_cancel(self,widget):
         self.close()
     
-    def close(self):
-        # Close the setting classes
-        for page in self.pages:
-            page.close()   
-        self.window.destroy()
+    def close(self,*args,**kwargs):
+        if self.dialog_open:
+            # Close the setting classes
+            for page in self.pages.values():
+                page.close()   
+            self.window.destroy()
+            self.dialog_open = False
diff --git a/settings_interface.glade b/settings_interface.glade
@@ -4,32 +4,21 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Preferences</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">750</property>
+    <property name="default_height">550</property>
+    <signal name="delete-event" handler="close" swapped="no"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkFrame" id="frame1">
+          <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">7</property>
-            <property name="label_xalign">0.029999999329447746</property>
-            <child>
-              <object class="GtkNotebook" id="notebook">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tab_pos">left</property>
-                <property name="scrollable">True</property>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Settings&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </object>
-            </child>
+            <property name="can_focus">True</property>
+            <property name="tab_pos">left</property>
+            <property name="scrollable">True</property>
           </object>
           <packing>
             <property name="expand">True</property>
