From a483f284372bccc1cba4cb17badd98ea1fd01d48 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Wed, 7 Oct 2020 20:43:23 -0500 Subject: [PATCH] Part: update icon for ProjectionOnSurface The previous icon was improperly trimmed. The new icon shows the projection more clearly as one object imprinting itself over another. Also update the tooltip, fix the indentation of the code, and the title of the taskpanel `DlgProjectionOnSurface.ui`. --- src/Mod/Part/Gui/Command.cpp | 27 +- src/Mod/Part/Gui/DlgProjectionOnSurface.ui | 2 +- .../icons/tools/Part_ProjectionOnSurface.svg | 689 ++++++++++++------ 3 files changed, 475 insertions(+), 243 deletions(-) diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index c756a88b53..532eae02ce 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -2431,27 +2431,30 @@ bool CmdBoxSelection::isActive(void) DEF_STD_CMD_A(CmdPartProjectionOnSurface) CmdPartProjectionOnSurface::CmdPartProjectionOnSurface() - :Command("Part_ProjectionOnSurface") + :Command("Part_ProjectionOnSurface") { - sAppModule = "Part"; - sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create projection on surface..."); - sToolTipText = QT_TR_NOOP("Create projection on surface..."); - sWhatsThis = "Part_ProjectionOnSurface"; - sStatusTip = sToolTipText; - sPixmap = "Part_ProjectionOnSurface"; + sAppModule = "Part"; + sGroup = QT_TR_NOOP("Part"); + sMenuText = QT_TR_NOOP("Create projection on surface..."); + sToolTipText = QT_TR_NOOP("Project edges, wires, or faces of one object\n" + "onto a face of another object.\n" + "The camera view determines the direction\n" + "of projection."); + sWhatsThis = "Part_ProjectionOnSurface"; + sStatusTip = sToolTipText; + sPixmap = "Part_ProjectionOnSurface"; } void CmdPartProjectionOnSurface::activated(int iMsg) { - Q_UNUSED(iMsg); - PartGui::TaskProjectionOnSurface* dlg = new PartGui::TaskProjectionOnSurface(); - Gui::Control().showDialog(dlg); + Q_UNUSED(iMsg); + PartGui::TaskProjectionOnSurface* dlg = new PartGui::TaskProjectionOnSurface(); + Gui::Control().showDialog(dlg); } bool CmdPartProjectionOnSurface::isActive(void) { - return (hasActiveDocument() && !Gui::Control().activeDialog()); + return (hasActiveDocument() && !Gui::Control().activeDialog()); } void CreatePartCommands(void) diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.ui b/src/Mod/Part/Gui/DlgProjectionOnSurface.ui index fe2098a57e..4d9647530a 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.ui +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.ui @@ -11,7 +11,7 @@ - Form + Projection on surface diff --git a/src/Mod/Part/Gui/Resources/icons/tools/Part_ProjectionOnSurface.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_ProjectionOnSurface.svg index 5d44c0bdf4..0ab84b1357 100644 --- a/src/Mod/Part/Gui/Resources/icons/tools/Part_ProjectionOnSurface.svg +++ b/src/Mod/Part/Gui/Resources/icons/tools/Part_ProjectionOnSurface.svg @@ -1,242 +1,237 @@ - - + version="1.1" + viewBox="0 0 16.933333 16.933334" + height="64" + width="64"> + Part_ProjectionOnSurface + style="stop-color:#204a87;stop-opacity:1" /> + style="stop-color:#729fcf;stop-opacity:1" /> + style="stop-color:#71b2f8;stop-opacity:1;" /> + style="stop-color:#002795;stop-opacity:1;" /> - + x1="22.116516" + y1="55.717518" + x2="20" + y2="40" + gradientUnits="userSpaceOnUse" /> + id="linearGradient3767"> + id="stop3769" /> + id="stop3771" /> + x1="53.896763" + y1="51.179787" + x2="50" + y2="38" + gradientUnits="userSpaceOnUse" /> + id="linearGradient3777"> + id="stop3779" /> + id="stop3781" /> + x2="80.450974" + y1="66.59771" + x1="44.663254" + id="linearGradient5871" + xlink:href="#linearGradient3767" /> + y2="39.061024" + x2="70.759598" + y1="39.061024" + x1="44.690838" + id="linearGradient5903" + xlink:href="#linearGradient3777" /> + id="stop3684" /> + id="stop3686" /> - + id="stop3866-1" /> + id="stop3868-1" /> + style="stop-color:#a40000;stop-opacity:1" /> + style="stop-color:#ef2929;stop-opacity:1" /> - + fx="270.58316" + cy="33.899986" + cx="270.58316" + gradientTransform="matrix(1.2361257,0.30001695,-0.83232803,3.3883821,-499.9452,-167.33108)" + gradientUnits="userSpaceOnUse" + id="radialGradient3817-5-3" + xlink:href="#linearGradient3682-0-6" /> + style="stop-color:#ff390f;stop-opacity:1" /> + style="stop-color:#ff1000;stop-opacity:1;" /> - - - - - + y1="55.717518" + x2="20" + y2="40" + gradientUnits="userSpaceOnUse" /> + + + + + + + + + + + + + + y2="21.31134" + x2="17.328547" + y1="55.717518" + x1="22.116516" + id="linearGradient3773-5-2" + xlink:href="#linearGradient3767" + gradientTransform="matrix(0.26458333,0,0,0.26458333,-26.515029,-2.4294368)" /> + gradientUnits="userSpaceOnUse" + y2="21.83742" + x2="47.502235" + y1="51.179787" + x1="53.896763" + id="linearGradient3783-6-0" + xlink:href="#linearGradient3777" + gradientTransform="matrix(0.26458333,0,0,0.26458333,-26.515029,-2.4294368)" /> + + + + style="stop-color:#31a52e;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -294,53 +440,136 @@ image/svg+xml - + Part_ProjectionOnSurface + 2020-10-07 + + + [vocx] + + + + + CC-BY-SA 4.0 + + + + + FreeCAD + + + FreeCAD/src/Mod/Part/Gui/Resources/icons/Part_ProjectionOnSurface.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + Cube + letter + projection + surface + + + Based on the 'Tree_Part' icon, a big 'F' letter is superimposed on the frontal face of the cube. + + + Manuel Apeltauer [apeltauer] + + + + + + + + + + + + id="layer8"> + id="path2993-2" + d="M 1.8520833,1.8520885 13.493758,3.4395884 15.566482,2.5022023 5.4438008,1.2666927 Z" + style="fill:#729fcf;stroke:#0b1521;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" /> + id="path2995-7" + d="m 15.566482,2.5022023 -0.03543,10.0919637 -2.037289,0.899588 V 3.4395884 Z" + style="fill:url(#linearGradient3783-6);fill-opacity:1;stroke:#0b1521;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" /> + style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3773-5);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + d="M 1.8520833,1.8520885 13.493758,3.4395884 V 13.493754 l -11.6416747,-1.5875 z" + id="path3825-0" /> + id="path3765-9" + d="m 2.3812499,2.4944227 0.00229,8.9744313 10.5856351,1.394037 -0.0023,-8.9782678 z" + style="fill:none;stroke:#729fcf;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - - + id="path3775-3" + d="m 14.02315,3.8942338 -0.0032,8.8728812 0.993036,-0.458183 0.006,-8.9335723 z" + style="fill:none;stroke:#3465a4;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path1424" + d="M 11.227152,5.9928126 12.444273,5.1990626 5.8539056,3.9108724 4.2421522,4.61598" + style="fill:none;stroke:#202020;stroke-width:0.26458335;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.52916667, 0.52916667;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + + + + + +