Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Source/eric6.Preferences.__init__.html	Sun Mar 06 13:42:29 2016 +0100
+++ b/Documentation/Source/eric6.Preferences.__init__.html	Sun Mar 06 14:09:37 2016 +0100
@@ -143,7 +143,7 @@
 <td>Module function to retrieve the Qt5DocDir setting.</td>
 </tr><tr>
 <td><a href="#getQtTranslationsDir">getQtTranslationsDir</a></td>
-<td>Module function to retrieve the Qt4TranslationsDir setting (Name kept for backward compatibility).</td>
+<td>Module function to retrieve the Qt4TranslationsDir or Qt5TranslationsDir setting depending on the current Qt version.</td>
 </tr><tr>
 <td><a href="#getShell">getShell</a></td>
 <td>Module function to retrieve the various shell settings.</td>
@@ -1042,8 +1042,8 @@
 <h2>getQtTranslationsDir</h2>
 <b>getQtTranslationsDir</b>(<i>prefClass=Prefs</i>)
 <p>
-    Module function to retrieve the Qt4TranslationsDir setting (Name kept for
-    backward compatibility).
+    Module function to retrieve the Qt4TranslationsDir or Qt5TranslationsDir
+    setting depending on the current Qt version.
 </p><dl>
 <dt><i>prefClass</i></dt>
 <dd>
@@ -1052,7 +1052,7 @@
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-the requested Qt4TranslationsDir setting (string)
+the requested setting (string)
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>

--- a/Preferences/ConfigurationPages/QtPage.py	Sun Mar 06 13:42:29 2016 +0100
+++ b/Preferences/ConfigurationPages/QtPage.py	Sun Mar 06 14:09:37 2016 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 
-from PyQt5.QtCore import pyqtSlot
+from PyQt5.QtCore import pyqtSlot, qVersion
 
 from E5Gui.E5PathPicker import E5PathPickerModes
 
@@ -34,7 +34,12 @@
         self.qt4TransPicker.setMode(E5PathPickerModes.DirectoryMode)
         
         # set initial values
-        self.qt4TransPicker.setText(Preferences.getQt("Qt4TranslationsDir"))
+        if qVersion() < "5.0.0":
+            self.qt4TransPicker.setText(
+                Preferences.getQt("Qt4TranslationsDir"))
+        else:
+            self.qt4TransPicker.setText(
+                Preferences.getQt("Qt5TranslationsDir"))
         self.qt4PrefixEdit.setText(Preferences.getQt("QtToolsPrefix4"))
         self.qt4PostfixEdit.setText(Preferences.getQt("QtToolsPostfix4"))
         self.__updateQt4Sample()
@@ -46,7 +51,10 @@
         """
         Public slot to save the Qt configuration.
         """
-        Preferences.setQt("Qt4TranslationsDir", self.qt4TransPicker.text())
+        if qVersion() < "5.0.0":
+            Preferences.setQt("Qt4TranslationsDir", self.qt4TransPicker.text())
+        else:
+            Preferences.setQt("Qt5TranslationsDir", self.qt4TransPicker.text())
         Preferences.setQt("QtToolsPrefix4", self.qt4PrefixEdit.text())
         Preferences.setQt("QtToolsPostfix4", self.qt4PostfixEdit.text())
         Preferences.setQt("PyuicIndent", self.pyuicIndentSpinBox.value())

--- a/Preferences/__init__.py	Sun Mar 06 13:42:29 2016 +0100
+++ b/Preferences/__init__.py	Sun Mar 06 14:09:37 2016 +0100
@@ -1020,9 +1020,9 @@
     }
 
     # defaults for Qt related stuff
-    # TODO: introduce Qt5TranslationsDir and use it depending on Qt version
     qtDefaults = {
         "Qt4TranslationsDir": "",
+        "Qt5TranslationsDir": "",
         "QtToolsPrefix4": "",
         "QtToolsPostfix4": "",
         "PyuicIndent": 4,
@@ -2574,14 +2574,20 @@
 
 def getQtTranslationsDir(prefClass=Prefs):
     """
-    Module function to retrieve the Qt4TranslationsDir setting (Name kept for
-    backward compatibility).
+    Module function to retrieve the Qt4TranslationsDir or Qt5TranslationsDir
+    setting depending on the current Qt version.
     
     @param prefClass preferences class used as the storage area
-    @return the requested Qt4TranslationsDir setting (string)
+    @return the requested setting (string)
     """
-    s = prefClass.settings.value(
-        "Qt/Qt4TranslationsDir", prefClass.qtDefaults["Qt4TranslationsDir"])
+    if qVersion() < "5.0.0":
+        s = prefClass.settings.value(
+            "Qt/Qt4TranslationsDir",
+            prefClass.qtDefaults["Qt4TranslationsDir"])
+    else:
+        s = prefClass.settings.value(
+            "Qt/Qt5TranslationsDir",
+            prefClass.qtDefaults["Qt5TranslationsDir"])
     if s == "":
         s = os.getenv("QTTRANSLATIONSDIR", "")
     if s == "":
@@ -2606,7 +2612,7 @@
     @param prefClass preferences class used as the storage area
     @return the requested Qt setting
     """
-    if key == "Qt4TranslationsDir":
+    if key in ["Qt4TranslationsDir", "Qt5TranslationsDir"]:
         return getQtTranslationsDir(prefClass)
     elif key in ["PyuicIndent"]:
         return int(prefClass.settings.value(