Skip to content

Commit

Permalink
remove UnicodeUTF8
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwmayer
wwmayer committed Dec 27, 2016
1 parent b6c2868 commit d9b1ce7
Show file tree
Hide file tree
Showing 10 changed files with 101 additions and 101 deletions.
14 changes: 7 additions & 7 deletions src/Mod/Arch/ArchAxis.py
View file
Expand Up @@ -499,13 +499,13 @@ def reject(self):
return True

def retranslateUi(self, TaskPanel):
TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Axes", None, QtGui.QApplication.UnicodeUTF8))
self.delButton.setText(QtGui.QApplication.translate("Arch", "Remove", None, QtGui.QApplication.UnicodeUTF8))
self.addButton.setText(QtGui.QApplication.translate("Arch", "Add", None, QtGui.QApplication.UnicodeUTF8))
self.title.setText(QtGui.QApplication.translate("Arch", "Distances (mm) and angles (deg) between axes", None, QtGui.QApplication.UnicodeUTF8))
self.tree.setHeaderLabels([QtGui.QApplication.translate("Arch", "Axis", None, QtGui.QApplication.UnicodeUTF8),
QtGui.QApplication.translate("Arch", "Distance", None, QtGui.QApplication.UnicodeUTF8),
QtGui.QApplication.translate("Arch", "Angle", None, QtGui.QApplication.UnicodeUTF8)])
TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Axes", None))
self.delButton.setText(QtGui.QApplication.translate("Arch", "Remove", None))
self.addButton.setText(QtGui.QApplication.translate("Arch", "Add", None))
self.title.setText(QtGui.QApplication.translate("Arch", "Distances (mm) and angles (deg) between axes", None))
self.tree.setHeaderLabels([QtGui.QApplication.translate("Arch", "Axis", None),
QtGui.QApplication.translate("Arch", "Distance", None),
QtGui.QApplication.translate("Arch", "Angle", None)])

if FreeCAD.GuiUp:
FreeCADGui.addCommand('Arch_Axis',_CommandAxis())
28 changes: 14 additions & 14 deletions src/Mod/Arch/ArchComponent.py
View file
Expand Up @@ -138,7 +138,7 @@ class SelectionTaskPanel:
"""A temp taks panel to wait for a selection"""
def __init__(self):
self.baseform = QtGui.QLabel()
self.baseform.setText(QtGui.QApplication.translate("Arch", "Please select a base object", None, QtGui.QApplication.UnicodeUTF8))
self.baseform.setText(QtGui.QApplication.translate("Arch", "Please select a base object", None))

def getStandardButtons(self):
return int(QtGui.QDialogButtonBox.Cancel)
Expand Down Expand Up @@ -292,19 +292,19 @@ def editObject(self,wid,col):
FreeCADGui.ActiveDocument.setEdit(obj.Name,0)

