suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad

Browse Source
This commit is contained in:
jrheinlaender 2012-12-03 19:07:22 +04:30
commit f0b48abf47
12 changed files with 1100 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Part/Gui/Command.cpp
View File

@ -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)

2
src/Mod/Part/Gui/CrossSections.cpp
View File

@ -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);

1
src/Mod/Part/Gui/Resources/Part.qrc
View File

@ -23,6 +23,7 @@
<file>icons/Part_Revolve.svg</file>
<file>icons/Part_RuledSurface.svg</file>
<file>icons/Part_Section.svg</file>
<file>icons/Part_CrossSections.svg</file>
<file>icons/Part_Shapebuilder.png</file>
<file>icons/Part_ShapeInfo.svg</file>
<file>icons/Part_Sphere.svg</file>

222
src/Mod/Part/Gui/Resources/icons/Part_CrossSections.svg Normal file
View File

@ -0,0 +1,222 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg2860"
sodipodi:version="0.32"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="Part_Cross-sections5.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<defs
id="defs2862">
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3377"
id="radialGradient3692"
cx="45.883327"
cy="28.869568"
fx="45.883327"
fy="28.869568"
r="19.467436"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3377"
id="radialGradient3703"
gradientUnits="userSpaceOnUse"
cx="135.38333"
cy="97.369568"
fx="135.38333"
fy="97.369568"
r="19.467436"
gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)" />
<linearGradient
id="linearGradient3377">
<stop
id="stop3379"
offset="0"
style="stop-color:#71b2f8;stop-opacity:1;" />
<stop
id="stop3381"
offset="1"
style="stop-color:#002795;stop-opacity:1;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3377"
id="radialGradient3705"
gradientUnits="userSpaceOnUse"
cx="148.88333"
cy="81.869568"
fx="148.88333"
fy="81.869568"
r="19.467436"
gradientTransform="matrix(1.3852588,-0.05136783,0.03705629,0.9993132,-60.392403,7.7040438)" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective2868" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="12.390625"
inkscape:cx="32"
inkscape:cy="34.742739"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1280"
inkscape:window-height="964"
inkscape:window-x="-2"
inkscape:window-y="-3"
inkscape:window-maximized="1"
showguides="true"
inkscape:guide-bbox="true" />
<metadata
id="metadata2865">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
style="fill:none;stroke:#ff0900;stroke-width:2.96823001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 2.009678,46.040506 26.542803,27.342618"
id="path3764-0-2-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#ff0900;stroke-width:2.96823001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 62.322841,31.280116 22.883003,24.276123"
id="path3764-0-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="opacity:0.53448277;fill:#ff0900;fill-opacity:1;stroke:none"
d="m 49.996354,31.103219 1.363637,-0.999998 2.84091,0.681815 -3.045456,2.022728 z"
id="path3241-9-9-0-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="opacity:0.53448277;fill:#ff0900;fill-opacity:1;stroke:none"
d="m 10.379955,21.080203 5.37343,-2.899295 4.363639,1.090907 -4.181821,2.727273 z"
id="path3241-9-9-00"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="opacity:0.53448277;fill:#ff0900;fill-opacity:1;stroke:none"
d="m 49.939268,11.768755 1.363637,-0.999998 2.84091,0.681815 -3.045456,2.022728 z"
id="path3241-9-9-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="opacity:0.53448277;fill:#ff0900;fill-opacity:1;stroke:none"
d="m 10.931117,38.984925 5.454545,-2.81818 4.363638,1.090907 -4.067106,3.071416 z"
id="path3241-9-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:none;stroke:#ff0900;stroke-width:2.96823001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 2.3838806,26.263754 27.605293,8.4835821"
id="path3764-0-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#ff0900;stroke-width:2.96823001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 62.260255,11.778332 30.804308,6.3179173"
id="path3764-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<g
id="g3618"
transform="matrix(0.71303129,0,0,1.2312496,-78.68564,-92.426968)">
<path
style="opacity:0.66523605;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.07586193;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 164.25407,125.89934 21.50437,-5.36633 5.55806,-5.36631 -9.85894,-1.43102 -17.20349,12.16366 z"
id="path3546"
inkscape:connector-curvature="0" />
<path
style="fill:url(#radialGradient3705);fill-opacity:1;fill-rule:evenodd;stroke:#000137;stroke-width:2.20000005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 152.88222,77.612314 -19.81441,7.17921 30.49556,4.148871 0.42548,35.773095 16.10976,-10.59033 0.57587,-34.384848 -27.79226,-2.125998 z"
id="rect3522"
sodipodi:nodetypes="ccccccc"
inkscape:connector-curvature="0" />
<path
style="fill:url(#radialGradient3703);fill-opacity:1;fill-rule:evenodd;stroke:#000137;stroke-width:2.20000005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 133.33785,84.998317 30.70884,3.365615 0,36.477188 -31.12383,-5.06478 0.41499,-34.778023 z"
id="rect3520"
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0" />
<path
style="fill:url(#radialGradient3692);fill-opacity:1;fill-rule:evenodd;stroke:#000137;stroke-width:2.20000005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 163.81279,88.408895 16.72598,-8.4088"
id="path3536"
inkscape:connector-curvature="0" />
</g>
<path
style="fill:none;stroke:#ff0900;stroke-width:2.96823001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 62.279286,11.950256 41.199264,37.507393 2.5224007,26.454684"
id="path3764"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
<path
style="opacity:0.53448277;fill:#ff0900;fill-opacity:1;stroke:none"
d="M 31.628117,34.625538 53.418813,10.286656 61.45061,11.906215 41.41592,38.093613 z"
id="path3241"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="opacity:0.53448277;fill:#ff0900;fill-opacity:1;stroke:none"
d="m 3.4484547,25.844868 8.1947553,-5.902532 26.911334,7.136273 -5.824739,6.515093 z"
id="path3241-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:none;stroke:#ff0900;stroke-width:2.96823001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 62.679055,31.586438 41.05449,56.36643 2.0334834,46.116721"
id="path3764-09"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
<path
style="opacity:0.53448277;fill:#ff0900;fill-opacity:1;stroke:none"
d="M 31.024485,54.19726 52.961276,29.992422 61.929108,31.633913 42.115394,56.379077 z"
id="path3241-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="opacity:0.53448277;fill:#ff0900;fill-opacity:1;stroke:none"
d="m 4.0221897,45.700347 6.9026733,-7.013689 27.370194,7.709845 -6.261529,6.756051 z"
id="path3241-9-1"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

