diff --git a/Caliper.py b/Caliper.py
index abc6416..029862e 100644
--- a/Caliper.py
+++ b/Caliper.py
@@ -43,6 +43,7 @@
# oDraft -> Draft from FreeCAD_0.17.13488
import FreeCAD, FreeCADGui
+from PySide.QtCore import QT_TRANSLATE_NOOP
def getFCversion():
@@ -1672,11 +1673,11 @@ def setupUi(self, DockWidget):
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap("Caliper.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
DockWidget.setWindowIcon(icon)
- DockWidget.setToolTip("Measure Tools")
+ DockWidget.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Measure Tools"))
DockWidget.setLayoutDirection(QtCore.Qt.LeftToRight)
DockWidget.setFeatures(QtGui.QDockWidget.DockWidgetFloatable|QtGui.QDockWidget.DockWidgetMovable)
DockWidget.setAllowedAreas(QtCore.Qt.LeftDockWidgetArea|QtCore.Qt.RightDockWidgetArea)
- DockWidget.setWindowTitle("Measure Tools")
+ DockWidget.setWindowTitle(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Measure Tools"))
self.dockWidgetContents = QtGui.QWidget()
self.dockWidgetContents.setObjectName("dockWidgetContents")
self.horizontalLayoutWidget = QtGui.QWidget(self.dockWidgetContents)
@@ -1688,7 +1689,7 @@ def setupUi(self, DockWidget):
self.horizontalLayout.setObjectName("horizontalLayout")
self.dock_float = QtGui.QPushButton(self.horizontalLayoutWidget)
self.dock_float.setMaximumSize(QtCore.QSize(28, 28))
- self.dock_float.setToolTip("un-dock (floating)")
+ self.dock_float.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "un-dock (floating)"))
self.dock_float.setText("")
icon1 = QtGui.QIcon()
icon1.addPixmap(QtGui.QPixmap("un_dock.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1698,7 +1699,7 @@ def setupUi(self, DockWidget):
self.horizontalLayout.addWidget(self.dock_float)
self.dock_minimize = QtGui.QPushButton(self.horizontalLayoutWidget)
self.dock_minimize.setMaximumSize(QtCore.QSize(28, 28))
- self.dock_minimize.setToolTip("minimize")
+ self.dock_minimize.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "minimize"))
self.dock_minimize.setText("")
icon2 = QtGui.QIcon()
icon2.addPixmap(QtGui.QPixmap("minimize.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1708,7 +1709,7 @@ def setupUi(self, DockWidget):
self.horizontalLayout.addWidget(self.dock_minimize)
self.close = QtGui.QPushButton(self.horizontalLayoutWidget)
self.close.setMaximumSize(QtCore.QSize(28, 28))
- self.close.setToolTip("close")
+ self.close.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "close"))
self.close.setText("")
icon3 = QtGui.QIcon()
icon3.addPixmap(QtGui.QPixmap("closeW.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1718,15 +1719,13 @@ def setupUi(self, DockWidget):
self.horizontalLayout.addWidget(self.close)
self.Label = QtGui.QLabel(self.dockWidgetContents)
self.Label.setGeometry(QtCore.QRect(110, 5, 186, 31))
- self.Label.setToolTip("Measure Tools\n"
-"Click on Measure button\n"
-"to start measuring")
- self.Label.setText("Click on Measure button
to start measuring")
+ self.Label.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Measure Tools\nClick on Measure button\nto start measuring"))
+ self.Label.setText(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Click on Measure button
to start measuring"))
self.Label.setObjectName("Label")
self.Controls_Group = QtGui.QGroupBox(self.dockWidgetContents)
self.Controls_Group.setGeometry(QtCore.QRect(3, 35, 295, 169))
- self.Controls_Group.setToolTip("Controls")
- self.Controls_Group.setTitle("Controls")
+ self.Controls_Group.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Controls"))
+ self.Controls_Group.setTitle(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Controls"))
self.Controls_Group.setObjectName("Controls_Group")
self.gridLayoutWidget_6 = QtGui.QWidget(self.Controls_Group)
self.gridLayoutWidget_6.setGeometry(QtCore.QRect(5, 16, 287, 65))
@@ -1739,8 +1738,7 @@ def setupUi(self, DockWidget):
self.Measure = QtGui.QPushButton(self.gridLayoutWidget_6)
self.Measure.setMinimumSize(QtCore.QSize(36, 36))
self.Measure.setMaximumSize(QtCore.QSize(48, 48))
- self.Measure.setToolTip("Measure Button\n"
-"Click Measure to start measuring")
+ self.Measure.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Measure Button\nClick Measure to start measuring"))
self.Measure.setText("")
self.Measure.setIcon(icon)
self.Measure.setIconSize(QtCore.QSize(32, 32))
@@ -1752,7 +1750,7 @@ def setupUi(self, DockWidget):
self.DimensionP3.setEnabled(False)
self.DimensionP3.setMinimumSize(QtCore.QSize(36, 36))
self.DimensionP3.setMaximumSize(QtCore.QSize(48, 48))
- self.DimensionP3.setToolTip("Dimension position")
+ self.DimensionP3.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Dimension position"))
self.DimensionP3.setText("")
icon4 = QtGui.QIcon()
icon4.addPixmap(QtGui.QPixmap("DimensionP3.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1765,7 +1763,7 @@ def setupUi(self, DockWidget):
self.CleanDist = QtGui.QPushButton(self.gridLayoutWidget_6)
self.CleanDist.setMinimumSize(QtCore.QSize(36, 36))
self.CleanDist.setMaximumSize(QtCore.QSize(48, 48))
- self.CleanDist.setToolTip("Clean Measures")
+ self.CleanDist.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Clean Measures"))
self.CleanDist.setText("")
icon5 = QtGui.QIcon()
icon5.addPixmap(QtGui.QPixmap("Clean.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1779,7 +1777,7 @@ def setupUi(self, DockWidget):
self.DimensionP1.setEnabled(False)
self.DimensionP1.setMinimumSize(QtCore.QSize(36, 36))
self.DimensionP1.setMaximumSize(QtCore.QSize(48, 48))
- self.DimensionP1.setToolTip("First Element")
+ self.DimensionP1.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "First Element"))
self.DimensionP1.setText("")
icon6 = QtGui.QIcon()
icon6.addPixmap(QtGui.QPixmap("DimensionP1.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1792,7 +1790,7 @@ def setupUi(self, DockWidget):
self.Help_Caliper = QtGui.QPushButton(self.gridLayoutWidget_6)
self.Help_Caliper.setMinimumSize(QtCore.QSize(36, 36))
self.Help_Caliper.setMaximumSize(QtCore.QSize(48, 48))
- self.Help_Caliper.setToolTip("Help on Caliper")
+ self.Help_Caliper.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Help on Caliper"))
self.Help_Caliper.setText("")
icon7 = QtGui.QIcon()
icon7.addPixmap(QtGui.QPixmap("help.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1806,7 +1804,7 @@ def setupUi(self, DockWidget):
self.DimensionP2.setEnabled(False)
self.DimensionP2.setMinimumSize(QtCore.QSize(36, 36))
self.DimensionP2.setMaximumSize(QtCore.QSize(48, 48))
- self.DimensionP2.setToolTip("Second Element")
+ self.DimensionP2.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Second Element"))
self.DimensionP2.setText("")
icon8 = QtGui.QIcon()
icon8.addPixmap(QtGui.QPixmap("DimensionP2.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1820,7 +1818,7 @@ def setupUi(self, DockWidget):
self.APlane.setEnabled(False)
self.APlane.setMinimumSize(QtCore.QSize(36, 36))
self.APlane.setMaximumSize(QtCore.QSize(48, 48))
- self.APlane.setToolTip("Annotation Plane")
+ self.APlane.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Annotation Plane"))
self.APlane.setText("")
icon9 = QtGui.QIcon()
icon9.addPixmap(QtGui.QPixmap("AnnPlane.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1833,7 +1831,7 @@ def setupUi(self, DockWidget):
self.rbRadius = QtGui.QRadioButton(self.Controls_Group)
self.rbRadius.setGeometry(QtCore.QRect(6, 120, 64, 32))
self.rbRadius.setMinimumSize(QtCore.QSize(64, 32))
- self.rbRadius.setToolTip("Get Radius of Arc or Circle")
+ self.rbRadius.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Get Radius of Arc or Circle"))
self.rbRadius.setText("")
icon10 = QtGui.QIcon()
icon10.addPixmap(QtGui.QPixmap("Radius.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1844,7 +1842,7 @@ def setupUi(self, DockWidget):
self.rbAngle = QtGui.QRadioButton(self.Controls_Group)
self.rbAngle.setGeometry(QtCore.QRect(144, 120, 64, 33))
self.rbAngle.setMinimumSize(QtCore.QSize(64, 32))
- self.rbAngle.setToolTip("Get Angle")
+ self.rbAngle.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Get Angle"))
self.rbAngle.setText("")
icon11 = QtGui.QIcon()
icon11.addPixmap(QtGui.QPixmap("Angle.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1855,10 +1853,10 @@ def setupUi(self, DockWidget):
self.rbLength = QtGui.QRadioButton(self.Controls_Group)
self.rbLength.setGeometry(QtCore.QRect(74, 120, 64, 32))
self.rbLength.setMinimumSize(QtCore.QSize(64, 32))
- self.rbLength.setToolTip("Get Length of Edge")
+ self.rbLength.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Get Length of Edge"))
self.rbLength.setText("")
icon12 = QtGui.QIcon()
- icon12.addPixmap(QtGui.QPixmap("Length.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ icon12.addPixmap(QtGui.QPixmap("Length.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)zz
self.rbLength.setIcon(icon12)
self.rbLength.setIconSize(QtCore.QSize(32, 32))
self.rbLength.setChecked(False)
@@ -1866,7 +1864,7 @@ def setupUi(self, DockWidget):
self.rbSnap = QtGui.QRadioButton(self.Controls_Group)
self.rbSnap.setGeometry(QtCore.QRect(6, 86, 109, 32))
self.rbSnap.setMinimumSize(QtCore.QSize(64, 32))
- self.rbSnap.setToolTip("Snap to EndPoint, MiddlePoint, Center")
+ self.rbSnap.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Snap to EndPoint, MiddlePoint, Center"))
self.rbSnap.setText("")
icon13 = QtGui.QIcon()
icon13.addPixmap(QtGui.QPixmap("Snap_Opt.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1877,7 +1875,7 @@ def setupUi(self, DockWidget):
self.rbBbox = QtGui.QRadioButton(self.Controls_Group)
self.rbBbox.setGeometry(QtCore.QRect(122, 84, 67, 32))
self.rbBbox.setMinimumSize(QtCore.QSize(64, 32))
- self.rbBbox.setToolTip("Center of BoundingBox")
+ self.rbBbox.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Center of BoundingBox"))
self.rbBbox.setText("")
icon14 = QtGui.QIcon()
icon14.addPixmap(QtGui.QPixmap("CenterBBox.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1888,7 +1886,7 @@ def setupUi(self, DockWidget):
self.rbMass = QtGui.QRadioButton(self.Controls_Group)
self.rbMass.setGeometry(QtCore.QRect(186, 84, 67, 32))
self.rbMass.setMinimumSize(QtCore.QSize(64, 32))
- self.rbMass.setToolTip("Center of Mass")
+ self.rbMass.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Center of Mass"))
self.rbMass.setText("")
icon15 = QtGui.QIcon()
icon15.addPixmap(QtGui.QPixmap("CenterOfMass.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -1898,7 +1896,7 @@ def setupUi(self, DockWidget):
self.rbMass.setObjectName("rbMass")
self.cbAPlane = QtGui.QCheckBox(self.Controls_Group)
self.cbAPlane.setGeometry(QtCore.QRect(230, 120, 64, 32))
- self.cbAPlane.setToolTip("use Annotation Plane")
+ self.cbAPlane.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Use Annotation Plane"))
self.cbAPlane.setText("")
self.cbAPlane.setIcon(icon9)
self.cbAPlane.setIconSize(QtCore.QSize(32, 32))
@@ -1906,8 +1904,7 @@ def setupUi(self, DockWidget):
self.rbParallel = QtGui.QRadioButton(self.dockWidgetContents)
self.rbParallel.setGeometry(QtCore.QRect(340, 286, 64, 32))
self.rbParallel.setMinimumSize(QtCore.QSize(64, 32))
- self.rbParallel.setToolTip("Get Distance\n"
-"between Parallel Edges")
+ self.rbParallel.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Get Distance\nbetween Parallel Edges"))
self.rbParallel.setText("")
icon16 = QtGui.QIcon()
icon16.addPixmap(QtGui.QPixmap("Distance_Parallel.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
diff --git a/InitGui.py b/InitGui.py
index 426e5b8..cf8168d 100644
--- a/InitGui.py
+++ b/InitGui.py
@@ -29,6 +29,7 @@
import FreeCAD, FreeCADGui, Part, os, sys
import re, time
+from PySide.QtCore import QT_TRANSLATE_NOOP
if (sys.version_info > (3, 0)): #py3
import urllib
@@ -58,8 +59,8 @@ class ManipulatorWB ( Workbench ):
"kicad StepUp WB object"
Icon = main_MWB_Icon
#Icon = ":Resources/icons/kicad-StepUp-tools-WB.svg"
- MenuText = "Manipulator WB"
- ToolTip = "Aligner & Mover Manipulator workbench"
+ MenuText = QtCore.QT_TRANSLATE_NOOP("Manipulator", "Manipulator WB")
+ ToolTip = QtCore.QT_TRANSLATE_NOOP("Manipulator", "Aligner & Mover Manipulator workbench")
def GetClassName(self):
return "Gui::PythonWorkbench"
diff --git a/ManipulatorCMD.py b/ManipulatorCMD.py
index b94e613..adfe6a9 100644
--- a/ManipulatorCMD.py
+++ b/ManipulatorCMD.py
@@ -15,6 +15,8 @@
import imp, os, sys, tempfile
import FreeCAD, FreeCADGui
from PySide import QtGui
+from PySide.QtCore import QT_TRANSLATE_NOOP
+
import mvr_locator
# from kicadStepUptools import onLoadBoard, onLoadFootprint
@@ -37,20 +39,20 @@ def reload_lib(lib):
# class SMExtrudeCommandClass():
# """Extrude face"""
-#
+#
# def GetResources(self):
# return {'Pixmap' : os.path.join( iconPath , 'SMExtrude.svg') , # the name of a svg file available in the resources
-# 'MenuText': "Extend Face" ,
-# 'ToolTip' : "Extend a face along normal"}
+# 'MenuText': QtCore.QT_TRANSLATE_NOOP("Manipulator", "Extend Face"),
+# 'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Manipulator", "Extend a face along normal")}
class AlignerTools:
"manipulator tools object"
-
+
def GetResources(self):
return {'Pixmap' : os.path.join( ManipulatorWB_icons_path , 'Center-Align.svg') , # the name of a svg file available in the resources
- 'MenuText': "Aligner Tools" ,
- 'ToolTip' : "Aligner & Mover Manipulator workbench"}
-
+ 'MenuText': QtCore.QT_TRANSLATE_NOOP("Manipulator", "Aligner Tools"),
+ 'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Manipulator", "Aligner & Mover Manipulator workbench")}
+
def IsActive(self):
#if FreeCAD.ActiveDocument == None:
# return False
@@ -74,9 +76,9 @@ class MoverTools:
def GetResources(self):
return {'Pixmap' : os.path.join( ManipulatorWB_icons_path , 'Manipulator-cmd.svg') , # the name of a svg file available in the resources
- 'MenuText': "Mover Tools" ,
- 'ToolTip' : "Mover Manipulator workbench"}
-
+ 'MenuText': QtCore.QT_TRANSLATE_NOOP("Manipulator", "Mover Tools"),
+ 'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Manipulator", "Mover Manipulator workbench")}
+
def IsActive(self):
#if FreeCAD.ActiveDocument == None:
# return False
@@ -103,9 +105,9 @@ class CaliperTools:
def GetResources(self):
return {'Pixmap' : os.path.join( ManipulatorWB_icons_path , 'Caliper.svg') , # the name of a svg file available in the resources
- 'MenuText': "Caliper Tools" ,
- 'ToolTip' : "Caliper Manipulator workbench"}
-
+ 'MenuText': QtCore.QT_TRANSLATE_NOOP("Manipulator", "Caliper Tools"),
+ 'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Manipulator", "Caliper Manipulator workbench")}
+
def IsActive(self):
#if FreeCAD.ActiveDocument == None:
# return False
@@ -143,14 +145,14 @@ def GetResources(self):
if 'pdf' in self.ext:
return {'Pixmap' : os.path.join( ManipulatorWB_icons_path , 'datasheet.svg') ,
'MenuText': str(self.exFile),
- 'ToolTip' : "Help files"}
+ 'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Manipulator", "Help files")}
elif 'fcstd' in self.ext:
return {'Pixmap' : os.path.join( ManipulatorWB_icons_path , 'Freecad.svg') ,
'MenuText': str(self.exFile),
- 'ToolTip' : "Demo files"}
+ 'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Manipulator", "Demo files")}
else:
return {'MenuText': str(self.exFile),
- 'ToolTip' : "Demo files"}
+ 'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Manipulator", "Demo files")}
def Activated(self):
FreeCAD.Console.PrintWarning('opening ' + self.exFile + "\r\n")
diff --git a/Mover.py b/Mover.py
index ddda50b..cf406c5 100644
--- a/Mover.py
+++ b/Mover.py
@@ -46,6 +46,7 @@
import sys, math
from PySide import QtCore, QtGui
from pivy import coin
+from PySide.QtCore import QT_TRANSLATE_NOOP
ninst = 0
@@ -550,11 +551,11 @@ def setupUi(self, DockWidget):
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap("Move_purple.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
DockWidget.setWindowIcon(icon)
- DockWidget.setToolTip("Mover Tools")
+ DockWidget.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Mover Tools"))
DockWidget.setLayoutDirection(QtCore.Qt.LeftToRight)
DockWidget.setFeatures(QtGui.QDockWidget.DockWidgetFloatable|QtGui.QDockWidget.DockWidgetMovable)
DockWidget.setAllowedAreas(QtCore.Qt.LeftDockWidgetArea|QtCore.Qt.RightDockWidgetArea)
- DockWidget.setWindowTitle("Mover Tools")
+ DockWidget.setWindowTitle(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Mover Tools"))
self.dockWidgetContents = QtGui.QWidget()
self.dockWidgetContents.setObjectName("dockWidgetContents")
self.horizontalLayoutWidget = QtGui.QWidget(self.dockWidgetContents)
@@ -566,7 +567,7 @@ def setupUi(self, DockWidget):
self.horizontalLayout.setObjectName("horizontalLayout")
self.dock_float = QtGui.QPushButton(self.horizontalLayoutWidget)
self.dock_float.setMaximumSize(QtCore.QSize(28, 28))
- self.dock_float.setToolTip("un-dock (floating)")
+ self.dock_float.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "un-dock (floating)"))
self.dock_float.setText("")
icon1 = QtGui.QIcon()
icon1.addPixmap(QtGui.QPixmap("un_dock.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -576,7 +577,7 @@ def setupUi(self, DockWidget):
self.horizontalLayout.addWidget(self.dock_float)
self.dock_minimize = QtGui.QPushButton(self.horizontalLayoutWidget)
self.dock_minimize.setMaximumSize(QtCore.QSize(28, 28))
- self.dock_minimize.setToolTip("minimize")
+ self.dock_minimize.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "minimize"))
self.dock_minimize.setText("")
icon2 = QtGui.QIcon()
icon2.addPixmap(QtGui.QPixmap("minimize.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -587,7 +588,7 @@ def setupUi(self, DockWidget):
self.Help_Mover = QtGui.QPushButton(self.horizontalLayoutWidget)
self.Help_Mover.setMinimumSize(QtCore.QSize(28, 28))
self.Help_Mover.setMaximumSize(QtCore.QSize(28, 28))
- self.Help_Mover.setToolTip("Help on Mover Manipulator")
+ self.Help_Mover.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Help on Mover Manipulator"))
self.Help_Mover.setText("")
icon3 = QtGui.QIcon()
icon3.addPixmap(QtGui.QPixmap("help.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -609,15 +610,13 @@ def setupUi(self, DockWidget):
self.horizontalLayout.addWidget(self.close)
self.Label = QtGui.QLabel(self.dockWidgetContents)
self.Label.setGeometry(QtCore.QRect(128, 2, 171, 37))
- self.Label.setToolTip("Mover Tools\n"
-"Click on Mover button\n"
-"to enable object Manipulation")
- self.Label.setText("Mover Tools
Click on Mover button")
+ self.Label.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Mover Tools\nClick on Mover button\nto enable object Manipulation"))
+ self.Label.setText(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Mover Tools
Click on Mover button"))
self.Label.setObjectName("Label")
self.ReferenceGroup = QtGui.QGroupBox(self.dockWidgetContents)
self.ReferenceGroup.setGeometry(QtCore.QRect(4, 56, 296, 90))
- self.ReferenceGroup.setToolTip("Settings")
- self.ReferenceGroup.setTitle("Settings")
+ self.ReferenceGroup.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Settings"))
+ self.ReferenceGroup.setTitle(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Settings"))
self.ReferenceGroup.setObjectName("ReferenceGroup")
self.gridLayoutWidget_7 = QtGui.QWidget(self.ReferenceGroup)
self.gridLayoutWidget_7.setGeometry(QtCore.QRect(14, 12, 274, 36))
@@ -628,7 +627,7 @@ def setupUi(self, DockWidget):
self.gridLayout_9.setObjectName("gridLayout_9")
self.rbZ = QtGui.QRadioButton(self.gridLayoutWidget_7)
self.rbZ.setMinimumSize(QtCore.QSize(64, 32))
- self.rbZ.setToolTip("move/rotate on Z Axis")
+ self.rbZ.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "move/rotate on Z Axis"))
self.rbZ.setText("")
icon5 = QtGui.QIcon()
icon5.addPixmap(QtGui.QPixmap("Z-axis.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -638,7 +637,7 @@ def setupUi(self, DockWidget):
self.gridLayout_9.addWidget(self.rbZ, 0, 3, 1, 1)
self.rbY = QtGui.QRadioButton(self.gridLayoutWidget_7)
self.rbY.setMinimumSize(QtCore.QSize(64, 32))
- self.rbY.setToolTip("move/rotate on Y Axis")
+ self.rbY.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "move/rotate on Y Axis"))
self.rbY.setText("")
icon6 = QtGui.QIcon()
icon6.addPixmap(QtGui.QPixmap("Y-axis.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -648,7 +647,7 @@ def setupUi(self, DockWidget):
self.gridLayout_9.addWidget(self.rbY, 0, 2, 1, 1)
self.rbX = QtGui.QRadioButton(self.gridLayoutWidget_7)
self.rbX.setMinimumSize(QtCore.QSize(64, 32))
- self.rbX.setToolTip("move/rotate on X Axis")
+ self.rbX.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "move/rotate on X Axis"))
self.rbX.setText("")
icon7 = QtGui.QIcon()
icon7.addPixmap(QtGui.QPixmap("X-axis.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -659,7 +658,7 @@ def setupUi(self, DockWidget):
self.gridLayout_9.addWidget(self.rbX, 0, 1, 1, 1)
self.rbAxis = QtGui.QRadioButton(self.gridLayoutWidget_7)
self.rbAxis.setMinimumSize(QtCore.QSize(64, 32))
- self.rbAxis.setToolTip("move/rotate on Selected Axis")
+ self.rbAxis.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "move/rotate on Selected Axis"))
self.rbAxis.setText("")
icon8 = QtGui.QIcon()
icon8.addPixmap(QtGui.QPixmap("Rotate-Axis.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -677,8 +676,7 @@ def setupUi(self, DockWidget):
self.gridLayout_14.setObjectName("gridLayout_14")
self.rbOneObj = QtGui.QRadioButton(self.gridLayoutWidget_12)
self.rbOneObj.setMinimumSize(QtCore.QSize(64, 32))
- self.rbOneObj.setToolTip("Single Object\n"
-"select Face or Edge to Move/Rotate object")
+ self.rbOneObj.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Single Object\nselect Face or Edge to Move/Rotate object"))
self.rbOneObj.setText("")
icon9 = QtGui.QIcon()
icon9.addPixmap(QtGui.QPixmap("one_obj.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -697,8 +695,7 @@ def setupUi(self, DockWidget):
self.cbHierarchy = QtGui.QCheckBox(self.gridLayoutWidget_13)
self.cbHierarchy.setMinimumSize(QtCore.QSize(47, 32))
self.cbHierarchy.setMaximumSize(QtCore.QSize(64, 128))
- self.cbHierarchy.setToolTip("Move/Rotate App::Part and Body\n"
-"hierarchy")
+ self.cbHierarchy.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Move/Rotate App::Part and Body\nhierarchy"))
self.cbHierarchy.setText("")
icon10 = QtGui.QIcon()
icon10.addPixmap(QtGui.QPixmap("hierarchy.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -711,7 +708,7 @@ def setupUi(self, DockWidget):
self.ViewAlign.setEnabled(True)
self.ViewAlign.setMinimumSize(QtCore.QSize(32, 32))
self.ViewAlign.setMaximumSize(QtCore.QSize(32, 32))
- self.ViewAlign.setToolTip("Align View to the selected Face")
+ self.ViewAlign.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Align View to the selected Face"))
self.ViewAlign.setText("")
icon11 = QtGui.QIcon()
icon11.addPixmap(QtGui.QPixmap("face_view.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -723,8 +720,8 @@ def setupUi(self, DockWidget):
self.gridLayout_15.addWidget(self.ViewAlign, 0, 1, 1, 1)
self.Controls_Group = QtGui.QGroupBox(self.dockWidgetContents)
self.Controls_Group.setGeometry(QtCore.QRect(4, 140, 296, 93))
- self.Controls_Group.setToolTip("Controls")
- self.Controls_Group.setTitle("Controls")
+ self.Controls_Group.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Controls"))
+ self.Controls_Group.setTitle(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Controls"))
self.Controls_Group.setObjectName("Controls_Group")
self.gridLayoutWidget_6 = QtGui.QWidget(self.Controls_Group)
self.gridLayoutWidget_6.setGeometry(QtCore.QRect(4, 16, 289, 73))
@@ -737,9 +734,7 @@ def setupUi(self, DockWidget):
self.Confirm_Move = QtGui.QPushButton(self.gridLayoutWidget_6)
self.Confirm_Move.setMinimumSize(QtCore.QSize(48, 36))
self.Confirm_Move.setMaximumSize(QtCore.QSize(60, 48))
- self.Confirm_Move.setToolTip("Mover button\n"
-"Click it to enable\n"
-"Move/Rotation")
+ self.Confirm_Move.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Mover button\nClick it to enable\nMove/Rotation"))
self.Confirm_Move.setText("")
self.Confirm_Move.setIcon(icon)
self.Confirm_Move.setIconSize(QtCore.QSize(28, 28))
@@ -754,7 +749,7 @@ def setupUi(self, DockWidget):
self.DS_MoveInput.setEnabled(False)
self.DS_MoveInput.setMinimumSize(QtCore.QSize(64, 0))
self.DS_MoveInput.setMaximumSize(QtCore.QSize(16777215, 16777215))
- self.DS_MoveInput.setToolTip("translate (+/- mm)")
+ self.DS_MoveInput.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "translate (+/- mm)"))
self.DS_MoveInput.setDecimals(2)
self.DS_MoveInput.setMinimum(-999.0)
self.DS_MoveInput.setMaximum(999.0)
@@ -783,7 +778,7 @@ def setupUi(self, DockWidget):
self.DS_RotateInput = QtGui.QDoubleSpinBox(self.gridLayoutWidget_6)
self.DS_RotateInput.setEnabled(False)
self.DS_RotateInput.setMinimumSize(QtCore.QSize(48, 0))
- self.DS_RotateInput.setToolTip("rotate (+/- deg)")
+ self.DS_RotateInput.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "rotate (+/- deg)"))
self.DS_RotateInput.setDecimals(1)
self.DS_RotateInput.setMinimum(-180.0)
self.DS_RotateInput.setMaximum(180.0)
@@ -794,7 +789,7 @@ def setupUi(self, DockWidget):
self.Undo_Move.setEnabled(False)
self.Undo_Move.setMinimumSize(QtCore.QSize(48, 36))
self.Undo_Move.setMaximumSize(QtCore.QSize(60, 48))
- self.Undo_Move.setToolTip("Undo last action")
+ self.Undo_Move.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Undo last action"))
self.Undo_Move.setText("")
icon12 = QtGui.QIcon()
icon12.addPixmap(QtGui.QPixmap("Undo.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -802,7 +797,7 @@ def setupUi(self, DockWidget):
self.Undo_Move.setIconSize(QtCore.QSize(24, 24))
self.Undo_Move.setCheckable(False)
self.Undo_Move.setChecked(False)
- self.Undo_Move.setObjectName("Undo_Move")
+ self.Undo_Move.setObjectName(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Undo_Move"))
self.gridLayout_8.addWidget(self.Undo_Move, 0, 3, 1, 1)
self.gridLayout_11 = QtGui.QGridLayout()
self.gridLayout_11.setSpacing(2)
@@ -811,8 +806,7 @@ def setupUi(self, DockWidget):
self.DS_MoveInput_Delta.setEnabled(False)
self.DS_MoveInput_Delta.setMinimumSize(QtCore.QSize(64, 0))
self.DS_MoveInput_Delta.setMaximumSize(QtCore.QSize(16777215, 16777215))
- self.DS_MoveInput_Delta.setToolTip("translation\n"
-"increment")
+ self.DS_MoveInput_Delta.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "translation\nincrement"))
self.DS_MoveInput_Delta.setDecimals(2)
self.DS_MoveInput_Delta.setMinimum(0.01)
self.DS_MoveInput_Delta.setMaximum(500.0)
@@ -824,8 +818,7 @@ def setupUi(self, DockWidget):
font.setWeight(75)
font.setBold(True)
self.label_3.setFont(font)
- self.label_3.setToolTip("rotation\n"
-"increment")
+ self.label_3.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "rotation\nincrement"))
self.label_3.setText("+/-")
self.label_3.setAlignment(QtCore.Qt.AlignCenter)
self.label_3.setObjectName("label_3")
@@ -835,8 +828,7 @@ def setupUi(self, DockWidget):
font.setWeight(75)
font.setBold(True)
self.label_4.setFont(font)
- self.label_4.setToolTip("translation\n"
-"increment")
+ self.label_4.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "translation\nincrement"))
self.label_4.setStatusTip("")
self.label_4.setWhatsThis("")
self.label_4.setText("+/-")
@@ -846,8 +838,7 @@ def setupUi(self, DockWidget):
self.DS_RotateInput_Delta = QtGui.QDoubleSpinBox(self.gridLayoutWidget_6)
self.DS_RotateInput_Delta.setEnabled(False)
self.DS_RotateInput_Delta.setMinimumSize(QtCore.QSize(48, 0))
- self.DS_RotateInput_Delta.setToolTip("rotation\n"
-"increment")
+ self.DS_RotateInput_Delta.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "rotation\nincrement"))
self.DS_RotateInput_Delta.setDecimals(1)
self.DS_RotateInput_Delta.setMinimum(0.1)
self.DS_RotateInput_Delta.setMaximum(180.0)
@@ -857,10 +848,8 @@ def setupUi(self, DockWidget):
self.gridLayout_8.addLayout(self.gridLayout_11, 0, 2, 1, 1)
self.Label_2 = QtGui.QLabel(self.dockWidgetContents)
self.Label_2.setGeometry(QtCore.QRect(102, 30, 186, 33))
- self.Label_2.setToolTip("Mover Tools\n"
-"Click on Mover button\n"
-"to enable object Manipulation")
- self.Label_2.setText("to enable object Manipulation")
+ self.Label_2.setToolTip(QtCore.QT_TRANSLATE_NOOP("Manipulator", "Mover Tools\nClick on Mover button\nto enable object Manipulation"))
+ self.Label_2.setText(QtCore.QT_TRANSLATE_NOOP("Manipulator", "To enable object Manipulation"))
self.Label_2.setObjectName("Label_2")
DockWidget.setWidget(self.dockWidgetContents)
diff --git a/src/Tools/updatets.py b/src/Tools/updatets.py
new file mode 100644
index 0000000..b03df44
--- /dev/null
+++ b/src/Tools/updatets.py
@@ -0,0 +1,144 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# (c) 2010 Werner Mayer LGPL
+
+#***************************************************************************
+#* *
+#* Copyright (c) 2010 Werner Mayer *
+#* *
+#* This program is free software; you can redistribute it and/or modify *
+#* it under the terms of the GNU Library General Public License (LGPL) *
+#* as published by the Free Software Foundation; either version 2 of *
+#* the License, or (at your option) any later version. *
+#* for detail see the LICENCE text file. *
+#* *
+#* This program is distributed in the hope that it will be useful, *
+#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+#* GNU Library General Public License for more details. *
+#* *
+#* You should have received a copy of the GNU Library General Public *
+#* License along with this program; if not, write to the Free Software *
+#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
+#* USA *
+#* *
+#***************************************************************************
+
+# This script has been modified to work for the Manipulator WB Addon
+# https://github.com/easyw/Manipulator/pull/11
+Usage = """updatets - update all .ts files found in the Manipulator WB source directory
+
+Usage:
+ updatets
+
+Author:
+ (c) 2010 Werner Mayer
+ Licence: GPL
+
+Version:
+ 0.1
+"""
+
+import os, re
+
+# folders that should not be treated by standard Qt tools
+DirFilter = ["^Attic$",
+ "^CVS$",
+ "^\\.svn$",
+ "^\\.deps$",
+ "^\\.libs$"
+ "oDraft.py"]
+
+# python folders that need a special pylupdate command
+# Manipulator WB: we're excluding oDraft.py for now
+# see https://github.com/easyw/Manipulator/issues/12
+PyCommands = [["./",
+ 'pylupdate `find ./ -name "*.py" \( ! -name "oDraft.py" \)` -ts Resources/translations/Manipulator.ts'],
+ ]
+
+# add python folders to exclude list
+for c in PyCommands:
+ DirFilter.append(c[0])
+
+QMAKE = ""
+LUPDATE = ""
+PYLUPDATE = ""
+
+def find_tools():
+ global QMAKE, LUPDATE, PYLUPDATE
+ if (os.system("qmake -version") == 0):
+ QMAKE = "qmake"
+ elif (os.system("qmake-qt4 -version") == 0):
+ QMAKE = "qmake-qt4"
+ elif (os.system("qmake-qt5 -version") == 0):
+ QMAKE = "qmake-qt5"
+ else:
+ raise Exception("Cannot find qmake")
+ if (os.system("lupdate -version") == 0):
+ LUPDATE = "lupdate"
+ if (os.system("lupdate-qt4 -version") == 0):
+ LUPDATE = "lupdate-qt4"
+ elif (os.system("lupdate-qt5 -version") == 0):
+ LUPDATE = "lupdate-qt5"
+ else:
+ raise Exception("Cannot find lupdate")
+ if (os.system("pylupdate -version") == 0):
+ PYLUPDATE = "pylupdate"
+ elif (os.system("pylupdate4 -version") == 0):
+ PYLUPDATE = "pylupdate4"
+ elif (os.system("pylupdate5 -version") == 0):
+ PYLUPDATE = "pylupdate5"
+ else:
+ raise Exception("Cannot find pylupdate")
+ print("Qt tools:", QMAKE, LUPDATE, PYLUPDATE)
+
+def filter_dirs(item):
+ global DirFilter
+ if not os.path.isdir(item):
+ return False
+ for regexp in DirFilter:
+ a = re.compile(regexp)
+ if (re.match(a, item)):
+ return False
+ return True
+
+def update_translation(path):
+ global QMAKE, LUPDATE
+ cur = os.getcwd()
+ os.chdir(path)
+ filename = os.path.basename(path) + ".pro"
+ os.system(QMAKE + " -project")
+ os.system(LUPDATE + " " + filename)
+ os.remove(filename)
+ os.chdir(cur)
+
+def update_python_translation(item):
+ global PYLUPDATE
+ cur = os.getcwd()
+ os.chdir(item[0])
+ execline = item[1].replace("pylupdate",PYLUPDATE)
+ print("Executing special command in ",item[0],": ",execline)
+ os.system(execline)
+ os.chdir(cur)
+
+def main():
+ find_tools()
+ path = os.path.realpath(__file__)
+ path = os.path.dirname(path)
+ os.chdir(path)
+ os.chdir("..")
+ os.chdir("..")
+ dirs=os.listdir("src/Mod")
+ for i in range(len(dirs)):
+ dirs[i] = "src/Mod/" + dirs[i]
+ # dirs.append("src/Base")
+ # dirs.append("src/App")
+ # dirs.append("src/Gui")
+ dirs = filter(filter_dirs, dirs)
+ for i in dirs:
+ update_translation(i)
+ for j in PyCommands:
+ update_python_translation(j)
+
+if __name__ == "__main__":
+ main()