def retranslateUi(self, TaskPanel):
self.baseform.setWindowTitle(QtGui.QApplication.translate("Arch", "Components", None, QtGui.QApplication.UnicodeUTF8))
self.delButton.setText(QtGui.QApplication.translate("Arch", "Remove", None, QtGui.QApplication.UnicodeUTF8))
self.addButton.setText(QtGui.QApplication.translate("Arch", "Add", None, QtGui.QApplication.UnicodeUTF8))
self.title.setText(QtGui.QApplication.translate("Arch", "Components of this object", None, QtGui.QApplication.UnicodeUTF8))
self.treeBase.setText(0,QtGui.QApplication.translate("Arch", "Base component", None, QtGui.QApplication.UnicodeUTF8))
self.treeAdditions.setText(0,QtGui.QApplication.translate("Arch", "Additions", None, QtGui.QApplication.UnicodeUTF8))
self.treeSubtractions.setText(0,QtGui.QApplication.translate("Arch", "Subtractions", None, QtGui.QApplication.UnicodeUTF8))
self.treeObjects.setText(0,QtGui.QApplication.translate("Arch", "Objects", None, QtGui.QApplication.UnicodeUTF8))
self.treeAxes.setText(0,QtGui.QApplication.translate("Arch", "Axes", None, QtGui.QApplication.UnicodeUTF8))
self.treeComponents.setText(0,QtGui.QApplication.translate("Arch", "Components", None, QtGui.QApplication.UnicodeUTF8))
self.treeFixtures.setText(0,QtGui.QApplication.translate("Arch", "Fixtures", None, QtGui.QApplication.UnicodeUTF8))
self.treeArmatures.setText(0,QtGui.QApplication.translate("Arch", "Armatures", None, QtGui.QApplication.UnicodeUTF8))
self.treeGroup.setText(0,QtGui.QApplication.translate("Arch", "Group", None, QtGui.QApplication.UnicodeUTF8))
self.baseform.setWindowTitle(QtGui.QApplication.translate("Arch", "Components", None))
self.delButton.setText(QtGui.QApplication.translate("Arch", "Remove", None))
self.addButton.setText(QtGui.QApplication.translate("Arch", "Add", None))
self.title.setText(QtGui.QApplication.translate("Arch", "Components of this object", None))
self.treeBase.setText(0,QtGui.QApplication.translate("Arch", "Base component", None))
self.treeAdditions.setText(0,QtGui.QApplication.translate("Arch", "Additions", None))
self.treeSubtractions.setText(0,QtGui.QApplication.translate("Arch", "Subtractions", None))
self.treeObjects.setText(0,QtGui.QApplication.translate("Arch", "Objects", None))
self.treeAxes.setText(0,QtGui.QApplication.translate("Arch", "Axes", None))
self.treeComponents.setText(0,QtGui.QApplication.translate("Arch", "Components", None))
self.treeFixtures.setText(0,QtGui.QApplication.translate("Arch", "Fixtures", None))
self.treeArmatures.setText(0,QtGui.QApplication.translate("Arch", "Armatures", None))
self.treeGroup.setText(0,QtGui.QApplication.translate("Arch", "Group", None))

class Component:
"The default Arch Component object"
Expand Down
10 changes: 5 additions & 5 deletions src/Mod/Arch/ArchCutPlane.py
View file
Expand Up @@ -127,11 +127,11 @@ def previewCutVolume(self, i):
self.previewObj.Shape = cutVolume

def retranslateUi(self, TaskPanel):
TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Cut Plane", None, QtGui.QApplication.UnicodeUTF8))
self.title.setText(QtGui.QApplication.translate("Arch", "Cut Plane options", None, QtGui.QApplication.UnicodeUTF8))
self.infoText.setText(QtGui.QApplication.translate("Arch", "Wich side to cut", None, QtGui.QApplication.UnicodeUTF8))
self.combobox.addItems([QtGui.QApplication.translate("Arch", "Behind", None, QtGui.QApplication.UnicodeUTF8),
QtGui.QApplication.translate("Arch", "Front", None, QtGui.QApplication.UnicodeUTF8)])
TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Cut Plane", None))
self.title.setText(QtGui.QApplication.translate("Arch", "Cut Plane options", None))
self.infoText.setText(QtGui.QApplication.translate("Arch", "Wich side to cut", None))
self.combobox.addItems([QtGui.QApplication.translate("Arch", "Behind", None),
QtGui.QApplication.translate("Arch", "Front", None)])

if FreeCAD.GuiUp:
FreeCADGui.addCommand('Arch_CutPlane',_CommandCutPlane())
4 changes: 2 additions & 2 deletions src/Mod/Arch/ArchPanel.py
View file
Expand Up @@ -932,11 +932,11 @@ def __init__(self,obj):
ArchComponent.ComponentTaskPanel.__init__(self)
self.obj = obj
self.optwid = QtGui.QWidget()
self.optwid.setWindowTitle(QtGui.QApplication.translate("Arch", "Tools", None, QtGui.QApplication.UnicodeUTF8))
self.optwid.setWindowTitle(QtGui.QApplication.translate("Arch", "Tools", None))
lay = QtGui.QVBoxLayout(self.optwid)
self.editButton = QtGui.QPushButton(self.optwid)
self.editButton.setIcon(QtGui.QIcon(":/icons/Draft_Edit.svg"))
self.editButton.setText(QtGui.QApplication.translate("Arch", "Edit views positions", None, QtGui.QApplication.UnicodeUTF8))
self.editButton.setText(QtGui.QApplication.translate("Arch", "Edit views positions", None))
lay.addWidget(self.editButton)
QtCore.QObject.connect(self.editButton, QtCore.SIGNAL("clicked()"), self.editNodes)
self.form = [self.form,self.optwid]
Expand Down
60 changes: 30 additions & 30 deletions src/Mod/Arch/ArchPrecast.py
View file
Expand Up @@ -853,25 +853,25 @@ def setTread(self,value):

