Merged remote changes.

Tue, 08 Jan 2013 19:16:09 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 08 Jan 2013 19:16:09 +0100
changeset 2327
b054ffacfbe6
parent 2326
7a9c4dafae62 (diff)
parent 2324
0d837f822f34 (current diff)
child 2329
7706d05104c5

Merged remote changes.

--- a/Preferences/ConfigurationDialog.py	Tue Jan 08 16:29:55 2013 +0100
+++ b/Preferences/ConfigurationDialog.py	Tue Jan 08 19:16:09 2013 +0100
@@ -20,6 +20,8 @@
 from E5Gui import E5MessageBox
 from E5Gui.E5MainWindow import E5MainWindow
 
+from Globals import isMacPlatform
+
 import QScintilla.Lexers
 
 import Preferences
@@ -383,9 +385,10 @@
         """
         Public slot to accept the buttonBox accept signal.
         """
-        wdg = self.focusWidget()
-        if wdg == self.configList:
-            return
+        if not isMacPlatform():
+            wdg = self.focusWidget()
+            if wdg == self.configList:
+                return
         
         self.accepted.emit()
         

eric ide

mercurial