Changeset 1490

Timestamp:

10/08/08 16:38:21 (3 months ago)

Author:

astormont

Message:

Winver sorta works

Files:

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

wine-doors/trunk/src/ui.py

@@ -150 +150 @@
-        preferences['crossover']     = wn_prefs['ck_crossover'].get_active() 
-        preferences['licensed']      = wn_prefs['ck_licensed'].get_active()
+
-        preferences['name']          = wn_prefs['en_name'].get_text()
-        wine.SetRegOwner( wn_prefs['en_name'].get_text() )
+
-        preferences['company']       = wn_prefs['en_company'].get_text()
+        wine.SetRegCompany( wn_prefs['en_company'].get_text() )
+
-        preferences['hideprograms']  = wn_prefs['ck_showwinemenu'].get_active()
-        preferences['installedfromreg'] = wn_prefs['installedfromreg'].get_active()
@@ -385 +389 @@
-        #    for engine in os.listdir( os.path.expanduser("~/.cedega/.winex_ver/") ):
-        #        wn_prefs['cb_winever'].prepend_text( engine.replace("winex", "cedega") )
+
+        # Detect wineversion and leave it at that
+        winver_model = gtk.ListStore( gobject.TYPE_STRING )
+        winver_model.append( [ wine.WineVersion() ] )
+        wn_prefs['cb_winever'].set_model( winver_model )
-
-        # Do audio

wine-doors/trunk/src/wine.py

@@ -48 +48 @@
-        self.setRegistry("HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\RegisteredOwner", name )
-        self.setRegistry("HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\RegisteredOwner", name )
+
+    def SetRegCompany( self, name ):
+        self.setRegistry("HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\RegisteredOrganization", name )
+        self.setRegistry("HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\RegisteredOrganization", name )
-
-    def SetAudioSystem( self, backend ):
@@ -133 +137 @@
-
-        self.SetRegOwner( preferences['name'] )
-
-
-
-
+
-        
-        # Add any registry hacks that may be needed for normal operation

wine-doors/trunk/src/winedoors.glade

@@ -968 +968 @@
-                  <widget class="GtkComboBox" id="cb_winever">
-                    <property name="visible">True</property>
-
+<!--
-5.1.2
-5.1.1
@@ -988 +988 @@
-4.1
-4.0.1
-
+-->
-                    <signal name="popup" handler="on_cb_winever_popup"/>
-                  </widget>