Changeset 1488
- Timestamp:
- 10/08/08 16:09:02 (3 months ago)
- Files:
-
- wine-doors/trunk/src/ui.py (modified) (3 diffs)
- wine-doors/trunk/src/wine.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
wine-doors/trunk/src/ui.py
r1487 r1488 151 151 preferences['licensed'] = wn_prefs['ck_licensed'].get_active() 152 152 preferences['name'] = wn_prefs['en_name'].get_text() 153 wine.SetRegOwner( wn_prefs['en_name'].get_text() ) 153 154 preferences['company'] = wn_prefs['en_company'].get_text() 154 155 preferences['hideprograms'] = wn_prefs['ck_showwinemenu'].get_active() … … 160 161 os.chmod( os.path.expanduser("~/.local/share/applications/wine"), 0755) 161 162 162 wine.setRegistry( "HKCU\\Software\\Wine\\Drivers\\Audio", wn_prefs['cb_audio'].get_active_text() ) 163 # Set audio backend 164 wine.SetAudioSystem( wn_prefs['cb_audio'].get_active_text() ) 163 165 164 166 # Refresh ctile … … 385 387 386 388 # Do audio 387 wn_prefs['cb_audio'].append_text( wine. getRegistry( "HKCU\\\\Software\\\\Wine\\\\Drivers", "Audio") )389 wn_prefs['cb_audio'].append_text( wine.GetAudioSystem() ) 388 390 wn_prefs['cb_audio'].set_active(0) 389 for item in wine. AudioSystems():391 for item in wine.GetAudioSystems(): 390 392 if item != wn_prefs['cb_audio'].get_active_text(): 391 393 wn_prefs['cb_audio'].append_text( item ) wine-doors/trunk/src/wine.py
r1468 r1488 27 27 if line.find("pulseaudio") == -1: 28 28 return line.rstrip().split("-")[1] 29 30 def AudioSystems( self ): 29 30 def GetAudioSystem( self ): 31 """ Returns backend currently set in reg """ 32 return self.getRegistry( "HKCU\\\\Software\\\\Wine\\\\Drivers", "Audio" ) 33 34 def GetAudioSystems( self ): 31 35 """ Returns a list of supported audio systems """ 32 36 audio_sys = [] … … 40 44 audio_sys.append( "esd" ) 41 45 return audio_sys 46 47 def SetRegOwner( self, name ): 48 self.setRegistry("HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\RegisteredOwner", name ) 49 self.setRegistry("HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\RegisteredOwner", name ) 50 51 def SetAudioSystem( self, backend ): 52 self.setRegistry( "HKCU\\Software\\Wine\\Drivers\\Audio", backend ) 53 log.Debug( "Audio backend changed to : " + backend ) 42 54 43 55 def CountInstances( self, process_name="wine" ): … … 120 132 log.Debug( "wine.py: CreateDrive: Registry changes" ) 121 133 122 self.setRegistry("HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\RegisteredOwner", preferences['name'] ) 134 self.SetRegOwner( preferences['name'] ) 135 123 136 self.setRegistry("HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\RegisteredOrganization", preferences['company'] ) 124 self.setRegistry("HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\RegisteredOwner", preferences['name'] ) 137 125 138 self.setRegistry("HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\RegisteredOrganization", preferences['company'] ) 126 139