def retranslateUi(self, dialog):
from PySide import QtGui
self.form.setWindowTitle(QtGui.QApplication.translate("Arch", "Precast elements", None, QtGui.QApplication.UnicodeUTF8))
self.labelSlabType.setText(QtGui.QApplication.translate("Arch", "Slab type", None, QtGui.QApplication.UnicodeUTF8))
self.labelChamfer.setText(QtGui.QApplication.translate("Arch", "Chamfer", None, QtGui.QApplication.UnicodeUTF8))
self.labelDentLength.setText(QtGui.QApplication.translate("Arch", "Dent length", None, QtGui.QApplication.UnicodeUTF8))
self.labelDentWidth.setText(QtGui.QApplication.translate("Arch", "Dent width", None, QtGui.QApplication.UnicodeUTF8))
self.labelDentHeight.setText(QtGui.QApplication.translate("Arch", "Dent height", None, QtGui.QApplication.UnicodeUTF8))
self.labelBase.setText(QtGui.QApplication.translate("Arch", "Slab base", None, QtGui.QApplication.UnicodeUTF8))
self.labelHoleNumber.setText(QtGui.QApplication.translate("Arch", "Number of holes", None, QtGui.QApplication.UnicodeUTF8))
self.labelHoleMajor.setText(QtGui.QApplication.translate("Arch", "Major diameter of holes", None, QtGui.QApplication.UnicodeUTF8))
self.labelHoleMinor.setText(QtGui.QApplication.translate("Arch", "Minor diameter of holes", None, QtGui.QApplication.UnicodeUTF8))
self.labelHoleSpacing.setText(QtGui.QApplication.translate("Arch", "Spacing between holes", None, QtGui.QApplication.UnicodeUTF8))
self.labelGrooveNumber.setText(QtGui.QApplication.translate("Arch", "Number of grooves", None, QtGui.QApplication.UnicodeUTF8))
self.labelGrooveDepth.setText(QtGui.QApplication.translate("Arch", "Depth of grooves", None, QtGui.QApplication.UnicodeUTF8))
self.labelGrooveHeight.setText(QtGui.QApplication.translate("Arch", "Height of grooves", None, QtGui.QApplication.UnicodeUTF8))
self.labelGrooveSpacing.setText(QtGui.QApplication.translate("Arch", "Spacing between grooves", None, QtGui.QApplication.UnicodeUTF8))
self.labelRiserNumber.setText(QtGui.QApplication.translate("Arch", "Number of risers", None, QtGui.QApplication.UnicodeUTF8))
self.labelDownLength.setText(QtGui.QApplication.translate("Arch", "Length of down floor", None, QtGui.QApplication.UnicodeUTF8))
self.labelRiser.setText(QtGui.QApplication.translate("Arch", "Height of risers", None, QtGui.QApplication.UnicodeUTF8))
self.labelTread.setText(QtGui.QApplication.translate("Arch", "Depth of treads", None, QtGui.QApplication.UnicodeUTF8))
self.form.setWindowTitle(QtGui.QApplication.translate("Arch", "Precast elements", None))
self.labelSlabType.setText(QtGui.QApplication.translate("Arch", "Slab type", None))
self.labelChamfer.setText(QtGui.QApplication.translate("Arch", "Chamfer", None))
self.labelDentLength.setText(QtGui.QApplication.translate("Arch", "Dent length", None))
self.labelDentWidth.setText(QtGui.QApplication.translate("Arch", "Dent width", None))
self.labelDentHeight.setText(QtGui.QApplication.translate("Arch", "Dent height", None))
self.labelBase.setText(QtGui.QApplication.translate("Arch", "Slab base", None))
self.labelHoleNumber.setText(QtGui.QApplication.translate("Arch", "Number of holes", None))
self.labelHoleMajor.setText(QtGui.QApplication.translate("Arch", "Major diameter of holes", None))
self.labelHoleMinor.setText(QtGui.QApplication.translate("Arch", "Minor diameter of holes", None))
self.labelHoleSpacing.setText(QtGui.QApplication.translate("Arch", "Spacing between holes", None))
self.labelGrooveNumber.setText(QtGui.QApplication.translate("Arch", "Number of grooves", None))
self.labelGrooveDepth.setText(QtGui.QApplication.translate("Arch", "Depth of grooves", None))
self.labelGrooveHeight.setText(QtGui.QApplication.translate("Arch", "Height of grooves", None))
self.labelGrooveSpacing.setText(QtGui.QApplication.translate("Arch", "Spacing between grooves", None))
self.labelRiserNumber.setText(QtGui.QApplication.translate("Arch", "Number of risers", None))
self.labelDownLength.setText(QtGui.QApplication.translate("Arch", "Length of down floor", None))
self.labelRiser.setText(QtGui.QApplication.translate("Arch", "Height of risers", None))
self.labelTread.setText(QtGui.QApplication.translate("Arch", "Depth of treads", None))

