kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge remote-tracking branch 'origin/master' into logari81/PartDesign

Browse Source
This commit is contained in:
logari81
2012-09-11 16:59:23 +02:00
parent 8b35efdb83 5a8caa6d06
commit e1727b6c16
18 changed files with 1898 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/PartDesign/Gui/Command.cpp
View File

@@ -404,6 +404,7 @@ bool CmdPartDesignGroove::isActive(void)
{
return hasActiveDocument();
}
//===========================================================================
// PartDesign_Fillet
//===========================================================================
@@ -418,7 +419,7 @@ CmdPartDesignFillet::CmdPartDesignFillet()
sToolTipText = QT_TR_NOOP("Make a fillet on an edge, face or body");
sWhatsThis = sToolTipText;
sStatusTip = sToolTipText;
sPixmap = "Part_Fillet";
sPixmap = "PartDesign_Fillet";
}
void CmdPartDesignFillet::activated(int iMsg)
@@ -564,7 +565,7 @@ CmdPartDesignChamfer::CmdPartDesignChamfer()
sToolTipText = QT_TR_NOOP("Chamfer the selected edges of a shape");
sWhatsThis = sToolTipText;
sStatusTip = sToolTipText;
sPixmap = "Part_Chamfer";
sPixmap = "PartDesign_Chamfer";
}
void CmdPartDesignChamfer::activated(int iMsg)

2
src/Mod/PartDesign/Gui/Resources/Makefile.am
View File

@@ -37,6 +37,8 @@ EXTRA_DIST = \
translations/PartDesign_uk.ts \
translations/PartDesign_zh.qm \
translations/PartDesign_zh.ts \
icons/PartDesign_Chamfer.svg \
icons/PartDesign_Fillet.svg \
icons/PartDesign_Groove.svg \
icons/PartDesign_Pad.svg \
icons/PartDesign_Pocket.svg \

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

@@ -1,5 +1,7 @@
<RCC>
<qresource>
<file>icons/PartDesign_Chamfer.svg</file>
<file>icons/PartDesign_Fillet.svg</file>
<file>icons/PartDesign_Groove.svg</file>
<file>icons/PartDesign_Pad.svg</file>
<file>icons/PartDesign_Pocket.svg</file>

197
src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Chamfer.svg Normal file
View File

@@ -0,0 +1,197 @@
<?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="PartDesign_Chamfer_v3.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:#d82b1e;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.2844364,0,0,1.2700541,-1.1984108,-15.131825)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3864"
id="linearGradient5146"
x1="55.545452"
y1="25.818182"
x2="20.636362"
y2="24.181818"
gradientUnits="userSpaceOnUse"
spreadMethod="pad" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.4999999"
inkscape:cx="36.157676"
inkscape:cy="24.078612"
inkscape:current-layer="g3780"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1680"
inkscape:window-height="988"
inkscape:window-x="-8"
inkscape:window-y="-8"
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 />
</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.55445003999999987;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 6.9752755,17.88958 8.3764789,43.983419 38.969419,59.685905 68.861758,45.599851 70.730028,5.6508767 37.801749,-3.5858797 17.484301,2.4180125 z"
id="path3783"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc" />
<path
style="fill:none;stroke:#000137;stroke-width:2.55445003999999987;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 38.735885,59.224067 37.801749,17.196823 70.496495,5.8817966"
id="path3801"
inkscape:connector-curvature="0" />
<path
style="fill:url(#linearGradient5146);fill-opacity:1;stroke:#ff0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 5.4545455,24.181818 25.9999995,12 8.727273,-15.818182 -25.818182,-9.636363 z"
id="path3841"
inkscape:connector-curvature="0"
transform="matrix(1.2080212,0,0,1.1944945,0.30193342,-10.822302)"
sodipodi:nodetypes="ccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

196
src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Fillet.svg Normal file
View File

@@ -0,0 +1,196 @@
<?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="PartDesign_Fillet_v3.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<defs
id="defs3366">
<linearGradient
id="linearGradient3776">
<stop
style="stop-color:#f82b39;stop-opacity:1;"
offset="0"
id="stop3778" />
<stop
style="stop-color:#660001;stop-opacity:1;"
offset="1"
id="stop3780" />
</linearGradient>
<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:#f82b39;stop-opacity:1;" />
<stop
id="stop3868"
offset="1"
style="stop-color:#520001;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="#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.2844364,0,0,1.2700541,-1.1984108,-15.131825)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3776"
id="linearGradient3784"
x1="26.214075"
y1="12.623135"
x2="15.684641"
y2="38.033287"
gradientUnits="userSpaceOnUse"
spreadMethod="reflect" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.5"
inkscape:cx="1.4601396"
inkscape:cy="24.078612"
inkscape:current-layer="g3780"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="930"
inkscape:window-height="1027"
inkscape:window-x="60"
inkscape:window-y="24"
inkscape:window-maximized="0" />
<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 />
</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.55503488999999995;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 6.9752755,17.88958 8.3764789,43.983419 38.969419,59.685905 68.861758,45.599851 70.730028,5.6508767 37.801749,-3.5858797 17.484301,2.4180125 z"
id="path3783"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc" />
<path
style="fill:none;stroke:#000137;stroke-width:2.55445003999999987;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 38.735885,59.224067 37.801749,17.196823 70.496495,5.8817966"
id="path3801"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="ccccc"
d="m 6.8196091,17.551454 c 8.8443999,3.52214 18.0369189,7.471809 31.3431519,12.85307 0.181545,-8.107212 0.984392,-13.535061 9.69838,-16.653218 C 38.602551,10.633148 26.373215,5.4479914 17.477681,2.2258944 11.216238,4.3625208 6.261769,7.3536988 6.8196091,17.551454 z"
style="fill:url(#linearGradient3784);fill-opacity:1.0;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.41762400000000000;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"
id="path3347"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB