orca r4573 - in trunk: . src/orca

[wwalker svn gnome org]

Author: wwalker
Date: Wed Feb 18 01:27:04 2009
New Revision: 4573
URL: http://svn.gnome.org/viewvc/orca?rev=4573&view=rev

Log:
Additional fix for bug #419123 - Modified speech settings do not change immediately in preferences dialog.


Modified:
   trunk/ChangeLog
   trunk/src/orca/acss.py
   trunk/src/orca/orca_gui_prefs.py

Modified: trunk/src/orca/acss.py
==============================================================================
--- trunk/src/orca/acss.py	(original)
+++ trunk/src/orca/acss.py	Wed Feb 18 01:27:04 2009
@@ -51,7 +51,7 @@
     settings = {
         FAMILY :        None,
         RATE :          50,
-        GAIN :          100,
+        GAIN :          10,
         AVERAGE_PITCH : 5,
         PITCH_RANGE :   5,
         STRESS :        5,

Modified: trunk/src/orca/orca_gui_prefs.py
==============================================================================
--- trunk/src/orca/orca_gui_prefs.py	(original)
+++ trunk/src/orca/orca_gui_prefs.py	Wed Feb 18 01:27:04 2009
@@ -658,14 +658,20 @@
         rate = self._getRateForVoiceType(voiceType)
         if rate != None:
             self.get_widget("rateScale").set_value(rate)
-
+        else:
+            self.get_widget("rateScale").set_value(50.0)
+            
         pitch = self._getPitchForVoiceType(voiceType)
         if pitch != None:
             self.get_widget("pitchScale").set_value(pitch)
+        else:
+            self.get_widget("pitchScale").set_value(5.0)
 
         volume = self._getVolumeForVoiceType(voiceType)
         if volume != None:
             self.get_widget("volumeScale").set_value(volume)
+        else:
+            self.get_widget("volumeScale").set_value(10.0)
 
     def _setSpeechFamiliesChoice(self, familyName):
         """Sets the active item in the families ("Person:") combo box
@@ -4063,7 +4069,7 @@
             self.prefsDict["speechServerInfo"] = \
                 self.speechServersChoice.getInfo()
 
-        if self.defaultVoice:
+        if self.defaultVoice != None:
             self.prefsDict["voices"] = {
                 settings.DEFAULT_VOICE   : acss.ACSS(self.defaultVoice),
                 settings.UPPERCASE_VOICE : acss.ACSS(self.uppercaseVoice),