def setPreset(self,preset):
self.preview.hide()
Expand Down Expand Up @@ -1256,17 +1256,17 @@ def editDent(self,item=None):

def retranslateUi(self, dialog):
from PySide import QtGui
self.form.setWindowTitle(QtGui.QApplication.translate("Arch", "Precast options", None, QtGui.QApplication.UnicodeUTF8))
self.labelDents.setText(QtGui.QApplication.translate("Arch", "Dents list", None, QtGui.QApplication.UnicodeUTF8))
self.buttonAdd.setText(QtGui.QApplication.translate("Arch", "Add dent", None, QtGui.QApplication.UnicodeUTF8))
self.buttonRemove.setText(QtGui.QApplication.translate("Arch", "Remove dent", None, QtGui.QApplication.UnicodeUTF8))
self.labelLength.setText(QtGui.QApplication.translate("Arch", "Length", None, QtGui.QApplication.UnicodeUTF8))
self.labelWidth.setText(QtGui.QApplication.translate("Arch", "Width", None, QtGui.QApplication.UnicodeUTF8))
self.labelHeight.setText(QtGui.QApplication.translate("Arch", "Height", None, QtGui.QApplication.UnicodeUTF8))
self.labelSlant.setText(QtGui.QApplication.translate("Arch", "Slant", None, QtGui.QApplication.UnicodeUTF8))
self.labelLevel.setText(QtGui.QApplication.translate("Arch", "Level", None, QtGui.QApplication.UnicodeUTF8))
self.labelRotation.setText(QtGui.QApplication.translate("Arch", "Rotation", None, QtGui.QApplication.UnicodeUTF8))
self.labelOffset.setText(QtGui.QApplication.translate("Arch", "Offset", None, QtGui.QApplication.UnicodeUTF8))
self.form.setWindowTitle(QtGui.QApplication.translate("Arch", "Precast options", None))
self.labelDents.setText(QtGui.QApplication.translate("Arch", "Dents list", None))
self.buttonAdd.setText(QtGui.QApplication.translate("Arch", "Add dent", None))
self.buttonRemove.setText(QtGui.QApplication.translate("Arch", "Remove dent", None))
self.labelLength.setText(QtGui.QApplication.translate("Arch", "Length", None))
self.labelWidth.setText(QtGui.QApplication.translate("Arch", "Width", None))
self.labelHeight.setText(QtGui.QApplication.translate("Arch", "Height", None))
self.labelSlant.setText(QtGui.QApplication.translate("Arch", "Slant", None))
self.labelLevel.setText(QtGui.QApplication.translate("Arch", "Level", None))
self.labelRotation.setText(QtGui.QApplication.translate("Arch", "Rotation", None))
self.labelOffset.setText(QtGui.QApplication.translate("Arch", "Offset", None))

def getValues(self):
l = []
Expand Down
18 changes: 9 additions & 9 deletions src/Mod/Arch/ArchRoof.py
View file
Expand Up @@ -775,15 +775,15 @@ def reject(self):
return True