2
src/Mod/PartDesign/Gui/Workbench.cpp
View File

@ -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"

8
src/Mod/PartDesign/WizardShaft/WizardShaft.py
View File

@ -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"

353
src/Mod/PartDesign/WizardShaft/WizardShaft.svg
View File

@ -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">
<defs
id="defs2903">
<linearGradient
id="linearGradient3937">
<stop
id="stop3939"
offset="0"
style="stop-color:#ffa300;stop-opacity:1;" />
<stop
style="stop-color:#ffff00;stop-opacity:1;"
offset="0.438618"
id="stop3941" />
<stop
id="stop3943"
offset="1"
style="stop-color:#7f5100;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3905">
<stop
id="stop3907"
offset="0"
style="stop-color:#ffa300;stop-opacity:1;" />
<stop
style="stop-color:#ffff00;stop-opacity:1;"
offset="0.45770368"
id="stop3909" />
<stop
id="stop3911"
offset="1"
style="stop-color:#cc8000;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3897">
<stop
style="stop-color:#ffa300;stop-opacity:1;"
offset="0"
id="stop3899" />
<stop
id="stop3901"
offset="0.40477183"
style="stop-color:#ffff00;stop-opacity:1;" />
<stop
style="stop-color:#7f5100;stop-opacity:1;"
offset="1"
id="stop3903" />
</linearGradient>
<linearGradient
id="linearGradient3863">
<stop
id="stop3865"
offset="0"
style="stop-color:#ffa300;stop-opacity:1;" />
<stop
style="stop-color:#ffff00;stop-opacity:1;"
offset="0.53160238"
id="stop3867" />
<stop
id="stop3869"
offset="1"
style="stop-color:#7f5100;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3830">
<stop
id="stop3832"
offset="0"
style="stop-color:#ffa300;stop-opacity:1;" />
<stop
style="stop-color:#ffff00;stop-opacity:1;"
offset="0.64134014"
id="stop3834" />
<stop
id="stop3836"
offset="1"
style="stop-color:#cc8000;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient4237">
<stop
@ -129,15 +204,15 @@
<linearGradient
id="linearGradient4052-1">
<stop
style="stop-color:#0090ff;stop-opacity:1;"
style="stop-color:#ffa300;stop-opacity:1;"
offset="0"
id="stop4054-5" />
<stop
id="stop4060-8"
offset="0.5"
style="stop-color:#f0f1f1;stop-opacity:1;" />
style="stop-color:#ffff00;stop-opacity:1;" />
<stop
style="stop-color:#0046ff;stop-opacity:1;"
style="stop-color:#cc8000;stop-opacity:1;"
offset="1"
id="stop4056-4" />
</linearGradient>
@ -181,16 +256,6 @@
y1="5.7974987"
x2="52.323219"
y2="22.675821" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4052-1-0"
id="linearGradient3890-3"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.55370638,0,0,0.55364331,74.680363,-24.12284)"
x1="42.373707"
y1="5.7974987"
x2="52.323219"
y2="22.675821" />
<linearGradient
id="linearGradient4052-1-0">
<stop
@ -241,16 +306,6 @@
id="linearGradient3985"
xlink:href="#linearGradient4052-1-0-0"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4044"
id="linearGradient3885-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.55370638,0,0,0.55364331,60.929239,37.280914)"
x1="44.858215"
y1="14.016123"
x2="33.928684"
y2="33.216251" />
<linearGradient
id="linearGradient4044-8">
<stop
@ -303,16 +358,6 @@
id="linearGradient4163"
xlink:href="#linearGradient4044-8-4"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4052-1-0-9"
id="linearGradient3890-3-5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.55370638,0,0,0.55364331,74.680363,-24.12284)"
x1="42.373707"
y1="5.7974987"
x2="52.323219"
y2="22.675821" />
<linearGradient
id="linearGradient4052-1-0-9">
<stop
@ -338,6 +383,139 @@
id="linearGradient4217"
xlink:href="#linearGradient4052-1-0-9"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4052-1-05"
id="linearGradient3890-3-5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.55370638,0,0,0.55364331,78.794439,-26.179878)"
x1="42.373707"
y1="5.7974987"
x2="52.323219"
y2="22.675821" />
<linearGradient
id="linearGradient4052-1-05">
<stop
style="stop-color:#ffa300;stop-opacity:1;"
offset="0"
id="stop4054-5-1" />
<stop
id="stop4060-8-8"
offset="0.5"
style="stop-color:#ffff00;stop-opacity:1;" />
<stop
style="stop-color:#cc8000;stop-opacity:1;"
offset="1"
id="stop4056-4-1" />
</linearGradient>
<linearGradient
y2="86.191978"
x2="-58.910812"
y1="71.868027"
x1="-69.202271"
gradientTransform="matrix(0.55370638,0,0,0.55364331,63.781226,-9.3780722)"
gradientUnits="userSpaceOnUse"
id="linearGradient3055"
xlink:href="#linearGradient3905"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4052-1"
id="linearGradient4053"
x1="-85.640633"
y1="54.604424"
x2="-37.632126"
y2="54.604424"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4052-1"
id="linearGradient4057"
gradientUnits="userSpaceOnUse"
x1="-85.640633"
y1="54.604424"
x2="-37.632126"
y2="54.604424" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4052-1"
id="linearGradient4064"
gradientUnits="userSpaceOnUse"
x1="-85.640633"
y1="54.604424"
x2="-37.632126"
y2="54.604424" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4052-1"
id="linearGradient4067"
gradientUnits="userSpaceOnUse"
x1="-85.640633"
y1="54.604424"
x2="-37.632126"
y2="54.604424" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3830"
id="linearGradient3828"
x1="48.738834"
y1="6.899754"
x2="56.940701"
y2="19.243893"
gradientUnits="userSpaceOnUse" />
<linearGradient
y2="22.675821"
x2="52.323219"
y1="5.7974987"
x1="42.373707"
gradientTransform="matrix(0.55370638,0,0,0.55364331,63.781226,-9.3780722)"
gradientUnits="userSpaceOnUse"
id="linearGradient3055-3"
xlink:href="#linearGradient4052-1-05-5"
inkscape:collect="always" />
<linearGradient
id="linearGradient4052-1-05-5">
<stop
style="stop-color:#ffa300;stop-opacity:1;"
offset="0"
id="stop4054-5-1-8" />
<stop
id="stop4060-8-8-0"
offset="0.5"
style="stop-color:#ffff00;stop-opacity:1;" />
<stop
style="stop-color:#7f5100;stop-opacity:1;"
offset="1"
id="stop4056-4-1-1" />
</linearGradient>
<linearGradient
y2="22.675821"
x2="52.323219"
y1="5.7974987"
x1="42.373707"
gradientTransform="matrix(-0.44761712,-0.03974624,0.03968572,-0.44819769,-44.347622,90.842439)"
gradientUnits="userSpaceOnUse"
id="linearGradient3074"
xlink:href="#linearGradient3863"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3897"
id="linearGradient3895"
x1="-13.054209"
y1="55.312195"
x2="-12.91594"
y2="41.530754"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3937"
id="linearGradient3935"
x1="17.603668"
y1="48.438316"
x2="13.874617"
y2="43.090275"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
@ -346,17 +524,17 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.8890873"
inkscape:cx="38.625766"
inkscape:cy="12.657788"
inkscape:zoom="7.9999996"
inkscape:cx="36.702399"
inkscape:cy="28.247095"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1920"
inkscape:window-height="1018"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-width="1863"
inkscape:window-height="1056"
inkscape:window-x="57"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:snap-global="true"
inkscape:snap-nodes="true"
@ -379,41 +557,60 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
style="color:#000000;fill:none;stroke:#ff0d00;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M 60.033553,11.624146 2.9356835,49.895439"
id="path4129"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="color:#000000;fill:url(#linearGradient3885-6);fill-opacity:1.0;fill-rule:evenodd;stroke:#000137;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 33.589321,8.1499488 c 0.310719,0.4348594 0.568952,0.924885 0.761713,1.4417267 1.54209,4.1347065 -1.513953,9.1431885 -6.819987,11.1914025 -1.079148,0.416568 -2.160312,0.657262 -3.223995,0.774928 7.099799,4.804046 13.087612,12.269737 15.251972,21.806117 0.674062,-1.709016 1.803272,-3.374523 3.365708,-4.775719 2.394689,-2.147563 5.276855,-3.22083 7.847415,-3.153778 1.999324,0.05215 3.808695,0.783303 5.066276,2.234677 0.431584,0.49809 0.762456,1.065523 1.027427,1.657986 C 57.308292,21.656223 46.249275,12.722898 33.589321,8.1499488 z"
id="path3832-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssccssscc" />
<path
style="color:#000000;fill:none;stroke:#000137;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 33.595667,8.1588471 c 0.31072,0.4348652 0.568952,0.9248908 0.761713,1.4417268 1.542089,4.1347081 -1.513952,9.1431901 -6.819987,11.1914041 -1.079148,0.416568 -2.160311,0.657262 -3.223994,0.774928 m 15.251974,21.806118 c 0.67406,-1.709017 1.803271,-3.374523 3.365708,-4.77572 2.394689,-2.147563 5.276852,-3.22083 7.847414,-3.153778 1.999324,0.05215 3.808695,0.783303 5.066277,2.234677 0.431581,0.49809 0.762455,1.065523 1.027426,1.657986"
id="path3832-2-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssccsssc" />
<path
id="path3846-3"
style="color:#000000;fill:url(#linearGradient3890-3);fill-opacity:1;fill-rule:evenodd;stroke:#000137;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 3.536174,22.642207 c 18.022131,7.741361 26.381756,27.136035 26.236001,37.96079 L 40.42899,51.501192 C 40.591405,33.650608 27.82732,21.231698 15.136181,17.008914 z"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
id="path3842-6"
style="color:#000000;fill:url(#linearGradient3890-3-5);fill-opacity:1;fill-rule:evenodd;stroke:#000137;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M 56.874841,39.325295 C 57.306666,21.656073 46.253772,12.727686 33.592842,8.1578264 L 39.537797,5.2929423 C 56.829323,9.1025668 61.692642,25.014757 61.692642,35.542943 z"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
id="path3852-7"
style="color:#000000;fill:#8bd2f7;fill-opacity:1;fill-rule:evenodd;stroke:#000137;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M 29.772175,60.602996 C 29.91793,49.77824 21.558305,30.383568 3.5361734,22.642207 L 3.97344,30.797845 c 7.619318,3.028308 17.782178,14.976717 18.219445,24.911767 z"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<g
id="g3081">
<path
transform="matrix(1.0895226,-0.72891705,0.72727205,1.091987,23.576251,-35.797469)"
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"
sodipodi:ry="16.777716"
sodipodi:rx="11.543545"
sodipodi:cy="48.122238"
sodipodi:cx="-13.113617"
id="path3815-2-3"
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"
sodipodi:type="arc" />
<path
transform="matrix(1.1357751,-0.74679771,0.75814626,1.1187739,6.8790101,-26.758312)"
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"
sodipodi:ry="16.777716"
sodipodi:rx="11.543545"
sodipodi:cy="48.122238"
sodipodi:cx="-13.113617"
id="path3815-2-3-8"
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"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csccscc"
inkscape:connector-curvature="0"
d="m 15.748623,18.102341 c 6.326457,-3.916561 17.677642,-1.857519 25.961443,10.343973 7.531446,11.093323 6.233487,22.335097 -0.521518,27.196968 L 56.488591,44.631176 C 63.703947,39.149865 63.082169,27.921758 56.983564,18.077301 50.10104,6.9674261 38.626161,4.2123456 32.084664,7.9890807 z"
style="color:#000000;fill:url(#linearGradient3828);fill-opacity:1;fill-rule:evenodd;stroke:#5e3800;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3846-3" />
<path
transform="matrix(0.83124933,-0.53551017,0.55487091,0.8022451,12.515187,-8.6993128)"
d="m -2.4280634,48.122238 a 10.685554,16.777716 0 1 1 -21.3711066,0 10.685554,16.777716 0 1 1 21.3711066,0 z"
sodipodi:ry="16.777716"
sodipodi:rx="10.685554"
sodipodi:cy="48.122238"
sodipodi:cx="-13.113617"
id="path3815"
style="fill:#ffc700;fill-opacity:1;fill-rule:evenodd;stroke:#5e3800;stroke-width:2.03699708;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
d="M 7.0663951,31.394552 C 17.066527,24.756926 36.306108,51.374843 25.695976,59.303434 l 11.929622,-8.914602 c 11.640747,-8.776616 -7.05728,-34.21213 -18.618933,-26.91968 z"
style="color:#000000;fill:url(#linearGradient3055);fill-opacity:1;fill-rule:evenodd;stroke:#5e3800;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3846-3-3" />
<path
transform="matrix(0.83172472,-0.55518824,0.55518824,0.83172472,0.57120419,-1.9559883)"
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"
sodipodi:ry="16.777716"
sodipodi:rx="10.829495"
sodipodi:cy="48.122238"
sodipodi:cx="-13.113617"
id="path3815-2"
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"
sodipodi:type="arc" />
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 20 KiB

2
src/Mod/Sketcher/Gui/Command.cpp
View File

@ -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;
}

2
src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
View File

@ -62,8 +62,10 @@
<file>icons/Sketcher_Trimming.svg</file>
<file>icons/Sketcher_External.svg</file>
<file>icons/Sketcher_LeaveSketch.svg</file>
<file>icons/Sketcher_MapSketch.svg</file>
<file>icons/Sketcher_NewSketch.svg</file>
<file>icons/Sketcher_Sketch.svg</file>
<file>icons/Sketcher_ViewSketch.svg</file>
<file>icons/Sketcher_AlterConstruction.svg</file>
<file>translations/Sketcher_af.qm</file>
<file>translations/Sketcher_de.qm</file>

307
src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MapSketch.svg Normal file
View File

@ -0,0 +1,307 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg3364"
sodipodi:version="0.32"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="Sketcher_MapSketch.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<defs
id="defs3366">
<linearGradient
id="linearGradient3835">
<stop
id="stop3837"
offset="0"
style="stop-color:#637dca;stop-opacity:1;" />
<stop
id="stop3839"
offset="1"
style="stop-color:#9eaede;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3827">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3829" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop3831" />
</linearGradient>
<linearGradient
id="linearGradient3864">
<stop
id="stop3866"
offset="0"
style="stop-color:#840000;stop-opacity:1;" />
<stop
id="stop3868"
offset="1"
style="stop-color:#ff2b1e;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3593">
<stop
style="stop-color:#00aff9;stop-opacity:1;"
offset="0"
id="stop3595" />
<stop
style="stop-color:#001ccc;stop-opacity:1;"
offset="1"
id="stop3597" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="-24.909091 : 16.545455 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="116.36364 : 23.818182 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective3372" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3864"
id="radialGradient2998"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.6696601,0.63911498,-0.09121381,0.31244488,-540.88725,-258.46199)"
cx="342.58258"
cy="27.256668"
fx="342.58258"
fy="27.256668"
r="19.571428" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3593-0"
id="radialGradient3004-8"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-320.59978,-6.63068)"
cx="330.63791"
cy="39.962704"
fx="330.63791"
fy="39.962704"
r="19.571428" />
<linearGradient
id="linearGradient3593-0">
<stop
style="stop-color:#c8e0f9;stop-opacity:1;"
offset="0"
id="stop3595-2" />
<stop
style="stop-color:#637dca;stop-opacity:1;"
offset="1"
id="stop3597-1" />
</linearGradient>
<radialGradient
r="19.571428"
fy="39.962704"
fx="330.63791"
cy="39.962704"
cx="330.63791"
gradientTransform="matrix(-0.93227784,0,0,1.3554421,396.33347,-27.208207)"
gradientUnits="userSpaceOnUse"
id="radialGradient3036"
xlink:href="#linearGradient3593-0"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3593"
id="linearGradient3799"
x1="5.3636365"
y1="34"
x2="57"
y2="34"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3500116,0,0,1.3348951,9.2846859,-20.430802)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3593-3"
id="linearGradient3799-2"
x1="5.3636365"
y1="34"
x2="57"
y2="34"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.6308426,0,0,1.5945248,9.3400117,-34.898933)" />
<linearGradient
id="linearGradient3593-3">
<stop
style="stop-color:#00aff9;stop-opacity:1;"
offset="0"
id="stop3595-23" />
<stop
style="stop-color:#001ccc;stop-opacity:1;"
offset="1"
id="stop3597-7" />
</linearGradient>
<linearGradient
y2="34"
x2="57"
y1="34"
x1="5.3636365"
gradientTransform="matrix(1.0632565,0,0,1.0632566,-4.7659293,-8.6027115)"
gradientUnits="userSpaceOnUse"
id="linearGradient3919"
xlink:href="#linearGradient3593-3"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.7781746"
inkscape:cx="18.788747"
inkscape:cy="23.403986"
inkscape:current-layer="g3780"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1863"
inkscape:window-height="1056"
inkscape:window-x="57"
inkscape:window-y="24"
inkscape:window-maximized="1" />
<metadata
id="metadata3369">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g3780"
transform="matrix(0.82780005,0,0,0.83717425,-0.2499405,9.0601524)">
<path
style="fill:url(#linearGradient3799);fill-opacity:1;stroke:#000137;stroke-width:2.68547869;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 19.348408,41.702495 51.503231,58.206651 71.393547,48.97617 72.094994,5.9059914 37.401457,-5.6328407 16.685975,-1.1860395 c 1.692756,28.0895705 0.963999,15.6031545 2.662433,42.8885345 z"
id="path3783"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<path
style="fill:none;stroke:#000137;stroke-width:2.68486428;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 51.257774,57.721234 50.275946,13.548343 72.101978,6.0654951"
id="path3801"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
<path
style="color:#000000;fill:url(#linearGradient3799-2);fill-opacity:1;fill-rule:nonzero;stroke:#000137;stroke-width:2.68486452;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M 16.632969,-0.94966132 50.10675,13.77367"
id="path3921"
inkscape:connector-curvature="0" />
<g
id="g3019"
transform="matrix(0.10218722,0.04451643,0,0.12623309,-92.618381,-167.25158)">
<path
id="path3650"
d="m 1064.6382,977.93767 25.0714,269.70903 271.2888,28.1934 c -3.4393,-123.5185 -4.9754,-180.4701 -6.6791,-292.9171 z"
style="opacity:0.6523605;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
id="rect3643"
d="m 957.09637,1008.9632 15.81386,351.5661 296.66507,6.3788 49.5656,-56.5039 -8.9678,-301.441 z"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#242121;stroke-width:15.60031223;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
<path
id="path3648"
d="m 1318.044,1309.274 -53.2211,-1.8212 3.7479,59.0492"
style="fill:none;stroke:#242121;stroke-width:15.60031223;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
<path
style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:21.86925507;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 989.27845,1162.5147 203.68205,5.9307 8.4551,167.2361 -204.56105,-2.7077 z"
id="rect3860"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
transform="matrix(5.5424812,0,0,5.3931657,1012.4561,972.28307)"
d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
sodipodi:ry="18.181818"
sodipodi:rx="18.181818"
sodipodi:cy="33.272728"
sodipodi:cx="30.181818"
id="path3862"
style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
inkscape:transform-center-y="-0.91957342"
transform="matrix(3.1478338,0,0,3.3398761,1090.2825,1162.2983)"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5707963"
sodipodi:arg1="0.52359878"
sodipodi:r2="3.8833756"
sodipodi:r1="8.051487"
sodipodi:cy="20.181818"
sodipodi:cx="-16.727274"
sodipodi:sides="3"
id="path3888"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="star" />
<path
inkscape:transform-center-y="6.7227566"
transform="matrix(3.1478338,0,0,-3.3398761,1090.2825,1342.2691)"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5707963"
sodipodi:arg1="0.52359878"
sodipodi:r2="3.8833756"
sodipodi:r1="8.051487"
sodipodi:cy="20.181818"
sodipodi:cx="-16.727274"
sodipodi:sides="3"
id="path3888-9"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="star" />
<path
inkscape:transform-center-x="2.898336"
inkscape:transform-center-y="-4.5388429"
transform="matrix(2.5317111,-1.8202453,2.0397146,2.6861652,1149.9734,1021.2999)"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5707963"
sodipodi:arg1="0.52359878"
sodipodi:r2="3.8833756"
sodipodi:r1="8.051487"
sodipodi:cy="20.181818"
sodipodi:cx="-16.727274"
sodipodi:sides="3"
id="path3888-97"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="star" />
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

279
src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ViewSketch.svg Normal file
View File

@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg5821"
sodipodi:version="0.32"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="Sketcher_NewSketch.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1"
inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45">
<defs
id="defs5823">
<linearGradient
inkscape:collect="always"
id="linearGradient6349">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop6351" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop6353" />
</linearGradient>
<linearGradient
id="linearGradient3377">
<stop
style="stop-color:#0019a3;stop-opacity:1;"
offset="0"
id="stop3379" />
<stop
style="stop-color:#0069ff;stop-opacity:1;"
offset="1"
id="stop3381" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3377"
id="linearGradient3383"
x1="901.1875"
y1="1190.875"
x2="1267.9062"
y2="1190.875"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective5829" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient6349"
id="radialGradient6355"
cx="1103.6399"
cy="1424.4465"
fx="1103.6399"
fy="1424.4465"
r="194.40614"
gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3253"
id="radialGradient2695"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(5.6470637,0.01334924,-0.03399104,2.0869569,1549.027,102.22394)"
cx="44.286785"
cy="6.4023118"
fx="44.286785"
fy="6.4023118"
r="27.986706" />
<linearGradient
id="linearGradient3253">
<stop
style="stop-color:#89d5f8;stop-opacity:1;"
offset="0"
id="stop3255" />
<stop
style="stop-color:#00899e;stop-opacity:1;"
offset="1"
id="stop3257" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3253"
id="radialGradient3270"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.3741544,0.4236661,-0.5825572,-0.5144765,35.157782,16.985792)"
cx="18.195206"
cy="17.38835"
fx="18.195206"
fy="17.38835"
r="27.986706" />
<linearGradient
id="linearGradient3098">
<stop
style="stop-color:#89d5f8;stop-opacity:1;"
offset="0"
id="stop3100" />
<stop
style="stop-color:#00899e;stop-opacity:1;"
offset="1"
id="stop3102" />
</linearGradient>
<radialGradient
r="27.986706"
fy="17.38835"
fx="18.195206"
cy="17.38835"
cx="18.195206"
gradientTransform="matrix(-0.3741544,0.4236661,-0.5825572,-0.5144765,35.157782,16.985792)"
gradientUnits="userSpaceOnUse"
id="radialGradient3106"
xlink:href="#linearGradient3253"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.7781746"
inkscape:cx="59.216468"
inkscape:cy="24.797857"
inkscape:current-layer="g3360"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1863"
inkscape:window-height="1056"
inkscape:window-x="57"
inkscape:window-y="24"
inkscape:window-maximized="1" />
<metadata
id="metadata5826">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g3360"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
inkscape:export-xdpi="3.2478156"
inkscape:export-ydpi="3.2478156"
transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
<path
inkscape:connector-curvature="0"
style="opacity:0.6523605;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 939.30104,1042.2626 0,360.0859 275.79216,0 50.4598,-47.9468 0,-312.1391 -326.25196,0 z"
id="path3650" />
<path
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#242121;stroke-width:14.41509247;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 912.0654,1011.6363 0,360.0859 275.7922,0 50.4598,-47.9467 0,-312.1392 -326.252,0 z"
id="rect3643" />
<path
inkscape:connector-curvature="0"
style="fill:none;stroke:#242121;stroke-width:14.41509247;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 1235.7011,1322.2371 -46.2257,-4.7916 0,52.7082"
id="path3648" />
<rect
style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:20.20775795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect3860"
width="187.16376"
height="164.90605"
x="941.80249"
y="1153.5219" />
<path
sodipodi:type="arc"
style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3862"
sodipodi:cx="30.181818"
sodipodi:cy="33.272728"
sodipodi:rx="18.181818"
sodipodi:ry="18.181818"
d="m 48.363636,33.272728 a 18.181818,18.181818 0 1 1 -36.363636,0 18.181818,18.181818 0 1 1 36.363636,0 z"
transform="matrix(5.1213961,0,0,4.9834247,963.21922,977.74292)" />
<path
sodipodi:type="star"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3888"
sodipodi:sides="3"
sodipodi:cx="-16.727274"
sodipodi:cy="20.181818"
sodipodi:r1="8.051487"
sodipodi:r2="3.8833756"
sodipodi:arg1="0.52359878"
sodipodi:arg2="1.5707963"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
transform="matrix(2.9086799,0,0,3.086132,1029.9665,1149.8268)"
inkscape:transform-center-y="-0.84971719" />
<path
sodipodi:type="star"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3888-9"
sodipodi:sides="3"
sodipodi:cx="-16.727274"
sodipodi:cy="20.181818"
sodipodi:r1="8.051487"
sodipodi:r2="3.8833756"
sodipodi:arg1="0.52359878"
sodipodi:arg2="1.5707963"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
transform="matrix(2.9086799,0,0,-3.086132,1029.9665,1316.1246)"
inkscape:transform-center-y="6.2120078" />
<path
sodipodi:type="star"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3888-97"
sodipodi:sides="3"
sodipodi:cx="-16.727274"
sodipodi:cy="20.181818"
sodipodi:r1="8.051487"
sodipodi:r2="3.8833756"
sodipodi:arg1="0.52359878"
sodipodi:arg2="1.5707963"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
transform="matrix(2.3393667,-1.6819538,1.884749,2.4820862,1090.2888,1023.0357)"
inkscape:transform-center-y="-4.1940025"
inkscape:transform-center-x="2.6781346" />
<path
sodipodi:type="arc"
style="color:#000000;fill:url(#radialGradient3106);fill-opacity:1;fill-rule:nonzero;stroke:#004c5b;stroke-width:2.41611409;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path2683"
sodipodi:cx="27.400389"
sodipodi:cy="25.019028"
sodipodi:rx="18.208"
sodipodi:ry="18.208"
d="m 45.608389,25.019028 a 18.208,18.208 0 1 1 -36.4160005,0 18.208,18.208 0 1 1 36.4160005,0 z"
transform="matrix(5.1990146,0,0,5.1990146,1007.7281,1131.0879)" />
<rect
style="color:#000000;fill:url(#radialGradient2695);fill-opacity:1;fill-rule:nonzero;stroke:#004c5b;stroke-width:12.57079124;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect2689"
width="97.446526"
height="54.679829"
x="1814.3544"
y="41.378105"
transform="matrix(0.70253188,0.71165228,-0.67223381,0.74033891,0,0)"
ry="19.084164" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

5
src/Mod/Sketcher/Gui/Workbench.cpp
View File

@ -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");