From 806df184f7bd09443a54cd0657efc878b3c1f8e7 Mon Sep 17 00:00:00 2001 From: Alexander Gryson Date: Fri, 27 Jan 2017 15:02:01 +0100 Subject: [PATCH] Align Ship Workbench icons to guidelines --- .../Ship/resources/icons/ShipWorkbench.svg | 636 ++++++++----- .../Ship/resources/icons/Ship_AreaCurve.svg | 125 ++- .../resources/icons/Ship_CapacityCurve.svg | 425 +++++++-- src/Mod/Ship/resources/icons/Ship_GZ.svg | 610 +++++++++++-- .../resources/icons/Ship_Hydrostatics.svg | 436 +++++++-- .../Ship/resources/icons/Ship_Instance.svg | 396 +++++--- src/Mod/Ship/resources/icons/Ship_Load.svg | 850 +++++++++++++----- .../resources/icons/Ship_LoadCondition.svg | 452 +++++----- src/Mod/Ship/resources/icons/Ship_Logo.svg | 729 ++++++++------- src/Mod/Ship/resources/icons/Ship_Module.svg | 634 ++++++++----- .../Ship/resources/icons/Ship_OutlineDraw.svg | 240 +++-- src/Mod/Ship/resources/icons/Ship_Tank.svg | 355 ++++++-- src/Mod/Ship/resources/icons/Ship_Weight.svg | 157 +++- 13 files changed, 4301 insertions(+), 1744 deletions(-) diff --git a/src/Mod/Ship/resources/icons/ShipWorkbench.svg b/src/Mod/Ship/resources/icons/ShipWorkbench.svg index 1a7e203d39b2..95ead0388efc 100644 --- a/src/Mod/Ship/resources/icons/ShipWorkbench.svg +++ b/src/Mod/Ship/resources/icons/ShipWorkbench.svg @@ -14,8 +14,8 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="Ship_Module.svg"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="ShipWorkbench.svg"> + + + + + + + + + + + + + + + + + + + + + xlink:href="#linearGradient3981" + id="radialGradient3145" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.24349825,1.4609914,-2.6633664,0.44389381,83.603295,-17.065868)" + cx="20.19652" + cy="25.415565" + fx="20.19652" + fy="25.415565" + r="2.4997866" /> + xlink:href="#linearGradient3975" + id="radialGradient3147" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.7044888,2.6784819,-2.2779738,1.4496199,44.850209,-66.292918)" + cx="19.299635" + cy="23.916559" + fx="19.299635" + fy="23.916559" + r="2.4997866" /> + xlink:href="#linearGradient3851" + id="radialGradient3149" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.3358863,0.38138403,-0.07170625,-0.43918384,-2.735927,51.809581)" + cx="19.608961" + cy="43.434444" + fx="19.608961" + fy="43.434444" + r="11.769514" /> + xlink:href="#linearGradient3924" + id="radialGradient3151" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.5373541,-3.5124075,1.2790074,0.55981185,-142.15537,187.59963)" + cx="49.533485" + cy="27.881353" + fx="49.533485" + fy="27.881353" + r="5.0740972" /> + xlink:href="#linearGradient3932" + id="radialGradient3153" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.2550156,0.07544973,-0.05054569,1.5106931,-120.15703,-4.659936)" + cx="20.411045" + cy="18.774475" + fx="20.411045" + fy="18.774475" + r="15.992805" /> + + + + + + + + + xlink:href="#linearGradient3851-6" + id="radialGradient3829" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.3358863,0.38138403,-0.07170625,-0.43918384,85.346441,51.032669)" + cx="19.608961" + cy="43.434444" + fx="19.608961" + fy="43.434444" + r="11.769514" /> + + + + + + + + + + + + + + + + + + + + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:snap-bbox="true" + inkscape:snap-nodes="false" + inkscape:snap-global="true" + inkscape:object-paths="false"> + + @@ -239,7 +438,7 @@ image/svg+xml - + @@ -247,181 +446,148 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - FreeCAD - - - - - - - - - - - - - - - + id="g3153" + transform="matrix(1,0,0,0.99509067,1.417632,-1.3185762)"> + + - + style="stroke:#2e3436;stroke-width:1.2203877" + id="g3948" + transform="matrix(1.6428611,0,0,1.6428611,-23.638671,-16.598994)"> - + id="path3918" + d="m 19.004065,21.288112 2.434777,-1.217388 c 0,0 1.299061,2.033199 1.299061,4.088228 0,2.055029 0,7.159456 0,7.159456 l -3.733838,1.534893 0,-7.30433 0.861219,-2.472776 c 0,0 0.243635,-1.125171 -0.861219,-1.788083 z" + style="fill:url(#radialGradient3172);fill-opacity:1;stroke:#2e3436;stroke-width:1.2203877;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> + sodipodi:nodetypes="csccccscc" /> + + + + + + + + + + + + - - - - - Sh - p + id="g3155" + transform="translate(104,-14)"> + inkscape:connector-curvature="0" + id="path3860" + d="m -99,61 c 0,0 1.375,-1 3.8125,-1 C -92.75,60 -92,61 -92,61" + style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="csc" /> + id="path3864" + d="m -45,62 c 0,0 -3.955729,-1.721009 -10.540661,-1.721009 C -62.125593,60.278991 -66,62 -66,62" + style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="csc" /> + + id="path3082" + d="m -94,63 c 0,0 3.4375,-4 9,-4 5.5625,0 8.9375,4 16,4 7.0625,0 5.375,-2 11,-2 5.625,0 10,4 10,4" + style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="csssc" /> + sodipodi:nodetypes="csssc" /> + sodipodi:nodetypes="csc" /> diff --git a/src/Mod/Ship/resources/icons/Ship_AreaCurve.svg b/src/Mod/Ship/resources/icons/Ship_AreaCurve.svg index 879c8e8dfa4b..235498728e19 100644 --- a/src/Mod/Ship/resources/icons/Ship_AreaCurve.svg +++ b/src/Mod/Ship/resources/icons/Ship_AreaCurve.svg @@ -14,10 +14,22 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.48.5 r10040" sodipodi:docname="Ship_AreaCurve.svg"> + + + + + + inkscape:window-width="1920" + inkscape:window-height="1017" + inkscape:window-x="1912" + inkscape:window-y="-8" + inkscape:window-maximized="1"> + + @@ -372,7 +403,7 @@ image/svg+xml - + @@ -381,20 +412,68 @@ inkscape:label="Layer 1" inkscape:groupmode="layer"> + + + sodipodi:nodetypes="cc" /> + style="fill:#d3d7cf;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 9,7 -2,4 4,0 z" + id="path3859" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + style="fill:#d3d7cf;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 9,7 -2,4 4,0 z" + id="path3859-7" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + + + + + + + diff --git a/src/Mod/Ship/resources/icons/Ship_CapacityCurve.svg b/src/Mod/Ship/resources/icons/Ship_CapacityCurve.svg index e722a67c8d4a..1623502a83a4 100644 --- a/src/Mod/Ship/resources/icons/Ship_CapacityCurve.svg +++ b/src/Mod/Ship/resources/icons/Ship_CapacityCurve.svg @@ -14,10 +14,70 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.48.5 r10040" sodipodi:docname="Ship_CapacityCurve.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-y="27" + inkscape:window-maximized="0" + inkscape:snap-bbox="false" + inkscape:snap-nodes="true"> + + @@ -686,7 +851,7 @@ image/svg+xml - + @@ -695,63 +860,203 @@ inkscape:label="Layer 1" inkscape:groupmode="layer"> + id="g4196" + transform="translate(82,2)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + id="path3139" + d="M 9,55 C 35,55 35,5 59,5" + style="fill:none;stroke:#a40000;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> + + style="fill:#d3d7cf;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 9,7.0000001 7,11 l 4,0 z" + id="path3859" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + + + + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" + id="path3859-7-5" + d="m 57,55 -4,-2 0,4 z" + style="fill:#d3d7cf;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + + + diff --git a/src/Mod/Ship/resources/icons/Ship_GZ.svg b/src/Mod/Ship/resources/icons/Ship_GZ.svg index b170c9c4417b..9d7ce927aa10 100644 --- a/src/Mod/Ship/resources/icons/Ship_GZ.svg +++ b/src/Mod/Ship/resources/icons/Ship_GZ.svg @@ -14,10 +14,33 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.48.5 r10040" sodipodi:docname="Ship_GZ.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-y="27" + inkscape:window-maximized="0" + inkscape:snap-bbox="true" + inkscape:snap-nodes="true"> + + @@ -936,7 +1251,7 @@ image/svg+xml - + @@ -944,98 +1259,223 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> + + + + + + + + + + + + + + id="g4181" + style="opacity:0.8" + transform="translate(80,0)"> + + + + + + + + + + + + transform="translate(-160,0)" + id="g4410"> + sodipodi:nodetypes="cc" /> + sodipodi:nodetypes="cc" /> + + id="g4410-2" + transform="matrix(-1,0,0,-1,78,66)"> + sodipodi:nodetypes="cc" /> + sodipodi:nodetypes="cc" /> - - + + + + + + + + + sodipodi:nodetypes="cc" /> + id="path3047-1-1" + d="m -41,33 0,26" + style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:2, 4;stroke-dashoffset:0" /> - - - - - - - - diff --git a/src/Mod/Ship/resources/icons/Ship_Hydrostatics.svg b/src/Mod/Ship/resources/icons/Ship_Hydrostatics.svg index acaae4cc9231..3d1ad873f2fe 100644 --- a/src/Mod/Ship/resources/icons/Ship_Hydrostatics.svg +++ b/src/Mod/Ship/resources/icons/Ship_Hydrostatics.svg @@ -14,7 +14,7 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.48.5 r10040" sodipodi:docname="Ship_Hydrostatics.svg"> @@ -560,6 +560,224 @@ y1="35.450564" x2="62.196699" y2="35.450564" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-y="27" + inkscape:window-maximized="0" + inkscape:snap-bbox="true" + inkscape:snap-nodes="true"> + + @@ -596,71 +824,175 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> + + id="g3246" + transform="matrix(0.95410736,0.25219478,-0.2556523,0.94120372,86.417188,2.844107)"> + + + id="g3950-2" + transform="matrix(-1,0,0,1,-96,6)"> + sodipodi:nodetypes="ccccc" /> - - + sodipodi:nodetypes="ccccc" /> + sodipodi:nodetypes="ccc" /> + sodipodi:nodetypes="ccc" /> + + + id="g4181" + style="opacity:0.8" + transform="translate(60,-4)"> + + + + + + + + id="path3859-3" + d="m 47,85 -2,4 4,0 z" + style="fill:#d3d7cf;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3859-7-56" + d="m 47,85 -2,4 4,0 z" + style="fill:#d3d7cf;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + sodipodi:type="arc" + style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:1.33333337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" + id="path4091" + sodipodi:cx="34" + sodipodi:cy="112" + sodipodi:rx="2" + sodipodi:ry="2" + d="m 36,112 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" + transform="matrix(1.5,0,0,1.5,-9,-122)" /> + + + + + + + sodipodi:type="arc" + style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:1.33333337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" + id="path4091-7" + sodipodi:cx="34" + sodipodi:cy="112" + sodipodi:rx="2" + sodipodi:ry="2" + d="m 36,112 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" + transform="matrix(1.5,0,0,-1.5,-20,195.90909)" /> + sodipodi:nodetypes="cc" /> diff --git a/src/Mod/Ship/resources/icons/Ship_Instance.svg b/src/Mod/Ship/resources/icons/Ship_Instance.svg index b4144fc253b3..60c67b87e9d5 100644 --- a/src/Mod/Ship/resources/icons/Ship_Instance.svg +++ b/src/Mod/Ship/resources/icons/Ship_Instance.svg @@ -14,10 +14,76 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="Ship_Module.svg"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="Ship_Instance.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + xlink:href="#linearGradient3932" + id="radialGradient3820" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3726149,0.04592581,-0.03076687,0.9195501,-5.1349354,6.7943334)" + cx="20.411045" + cy="18.774475" + fx="20.411045" + fy="18.774475" + r="15.992805" /> + xlink:href="#linearGradient3924" + id="radialGradient3823" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.93577853,-2.137982,0.77852437,0.34075422,-18.5252,123.82161)" + cx="49.533485" + cy="27.881353" + fx="49.533485" + fy="27.881353" + r="5.0740972" /> + xlink:href="#linearGradient3851" + id="radialGradient3829" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.4218404,0.23214624,-0.04364718,-0.26732865,66.338604,41.167)" + cx="19.608961" + cy="43.434444" + fx="19.608961" + fy="43.434444" + r="11.769514" /> + + + + + xlink:href="#linearGradient3981" + id="radialGradient3909" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.24349825,1.4609914,-2.6633664,0.44389381,83.603295,-17.065868)" + cx="20.19652" + cy="25.415565" + fx="20.19652" + fy="25.415565" + r="2.4997866" /> + xlink:href="#linearGradient3900-2" + id="radialGradient3911-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1875159,0.30002561,-0.66139805,2.6178455,13.656265,-48.87061)" + cx="17.915045" + cy="24.185383" + fx="17.915045" + fy="24.185383" + r="2.4997866" /> + + + + + inkscape:window-y="27" + inkscape:window-maximized="0" + inkscape:snap-global="true"> + + @@ -239,7 +336,7 @@ image/svg+xml - + @@ -250,70 +347,109 @@ + + - - - - - - - - - - - - + id="g3948" + style="stroke:#2e3436;stroke-width:1.21738839"> - + sodipodi:nodetypes="ccsccccc" /> + id="path3932" + d="m 22.737903,31.318408 c 0,0 0,-5.104427 0,-7.159456 0,-2.055029 -1.299061,-4.088228 -1.299061,-4.088228 0,-0.927244 0,-2.434777 0,-2.434777 l 14.078923,4.745678 0,2.108783 c 0,0 -1.930193,-0.176776 -1.930193,1.502602 0,1.679379 0,7.51301 0,7.51301 z" + style="fill:url(#radialGradient3913);fill-opacity:1;stroke:#2e3436;stroke-width:1.21738839000000021;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> + + + + + + + + + + + + diff --git a/src/Mod/Ship/resources/icons/Ship_Load.svg b/src/Mod/Ship/resources/icons/Ship_Load.svg index 240baff3dfff..8538b300ba83 100644 --- a/src/Mod/Ship/resources/icons/Ship_Load.svg +++ b/src/Mod/Ship/resources/icons/Ship_Load.svg @@ -14,7 +14,7 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.48.5 r10040" sodipodi:docname="Ship_Load.svg"> @@ -145,116 +145,335 @@ offset="1" id="stop3864-4" /> + + + + + + cx="605.71002" + cy="486.64999" + r="117.14" + id="radialGradient6717" + xlink:href="#linearGradient5060" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1891.6,-872.89)" /> + + + + + gradientTransform="matrix(-2.7744,0,0,1.9697,112.76,-872.89)" /> + + + + + gradientTransform="matrix(1.5229824,-0.03951002,0.25652509,1.7206972,-87.531844,0.005917)" /> + gradientTransform="matrix(1.055,-0.027345,0.1777,1.1909,-3.5722,-7.1253)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + gradientTransform="matrix(1.5373541,-3.5124075,1.2790074,0.55981185,-54.073001,186.82272)" + cx="49.533485" + cy="27.881353" + fx="49.533485" + fy="27.881353" + r="5.0740972" /> + gradientTransform="matrix(2.2550156,0.07544973,-0.05054569,1.5106931,-32.074657,-5.4368476)" + cx="20.411045" + cy="18.774475" + fx="20.411045" + fy="18.774475" + r="15.992805" /> + + gradientTransform="matrix(1.5229824,-0.03951002,0.25652509,1.7206972,-7.034039,-6.386248)" + cx="20.705999" + cy="37.518002" + r="30.905001" /> + + + + + + + + + + + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:snap-bbox="true" + inkscape:snap-nodes="false"> + + @@ -283,7 +512,7 @@ image/svg+xml - + @@ -291,162 +520,329 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - + transform="matrix(0.03151964,0,0,0.02921493,60.004605,54.646456)" + id="g6707"> + - + d="m -219.62,-150.68 v 478.33 c 142.88,0.9 345.4,-107.17 345.4,-239.2 0,-132.02 -159.44,-239.13 -345.4,-239.13 z" + id="path6711" + style="opacity:0.40206;fill:url(#radialGradient3333)" + inkscape:connector-curvature="0" /> + d="m -1559.3,-150.68 v 478.33 c -142.8,0.9 -345.4,-107.17 -345.4,-239.2 0,-132.02 159.5,-239.13 345.4,-239.13 z" + id="path6713" + style="opacity:0.40206;fill:url(#radialGradient3335)" + inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + transform="matrix(1,0,0,0.99509067,-194.58237,-33.318576)" + id="g3153"> + + + transform="matrix(1.6428611,0,0,1.6428611,-23.638671,-16.598994)" + id="g3948-6" + style="stroke:#2e3436;stroke-width:1.2203877"> - + sodipodi:nodetypes="ccsccccc" /> - + id="path3932-5" + d="m 22.737903,31.318408 c 0,0 0,-5.104427 0,-7.159456 0,-2.055029 -1.299061,-4.088228 -1.299061,-4.088228 0,-0.927244 0,-2.434777 0,-2.434777 l 14.078923,4.745678 0,2.108783 c 0,0 -1.930193,-0.176776 -1.930193,1.502602 0,1.679379 0,7.51301 0,7.51301 z" + style="fill:url(#radialGradient3288);fill-opacity:1;stroke:#2e3436;stroke-width:1.2203877;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + - - - - - - - + id="g3254" + transform="translate(80.497805,13.607835)"> + style="fill:#f57900;stroke:#ce5c00;stroke-width:2;stroke-linejoin:round;display:block" + id="path233" + d="m -24.914228,47.38925 c 1.664751,-0.06414 2.859059,-1.599175 2.981403,-3.383488 1.152071,-16.835807 2.416291,-30.951413 2.416291,-30.951413 0.104876,-0.361527 -0.244688,-0.721595 -0.699108,-0.721595 H -70.27612 c -5.82e-4,0 -2.695497,31.877097 -2.695497,31.877097 -0.166766,1.431531 -0.678716,2.629819 -2.257243,3.182314 l 50.31536,-0.0029 z" /> + style="opacity:0.46591001;fill:none;stroke:#fcaf3e;stroke-width:1.99999976;stroke-linecap:round" + id="path304" + d="m -68.068813,14.158117 47.003039,0.0017 -2.256191,28.903455 c -0.120408,1.547624 -0.645035,2.0635 -2.683349,2.0635 -2.683348,4e-6 -41.107412,0.153551 -45.001994,0.153551 0.119545,-0.340904 0.201699,-1.613552 0.203562,-1.636671 l 2.474411,-29.403842 z" /> + style="fill:#ffffff;fill-opacity:0.089286;fill-rule:evenodd" + id="path323" + d="m -69.223325,13.636909 -1.968297,22.669153 c 0,0 12.728965,-6.108311 27.832023,-6.108311 15.103057,0 22.655459,-16.757089 22.655459,-16.757089 l -48.594265,0.09131 z" /> + + + + + + + + + diff --git a/src/Mod/Ship/resources/icons/Ship_LoadCondition.svg b/src/Mod/Ship/resources/icons/Ship_LoadCondition.svg index b6f7df03d90b..0ccebe87afe7 100644 --- a/src/Mod/Ship/resources/icons/Ship_LoadCondition.svg +++ b/src/Mod/Ship/resources/icons/Ship_LoadCondition.svg @@ -14,10 +14,34 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.48.5 r10040" sodipodi:docname="Ship_LoadCondition.svg"> + + + + + + + + + + + + + + + + + + + + + inkscape:window-width="960" + inkscape:window-height="1136" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="0" + inkscape:snap-bbox="false" + inkscape:snap-nodes="true"> + + @@ -431,7 +527,7 @@ image/svg+xml - + @@ -456,205 +552,149 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> + + - - - - - - - - + transform="matrix(-1,0,0,1,-16,0)" + id="g3950-2"> + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - TF - F - T - S - W - WNA - + id="g4215" + transform="translate(58,-2)"> + + + + + + + + + + diff --git a/src/Mod/Ship/resources/icons/Ship_Logo.svg b/src/Mod/Ship/resources/icons/Ship_Logo.svg index fde3fc215888..c3ef938dbbb0 100644 --- a/src/Mod/Ship/resources/icons/Ship_Logo.svg +++ b/src/Mod/Ship/resources/icons/Ship_Logo.svg @@ -10,69 +10,65 @@ 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="256" - height="256" + width="64px" + height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="Ship_Module.svg"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="ShipWorkbench.svg"> + style="overflow:visible;"> + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;" + transform="scale(0.2) rotate(180) translate(6,0)" /> + style="overflow:visible;"> + style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;" + d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " + transform="scale(0.3) rotate(180) translate(-2.3,0)" /> + style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round" + d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " + transform="scale(0.3) translate(-2.3,0)" /> + style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round" + d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " + transform="scale(0.6) translate(0,0)" /> @@ -127,181 +123,280 @@ offset="1" id="stop3864-4" /> + + + + + + + + + + + + + + + + + + + + + xlink:href="#linearGradient3981" + id="radialGradient3145" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.24349825,1.4609914,-2.6633664,0.44389381,83.603295,-17.065868)" + cx="20.19652" + cy="25.415565" + fx="20.19652" + fy="25.415565" + r="2.4997866" /> + xlink:href="#linearGradient3975" + id="radialGradient3147" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.7044888,2.6784819,-2.2779738,1.4496199,44.850209,-66.292918)" + cx="19.299635" + cy="23.916559" + fx="19.299635" + fy="23.916559" + r="2.4997866" /> + xlink:href="#linearGradient3851" + id="radialGradient3149" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.3358863,0.38138403,-0.07170625,-0.43918384,-2.735927,51.809581)" + cx="19.608961" + cy="43.434444" + fx="19.608961" + fy="43.434444" + r="11.769514" /> + xlink:href="#linearGradient3924" + id="radialGradient3151" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.5373541,-3.5124075,1.2790074,0.55981185,-142.15537,187.59963)" + cx="49.533485" + cy="27.881353" + fx="49.533485" + fy="27.881353" + r="5.0740972" /> + xlink:href="#linearGradient3932" + id="radialGradient3153" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.2550156,0.07544973,-0.05054569,1.5106931,-120.15703,-4.659936)" + cx="20.411045" + cy="18.774475" + fx="20.411045" + fy="18.774475" + r="15.992805" /> + + + + + + + + + xlink:href="#linearGradient3851-6" + id="radialGradient3829" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.3358863,0.38138403,-0.07170625,-0.43918384,85.346441,51.032669)" + cx="19.608961" + cy="43.434444" + fx="19.608961" + fy="43.434444" + r="11.769514" /> + + + + + gradientTransform="matrix(1.5373541,-3.5124075,1.2790074,0.55981185,-54.073001,186.82272)" + cx="49.533485" + cy="27.881353" + fx="49.533485" + fy="27.881353" + r="5.0740972" /> + + + + + gradientTransform="matrix(2.2550156,0.07544973,-0.05054569,1.5106931,-32.074657,-5.4368476)" + cx="20.411045" + cy="18.774475" + fx="20.411045" + fy="18.774475" + r="15.992805" /> + + + + - + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:snap-bbox="true" + inkscape:snap-nodes="false" + inkscape:snap-global="true" + inkscape:object-paths="false"> + + @@ -338,187 +445,149 @@ + inkscape:groupmode="layer"> - FreeCAD + id="g3153" + transform="matrix(1,0,0,0.99509067,1.417632,-1.3185762)"> + + + + + + + id="path3939" + d="m 29.582368,20.374417 -18,-6 -2.0000003,1 0,2 c 2.6250003,3.53125 1.0000003,5 0,8 l 0,8" + style="fill:none;stroke:#d3d7cf;stroke-width:2.0049274;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> + + + + + + + + + + + + + + d="m -99,61 c 0,0 1.375,-1 3.8125,-1 C -92.75,60 -92,61 -92,61" + style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="csc" /> + d="m -45,62 c 0,0 -3.955729,-1.721009 -10.540661,-1.721009 C -62.125593,60.278991 -66,62 -66,62" + style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="csc" /> - - - - - - - - - - - - - - - - - - - + inkscape:connector-curvature="0" + sodipodi:nodetypes="csc" /> + d="m -94,63 c 0,0 3.4375,-4 9,-4 5.5625,0 8.9375,4 16,4 7.0625,0 5.375,-2 11,-2 5.625,0 10,4 10,4" + style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="csssc" /> - + inkscape:connector-curvature="0" + sodipodi:nodetypes="csssc" /> - Sh - p - - - - - - - + inkscape:connector-curvature="0" + sodipodi:nodetypes="csc" /> diff --git a/src/Mod/Ship/resources/icons/Ship_Module.svg b/src/Mod/Ship/resources/icons/Ship_Module.svg index 1a7e203d39b2..109287f3f6fd 100644 --- a/src/Mod/Ship/resources/icons/Ship_Module.svg +++ b/src/Mod/Ship/resources/icons/Ship_Module.svg @@ -14,8 +14,8 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="Ship_Module.svg"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="Ship_Logo.svg"> + + + + + + + + + + + + + + + + + + + + + xlink:href="#linearGradient3981" + id="radialGradient3145" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.24349825,1.4609914,-2.6633664,0.44389381,83.603295,-17.065868)" + cx="20.19652" + cy="25.415565" + fx="20.19652" + fy="25.415565" + r="2.4997866" /> + xlink:href="#linearGradient3975" + id="radialGradient3147" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.7044888,2.6784819,-2.2779738,1.4496199,44.850209,-66.292918)" + cx="19.299635" + cy="23.916559" + fx="19.299635" + fy="23.916559" + r="2.4997866" /> + xlink:href="#linearGradient3851" + id="radialGradient3149" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.3358863,0.38138403,-0.07170625,-0.43918384,-2.735927,51.809581)" + cx="19.608961" + cy="43.434444" + fx="19.608961" + fy="43.434444" + r="11.769514" /> + xlink:href="#linearGradient3924" + id="radialGradient3151" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.5373541,-3.5124075,1.2790074,0.55981185,-142.15537,187.59963)" + cx="49.533485" + cy="27.881353" + fx="49.533485" + fy="27.881353" + r="5.0740972" /> + xlink:href="#linearGradient3932" + id="radialGradient3153" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.2550156,0.07544973,-0.05054569,1.5106931,-120.15703,-4.659936)" + cx="20.411045" + cy="18.774475" + fx="20.411045" + fy="18.774475" + r="15.992805" /> + + + + + + + + + xlink:href="#linearGradient3851-6" + id="radialGradient3829" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.3358863,0.38138403,-0.07170625,-0.43918384,85.346441,51.032669)" + cx="19.608961" + cy="43.434444" + fx="19.608961" + fy="43.434444" + r="11.769514" /> + + + + + + + + + + + + + + + + + + + + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:snap-bbox="true" + inkscape:snap-nodes="false" + inkscape:snap-global="true" + inkscape:object-paths="false"> + + @@ -247,181 +446,148 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - FreeCAD - - - - - - - - - - - - - - - + id="g3153" + transform="matrix(1,0,0,0.99509067,1.417632,-1.3185762)"> + + - + style="stroke:#2e3436;stroke-width:1.2203877" + id="g3948" + transform="matrix(1.6428611,0,0,1.6428611,-23.638671,-16.598994)"> - + id="path3918" + d="m 19.004065,21.288112 2.434777,-1.217388 c 0,0 1.299061,2.033199 1.299061,4.088228 0,2.055029 0,7.159456 0,7.159456 l -3.733838,1.534893 0,-7.30433 0.861219,-2.472776 c 0,0 0.243635,-1.125171 -0.861219,-1.788083 z" + style="fill:url(#radialGradient3172);fill-opacity:1;stroke:#2e3436;stroke-width:1.2203877;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> + sodipodi:nodetypes="csccccscc" /> + + + + + + + + + + + + - - - - - Sh - p + id="g3155" + transform="translate(104,-14)"> + inkscape:connector-curvature="0" + id="path3860" + d="m -99,61 c 0,0 1.375,-1 3.8125,-1 C -92.75,60 -92,61 -92,61" + style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="csc" /> + id="path3864" + d="m -45,62 c 0,0 -3.955729,-1.721009 -10.540661,-1.721009 C -62.125593,60.278991 -66,62 -66,62" + style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="csc" /> + + id="path3082" + d="m -94,63 c 0,0 3.4375,-4 9,-4 5.5625,0 8.9375,4 16,4 7.0625,0 5.375,-2 11,-2 5.625,0 10,4 10,4" + style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="csssc" /> + sodipodi:nodetypes="csssc" /> + sodipodi:nodetypes="csc" /> diff --git a/src/Mod/Ship/resources/icons/Ship_OutlineDraw.svg b/src/Mod/Ship/resources/icons/Ship_OutlineDraw.svg index 21f0dd7a4ec2..f557df21c554 100644 --- a/src/Mod/Ship/resources/icons/Ship_OutlineDraw.svg +++ b/src/Mod/Ship/resources/icons/Ship_OutlineDraw.svg @@ -14,10 +14,34 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="Ship_Load.svg"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="Ship_OutlineDraw.svg"> + + + + + + + + - + + + + + - + + gradientTransform="matrix(0,-0.81681671,-0.68571822,0.21886538,39.200103,51.977903)" + x1="6.0000186" + y1="17.999992" + x2="58.000019" + y2="27.999992" /> + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:snap-bbox="false" + inkscape:snap-nodes="true"> + + @@ -310,7 +364,7 @@ image/svg+xml - + @@ -318,81 +372,117 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - - - - + + + + + d="m 10.562825,-37.805243 c 0,0 0,12 0,18 0,4.465337 4,12 8,12 4.14201,0 0.375,-4.125 4,-4 3.625,0.125 5,5.625 10,6 m 0,0 c -1,-4.25 -1.659955,-7.439737 -2.5,-12.375 -1,-5.875 -1.5,-21.625 -1.5,-21.625" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="m 14.562825,-37.805243 c 0,0 0,11 0,15 0,3.752083 8.437825,9.944757 16.437825,9.944757" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="m 18.562825,-37.805243 c 0,0 -0.176777,11.525126 0,14 0.176776,2.474873 2.508081,6.28543 11.612081,6.28543" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + + id="g3973" + transform="matrix(-0.78031416,0.35176755,0.0870326,0.86674487,390.5768,-223.41788)" + style="stroke:#271903;stroke-width:1"> + id="g3939" + style="stroke-width:1"> + + sodipodi:nodetypes="cccccc" /> - - + sodipodi:nodetypes="ccccc" /> + + sodipodi:nodetypes="ccccc" /> + sodipodi:nodetypes="ccccc" /> + + id="path3937" + d="m 445.80571,86.447596 -2.1589,-2.121316 -9.00202,8.845293" + style="fill:none;stroke:#ef2929;stroke-width:2.37868047;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> diff --git a/src/Mod/Ship/resources/icons/Ship_Tank.svg b/src/Mod/Ship/resources/icons/Ship_Tank.svg index 9fc8c2f8b41a..71c9973f031b 100644 --- a/src/Mod/Ship/resources/icons/Ship_Tank.svg +++ b/src/Mod/Ship/resources/icons/Ship_Tank.svg @@ -14,10 +14,22 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.48.5 r10040" sodipodi:docname="Ship_Tank.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-y="27" + inkscape:window-maximized="0"> + + @@ -658,7 +802,7 @@ image/svg+xml - + @@ -666,48 +810,155 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Ship/resources/icons/Ship_Weight.svg b/src/Mod/Ship/resources/icons/Ship_Weight.svg index e4f6f3c4162d..9b70cc52eb36 100644 --- a/src/Mod/Ship/resources/icons/Ship_Weight.svg +++ b/src/Mod/Ship/resources/icons/Ship_Weight.svg @@ -14,10 +14,34 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.48.5 r10040" sodipodi:docname="Ship_Weight.svg"> + + + + + + + + + + + + inkscape:window-width="708" + inkscape:window-height="445" + inkscape:window-x="2843" + inkscape:window-y="280" + inkscape:window-maximized="0" + inkscape:snap-bbox="false" + inkscape:snap-nodes="true"> + + @@ -479,7 +540,7 @@ image/svg+xml - + @@ -487,35 +548,61 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> + + + + + + style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 18,25 8,49 58,49 48,25 z" + id="path3067-1" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:#2e3436;font-family:Arial;-inkscape-font-specification:Arial" + id="text3919" + transform="translate(80,0)"> + + - kg. + style="stroke-width:1" />