From c2d972d5f5cf66309aa414baa572b47c1a4e741e Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 3 Dec 2012 12:11:03 +0100 Subject: [PATCH 1/5] Add correct shaft icon --- .../PartDesign/WizardShaft/WizardShaft.svg | 340 ++++++++++++++---- 1 file changed, 270 insertions(+), 70 deletions(-) diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg index d0322fd3b..d8072105a 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg +++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg @@ -14,8 +14,8 @@ height="64px" id="svg2901" sodipodi:version="0.32" - inkscape:version="0.48.0 r9654" - sodipodi:docname="PartDesign_Groove.svg" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="WizardShaft_normandc_v2.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/home/yorik/PartDesign_Groove.png" @@ -23,6 +23,81 @@ inkscape:export-ydpi="90"> + + + + + + + + + + + + + + + + + + + + + + + + + + style="stop-color:#ffff00;stop-opacity:1;" /> @@ -181,16 +256,6 @@ y1="5.7974987" x2="52.323219" y2="22.675821" /> - - - + + + + + + + + + + + + + + + + + + + + + image/svg+xml - + @@ -380,40 +558,62 @@ inkscape:label="Layer 1" inkscape:groupmode="layer"> + sodipodi:type="arc" + style="fill:#ffc700;fill-opacity:1;fill-rule:evenodd;stroke:#5e3800;stroke-width:1.52504533;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path3815-2-3" + sodipodi:cx="-13.113617" + sodipodi:cy="48.122238" + sodipodi:rx="11.543545" + sodipodi:ry="16.777716" + d="m -1.5700722,48.122238 a 11.543545,16.777716 0 1 1 -23.0870898,0 11.543545,16.777716 0 1 1 23.0870898,0 z" + transform="matrix(1.0895226,-0.72891705,0.72727205,1.091987,23.576251,-35.797469)" /> - + sodipodi:type="arc" + style="fill:#ffc700;fill-opacity:1;fill-rule:evenodd;stroke:#5e3800;stroke-width:1.47568027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path3815-2-3-8" + sodipodi:cx="-13.113617" + sodipodi:cy="48.122238" + sodipodi:rx="11.543545" + sodipodi:ry="16.777716" + d="m -1.5700722,48.122238 a 11.543545,16.777716 0 1 1 -23.0870898,0 11.543545,16.777716 0 1 1 23.0870898,0 z" + transform="matrix(1.1357751,-0.74679771,0.75814626,1.1187739,6.8790101,-26.758312)" /> + + + sodipodi:type="arc" + style="fill:#ffc700;fill-opacity:1;fill-rule:evenodd;stroke:#5e3800;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path3815-2" + sodipodi:cx="-13.113617" + sodipodi:cy="48.122238" + sodipodi:rx="10.829495" + sodipodi:ry="16.777716" + d="m -2.2841215,48.122238 a 10.829495,16.777716 0 1 1 -21.6589905,0 10.829495,16.777716 0 1 1 21.6589905,0 z" + transform="matrix(0.83172472,-0.55518824,0.55518824,0.83172472,0.57120419,-1.9559883)" /> + sodipodi:nodetypes="cssscccc" /> From 747a0f12415b8411202e00dab6caed9f55264a51 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 3 Dec 2012 12:12:09 +0100 Subject: [PATCH 2/5] Add shaft icon without feature key --- .../PartDesign/WizardShaft/WizardShaft.svg | 115 +++++++++--------- 1 file changed, 56 insertions(+), 59 deletions(-) diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg index d8072105a..4f624f6c3 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg +++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg @@ -549,7 +549,7 @@ image/svg+xml - + @@ -557,63 +557,60 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - - - - - - - + + + + + + + + From 3e366a6b0309b0650c255f5534a1dc275059c43e Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 3 Dec 2012 12:34:12 +0100 Subject: [PATCH 3/5] Add icon for cross-sections command --- src/Mod/Part/Gui/Command.cpp | 2 +- src/Mod/Part/Gui/CrossSections.cpp | 2 +- src/Mod/Part/Gui/Resources/Part.qrc | 1 + .../Resources/icons/Part_CrossSections.svg | 222 ++++++++++++++++++ 4 files changed, 225 insertions(+), 2 deletions(-) create mode 100644 src/Mod/Part/Gui/Resources/icons/Part_CrossSections.svg diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index 53baa755b..bbbd95cb8 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -887,7 +887,7 @@ CmdPartCrossSections::CmdPartCrossSections() sToolTipText = QT_TR_NOOP("Cross-sections"); sWhatsThis = "Part_CrossSections"; sStatusTip = sToolTipText; -// sPixmap = "Part_Booleans"; + sPixmap = "Part_CrossSections"; } void CmdPartCrossSections::activated(int iMsg) diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp index bc07e5a1a..69ca7c93e 100644 --- a/src/Mod/Part/Gui/CrossSections.cpp +++ b/src/Mod/Part/Gui/CrossSections.cpp @@ -502,7 +502,7 @@ TaskCrossSections::TaskCrossSections(const Base::BoundBox3d& bb) { widget = new CrossSections(bb); taskbox = new Gui::TaskView::TaskBox( - Gui::BitmapFactory().pixmap("Part_Section"), + Gui::BitmapFactory().pixmap("Part_CrossSections"), widget->windowTitle(), true, 0); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc index 9246ffeb3..c2ea80ffd 100644 --- a/src/Mod/Part/Gui/Resources/Part.qrc +++ b/src/Mod/Part/Gui/Resources/Part.qrc @@ -23,6 +23,7 @@ icons/Part_Revolve.svg icons/Part_RuledSurface.svg icons/Part_Section.svg + icons/Part_CrossSections.svg icons/Part_Shapebuilder.png icons/Part_ShapeInfo.svg icons/Part_Sphere.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_CrossSections.svg b/src/Mod/Part/Gui/Resources/icons/Part_CrossSections.svg new file mode 100644 index 000000000..53bd20b14 --- /dev/null +++ b/src/Mod/Part/Gui/Resources/icons/Part_CrossSections.svg @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 14cdb9cd401a5a22c888710f936ca5dc735ebac6 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 3 Dec 2012 12:50:31 +0100 Subject: [PATCH 4/5] Add icons for sketcher commands --- src/Mod/PartDesign/Gui/Workbench.cpp | 2 + src/Mod/Sketcher/Gui/Command.cpp | 2 + src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 2 + .../Resources/icons/Sketcher_MapSketch.svg | 307 ++++++++++++++++++ .../Resources/icons/Sketcher_ViewSketch.svg | 279 ++++++++++++++++ src/Mod/Sketcher/Gui/Workbench.cpp | 5 +- 6 files changed, 596 insertions(+), 1 deletion(-) create mode 100644 src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MapSketch.svg create mode 100644 src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ViewSketch.svg diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp index aa374b539..7a3b472a2 100644 --- a/src/Mod/PartDesign/Gui/Workbench.cpp +++ b/src/Mod/PartDesign/Gui/Workbench.cpp @@ -233,6 +233,8 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* part = new Gui::ToolBarItem(root); part->setCommand("Part Design"); *part << "Sketcher_NewSketch" + << "Sketcher_ViewSketch" + << "Sketcher_MapSketch" << "Sketcher_LeaveSketch" << "Separator" << "PartDesign_Pad" diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 6a5a5061d..0dc6a3e2e 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -177,6 +177,7 @@ CmdSketcherMapSketch::CmdSketcherMapSketch() sToolTipText = QT_TR_NOOP("Map a sketch to a face"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; + sPixmap = "Sketcher_MapSketch"; } void CmdSketcherMapSketch::activated(int iMsg) @@ -311,6 +312,7 @@ CmdSketcherViewSketch::CmdSketcherViewSketch() sToolTipText = QT_TR_NOOP("View sketch perpendicular to sketch plane"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; + sPixmap = "Sketcher_ViewSketch"; eType = 0; } diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index 10989058e..9b9e42935 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -62,8 +62,10 @@ icons/Sketcher_Trimming.svg icons/Sketcher_External.svg icons/Sketcher_LeaveSketch.svg + icons/Sketcher_MapSketch.svg icons/Sketcher_NewSketch.svg icons/Sketcher_Sketch.svg + icons/Sketcher_ViewSketch.svg icons/Sketcher_AlterConstruction.svg translations/Sketcher_af.qm translations/Sketcher_de.qm diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MapSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MapSketch.svg new file mode 100644 index 000000000..12164dcd4 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MapSketch.svg @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ViewSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ViewSketch.svg new file mode 100644 index 000000000..f43d28691 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ViewSketch.svg @@ -0,0 +1,279 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index f7b2a6535..ead382363 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -111,7 +111,10 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* part = new Gui::ToolBarItem(root); part->setCommand("Sketcher"); - *part << "Sketcher_NewSketch"<< "Sketcher_LeaveSketch"; + *part << "Sketcher_NewSketch" + << "Sketcher_ViewSketch" + << "Sketcher_MapSketch" + << "Sketcher_LeaveSketch"; Gui::ToolBarItem* geom = new Gui::ToolBarItem(root); geom->setCommand("Sketcher geometries"); From 58a0ad50ec56fab3460d720c6b5f539b0346c1d6 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 3 Dec 2012 14:28:56 +0100 Subject: [PATCH 5/5] 0000896: ShaftDesign wizard incorrectly calls the active document --- src/Mod/PartDesign/WizardShaft/WizardShaft.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.py b/src/Mod/PartDesign/WizardShaft/WizardShaft.py index 9b5c6a164..799effb7d 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaft.py +++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.py @@ -31,7 +31,6 @@ class TaskWizardShaft: # GUI App = FreeCAD Gui = FreeCADGui - doc = Gui.ActiveDocument # Table and widget table = 0 form = 0 @@ -40,16 +39,17 @@ class TaskWizardShaft: # Feature featureWindow = 0 - def __init__(self): + def __init__(self, doc): mw = QtGui.qApp.activeWindow() cw = mw.centralWidget() # This is a qmdiarea widget + self.doc = doc # Get active document or create a new one # Important because when setting the default data in WizardShaftTable() the # updateSketch() slot will be activated and it relies on finding a valid document if self.doc == None: self.Gui.activateWorkbench("PartDesignWorkbench") - self.doc = self.App.ActiveDocument + self.doc = self.App.newDocument() # Grab the newly created feature window featureWindow = cw.subWindowList()[-1] else: @@ -77,7 +77,7 @@ class TaskWizardShaft: class WizardShaftGui: def Activated(self): - FreeCADGui.Control.showDialog(TaskWizardShaft()) + FreeCADGui.Control.showDialog(TaskWizardShaft(FreeCAD.ActiveDocument)) def GetResources(self): IconPath = FreeCAD.ConfigGet("AppHomePath") + "Mod/PartDesign/WizardShaft/WizardShaft.svg"