Changeset 1536

Timestamp:

10/22/08 15:07:18 (3 months ago)

Author:

astormont

Message:

Support for setting WINE colours from GTK

Files:

• wine-doors/trunk/src/preferences.py (modified) (1 diff)
• wine-doors/trunk/src/ui.py (modified) (2 diffs)
• wine-doors/trunk/src/wine.py (modified) (1 diff)
• wine-doors/trunk/src/winedoors.glade (modified) (2 diffs)

wine-doors/trunk/src/preferences.py

@@ -101 +101 @@
-        self['hideprograms'] = "0"
-        self['installedfromreg'] = '0'
+        self['winegtkcolours'] = '0'
-        self['prefix'] = os.path.expanduser( "~/.local/share/wine-doors" )
-

wine-doors/trunk/src/ui.py

@@ -150 +150 @@
-        preferences['crossover']     = wn_prefs['ck_crossover'].get_active() 
-        preferences['licensed']      = wn_prefs['ck_licensed'].get_active()
+
+        if preferences['winegtkcolours'] != wn_prefs['ck_winegtkcolours'].get_active():
+            if wn_prefs['ck_winegtkcolours']:
+                wine.SetColoursFromGtk()
+            else:
+                #FIXME: Change colours back.
+                pass
+            preferences['winegtkcolours']= wn_prefs['ck_winegtkcolours'].get_active()
-
-        preferences['name']          = wn_prefs['en_name'].get_text()
@@ -393 +401 @@
-        wn_prefs['ck_showwinemenu'].set_active( utils.string2bool( preferences['hideprograms'] ) )
-        wn_prefs['installedfromreg'].set_active( utils.string2bool( preferences['installedfromreg'] ) )
+        wn_prefs['ck_winegtkcolours'].set_active( utils.string2bool( preferences['winegtkcolours'] ) )
-        wn_prefs['en_name'].set_text( preferences['name' ] )
-        wn_prefs['en_company'].set_text( preferences['company'] )

wine-doors/trunk/src/wine.py

@@ -23 +23 @@
-    def __init__( self ):
-        self.gui = True
+
+    def SetColoursFromGtk( self ):
+        import winethemefromgtk
+        del winethemefromgtk
-
-    def WineVersion( self ):

wine-doors/trunk/src/winedoors.glade

@@ -485 +485 @@
-                </child>
-                <child>
+                  <widget class="GtkCheckButton" id="ck_winegtkcolours">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Set Wine colours to match GTK</property>
+                    <property name="use_underline">True</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">6</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
-                  <widget class="GtkLabel" id="label68">
-                    <property name="visible">True</property>
@@ -1901 +1918 @@
-The DarkMaster aka Luca D.M. &amp;lt;darkmaster@email.it&amp;gt;
-Peter Charlton &amp;lt;pcharlton@gmail.com&amp;gt;
-
+
+
-                <property name="use_markup">True</property>
-                <property name="wrap">True</property>