diff -r 331569d44b19 -r 684261ef2165 eric6/Preferences/ConfigurationPages/QtPage.py
--- a/eric6/Preferences/ConfigurationPages/QtPage.py Sun Sep 01 17:44:33 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/QtPage.py Sun Sep 01 19:40:53 2019 +0200
@@ -17,7 +17,6 @@
from .Ui_QtPage import Ui_QtPage
import Preferences
-from Globals import qVersionTuple
class QtPage(ConfigurationPageBase, Ui_QtPage):
@@ -32,22 +31,18 @@
self.setupUi(self)
self.setObjectName("QtPage")
- self.qt4TransPicker.setMode(E5PathPickerModes.DirectoryMode)
+ self.qtTransPicker.setMode(E5PathPickerModes.DirectoryMode)
self.qtToolsDirPicker.setMode(E5PathPickerModes.DirectoryShowFilesMode)
self.pyqtToolsDirPicker.setMode(
E5PathPickerModes.DirectoryShowFilesMode)
# set initial values
- if qVersionTuple() < (5, 0, 0):
- self.qt4TransPicker.setText(
- Preferences.getQt("Qt4TranslationsDir"))
- else:
- self.qt4TransPicker.setText(
- Preferences.getQt("Qt5TranslationsDir"))
+ self.qtTransPicker.setText(
+ Preferences.getQt("Qt5TranslationsDir"))
self.qtToolsDirPicker.setText(Preferences.getQt("QtToolsDir"))
- self.qt4PrefixEdit.setText(Preferences.getQt("QtToolsPrefix4"))
- self.qt4PostfixEdit.setText(Preferences.getQt("QtToolsPostfix4"))
- self.__updateQt4Sample()
+ self.qtPrefixEdit.setText(Preferences.getQt("QtToolsPrefix"))
+ self.qtPostfixEdit.setText(Preferences.getQt("QtToolsPostfix"))
+ self.__updateQtSample()
self.pyqtToolsDirPicker.setText(Preferences.getQt("PyQtToolsDir"))
self.pyuicIndentSpinBox.setValue(Preferences.getQt("PyuicIndent"))
self.pyuicImportsCheckBox.setChecked(
@@ -57,43 +52,40 @@
"""
Public slot to save the Qt configuration.
"""
- if qVersionTuple() < (5, 0, 0):
- Preferences.setQt("Qt4TranslationsDir", self.qt4TransPicker.text())
- else:
- Preferences.setQt("Qt5TranslationsDir", self.qt4TransPicker.text())
+ Preferences.setQt("Qt5TranslationsDir", self.qtTransPicker.text())
Preferences.setQt("QtToolsDir", self.qtToolsDirPicker.text())
- Preferences.setQt("QtToolsPrefix4", self.qt4PrefixEdit.text())
- Preferences.setQt("QtToolsPostfix4", self.qt4PostfixEdit.text())
+ Preferences.setQt("QtToolsPrefix", self.qtPrefixEdit.text())
+ Preferences.setQt("QtToolsPostfix", self.qtPostfixEdit.text())
Preferences.setQt("PyQtToolsDir", self.pyqtToolsDirPicker.text())
Preferences.setQt("PyuicIndent", self.pyuicIndentSpinBox.value())
Preferences.setQt("PyuicFromImports",
self.pyuicImportsCheckBox.isChecked())
- def __updateQt4Sample(self):
+ def __updateQtSample(self):
"""
- Private slot to update the Qt4 tools sample label.
+ Private slot to update the Qt tools sample label.
"""
- self.qt4SampleLabel.setText(
+ self.qtSampleLabel.setText(
self.tr("Sample: {0}designer{1}").format(
- self.qt4PrefixEdit.text(), self.qt4PostfixEdit.text()))
+ self.qtPrefixEdit.text(), self.qtPostfixEdit.text()))
@pyqtSlot(str)
- def on_qt4PrefixEdit_textChanged(self, txt):
+ def on_qtPrefixEdit_textChanged(self, txt):
"""
Private slot to handle a change in the entered Qt directory.
@param txt the entered string (string)
"""
- self.__updateQt4Sample()
+ self.__updateQtSample()
@pyqtSlot(str)
- def on_qt4PostfixEdit_textChanged(self, txt):
+ def on_qtPostfixEdit_textChanged(self, txt):
"""
Private slot to handle a change in the entered Qt directory.
@param txt the entered string (string)
"""
- self.__updateQt4Sample()
+ self.__updateQtSample()
def create(dlg):
