From a4b2f56a2a278e185981ffab7d4846a6715fce19 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Sat, 26 Sep 2020 23:12:12 -0500 Subject: [PATCH] Sketcher: upgrade icons for existing commands `SelectConstraints`, `SelectElementsAssociatedWithConstraints`, these include the icon for parallel constraint, which was upgraded in 4fb193aa. `SelectRedundantConstraints`, `SelectConflinctingConstraints`, previosuly were the same with only a small color variation (orange outline and red outline). Now they have another symbol overlayed (lightning and exclamation mark) to distinguish them more clearly. The parallel icon was also upgraded in these icons. The `Move` icon is also made more clear. The first element now has a clear outline, instead of being a faded green color which is hard to see. An arrow is added to imply movement from the first position to the second position. --- .../Resources/icons/tools/Sketcher_Move.svg | 980 +++++++++----- .../Sketcher_SelectConflictingConstraints.svg | 520 +++++++- .../tools/Sketcher_SelectConstraints.svg | 658 +++++----- ...electElementsAssociatedWithConstraints.svg | 514 ++++++-- .../Sketcher_SelectRedundantConstraints.svg | 1143 ++++++++++++++++- 5 files changed, 3015 insertions(+), 800 deletions(-) diff --git a/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Move.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Move.svg index 16a49aab27..724b63e5f0 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Move.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Move.svg @@ -1,6 +1,4 @@ - - + id="svg2869" + height="64px" + width="64px"> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> - + xlink:href="#linearGradient3144" /> + xlink:href="#linearGradient3144" /> + fx="225.26402" + cy="672.79736" + cx="225.26402" + gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" + gradientUnits="userSpaceOnUse" + id="radialGradient5130" + xlink:href="#linearGradient3144" /> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + xlink:href="#linearGradient3144-0" /> + xlink:href="#linearGradient3144" /> + xlink:href="#linearGradient3144-9-6" /> + xlink:href="#linearGradient3144-9-6" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="linearGradient3836-9-7-3"> + id="stop3838-8-0-74" /> + id="stop3840-1-9-52" /> - - - - - - - - - - + - + - - - - - + - - - - + gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" + cx="225.26402" + cy="672.79736" + fx="225.26402" + fy="672.79736" + r="34.345188" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -308,7 +697,7 @@ image/svg+xml - + [Abdullah Tahiri] @@ -322,7 +711,7 @@ FreeCAD - FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Copy.svg + FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Movy.svg FreeCAD LGPL2+ @@ -331,99 +720,82 @@ https://www.gnu.org/copyleft/lesser.html - [agryson] Alexander Gryson + [agryson] Alexander Gryson, vocx + A faded curve with two vertices, an arrow pointing right, to a colored curve with red vertices, indicating that the object was moved from one location to the other. + transform="matrix(-0.10363852,-0.08809389,0.10363852,-0.08809389,-64.889276,56.289015)" + id="g3389-6" + style="stroke-width:14.80067444;stroke-miterlimit:4;stroke-dasharray:none"> + + + + - - - - - - - - - - + style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" + transform="translate(31.322131,40.570289)" + id="g3797-7"> + id="path4250-6" + d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 Z" /> - - - - - - + style="fill:url(#linearGradient3091);fill-opacity:1;stroke:#ef2929;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4250-7-0" + d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 Z" /> + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConflictingConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConflictingConstraints.svg index cef8438db5..2b70df2853 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConflictingConstraints.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConflictingConstraints.svg @@ -1,37 +1,390 @@ - - - - - - + + Sketcher_SelectConflictingConstraints + + + + - - - - - - - - - + + + + + + + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - + image/svg+xml - - + + Sketcher_SelectConflictingConstraints [Abdullah Tahiri] @@ -54,40 +407,107 @@ https://www.gnu.org/copyleft/lesser.html - [agryson] Alexander Gryson + [agryson] Alexander Gryson, vocx + Three constraint symbols, vertical, parallel, symmetry, next to a blue lightning bolt. + + + constraints + conflicting + warning + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - + + + + + + - - - - - + + + - - + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConstraints.svg index 9770cf2286..a72f93eed7 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConstraints.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConstraints.svg @@ -1,6 +1,4 @@ - - + id="svg2869" + height="64px" + width="64px"> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> - + xlink:href="#linearGradient3144" /> + xlink:href="#linearGradient3144" /> + xlink:href="#linearGradient3144" /> + xlink:href="#linearGradient3144" /> + fx="225.26402" + cy="672.79736" + cx="225.26402" + gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" + gradientUnits="userSpaceOnUse" + id="radialGradient3150" + xlink:href="#linearGradient3144" /> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + xlink:href="#linearGradient3144-9" /> + xlink:href="#linearGradient3144-9-6" /> + xlink:href="#linearGradient3144-9" /> - + + id="linearGradient3043" + gradientUnits="userSpaceOnUse" + x1="-18" + y1="18" + x2="-22" + y2="5" /> + style="stop-color:#a40000;stop-opacity:1" /> + style="stop-color:#ef2929;stop-opacity:1" /> + id="linearGradient3426" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)" + x1="-18" + y1="18" + x2="-22" + y2="5" /> + style="stop-color:#a40000;stop-opacity:1" /> + style="stop-color:#ef2929;stop-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + - - - @@ -243,7 +332,7 @@ image/svg+xml - + [wmayer] @@ -273,169 +362,130 @@ + id="layer1"> + transform="matrix(0.62846906,0,0,0.63449019,18.864964,33.515677)" + id="g3114"> + transform="matrix(-0.73872768,0,0,1.3536788,69.994068,-11.747782)"> + d="m 3.9935419,8.0780181 0,10.3727259 16.4481981,5.927271 -16.4481981,5.927273 0,10.372724 30.1550301,-11.854542 0,-8.890908 z" + style="fill:#73d216;stroke:#172a04;stroke-width:3.16720104000000013;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" /> + id="path3832-3" + d="m 6.1324762,16.766495 0,6.461881 L 19.590577,33 6.1133822,42 l 0.019094,6.793782 15.9116828,-11.582527 0,-8.580117 z" + style="fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" /> + d="m 8.301403,36.045318 -0.025847,-5.018755 0.025847,5.018755 21.539307,-8.556334 0,-6.338369 -21.539307,-8.764741 0,4.77357 0,-4.77357" + style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" /> + transform="matrix(0.73872768,0,0,1.3536788,64.093791,-11.747785)"> + d="m -69.240103,8.0780181 0,10.3727259 16.448198,5.927271 -16.448198,5.927273 0,10.372724 30.15503,-11.854542 0,-8.890908 z" + style="fill:#73d216;stroke:#172a04;stroke-width:3.16720104000000013;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" /> + d="m -64.932242,12.385874 0,4.77357 18.217946,7.218569 -18.243793,6.64855 0.02585,5.018754 21.539308,-8.556333 0,-6.33837 z" + style="fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" /> + d="m -64.932242,36.045318 -0.02585,-5.018755 0.02585,5.018755 21.539307,-8.556334 0,-6.338369 -21.539307,-8.764741 0,4.77357 0,-4.77357" + style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" /> + id="g3109" + transform="matrix(0.41458709,-0.41458709,0.41458709,0.41458709,-15.656622,77.226071)"> + id="g3071-4" + transform="rotate(-45,42.120304,23.144678)"> + id="rect3770-1-0" + d="m 76.867483,32.638193 54.578187,-0.03926 0.007,10.233409 -54.578185,0.03929 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#172a04;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)" /> + + + + + + + + + + + + + + + + + + + + + id="g1248"> - - - - - + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#172a04;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + d="m -55.204488,29.242958 15.433818,-15.240702 3.756129,3.806536 -15.433822,15.240697 z" + id="rect3770-9-9" /> - - - - - - - - - - - - - + id="path1195" + d="M -38.872795,16.129159 -53.115219,30.17029" + style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectElementsAssociatedWithConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectElementsAssociatedWithConstraints.svg index d4f5acd55e..6a7b5c8db5 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectElementsAssociatedWithConstraints.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectElementsAssociatedWithConstraints.svg @@ -1,69 +1,310 @@ - - - - - - + + + + + - - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + - - - - + - + image/svg+xml - - + + [Abdullah Tahiri] @@ -92,48 +333,137 @@ - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectRedundantConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectRedundantConstraints.svg index 4794f4e9f7..02787486e4 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectRedundantConstraints.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectRedundantConstraints.svg @@ -1,37 +1,1000 @@ - - - - - - + + Sketcher_SelectRedundantConstraints + + + + - - - - - - - - - + + + + + + + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - + image/svg+xml - - + + Sketcher_SelectRedundantConstraints [Abdullah Tahiri] @@ -54,40 +1017,120 @@ https://www.gnu.org/copyleft/lesser.html - [agryson] Alexander Gryson + [agryson] Alexander Gryson, vocx + Three constraints, vertical, parallel, symmetry, next to a blue circle with an exclamation point. + + + constraints + redundant + warning + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - + + + + + + - - - - - + + + - - + + +