Fix 'PySide.QtCore.QCoreApplication.translate' arguements
PySide.QtCore.QCoreApplication.translate has changed its function signature because QtGui.QApplication.UnicodeUTF8 is deprecated. See: https://srinikom.github.io/pyside-docs/PySide/QtCore/QCoreApplication.html#PySide.QtCore.PySide.QtCore.QCoreApplication.translate Resulted in the following error when running the macro: <class 'TypeError'>: 'PySide.QtCore.QCoreApplication.translate' called with wrong argument types: PySide.QtCore.QCoreApplication.translate(str, str, NoneType, int) Supported signatures: PySide.QtCore.QCoreApplication.translate(unicode, unicode, unicode = None, PySide.QtCore.QCoreApplication.Encoding = CodecForTr) PySide.QtCore.QCoreApplication.translate(unicode, unicode, unicode, PySide.QtCore.QCoreApplication.Encoding, int) Fix by setting the default translation codec to UTF-8, and letting translate() pick that up itself by using the second supported method signature. Also tidied up 4 cases where the helper function wasn't being used. Reported in issue #251. Signed-off-by: Laurence Rochfort <laurence.rochfort@gmail.com>
This commit is contained in:
Laurence Rochfort
parent
62de030972
commit
45b338d9c6
1 changed files with 23 additions and 26 deletions
|
|
@ -81,27 +81,24 @@ param = FreeCAD.ParamGet('User parameter:Plugins/parts_library')
|
||||||
s = param.GetString('destination')
|
s = param.GetString('destination')
|
||||||
#print('User parameter:Plugins/partlib : destination : ',s)
|
#print('User parameter:Plugins/partlib : destination : ',s)
|
||||||
|
|
||||||
#encoding error trap
|
|
||||||
_encoding = None
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
_encoding = QtGui.QApplication.UnicodeUTF8
|
QtCore.QTextCodec.setCodecForTr(QTextCodec.codecForName("UTF-8"))
|
||||||
except AttributeError:
|
except:
|
||||||
_encoding = -1
|
pass # Will fallback to Latin-1
|
||||||
|
|
||||||
if s:
|
if s:
|
||||||
LIBRARYPATH = s
|
LIBRARYPATH = s
|
||||||
else:
|
else:
|
||||||
|
|
||||||
folderDialog = QtGui.QFileDialog.getExistingDirectory(None,QtGui.QApplication.translate("PartsLibrary", "Location of your existing Parts library", None, _encoding))
|
folderDialog = QtGui.QFileDialog.getExistingDirectory(None,QtGui.QApplication.translate("PartsLibrary", "Location of your existing Parts library"))
|
||||||
param.SetString('destination',folderDialog)
|
param.SetString('destination',folderDialog)
|
||||||
LIBRARYPATH = param.GetString('destination')
|
LIBRARYPATH = param.GetString('destination')
|
||||||
|
|
||||||
|
|
||||||
def translate(context, text, utf8_decode = _encoding):
|
def translate(context, text):
|
||||||
|
|
||||||
#added compare to ensure utf8 encoding is skipped if not available
|
# Will fallback to Latin-1
|
||||||
return QtGui.QApplication.translate(context, text, None, utf8_decode & _encoding)
|
return QtGui.QApplication.translate(context, text)
|
||||||
|
|
||||||
class ExpFileSystemModel(QtGui.QFileSystemModel):
|
class ExpFileSystemModel(QtGui.QFileSystemModel):
|
||||||
"a custom QFileSystemModel that displays freecad file icons"
|
"a custom QFileSystemModel that displays freecad file icons"
|
||||||
|
|
@ -334,21 +331,21 @@ class ExpDockWidget(QtGui.QDockWidget):
|
||||||
c.hide()
|
c.hide()
|
||||||
for c in tree:
|
for c in tree:
|
||||||
c.show()
|
c.show()
|
||||||
self.optbutton.setText(QtGui.QApplication.translate("PartsLibrary", "Options ⏷", None, _encoding))
|
self.optbutton.setText(translate("PartsLibrary", "Options ⏷"))
|
||||||
else:
|
else:
|
||||||
for c in controls:
|
for c in controls:
|
||||||
c.show()
|
c.show()
|
||||||
for c in tree:
|
for c in tree:
|
||||||
c.hide()
|
c.hide()
|
||||||
self.optbutton.setText(QtGui.QApplication.translate("PartsLibrary", "Options ⏶", None, _encoding))
|
self.optbutton.setText(translate("PartsLibrary", "Options ⏶"))
|
||||||
|
|
||||||
def showpreview(self):
|
def showpreview(self):
|
||||||
if self.preview.isVisible():
|
if self.preview.isVisible():
|
||||||
self.preview.hide()
|
self.preview.hide()
|
||||||
self.prevbutton.setText(QtGui.QApplication.translate("PartsLibrary", "Preview ⏷", None, _encoding))
|
self.prevbutton.setText(translate("PartsLibrary", "Preview ⏷"))
|
||||||
else:
|
else:
|
||||||
self.preview.show()
|
self.preview.show()
|
||||||
self.prevbutton.setText(QtGui.QApplication.translate("PartsLibrary", "Preview ⏶", None, _encoding))
|
self.prevbutton.setText(translate("PartsLibrary", "Preview ⏶"))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -413,18 +410,18 @@ class ConfigDialog(QtGui.QDialog):
|
||||||
self.lineEdit_3.setText(librarypath)
|
self.lineEdit_3.setText(librarypath)
|
||||||
|
|
||||||
def retranslateUi(self):
|
def retranslateUi(self):
|
||||||
self.setWindowTitle(QtGui.QApplication.translate("PartsLibrary", "Parts library configuration", None, _encoding))
|
self.setWindowTitle(QtGui.QApplication.translate("PartsLibrary", "Parts library configuration"))
|
||||||
self.groupBox.setTitle(QtGui.QApplication.translate("PartsLibrary", "Pull server (where you get your updates from)", None, _encoding))
|
self.groupBox.setTitle(QtGui.QApplication.translate("PartsLibrary", "Pull server (where you get your updates from)"))
|
||||||
self.lineEdit.setToolTip(QtGui.QApplication.translate("PartsLibrary", "Enter the URL of the pull server here", None, _encoding))
|
self.lineEdit.setToolTip(QtGui.QApplication.translate("PartsLibrary", "Enter the URL of the pull server here"))
|
||||||
self.pushButton.setToolTip(QtGui.QApplication.translate("PartsLibrary", "Use the official FreeCAD-library repository", None, _encoding))
|
self.pushButton.setToolTip(QtGui.QApplication.translate("PartsLibrary", "Use the official FreeCAD-library repository"))
|
||||||
self.pushButton.setText(QtGui.QApplication.translate("PartsLibrary", "use official", None, _encoding))
|
self.pushButton.setText(QtGui.QApplication.translate("PartsLibrary", "use official"))
|
||||||
self.groupBox_2.setTitle(QtGui.QApplication.translate("PartsLibrary", "Push server (where you push your changes to)", None, _encoding))
|
self.groupBox_2.setTitle(QtGui.QApplication.translate("PartsLibrary", "Push server (where you push your changes to)"))
|
||||||
self.lineEdit_2.setToolTip(QtGui.QApplication.translate("PartsLibrary", "Enter the URL of the push server here", None, _encoding))
|
self.lineEdit_2.setToolTip(QtGui.QApplication.translate("PartsLibrary", "Enter the URL of the push server here"))
|
||||||
self.label.setText(QtGui.QApplication.translate("PartsLibrary", "Warning: You need write permission on this server", None, _encoding))
|
self.label.setText(QtGui.QApplication.translate("PartsLibrary", "Warning: You need write permission on this server"))
|
||||||
self.groupBox_3.setTitle(QtGui.QApplication.translate("PartsLibrary", "Library path", None, _encoding))
|
self.groupBox_3.setTitle(QtGui.QApplication.translate("PartsLibrary", "Library path"))
|
||||||
self.lineEdit_3.setToolTip(QtGui.QApplication.translate("PartsLibrary", "Enter the path to your parts library", None, _encoding))
|
self.lineEdit_3.setToolTip(QtGui.QApplication.translate("PartsLibrary", "Enter the path to your parts library"))
|
||||||
self.pushButton_3.setToolTip(QtGui.QApplication.translate("PartsLibrary", "Browse to your path library", None, _encoding))
|
self.pushButton_3.setToolTip(QtGui.QApplication.translate("PartsLibrary", "Browse to your path library"))
|
||||||
self.pushButton_3.setText(QtGui.QApplication.translate("PartsLibrary", "...", None, _encoding))
|
self.pushButton_3.setText(QtGui.QApplication.translate("PartsLibrary", "..."))
|
||||||
|
|
||||||
def setdefaulturl(self):
|
def setdefaulturl(self):
|
||||||
self.lineEdit.setText("https://github.com/FreeCAD/FreeCAD-library.git")
|
self.lineEdit.setText("https://github.com/FreeCAD/FreeCAD-library.git")
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue