From 82a75e2a2086ee06cbbb8c094355961629333b0b Mon Sep 17 00:00:00 2001 From: sliptonic Date: Mon, 28 Mar 2016 08:49:48 -0500 Subject: [PATCH] cmake fixes for engrave task panel --- src/Mod/Path/Gui/Resources/Path.qrc | 1 + src/Mod/Path/PathScripts/PathDressup.py | 2 +- src/Mod/Path/PathScripts/PathEngrave.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc index 9bc4acf40..442006295 100644 --- a/src/Mod/Path/Gui/Resources/Path.qrc +++ b/src/Mod/Path/Gui/Resources/Path.qrc @@ -57,5 +57,6 @@ translations/Path_sk.qm translations/Path_tr.qm translations/Path_sl.qm + ../EngraveEdit.ui diff --git a/src/Mod/Path/PathScripts/PathDressup.py b/src/Mod/Path/PathScripts/PathDressup.py index 4b3fe37da..a478b1363 100644 --- a/src/Mod/Path/PathScripts/PathDressup.py +++ b/src/Mod/Path/PathScripts/PathDressup.py @@ -97,7 +97,7 @@ class CommandPathDressup: return {'Pixmap' : 'Path-Dressup', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Dressup","Dress-up"), 'Accel': "P, S", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Dressup","Creates a Path Dess-up object from a selected path")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Dressup","Creates a Path Dress-up object from a selected path")} def IsActive(self): return not FreeCAD.ActiveDocument is None diff --git a/src/Mod/Path/PathScripts/PathEngrave.py b/src/Mod/Path/PathScripts/PathEngrave.py index 2f1dacf52..a82b1ea68 100644 --- a/src/Mod/Path/PathScripts/PathEngrave.py +++ b/src/Mod/Path/PathScripts/PathEngrave.py @@ -206,8 +206,8 @@ class CommandPathEngrave: class TaskPanel: def __init__(self): - self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/EngraveEdit.ui") - #self.form = FreeCADGui.PySideUic.loadUi(":/gui/EngraveEdit.ui") + #self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/EngraveEdit.ui") + self.form = FreeCADGui.PySideUic.loadUi(":/EngraveEdit.ui") def accept(self): self.getFields()