def retranslateUi(self, TaskPanel):
TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Roof", None, QtGui.QApplication.UnicodeUTF8))
self.title.setText(QtGui.QApplication.translate("Arch", "Parameters of the profiles of the roof:\n* Angle : slope in degrees compared to the horizontal one.\n* Run : outdistance between the wall and the ridge sheathing.\n* Thickness : thickness of the side of roof.\n* Overhang : outdistance between the sewer and the wall.\n* Height : height of the ridge sheathing (calculated automatically)\n* IdRel : Relative Id for calculations automatic.\n---\nIf Angle = 0 and Run = 0 then profile is identical to the relative profile.\nIf Angle = 0 then angle is calculated so that the height is the same one as the relative profile.\nIf Run = 0 then Run is calculated so that the height is the same one as the relative profile.", None, QtGui.QApplication.UnicodeUTF8))
self.tree.setHeaderLabels([QtGui.QApplication.translate("Arch", "Id", None, QtGui.QApplication.UnicodeUTF8),
QtGui.QApplication.translate("Arch", "Angle (deg)", None, QtGui.QApplication.UnicodeUTF8),
QtGui.QApplication.translate("Arch", "Run (mm)", None, QtGui.QApplication.UnicodeUTF8),
QtGui.QApplication.translate("Arch", "IdRel", None, QtGui.QApplication.UnicodeUTF8),
QtGui.QApplication.translate("Arch", "Thickness (mm)", None, QtGui.QApplication.UnicodeUTF8),
QtGui.QApplication.translate("Arch", "Overhang (mm)", None, QtGui.QApplication.UnicodeUTF8),
QtGui.QApplication.translate("Arch", "Height (mm)", None, QtGui.QApplication.UnicodeUTF8)])
TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Roof", None))
self.title.setText(QtGui.QApplication.translate("Arch", "Parameters of the profiles of the roof:\n* Angle : slope in degrees compared to the horizontal one.\n* Run : outdistance between the wall and the ridge sheathing.\n* Thickness : thickness of the side of roof.\n* Overhang : outdistance between the sewer and the wall.\n* Height : height of the ridge sheathing (calculated automatically)\n* IdRel : Relative Id for calculations automatic.\n---\nIf Angle = 0 and Run = 0 then profile is identical to the relative profile.\nIf Angle = 0 then angle is calculated so that the height is the same one as the relative profile.\nIf Run = 0 then Run is calculated so that the height is the same one as the relative profile.", None))
self.tree.setHeaderLabels([QtGui.QApplication.translate("Arch", "Id", None),
QtGui.QApplication.translate("Arch", "Angle (deg)", None),
QtGui.QApplication.translate("Arch", "Run (mm)", None),
QtGui.QApplication.translate("Arch", "IdRel", None),
QtGui.QApplication.translate("Arch", "Thickness (mm)", None),
QtGui.QApplication.translate("Arch", "Overhang (mm)", None),
QtGui.QApplication.translate("Arch", "Height (mm)", None)])

if FreeCAD.GuiUp:
FreeCADGui.addCommand('Arch_Roof',_CommandRoof())
8 changes: 4 additions & 4 deletions src/Mod/Arch/ArchSectionPlane.py
View file
Expand Up @@ -726,10 +726,10 @@ def accept(self):
return True

def retranslateUi(self, TaskPanel):
TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Objects", None, QtGui.QApplication.UnicodeUTF8))
self.delButton.setText(QtGui.QApplication.translate("Arch", "Remove", None, QtGui.QApplication.UnicodeUTF8))
self.addButton.setText(QtGui.QApplication.translate("Arch", "Add", None, QtGui.QApplication.UnicodeUTF8))
self.title.setText(QtGui.QApplication.translate("Arch", "Objects seen by this section plane", None, QtGui.QApplication.UnicodeUTF8))
TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Objects", None))
self.delButton.setText(QtGui.QApplication.translate("Arch", "Remove", None))
self.addButton.setText(QtGui.QApplication.translate("Arch", "Add", None))
self.title.setText(QtGui.QApplication.translate("Arch", "Objects seen by this section plane", None))

if FreeCAD.GuiUp:
FreeCADGui.addCommand('Arch_SectionPlane',_CommandSectionPlane())
2 changes: 1 addition & 1 deletion src/Mod/Arch/ArchSpace.py
View file
Expand Up @@ -600,7 +600,7 @@ def __init__(self):
self.editButton.setObjectName("editButton")
self.editButton.setIcon(QtGui.QIcon(":/icons/Draft_Edit.svg"))
self.grid.addWidget(self.editButton, 4, 0, 1, 2)
self.editButton.setText(QtGui.QApplication.translate("Arch", "Set text position", None, QtGui.QApplication.UnicodeUTF8))
self.editButton.setText(QtGui.QApplication.translate("Arch", "Set text position", None))
QtCore.QObject.connect(self.editButton, QtCore.SIGNAL("clicked()"), self.setTextPos)

def setTextPos(self):
Expand Down

0 comments on commit d9b1ce7

Please sign in to comment.