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 @@
+
+
+
+
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/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"
diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg
index d0322fd3b..4f624f6c3 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" />
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
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 @@
+
+
+
+
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");