Code cleaning (Thx Jamie)

diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
index b90e8bb..ecd7e00 100644 (file)
--- a/source/gui/settingsDialogs.py
+++ b/source/gui/settingsDialogs.py
@@ -277,31 +277,21 @@ class VoiceSettingsSlider(wx.Slider):
        def onSliderChar(self, evt):\r
                key = evt.KeyCode\r
                if key == wx.WXK_UP:\r
-                       newValue=self.Value+self.LineSize\r
-                       if newValue >self.Max:\r
-                               newValue=self.Max\r
-                       self.SetValue(newValue)\r
+                       newValue = min(self.Value + self.LineSize, self.Max)\r
                elif key == wx.WXK_DOWN:\r
-                       newValue=self.Value-self.LineSize\r
-                       if newValue <self.Min:\r
-                               newValue=self.Min\r
-                       self.SetValue(newValue)\r
+                       newValue = max(self.Value - self.LineSize, self.Min)\r
                elif key == wx.WXK_PRIOR:\r
-                       newValue=self.Value+self.PageSize\r
-                       if newValue >self.Max:\r
-                               newValue=self.Max\r
-                       self.SetValue(newValue)\r
+                       newValue = min(self.Value + self.PageSize, self.Max)\r
                elif key == wx.WXK_NEXT:\r
-                       newValue=self.Value-self.PageSize\r
-                       if newValue <self.Min:\r
-                               newValue=self.Min\r
-                       self.SetValue(newValue)\r
+                       newValue = max(self.Value - self.PageSize, self.Min)\r
                elif key == wx.WXK_HOME:\r
-                       self.SetValue(self.Max)\r
+                       newValue = self.Max\r
                elif key == wx.WXK_END:\r
-                       self.SetValue(self.Min)\r
+                       newValue = self.Min\r
                else:\r
                        evt.Skip()\r
+                       return\r
+               self.SetValue(newValue)\r
 \r
 class VoiceSettingsDialog(SettingsDialog):\r
        title = _("Voice settings")\r
@@ -439,14 +429,6 @@ class VoiceSettingsDialog(SettingsDialog):
                config.conf["speech"][getSynth().name]["useSpellingFunctionality"]=self.useSpellingFunctionalityCheckBox.IsChecked()\r
                super(VoiceSettingsDialog, self).onOk(evt)\r
 \r
-       def sendEvent(self,window, eventBinder):\r
-               # Example of PyEventBinder: wx.EVT_BUTTON\r
-               # window is the window (control) that triggers the event\r
-               cmd = wx.CommandEvent(eventBinder.evtType[0])\r
-               cmd.SetEventObject(window)\r
-               cmd.SetId(window.GetId())\r
-               window.GetEventHandler().ProcessEvent(cmd)\r
-\r
 class KeyboardSettingsDialog(SettingsDialog):\r
        title = _("Keyboard Settings")\r
 \r