Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(WIP) Adding the ability to translate Maniplulator WB #11

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

(WIP) Adding the ability to translate Maniplulator WB #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fe77a66
WIP: ManipulatorCMD.py: Adding QtCore.QT_TRANSLATE_NOOP()
luzpaz Sep 11, 2018
a45f9b9
Created src/Tools/updatets.py (but needs heavier modifications)
luzpaz Sep 11, 2018
71bebf9
Caliper.py: qtlinguist markup
luzpaz Sep 26, 2018
084a6b6
InitGui.py: QtLinguist markip
luzpaz Sep 26, 2018
1345a6c
Mover.py: QtLinguist markup
luzpaz Sep 26, 2018
c9f7458
Add missing import to 2 previous commits
luzpaz Sep 26, 2018
5bf59d5
Mover.py: Added missing closing quotes
luzpaz Sep 26, 2018
39cc467
updatets.py: modifying wmayer's script to work with Manipulator WB
luzpaz Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 26 additions & 29 deletions Caliper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
# oDraft -> Draft from FreeCAD_0.17.13488

import FreeCAD, FreeCADGui
from PySide.QtCore import QT_TRANSLATE_NOOP

def getFCversion():

Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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("<b>Click on Measure button</b><br>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", "<b>Click on Measure button</b><br>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))
Expand All @@ -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))
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -1855,18 +1853,18 @@ 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)
self.rbLength.setObjectName("rbLength")
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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -1898,16 +1896,15 @@ 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))
self.cbAPlane.setObjectName("cbAPlane")
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)
Expand Down
5 changes: 3 additions & 2 deletions InitGui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
34 changes: 18 additions & 16 deletions ManipulatorCMD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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")
Expand Down
Loading