From 0fccc2b40be03c341e37219babc2d2440b35ce03 Mon Sep 17 00:00:00 2001 From: Shai Seger Date: Wed, 25 Oct 2017 15:29:05 +0300 Subject: [PATCH] Add missing files and place ui file in correct location --- src/Mod/Path/CMakeLists.txt | 1 - src/Mod/Path/Gui/Resources/Path.qrc | 6 + .../Gui/Resources/icons/Path-BFastForward.svg | 118 +++++++++++++++++ .../Path/Gui/Resources/icons/Path-BPause.svg | 121 ++++++++++++++++++ .../Path/Gui/Resources/icons/Path-BPlay.svg | 60 +++++++++ .../Path/Gui/Resources/icons/Path-BStep.svg | 118 +++++++++++++++++ .../Path/Gui/Resources/icons/Path-BStop.svg | 97 ++++++++++++++ .../Resources/panels}/TaskPathSimulator.ui | 10 +- src/Mod/Path/InitGui.py | 3 +- src/Mod/Path/PathScripts/PathSimulatorGui.py | 3 +- 10 files changed, 528 insertions(+), 9 deletions(-) create mode 100644 src/Mod/Path/Gui/Resources/icons/Path-BFastForward.svg create mode 100644 src/Mod/Path/Gui/Resources/icons/Path-BPause.svg create mode 100644 src/Mod/Path/Gui/Resources/icons/Path-BPlay.svg create mode 100644 src/Mod/Path/Gui/Resources/icons/Path-BStep.svg create mode 100644 src/Mod/Path/Gui/Resources/icons/Path-BStop.svg rename src/Mod/Path/{PathScripts => Gui/Resources/panels}/TaskPathSimulator.ui (92%) diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt index 736b8ba82e..31aa0f66c8 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/Path/CMakeLists.txt @@ -89,7 +89,6 @@ SET(PathScripts_SRCS PathScripts/PathUtils.py PathScripts/PathSimulatorGui.py PathScripts/PostUtils.py - PathScripts/TaskPathSimulator.ui PathScripts/__init__.py ) diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc index 23cd4b8f89..6f8a10d0eb 100644 --- a/src/Mod/Path/Gui/Resources/Path.qrc +++ b/src/Mod/Path/Gui/Resources/Path.qrc @@ -53,6 +53,11 @@ icons/Path-Area-View.svg icons/Path-Area-Workplane.svg icons/Path-Simulator.svg + icons/Path-BFastForward.svg + icons/Path-BPause.svg + icons/Path-BPlay.svg + icons/Path-BStep.svg + icons/Path-BStop.svg icons/preferences-path.svg panels/DlgJobChooser.ui panels/DlgJobCreate.ui @@ -79,6 +84,7 @@ panels/PointEdit.ui panels/ToolEdit.ui panels/ToolLibraryEditor.ui + panels/TaskPathSimulator.ui preferences/PathDressupHoldingTags.ui preferences/PathJob.ui translations/Path_af.qm diff --git a/src/Mod/Path/Gui/Resources/icons/Path-BFastForward.svg b/src/Mod/Path/Gui/Resources/icons/Path-BFastForward.svg new file mode 100644 index 0000000000..17ecb90d4b --- /dev/null +++ b/src/Mod/Path/Gui/Resources/icons/Path-BFastForward.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/Mod/Path/Gui/Resources/icons/Path-BPause.svg b/src/Mod/Path/Gui/Resources/icons/Path-BPause.svg new file mode 100644 index 0000000000..439edcd6b7 --- /dev/null +++ b/src/Mod/Path/Gui/Resources/icons/Path-BPause.svg @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/Mod/Path/Gui/Resources/icons/Path-BPlay.svg b/src/Mod/Path/Gui/Resources/icons/Path-BPlay.svg new file mode 100644 index 0000000000..6cf1536fa6 --- /dev/null +++ b/src/Mod/Path/Gui/Resources/icons/Path-BPlay.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/Mod/Path/Gui/Resources/icons/Path-BStep.svg b/src/Mod/Path/Gui/Resources/icons/Path-BStep.svg new file mode 100644 index 0000000000..898b343ed1 --- /dev/null +++ b/src/Mod/Path/Gui/Resources/icons/Path-BStep.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/Mod/Path/Gui/Resources/icons/Path-BStop.svg b/src/Mod/Path/Gui/Resources/icons/Path-BStop.svg new file mode 100644 index 0000000000..8ae4161a69 --- /dev/null +++ b/src/Mod/Path/Gui/Resources/icons/Path-BStop.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/Mod/Path/PathScripts/TaskPathSimulator.ui b/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui similarity index 92% rename from src/Mod/Path/PathScripts/TaskPathSimulator.ui rename to src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui index 3a60df4f0c..b184337a6f 100644 --- a/src/Mod/Path/PathScripts/TaskPathSimulator.ui +++ b/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui @@ -39,7 +39,7 @@ - :/Icons/BStop.svg:/Icons/BStop.svg + :/icons/Path-BStop.svg:/icons/Path-BStop.svg @@ -59,7 +59,7 @@ - :/Icons/BPlay.svg:/Icons/BPlay.svg + :/icons/Path-BPlay.svg:/icons/Path-BPlay.svg @@ -79,7 +79,7 @@ - :/Icons/BPause.svg:/Icons/BPause.svg + :/icons/Path-BPause.svg:/icons/Path-BPause.svg @@ -99,7 +99,7 @@ - :/Icons/BStep.svg:/Icons/BStep.svg + :/icons/Path-BStep.svg:/icons/Path-BStep.svg @@ -119,7 +119,7 @@ - :/Icons/BFastForward.svg:/Icons/BFastForward.svg + :/icons/Path-BFastForward.svg:/icons/Path-BFastForward.svg diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index d1a8dd317e..6f09f8b60d 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -73,10 +73,11 @@ class PathWorkbench (Workbench): from PathScripts import PathToolController from PathScripts import PathToolLenOffset from PathScripts import PathToolLibraryManager + from PathScripts import PathSimulatorGui import PathCommands # build commands list - projcmdlist = ["Path_Job", "Path_Post", "Path_Inspect", "Path_Sanity"] + projcmdlist = ["Path_Job", "Path_Post", "Path_Inspect", "Path_Sanity", "Path_Simulator"] toolcmdlist = ["Path_ToolLibraryEdit"] prepcmdlist = ["Path_Plane", "Path_Fixture", "Path_ToolLenOffset", "Path_Comment", "Path_Stop", "Path_Custom", "Path_Shape"] twodopcmdlist = ["Path_Contour", "Path_Profile_Faces", "Path_Profile_Edges", "Path_Pocket_Shape", "Path_Drilling", "Path_Engrave", "Path_MillFace", "Path_Helix"] diff --git a/src/Mod/Path/PathScripts/PathSimulatorGui.py b/src/Mod/Path/PathScripts/PathSimulatorGui.py index 0272feb44f..b8afe2cf7f 100644 --- a/src/Mod/Path/PathScripts/PathSimulatorGui.py +++ b/src/Mod/Path/PathScripts/PathSimulatorGui.py @@ -13,12 +13,11 @@ if FreeCAD.GuiUp: from PySide import QtGui, QtCore #compiled with pyrcc4 -py3 Resources\CAM_Sim.qrc -o CAM_Sim_rc.py -import CAM_Sim_rc class CAMSimTaskUi: def __init__(self, parent): # this will create a Qt widget from our ui file - self.form = FreeCADGui.PySideUic.loadUi(_filePath + "/TaskPathSimulator.ui") + self.form = FreeCADGui.PySideUic.loadUi(":/panels/TaskPathSimulator.ui") self.parent = parent def accept(self):