From 6567b5cbb6dd687b301ab62cbaa009faf341737f Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 7 Feb 2020 13:30:32 +0100 Subject: [PATCH 01/15] Gui: also sort parameter groups in ascending order [skip ci] --- src/Gui/DlgParameter.ui | 10 ++++++++++ src/Gui/DlgParameterImp.cpp | 25 ++++++++++++++++++++++++- src/Gui/DlgParameterImp.h | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/Gui/DlgParameter.ui b/src/Gui/DlgParameter.ui index 761b9db7a5..1f2ff08707 100644 --- a/src/Gui/DlgParameter.ui +++ b/src/Gui/DlgParameter.ui @@ -36,6 +36,16 @@ 6 + + + + Sorted + + + true + + + diff --git a/src/Gui/DlgParameterImp.cpp b/src/Gui/DlgParameterImp.cpp index 5b169fa7bb..1ad8b1e75a 100644 --- a/src/Gui/DlgParameterImp.cpp +++ b/src/Gui/DlgParameterImp.cpp @@ -63,11 +63,18 @@ DlgParameterImp::DlgParameterImp( QWidget* parent, Qt::WindowFlags fl ) , ui(new Ui_DlgParameter) { ui->setupUi(this); - QStringList groupLabels; + ui->checkSort->setVisible(false); // for testing + + QStringList groupLabels; groupLabels << tr( "Group" ); paramGroup = new ParameterGroup(ui->splitter3); paramGroup->setHeaderLabels(groupLabels); paramGroup->setRootIsDecorated(false); +#if QT_VERSION >= 0x050000 + paramGroup->setSortingEnabled(true); + paramGroup->sortByColumn(0, Qt::AscendingOrder); + paramGroup->header()->setProperty("showSortIndicator", QVariant(true)); +#endif QStringList valueLabels; valueLabels << tr( "Name" ) << tr( "Type" ) << tr( "Value" ); @@ -77,6 +84,7 @@ DlgParameterImp::DlgParameterImp( QWidget* parent, Qt::WindowFlags fl ) #if QT_VERSION >= 0x050000 paramValue->header()->setSectionResizeMode(0, QHeaderView::Stretch); paramValue->setSortingEnabled(true); + paramValue->sortByColumn(0, Qt::AscendingOrder); paramValue->header()->setProperty("showSortIndicator", QVariant(true)); #else paramValue->header()->setResizeMode(0, QHeaderView::Stretch); @@ -144,6 +152,21 @@ void DlgParameterImp::changeEvent(QEvent *e) } } +void DlgParameterImp::on_checkSort_toggled(bool on) +{ +#if QT_VERSION >= 0x050000 + paramGroup->setSortingEnabled(on); + paramGroup->sortByColumn(0, Qt::AscendingOrder); + paramGroup->header()->setProperty("showSortIndicator", QVariant(on)); +#endif + +#if QT_VERSION >= 0x050000 + paramValue->setSortingEnabled(on); + paramValue->sortByColumn(0, Qt::AscendingOrder); + paramValue->header()->setProperty("showSortIndicator", QVariant(on)); +#endif +} + void DlgParameterImp::on_closeButton_clicked() { close(); diff --git a/src/Gui/DlgParameterImp.h b/src/Gui/DlgParameterImp.h index 2f86121ae2..fdea01bb3a 100644 --- a/src/Gui/DlgParameterImp.h +++ b/src/Gui/DlgParameterImp.h @@ -61,6 +61,7 @@ protected Q_SLOTS: void onGroupSelected(QTreeWidgetItem *); void on_closeButton_clicked(); + void on_checkSort_toggled(bool); protected: void changeEvent(QEvent *e); From 24ec114cb8757df290f39bb634a3ae644da3bfcb Mon Sep 17 00:00:00 2001 From: donovaly Date: Thu, 6 Feb 2020 01:26:10 +0100 Subject: [PATCH 02/15] remove program-specific SVG namespaces while fixing a SVG export issue for techDraw I noticed that some SVG files have program-dependent (and thus not clean) code in it. These are traces of the programs Sodipodi and Inkscape, like e.g. this line: inkscape:export-filename="/home/yorik/PartDesign_Groove.png This is unnecessary and FC should not use program-dependent code in the SVG but use instead plain SVG strictly following the SVG specification. This PR transforms the few affected SVGs to a plain version. --- .../Arch/Resources/icons/ArchWorkbench.svg | 672 +++---- .../Gui/Resources/icons/CompleteWorkbench.svg | 109 +- .../Draft/Resources/icons/DraftWorkbench.svg | 335 ++-- .../Gui/Resources/icons/DrawingWorkbench.svg | 535 +++-- .../Fem/Gui/Resources/icons/FemWorkbench.svg | 995 ++++++++-- .../Gui/Resources/icons/ImageWorkbench.svg | 420 ++-- .../Resources/icons/InspectionWorkbench.svg | 438 ++-- .../Gui/Resources/icons/MeshWorkbench.svg | 627 +++--- .../Resources/icons/OpenSCADWorkbench.svg | 587 +++++- .../Gui/Resources/icons/PartWorkbench.svg | 222 ++- .../Resources/icons/PartDesignWorkbench.svg | 445 +++-- .../PartDesign/WizardShaft/WizardShaft.svg | 973 ++++----- .../Gui/Resources/icons/PathWorkbench.svg | 596 ++++-- src/Mod/Path/Images/Tools/drill.svg | 319 ++- src/Mod/Path/Images/Tools/endmill.svg | 673 +++---- src/Mod/Path/Images/Tools/v-bit.svg | 755 +++---- .../Gui/Resources/icons/PointsWorkbench.svg | 157 +- .../Resources/icons/RaytracingWorkbench.svg | 513 ++--- .../icons/ReverseEngineeringWorkbench.svg | 921 +++------ .../Gui/Resources/icons/RobotWorkbench.svg | 323 ++- .../Gui/Resources/icons/SketcherWorkbench.svg | 315 ++- .../Resources/icons/SpreadsheetWorkbench.svg | 138 +- .../Gui/Resources/icons/StartWorkbench.svg | 132 +- .../StartPage/images/new_file_thumbnail.svg | 192 +- .../Gui/Resources/icons/TestWorkbench.svg | 200 +- .../Web/Gui/Resources/icons/WebWorkbench.svg | 1753 ++++++++--------- 26 files changed, 6799 insertions(+), 6546 deletions(-) diff --git a/src/Mod/Arch/Resources/icons/ArchWorkbench.svg b/src/Mod/Arch/Resources/icons/ArchWorkbench.svg index c55eabaa85..6f8e34c47a 100755 --- a/src/Mod/Arch/Resources/icons/ArchWorkbench.svg +++ b/src/Mod/Arch/Resources/icons/ArchWorkbench.svg @@ -1,6 +1,4 @@ - - + id="svg2816" + height="64px" + width="64px"> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> - - - - - - - - - - - - - - - - - + y1="-0.52792466" + x1="93.501396" + id="linearGradient3787" + xlink:href="#linearGradient3781" /> + + + + + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-3" + xlink:href="#linearGradient3789-5" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + y1="-0.52792466" + x1="93.501396" + gradientUnits="userSpaceOnUse" + id="linearGradient3804-36" + xlink:href="#linearGradient3781-0" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-6" + xlink:href="#linearGradient3789-1" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + y1="-0.52792466" + x1="93.501396" + gradientUnits="userSpaceOnUse" + id="linearGradient3804-2" + xlink:href="#linearGradient3781-8" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-36" + xlink:href="#linearGradient3789-12" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + y1="-0.52792466" + x1="93.501396" + gradientUnits="userSpaceOnUse" + id="linearGradient3804-5" + xlink:href="#linearGradient3781-03" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-63" + xlink:href="#linearGradient3789-2" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + y1="-0.52792466" + x1="93.501396" + gradientUnits="userSpaceOnUse" + id="linearGradient3804-9" + xlink:href="#linearGradient3781-3" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-5" + xlink:href="#linearGradient3789-4" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + y1="-0.52792466" + x1="93.501396" + gradientUnits="userSpaceOnUse" + id="linearGradient3804-8" + xlink:href="#linearGradient3781-84" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-4" + xlink:href="#linearGradient3789-9" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> - - - + id="radialGradient3169" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.32526,0,28.08607)" + cx="25.1875" + cy="41.625" + fx="25.1875" + fy="41.625" + r="18.0625" /> + offset="0" /> + offset="1" /> + id="radialGradient3027" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.32526,0,28.08607)" + cx="25.1875" + cy="41.625" + fx="25.1875" + fy="41.625" + r="18.0625" /> - - - @@ -511,7 +334,7 @@ image/svg+xml - + [triplus] @@ -541,126 +364,89 @@ + id="layer1"> + d="m 43.25,41.625 a 18.0625,5.875 0 1 1 -36.125,0 18.0625,5.875 0 1 1 36.125,0 z" + transform="matrix(1.6349796,0,0,1.0662685,-9.1810484,1.3522451)" + id="path2267" /> + transform="translate(-71.999999,3.9999969)" + id="g3797"> + d="m 82.146381,-7.6186648 23.470399,-2.1767614 0,12 -23.470399,2.1767615 z" + id="rect2840-3" /> + d="m 130.65607,112.26435 15.8371,4.33507 0,12 -15.8371,-4.33507 z" + id="rect2840-3-4-0" /> + id="rect2840-3-5" /> + id="path3009" /> + id="path3011" /> + transform="translate(-50,10)" + id="g3797-4"> + d="m 82.146381,-7.6186648 23.470399,-2.1767614 0,12 -23.470399,2.1767615 z" + id="rect2840-3-3" /> + d="m 130.65607,112.26435 15.8371,4.33507 0,12 -15.8371,-4.33507 z" + id="rect2840-3-4-0-0" /> + id="rect2840-3-5-7" /> + id="path3009-8" /> + id="path3011-6" /> + transform="translate(-61.000004,-5.0000014)" + id="g3797-6"> + d="m 82.146381,-7.6186648 23.470399,-2.1767614 0,12 -23.470399,2.1767615 z" + id="rect2840-3-8" /> + d="m 130.65607,112.26435 15.8371,4.33507 0,12 -15.8371,-4.33507 z" + id="rect2840-3-4-0-9" /> + id="rect2840-3-5-2" /> + id="path3009-6" /> + id="path3011-64" /> diff --git a/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg b/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg index 7865be2b97..5be7796e1e 100644 --- a/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg +++ b/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg @@ -1,6 +1,4 @@ - - + id="svg2989" + height="64" + width="64"> + style="stop-color:#c4a000;stop-opacity:1" /> + style="stop-color:#fce94f;stop-opacity:1" /> + x2="2.9672837" + y1="13.130123" + x1="8.2747869" + id="linearGradient3773" + xlink:href="#linearGradient3767" /> + y2="-9.1497173" + x2="15.07192" + y1="13.003332" + x1="-2.6557214" + id="linearGradient3773-7" + xlink:href="#linearGradient3767-4" /> + style="stop-color:#ff8d00;stop-opacity:1;" /> + style="stop-color:#fff000;stop-opacity:1;" /> - - - @@ -98,28 +61,20 @@ image/svg+xml - + + transform="translate(0,32)" + id="layer1"> + d="m 32,-29 c 0,0 4.925086,12.811302 8.961494,19.8000864 8.440078,0.9492735 20.038507,2.3539443 20.038507,2.3539443 0,0 -5.000454,4.9806248 -7.523802,7.49396506 -2.52335,2.51334264 -7.616292,7.58608884 -7.616292,7.58608884 0,0 0.549541,2.8086294 1.226719,6.2696154 C 47.763806,17.964686 49.922985,29 49.922985,29 c 0,0 -6.513844,-3.726583 -9.56694,-5.473264 -3.0531,-1.746685 -8.751643,-5.006834 -8.751643,-5.006834 0,0 -5.963387,3.565669 -8.884618,5.31235 C 19.798553,25.578938 14.077014,29 14.077014,29 c 0,0 1.657742,-9.358475 2.294172,-12.951327 0.636432,-3.592854 1.524412,-8.6057861 1.524412,-8.6057861 0,0 -4.22834,-4.0561077 -6.710937,-6.4375829 -2.4826013,-2.3814775 -8.1846612,-7.8512756 -8.1846612,-7.8512756 0,0 7.0833772,-0.8081066 12.2529842,-1.684563 5.169608,-0.8764543 8.425615,-1.1583674 8.425615,-1.1583674 z" + style="color:#000000;fill:url(#linearGradient3773);fill-opacity:1;fill-rule:nonzero;stroke:#3e2709;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="m 31.933023,-23.816732 c 0,0 4.446694,10.530732 7.926357,16.555546 7.27593,0.8183396 16.850384,1.8506563 16.850384,1.8506563 0,0 -4.042827,4.0480575 -6.218127,6.21473085 -2.175302,2.16667415 -6.632745,6.60670855 -6.632745,6.60670855 0,0 0.473741,2.8677493 1.057516,5.8513563 C 45.500183,16.245876 47.138287,25 47.138287,25 c 0,0 -5.347474,-2.989313 -7.979453,-4.495074 -2.631982,-1.505761 -7.499868,-4.226931 -7.499868,-4.226931 0,0 -5.185503,3.029202 -7.703805,4.534959 -2.518302,1.505766 -7.227405,4.276349 -7.227405,4.276349 0,0 1.429087,-7.933696 1.977735,-11.030982 0.548648,-3.097288 1.269497,-7.3294778 1.269497,-7.3294778 0,0 -3.890705,-3.8315319 -6.030876,-5.88452764 C 11.803939,-1.2086828 7.4018645,-5.3882065 7.4018645,-5.3882065 c 0,0 5.7937945,-0.8529261 10.2280285,-1.496861 4.434235,-0.6439348 7.419744,-0.931615 7.419744,-0.931615 z" + style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/src/Mod/Draft/Resources/icons/DraftWorkbench.svg b/src/Mod/Draft/Resources/icons/DraftWorkbench.svg index 8ec2468054..4e69418dd2 100644 --- a/src/Mod/Draft/Resources/icons/DraftWorkbench.svg +++ b/src/Mod/Draft/Resources/icons/DraftWorkbench.svg @@ -1,6 +1,4 @@ - - + id="svg2980" + height="64px" + width="64px"> + style="stop-color:#c4a000;stop-opacity:1" /> + style="stop-color:#fce94f;stop-opacity:1" /> + style="stop-color:#8f5902;stop-opacity:1" /> + style="stop-color:#e9b96e;stop-opacity:1" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + style="stop-color:#eeeeec;stop-opacity:1" /> + style="stop-color:#e9b96e;stop-opacity:1" /> + style="stop-color:#8f5902;stop-opacity:1" /> + osb:paint="solid" + id="linearGradient3786"> + style="stop-color:#a0eb07;stop-opacity:1;" /> + id="stop3866" /> + id="stop3868" /> - + style="stop-color:#ffaa00;stop-opacity:1;" /> + style="stop-color:#faff2b;stop-opacity:1;" /> + y2="63.578461" + x2="9.3772163" + y1="28.663757" + x1="5.1754909" + id="linearGradient3863" + xlink:href="#linearGradient3855" /> + x2="60.769054" + y1="31.552309" + x1="3.9825215" + id="linearGradient3861-4" + xlink:href="#linearGradient3855-2" + gradientTransform="translate(63.406413,58.258077)" /> + style="stop-color:#d07200;stop-opacity:1;" /> + style="stop-color:#fcb200;stop-opacity:1;" /> + x2="23.852976" + y1="31.552309" + x1="3.9825215" + id="linearGradient3863-2" + xlink:href="#linearGradient3855-2" /> + style="stop-color:#d07200;stop-opacity:1;" /> + style="stop-color:#fcb200;stop-opacity:1;" /> + - - - - + id="linearGradient3921" + xlink:href="#linearGradient3855-2" /> + + + + style="stop-color:#e9b96e;stop-opacity:1" /> + style="stop-color:#8f5902;stop-opacity:1" /> + x2="32" + y1="38" + x1="37" + id="linearGradient3896" + xlink:href="#linearGradient3890" /> - - - + id="layer1"> + height="58" + width="48" + id="rect3783" + style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="m 7,27 -4,4 0,24 4,4 4,0 0,-32 z" + style="fill:url(#linearGradient3863);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + height="54" + width="44" + id="rect3783-3" + style="fill:none;stroke:#ffffff;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="m 27,5 0,32 24,0 z m 6,18 6,8 -6,0 z" + style="fill:url(#linearGradient3896);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="M 8,29 5,31.85285 5,54.171675 7.8160622,57 9,57 9,29 z" + style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="M 57,39 55,45 5,50 5,39 z" + style="fill:url(#linearGradient3835);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="M 54.220725,41 53.465976,43.178411 6.9877375,47.816062 7,41 z" + style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="m 29,11 0,24 18,0 z" + style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> @@ -324,7 +247,7 @@ image/svg+xml - DraftWorkbench + Fri Feb 26 23:17:43 2016 +0100 diff --git a/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg b/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg index 495ed189f9..4325237e95 100644 --- a/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg +++ b/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg @@ -1,129 +1,406 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg - - - FreeCAD LGPL2+ - - - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg b/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg index ad797d7812..6a9892f841 100755 --- a/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg +++ b/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg @@ -1,112 +1,408 @@ - - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + - + image/svg+xml - - + + [triplus] @@ -135,125 +431,438 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + diff --git a/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg b/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg index e7a0a507b9..1f1259006c 100644 --- a/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg +++ b/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg @@ -1,243 +1,177 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg b/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg index d83fa47056..3578e95e4f 100644 --- a/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg +++ b/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg @@ -1,253 +1,185 @@ - - - - - mesh_pipette - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - mesh_pipette - - - - FreeCAD LGPL2+ - - - - - FreeCAD - - - FreeCAD/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - pipette - eyedropper - sample - - - Pipette or eyedropper lit from above - - - [agryson] Alexander Gryson - - - Sat Feb 8 16:10:16 2014 +0100 - - - [wmayer] - - - - - - - - - - - - - - - - - + + + mesh_pipette + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + mesh_pipette + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + FreeCAD/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + pipette + eyedropper + sample + + + Pipette or eyedropper lit from above + + + [agryson] Alexander Gryson + + + Sat Feb 8 16:10:16 2014 +0100 + + + [wmayer] + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg b/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg index 0b1f37eafd..d291b0dc19 100644 --- a/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg +++ b/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg @@ -1,367 +1,260 @@ - - - - - MeshWorkbench - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - MeshWorkbench - - - FreeCAD LGPL2+ - - - - - mesh - sphere - workbench - tessellated - - - - Tessellated sphere mesh, lit from top - - - [agryson] Alexander Gryson - - - - - - FreeCAD - - - - - [triplus] - - - Fri Feb 26 23:17:43 2016 +0100 - FreeCAD/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + MeshWorkbench + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + MeshWorkbench + + + FreeCAD LGPL2+ + + + + + mesh + sphere + workbench + tessellated + + + + Tessellated sphere mesh, lit from top + + + [agryson] Alexander Gryson + + + + + + FreeCAD + + + + + [triplus] + + + Fri Feb 26 23:17:43 2016 +0100 + FreeCAD/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg b/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg index 800057f750..c9d31ec7b3 100644 --- a/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg +++ b/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg @@ -1,111 +1,426 @@ - - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - + - - - - + - + image/svg+xml - - + + [triplus] @@ -134,26 +449,86 @@ - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg b/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg index f94d8ae993..745c93470e 100644 --- a/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg +++ b/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg @@ -1,70 +1,152 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - [triplus] - - - PartWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + [triplus] + + + + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg index b988862c2e..a140bc71cc 100644 --- a/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg +++ b/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg @@ -1,114 +1,331 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [triplus] - - - PartDesignWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [triplus] + + + PartDesignWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg index 26b81e1e61..98bba64cd7 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg +++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg @@ -1,6 +1,4 @@ - - + id="svg2901" + height="64px" + width="64px"> + id="stop3939" /> + style="stop-color:#ffff00;stop-opacity:1;" /> + id="stop3943" /> + id="stop3907" /> + style="stop-color:#ffff00;stop-opacity:1;" /> + id="stop3911" /> - - - - - + offset="0.40477183" + id="stop3901" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="linearGradient3863"> + id="stop3865" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="stop3869" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="linearGradient3074" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.44761712,-0.03974624,0.03968572,-0.44819769,-44.347622,90.842439)" + x1="42.373707" + y1="5.7974987" + x2="52.323219" + y2="22.675821" /> + x2="-12.91594" + y1="55.312195" + x1="-13.054209" + id="linearGradient3895" + xlink:href="#linearGradient3897" /> + x2="13.874617" + y1="48.438316" + x1="17.603668" + id="linearGradient3935" + xlink:href="#linearGradient3937" /> + x2="-13.508098" + y1="54.813248" + x1="-13.22155" + id="linearGradient3882" + xlink:href="#linearGradient3937" /> - @@ -563,73 +489,42 @@ + id="layer1"> - + + id="path3815-2-3-8" + 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" + transform="matrix(1.1357751,-0.74679771,0.75814626,1.1187739,6.8790101,-26.758312)" /> + 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" /> + id="path3815" + 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" + transform="matrix(0.83124933,-0.53551017,0.55487091,0.8022451,12.515187,-8.6993128)" /> + 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" /> - + + id="path3815-2-2" + 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" + transform="matrix(0.3792391,-0.25314756,0.25314756,0.3792391,8.8844614,24.305486)" /> diff --git a/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg b/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg index 75589dd3ea..67a8075a95 100644 --- a/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg +++ b/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg @@ -1,161 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - PathWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + PathWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Path/Images/Tools/drill.svg b/src/Mod/Path/Images/Tools/drill.svg index 1eb08e786e..2d149e62aa 100644 --- a/src/Mod/Path/Images/Tools/drill.svg +++ b/src/Mod/Path/Images/Tools/drill.svg @@ -1,166 +1,114 @@ - - + version="1.1" + viewBox="0 0 210 297" + height="297mm" + width="210mm"> + style="overflow:visible;"> - - - - - - - - - - - - + id="marker8663" + style="overflow:visible;"> + + + + refY="0.0" + refX="0.0" + id="marker8589" + style="overflow:visible"> + id="path8587" + 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:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1" + transform="scale(0.8) translate(12.5,0)" /> + style="overflow:visible;" + id="Arrow1Lend" + refX="0.0" + refY="0.0" + orient="auto"> + + + + + + + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + + + - - - @@ -174,107 +122,80 @@ + d="M 60.000001,36.999999 V 257 L 80,277.00001 100,257 V 36.999999 Z" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 60.000001,77 V 256.99999 L 80,277 100,256.99999 V 77 Z" + style="fill:#000000;fill-opacity:0.1372549;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 120,237 v 0 L 130,227 80,277.00001 30.000001,227 v 0 0" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path836" + style="opacity:1;fill:none;fill-opacity:0.1372549;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Lstart);marker-end:url(#Arrow1Lend)" /> + d="M 60.000001,36.999999 V 17 17" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 100,36.999999 V 17" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 100,77 h 50" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 80,277.00001 h 70" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 140,77 V 277.00001" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker8617);marker-end:url(#marker8709)" /> + d="m 100,27 h 30" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker8589)" /> H + x="145.48189" + id="tspan8765">H D - D + α + x="70.101288" + id="tspan8783">α + d="M 30,27 H 59.999999" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8663-8)" /> diff --git a/src/Mod/Path/Images/Tools/endmill.svg b/src/Mod/Path/Images/Tools/endmill.svg index dbf3e746fc..a3a43ee4ba 100644 --- a/src/Mod/Path/Images/Tools/endmill.svg +++ b/src/Mod/Path/Images/Tools/endmill.svg @@ -1,404 +1,294 @@ - - + version="1.1" + viewBox="0 0 210 297.00001" + height="297mm" + width="210mm"> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1183" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1179" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1175" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1171" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path920" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path917" /> + refX="0" + refY="0" + orient="auto"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path899" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path923" /> + refX="0" + refY="0" + orient="auto"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path908" /> + refX="0" + refY="0" + orient="auto"> + id="path7495" /> + refX="0" + refY="0" + orient="auto"> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path7377" /> + style="overflow:visible"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(-0.6)" /> + style="overflow:visible"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(-0.6)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -412,118 +302,95 @@ + transform="translate(0.19510138,82.181594)" + id="layer1"> + d="M 49.933333,-22.442786 V 68.899983 H 13 V 147.19377 H 160.73333 V 68.899983 H 123.8 v -91.342769 z" + style="fill:none;stroke:#000000;stroke-width:3.35350633px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="M 86.866667,-35.491751 V 160.24274" + style="fill:none;stroke:#000000;stroke-width:1.26746702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:10.13973638, 2.53493409, 1.26746704, 2.53493409;stroke-dashoffset:0;stroke-opacity:1" /> + d="M 49.933333,-22.442786 V -61.589682" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 123.8,-22.442786 V -61.589682" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 160.73333,186.34067 v -39.1469" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 49.933333,-48.540717 H 123.8" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1181);marker-end:url(#marker1185)" /> + d="M 13,173.2917 H 160.73333" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1173);marker-end:url(#marker1177)" /> S + x="78.952225" + id="tspan5678">S D - D + HH + y="164.02852" + x="185.94191" /> + d="m 13,186.34067 v -39.1469" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 173.04444,68.899983 V 147.19377" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#Arrow2Lend)" /> + d="m 160.73333,68.899983 h 24.62222" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 160.73333,147.19377 h 24.62222" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + height="78.293793" + width="147.73334" + id="rect1191" + style="fill:#000000;fill-opacity:0.1365314;stroke:#000025;stroke-width:0.82385355;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> diff --git a/src/Mod/Path/Images/Tools/v-bit.svg b/src/Mod/Path/Images/Tools/v-bit.svg index ca9991a01d..d1f4f22e25 100644 --- a/src/Mod/Path/Images/Tools/v-bit.svg +++ b/src/Mod/Path/Images/Tools/v-bit.svg @@ -1,407 +1,294 @@ - - + version="1.1" + viewBox="0 0 210 297" + height="297mm" + width="210mm"> + style="overflow:visible"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(1.1,0,0,1.1,1.1,0)" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path4878" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path4730" /> + style="overflow:visible"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path4326" /> + style="overflow:visible"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(1.1,0,0,1.1,1.1,0)" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path3946" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000025;fill-opacity:1;fill-rule:evenodd;stroke:#000025;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path920" /> + refX="0" + refY="0" + orient="auto"> - - - + id="path917" /> + + + + refX="0" + refY="0" + orient="auto"> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path7377" /> + style="overflow:visible"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(-0.6)" /> + style="overflow:visible"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(-0.6)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -410,187 +297,143 @@ image/svg+xml - + + transform="translate(-2.9715041,189.05423)" + id="layer1"> + d="M 16.482124,-35.533338 H 161.08374 l -60.25067,63.90854 H 76.732798 Z" + style="fill:#000000;fill-opacity:0.1372549;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 52.632531,-125.00529 v 89.471952 H 16.482124 l 60.250677,63.90854 h 24.100269 l 60.25067,-63.90854 h -36.15041 v -89.471952 z" + style="fill:none;stroke:#000000;stroke-width:3.28361988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="M 88.782934,-137.787 V 41.156909" + style="fill:none;stroke:#000000;stroke-width:1.24105322;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:9.9284259, 2.48210647, 1.24105325, 2.48210647;stroke-dashoffset:0;stroke-opacity:1" /> + d="m 52.632531,-125.00529 v -38.34513" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 124.93333,-125.00529 v -38.34513" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + transform="matrix(12.050135,0,0,12.781708,4.431989,-176.13213)" + id="g7053"> + d="m 8,16 v 2" + id="path4536" /> + d="M 161.08374,79.502035 V -35.533338" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 52.632531,-150.56871 H 124.93333" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4186);marker-end:url(#marker4584)" /> + d="m 100.83307,44.466662 v 0 h 24.10026" + style="fill:none;stroke:#000000;stroke-width:0.65865523;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4732)" /> + d="M 16.482124,66.720326 H 161.08374" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker3948);marker-end:url(#marker4328)" /> S + x="81.176964" + id="tspan5678">S D + x="78.339798" + id="tspan5690">D + d="M 13.451117,38.457364 A 76.688599,72.377235 0 0 1 12.422369,139.63833" + id="path5698" + style="fill:none;fill-opacity:1;stroke:#000025;stroke-width:0.80668473;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#Arrow2Lend)" /> α - α + d + x="28.921215" + id="tspan10475">d + d="m 50.833067,44.466662 v 0 h 24.100267" + style="fill:none;stroke:#000000;stroke-width:0.65865511;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4880)" /> + id="g7053-6" + transform="matrix(12.050135,0,0,12.781708,-19.668283,-176.13213)"> + d="m 8,16 v 2" + id="path4536-1" /> + d="M 16.482124,79.502035 V -35.533338" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 160.33172,-35.533338 24.60161,0" + style="fill:none;stroke:#000000;stroke-width:0.68599999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 100.93333,28.466662 84,0" + style="fill:none;stroke:#000000;stroke-width:0.75753552;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 174.93333,28.466662 0,-64" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7593);marker-end:url(#marker5072)" /> H + id="tspan7855">H diff --git a/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg b/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg index 655ee72326..baf553d109 100644 --- a/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg +++ b/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg @@ -1,51 +1,106 @@ - - - - - - image/svg+xml - - - - $committer - - - PointsWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + $committer + + + + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg b/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg index 0d9c78ef36..0dacc1d718 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg @@ -1,306 +1,207 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - $committer - - - RaytracingWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + $committer + + + RaytracingWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + diff --git a/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg b/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg index 875408b268..08482c6463 100644 --- a/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg +++ b/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg @@ -1,612 +1,309 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg b/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg index 08691975f2..63eee96477 100644 --- a/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg +++ b/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg @@ -1,90 +1,233 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [triplus] - - - RobotWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [triplus] + + + RobotWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg b/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg index b84b01837d..95d9a6a2d8 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg @@ -1,190 +1,125 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [triplus] - - - SketcherWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [triplus] + + + SketcherWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg index 85c337b618..ca6cea97bd 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg @@ -1,30 +1,87 @@ - - - - - - + + + + + - - - - - + + + + + - - - + + - - - - + - + image/svg+xml - - + + [triplus] @@ -53,12 +110,37 @@ - - - - - - - + + + + + + + diff --git a/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg b/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg index c5583b64dd..4227f68e0b 100644 --- a/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg +++ b/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg @@ -1,6 +1,4 @@ - - + height="64px" + width="64px"> + id="stop3796" /> + id="stop3798" /> + style="stop-color:#0619c0;stop-opacity:1;" /> + style="stop-color:#379cfb;stop-opacity:1;" /> - + xlink:href="#linearGradient3841" /> - + + x2="3935.5251" + y1="1286.7291" + x1="3709.3296" + gradientUnits="userSpaceOnUse" + id="linearGradient2991-3" + xlink:href="#linearGradient3841-6" /> + style="stop-color:#0619c0;stop-opacity:1;" /> + style="stop-color:#379cfb;stop-opacity:1;" /> - - - @@ -163,20 +117,14 @@ + id="layer1"> + d="M 61,31 31,5 l 0,14 -24,0 0,24 24,0 0,14 z" + style="fill:url(#linearGradient2991);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="M 58,31 33.012263,9.3801382 33,21 9,21 l 0,20 24,0 0,11.600864 z" + style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/src/Mod/Start/StartPage/images/new_file_thumbnail.svg b/src/Mod/Start/StartPage/images/new_file_thumbnail.svg index d5250e9658..e1b1dfe3c1 100644 --- a/src/Mod/Start/StartPage/images/new_file_thumbnail.svg +++ b/src/Mod/Start/StartPage/images/new_file_thumbnail.svg @@ -1,6 +1,4 @@ - - + height="128" + width="128"> + style="stop-color:black;stop-opacity:0;" /> + id="stop5056" /> + style="stop-color:black;stop-opacity:0;" /> + style="stop-color:#000000;stop-opacity:1;" /> + style="stop-color:#000000;stop-opacity:0;" /> + r="15.821514" + fy="42.07798" + fx="24.306795" + cy="42.07798" + cx="24.306795" + id="radialGradient4548" + xlink:href="#linearGradient4542" /> + style="stop-color:#ffffff;stop-opacity:1.0000000;" /> + style="stop-color:#f8f8f8;stop-opacity:1.0000000;" /> + cy="64.567902" + r="5.257" + fx="20.892099" + fy="64.567902" + gradientUnits="userSpaceOnUse"> + id="stop15573" /> + id="stop15575" /> + cy="114.5684" + r="5.256" + fx="20.892099" + fy="114.5684" + gradientUnits="userSpaceOnUse"> + id="stop15566" /> + id="stop15568" /> + style="stop-color:#a3a3a3;stop-opacity:1.0000000;" /> + style="stop-color:#4c4c4c;stop-opacity:1.0000000;" /> + style="stop-color:#fafafa;stop-opacity:1.0000000;" /> + style="stop-color:#bbbbbb;stop-opacity:1.0000000;" /> + style="stop-color:#ffffff;stop-opacity:1.0000000;" /> + style="stop-color:#fff520;stop-opacity:0.89108908;" /> + style="stop-color:#fff300;stop-opacity:0.0000000;" /> - @@ -173,7 +139,7 @@ image/svg+xml - New Document + Jakub Steiner @@ -201,35 +167,29 @@ + transform="translate(0,80)" + id="layer6" /> + id="layer1" /> + id="layer4"> + y="-80" + x="0" + height="128" + width="128" + id="rect911" + style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.05882353;fill-rule:evenodd;stroke:none;stroke-width:7.5590539;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + d="M 63.939453 24 A 4.0004 4.0004 0 0 0 60 28.056641 L 60 60 L 28.056641 60 A 4.0004 4.0004 0 1 0 28.056641 68 L 60 68 L 60 99.943359 A 4.0004 4.0004 0 1 0 68 99.943359 L 68 68 L 99.943359 68 A 4.0004 4.0004 0 1 0 99.943359 60 L 68 60 L 68 28.056641 A 4.0004 4.0004 0 0 0 63.939453 24 z " + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.3137255;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> diff --git a/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg b/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg index 9e278806e9..cb76960ed2 100644 --- a/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg +++ b/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg @@ -1,6 +1,4 @@ - - + id="svg2" + height="64" + width="64"> + style="stop-color:#555753;stop-opacity:1" /> + style="stop-color:#babdb6;stop-opacity:1" /> + style="stop-color:#888a85;stop-opacity:1" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + style="stop-color:#888a85;stop-opacity:1" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + style="stop-color:#8f5902;stop-opacity:1" /> + style="stop-color:#e9b96e;stop-opacity:1" /> + x2="29.677343" + y1="56.068802" + x1="34.94899" + id="linearGradient3789" + xlink:href="#linearGradient3783" /> + x2="43.3125" + y1="22.874998" + x1="48.625" + id="linearGradient3815" + xlink:href="#linearGradient3809" /> + x2="35.803085" + y1="11.473497" + x1="38.244366" + id="linearGradient3841" + xlink:href="#linearGradient3835" /> + x2="51.800217" + y1="28.469421" + x1="52.817749" + id="linearGradient3867" + xlink:href="#linearGradient3861" /> - - - @@ -140,72 +97,49 @@ image/svg+xml - + + transform="translate(0,-988.36218)" + id="layer1"> + d="M 3,53 39,17 45,23 9,59 z" + style="fill:url(#linearGradient3789);stroke:#271903;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" /> + d="m 5.8481613,1041.3622 33.2277577,-33.2657 3.392646,2.981 -33.4495852,33.4555 z" + style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="m 53,19 c 1,1 3,1 4,0 l 4,4 -10,10 -4,-4 c 1,-1 1,-3 0,-4 z" + style="fill:url(#linearGradient3867);stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" /> + d="M 49,10 C 36,3 30,3 17,13 28,10 32,10 37,14 z" + style="fill:url(#linearGradient3841);stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" /> + d="m 46,999.36218 c -7.177936,-4.84816 -15.442467,-4.8363 -19.734282,-1.92408 8.810201,-1.5694 12.213523,4.8719 15.163701,5.5563 z" + style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:58.79999923999999800;stroke-opacity:1;stroke-dasharray:none" /> + d="m 51.993137,1009.0401 c 1.187891,0.9195 2.745311,1.4563 4.631081,0.7784 l 1.536831,1.5303 -7.134207,7.161 -1.530274,-1.4766 c 0.610798,-1.3489 -0.01342,-3.5973 -0.812109,-4.6376 z" + style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:url(#linearGradient3815);fill-opacity:1;stroke:#2e3436;stroke-width:2.12500000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000000" /> + id="path2989-7" + style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.83333302000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000000" /> diff --git a/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg b/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg index cb1cb2822c..22fbb87c40 100644 --- a/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg +++ b/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg @@ -1,6 +1,4 @@ - - + height="64" + width="64"> + style="stop-color:#4e9a06;stop-opacity:1" /> + style="stop-color:#8ae234;stop-opacity:1" /> - + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#fefefe;stop-opacity:1.0000000;" /> + style="stop-color:#1d1d1d;stop-opacity:1.0000000;" /> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:#ffffff;stop-opacity:1.0000000;" /> + style="stop-color:#ffffff;stop-opacity:0.16494845;" /> + style="stop-color:#000000;stop-opacity:1;" /> + style="stop-color:#000000;stop-opacity:0;" /> + style="stop-color:#d3e9ff;stop-opacity:1.0000000;" /> + style="stop-color:#d3e9ff;stop-opacity:1.0000000;" /> + style="stop-color:#4074ae;stop-opacity:1.0000000;" /> + style="stop-color:#36486c;stop-opacity:1.0000000;" /> + fy="15.716079" + fx="18.247644" + cy="15.716079" + cx="18.247644" + gradientTransform="matrix(1.3888978,0,0,1.3889284,-2.124907,-18.68781)" + id="radialGradient3968" + xlink:href="#linearGradient3962" /> + fy="63.965389" + fx="15.115514" + cy="63.965389" + cx="15.115514" + gradientTransform="scale(1.64399,0.608276)" + id="radialGradient4120" + xlink:href="#linearGradient4114" /> + fy="12.142302" + fx="15.601279" + cy="12.142302" + cx="15.601279" + gradientTransform="matrix(1.3582501,0,0,1.3582491,-1.3715663,-17.89974)" + id="radialGradient4132" + xlink:href="#linearGradient4126" /> + fy="10.476453" + fx="11.826907" + cy="10.476453" + cx="11.826907" + gradientTransform="scale(1.179536,0.847791)" + id="radialGradient4356" + xlink:href="#linearGradient4350" /> + x2="21.962091" + y1="38.552639" + x1="29.357769" + id="linearGradient3908" + xlink:href="#linearGradient3902" /> + x2="14.566413" + y1="36.323967" + x1="31.576473" + id="linearGradient3908-3" + xlink:href="#linearGradient3902-6" /> + style="stop-color:#4e9a06;stop-opacity:1" /> + style="stop-color:#8ae234;stop-opacity:1" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + id="linearGradient4365" + gradientUnits="userSpaceOnUse" + x1="31.576473" + y1="36.323967" + x2="14.566413" + y2="9.5799379" /> + id="filter4864" + color-interpolation-filters="sRGB"> + result="result6" /> - + + operator="atop" + in2="SourceAlpha" + in="result8" /> + style="stop-color:#4e9a06;stop-opacity:1" /> + style="stop-color:#8ae234;stop-opacity:1" /> + id="linearGradient4363-9" + gradientUnits="userSpaceOnUse" + x1="31.576473" + y1="36.323967" + x2="14.566413" + y2="9.5799379" /> + fy="15.716079" + fx="18.247644" + cy="15.716079" + cx="18.247644" + gradientTransform="matrix(1.3888978,0,0,1.3889284,-2.124907,-18.68781)" + id="radialGradient3968-4" + xlink:href="#linearGradient3962-7" /> + style="stop-color:#d3e9ff;stop-opacity:1.0000000;" /> + style="stop-color:#d3e9ff;stop-opacity:1.0000000;" /> + style="stop-color:#4074ae;stop-opacity:1.0000000;" /> + style="stop-color:#36486c;stop-opacity:1.0000000;" /> - - - @@ -1024,7 +882,7 @@ image/svg+xml - Globe + Jakub Steiner @@ -1061,402 +919,359 @@ + transform="translate(0,16)" + id="layer1"> + id="path4112" + style="fill:url(#radialGradient4120);fill-opacity:1;stroke:none;stroke-width:1.29144747" /> + d="M 58.931509,13.931507 C 58.931509,28.806375 46.872822,40.864925 32,40.864925 17.125816,40.864925 5.0678105,28.806239 5.0678105,13.931507 5.0678105,-0.94267845 17.125816,-13 32,-13 c 14.872822,0 26.931509,12.05732155 26.931509,26.931507 l 0,0 z" + style="fill:url(#radialGradient3968);fill-opacity:1;fill-rule:nonzero;stroke:#39396c;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1" /> + id="path4348" + style="opacity:0.42159382000000001;fill:url(#radialGradient4356);fill-opacity:1;stroke:none;stroke-width:1.57495408" /> + id="g3216-2"> + style="color:#000000;fill:url(#linearGradient4289);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3218-9"> + style="color:#000000;fill:url(#linearGradient4287);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3222-1"> + id="path3224-2" + d="m 44.0713,20.7144 c 0,0.2627 0,0 0,0 l -0.5449,0.6172 c -0.334,-0.3936 -0.709,-0.7246 -1.0898,-1.0703 l -0.8359,0.123 -0.7637,-0.8633 0,1.0684 0.6543,0.4951 0.4355,0.4932 0.582,-0.6582 c 0.1465,0.2744 0.291,0.5488 0.4365,0.8232 l 0,0.8223 -0.6553,0.7402 -1.1992,0.8232 -0.9082,0.9063 -0.582,-0.6602 0.291,-0.7402 -0.5811,-0.6582 -0.9814,-2.0977 -0.8359,-0.9453 -0.2188,0.2461 0.3281,1.1934 0.6172,0.6992 c 0.3525,1.0176 0.7012,1.9902 1.1641,2.9629 0.7178,0 1.3945,-0.0762 2.1074,-0.166 l 0,0.5762 -0.8721,2.1392 -0.7998,0.9043 -0.6543,1.4004 c 0,0.7676 0,1.5352 0,2.3027 l 0.2188,0.9063 -0.3633,0.4102 -0.8008,0.4941 -0.8359,0.6992 0.6914,0.7813 -0.9453,0.8242 0.1816,0.5332 -1.418,1.6055 -0.9443,0 -0.7998,0.4941 -0.5098,0 0,-0.6582 -0.2168,-1.3184 c -0.2813,-0.8262 -0.5742,-1.6465 -0.8721,-2.4668 0,-0.6055 0.0361,-1.2051 0.0723,-1.8105 l 0.3643,-0.8223 -0.5098,-0.9883 0.0371,-1.3574 -0.6914,-0.7813 0.3457,-1.1309 -0.5625,-0.6382 -0.9824,0 -0.3271,-0.3701 -0.9814,0.6177 -0.3994,-0.4536 -0.9092,0.7817 c -0.6172,-0.6997 -1.2354,-1.3989 -1.8535,-2.0981 l -0.7266,-1.7285 0.6543,-0.9863 -0.3633,-0.4111 0.7988,-1.8936 c 0.6563,-0.8164 1.3418,-1.5996 2.0352,-2.3857 l 1.2363,-0.3291 1.3809,-0.1641 0.9453,0.2471 1.3447,1.3564 0.4727,-0.5342 0.6533,-0.082 1.2363,0.4111 0.9453,0 0.6543,-0.5762 0.291,-0.4111 -0.6553,-0.4111 -1.0908,-0.082 c -0.3027,-0.4199 -0.584,-0.8613 -0.9434,-1.2344 l -0.3643,0.1641 -0.1455,1.0703 -0.6543,-0.7402 -0.1445,-0.8242 -0.7266,-0.5742 -0.292,0 0.7275,0.8223 -0.291,0.7402 -0.5811,0.1641 0.3633,-0.7402 -0.6553,-0.3281 -0.5801,-0.6582 -1.0918,0.2461 -0.1445,0.3281 -0.6543,0.4121 -0.3633,0.9053 -0.9082,0.4521 -0.4004,-0.4521 -0.4355,0 0,-1.4814 0.9453,-0.4941 0.7266,0 -0.1465,-0.5752 -0.5801,-0.5762 0.9805,-0.2061 0.5449,-0.6162 0.4355,-0.7412 0.8008,0 -0.2188,-0.5752 0.5098,-0.3291 0,0.6582 1.0898,0.2461 1.0898,-0.9043 0.0732,-0.4121 0.9443,-0.6577 c -0.3418,0.0425 -0.6836,0.0737 -1.0176,0.1646 l 0,-0.7411 0.3633,-0.8228 -0.3633,0 -0.7984,0.7402 -0.2188,0.4116 0.2188,0.5767 -0.3643,0.9863 -0.5811,-0.3291 -0.5078,-0.5752 -0.8008,0.5752 -0.291,-1.3159 1.3809,-0.9048 0,-0.4941 0.873,-0.5757 1.3809,-0.3296 0.9453,0.3296 1.7441,0.3291 -0.4355,0.4932 -0.9453,0 0.9453,0.9873 0.7266,-0.8223 0.2207,-0.3618 c 0,0 2.7871,2.498 4.3799,5.2305 1.5928,2.7334 2.3408,5.9551 2.3408,6.6094 z" /> + style="color:#000000;fill:url(#linearGradient4295);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3226-7"> + style="color:#000000;fill:url(#linearGradient4293);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3230-0"> + id="path3232-9" + d="m 26.0703,9.2363 -0.0732,0.4932 0.5098,0.3291 0.8711,-0.5757 -0.4355,-0.4937 -0.582,0.3296 -0.29,-0.0825" /> + style="color:#000000;fill:url(#linearGradient4301);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3234-3"> + style="color:#000000;fill:url(#linearGradient4299);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3238-6"> + id="path3240-0" + d="m 26.8701,5.8633 -1.8906,-0.7407 -2.1797,0.2466 -2.6904,0.7402 -0.5088,0.4941 1.6719,1.1514 0,0.6582 -0.6543,0.6582 0.873,1.729 0.5801,-0.3301 0.7285,-1.1514 c 1.123,-0.3472 2.1299,-0.7407 3.1973,-1.2344 l 0.873,-2.2212" /> + style="color:#000000;fill:url(#linearGradient4307);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3242-6"> + style="color:#000000;fill:url(#linearGradient4305);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3246-2"> + id="path3248-6" + d="m 28.833,12.7749 -0.291,-0.7412 -0.5098,0.165 0.1465,0.9043 0.6543,-0.3281" /> + style="color:#000000;fill:url(#linearGradient4313);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3250-1"> + style="color:#000000;fill:url(#linearGradient4311);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3254-8"> + id="path3256-7" + d="m 29.123,12.6089 -0.1455,0.9883 0.7998,-0.165 0.5811,-0.5752 -0.5088,-0.4941 C 29.6787,11.9078 29.4824,11.483 29.2685,11.0465 l -0.4355,0 0,0.4932 0.29,0.3291 0,0.7402" /> + style="color:#000000;fill:url(#linearGradient4319);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3258-9"> + style="color:#000000;fill:url(#linearGradient4317);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3262-2"> + id="path3264-0" + d="m 18.3652,28.2422 -0.582,-1.1523 -1.0903,-0.2466 -0.5815,-1.5625 -1.4536,0.1641 -1.2354,-0.9043 -1.3091,1.1514 0,0.1816 c -0.396,-0.1143 -0.8828,-0.1299 -1.2354,-0.3467 l -0.291,-0.8223 0,-0.9053 -0.8721,0.082 c 0.0728,-0.5762 0.145,-1.1514 0.2183,-1.7275 l -0.5093,0 -0.5083,0.6582 -0.5093,0.2461 -0.7271,-0.4102 -0.0728,-0.9053 0.1455,-0.9873 1.0908,-0.8223 0.8721,0 0.145,-0.4941 1.0903,0.2461 0.7998,0.9883 0.1455,-1.6465 1.3813,-1.1514 0.5088,-1.2344 1.0176,-0.4111 0.5815,-0.8223 1.3081,-0.248 0.6548,-0.9863 c -0.6543,0 -1.3086,0 -1.9629,0 l 1.2358,-0.5762 0.8716,0 1.2363,-0.4121 0.1455,-0.4922 -0.4365,-0.4121 -0.5088,-0.165 0.1455,-0.4932 -0.3633,-0.7402 -0.8726,0.3281 0.1455,-0.6577 -1.0176,-0.5762 -0.7993,1.3979 0.0723,0.4941 -0.7993,0.3301 -0.5093,1.0693 -0.2178,-0.9873 -1.3813,-0.5762 -0.2183,-0.7402 1.8174,-1.0703 0.7998,-0.7402 0.0728,-0.9048 -0.436,-0.2471 -0.5815,-0.0825 -0.3633,0.9053 c 0,0 -0.6079,0.1191 -0.7642,0.1577 -1.9961,1.8394 -6.0293,5.8101 -6.9663,13.3062 0.0371,0.1738 0.6792,1.1816 0.6792,1.1816 l 1.5264,0.9043 1.5264,0.4121 0.6548,0.8232 1.0171,0.7402 0.5815,-0.082 0.436,0.1963 0,0.1328 -0.5811,1.563 -0.4365,0.6582 0.1455,0.3301 -0.3633,1.2324 1.3086,2.3867 1.3081,1.1523 0.582,0.8223 -0.0732,1.7285 0.4365,0.9863 -0.4365,1.8926 c 0,0 -0.0342,-0.0117 0.0215,0.1777 0.0562,0.1895 2.3291,1.4512 2.4736,1.3438 0.144,-0.1094 0.2671,-0.2051 0.2671,-0.2051 l -0.145,-0.4102 0.5811,-0.5762 0.2183,-0.5762 0.9453,-0.3301 0.7266,-1.8105 -0.2178,-0.4922 0.5078,-0.7402 1.0908,-0.248 0.582,-1.3164 -0.1455,-1.6445 0.8721,-1.2344 0.1455,-1.2344 C 20.7331,29.4607 19.5495,28.8513 18.365,28.242" /> + style="color:#000000;fill:url(#linearGradient4325);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3266-2"> + style="color:#000000;fill:url(#linearGradient4323);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3270-3"> + id="path3272-7" + d="m 16.7656,9.5649 0.7266,0.4937 0.582,0 0,-0.5757 -0.7266,-0.3291 -0.582,0.4111" /> + style="color:#000000;fill:url(#linearGradient4331);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3274-5"> + style="color:#000000;fill:url(#linearGradient4329);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3278-9"> + id="path3280-2" + d="m 14.876,8.9072 -0.3638,0.9048 0.7271,0 0.3638,-0.8228 C 15.9166,8.7675 16.2286,8.5444 16.5479,8.331 l 0.7271,0.2471 c 0.4844,0.3291 0.9688,0.6582 1.4536,0.9868 L 19.4561,8.9072 18.6558,8.5781 18.292,7.8374 16.9111,7.6728 16.8383,7.2612 16.184,7.4262 15.8936,8.002 15.5298,7.2613 l -0.145,0.3291 0.0728,0.8228 -0.5816,0.494" /> + style="color:#000000;fill:url(#linearGradient4341);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3282-2"> + id="g3284-8" + style="opacity:0.75000000000000000;color:#000000;fill:url(#linearGradient4335);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"> + style="color:#000000;fill:url(#linearGradient4333);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + d="" /> + style="color:#000000;fill:url(#linearGradient4339);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3288-7"> + id="path3290-3" + d="" /> + style="color:#000000;fill:url(#linearGradient4351);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3292-6"> + id="g3294-1" + style="opacity:0.75000000000000000;color:#000000;fill:url(#linearGradient4345);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"> + style="color:#000000;fill:url(#linearGradient4343);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + d="" /> + style="color:#000000;fill:url(#linearGradient4349);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3298-9"> + id="path3300-3" + d="" /> + style="color:#000000;fill:url(#linearGradient4357);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3302-1"> + style="color:#000000;fill:url(#linearGradient4355);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3306-9"> + id="path3308-4" + d="M 17.4922,6.8496 17.856,6.521 18.5831,6.3564 c 0.498,-0.2422 0.998,-0.4053 1.5264,-0.5762 l -0.29,-0.4937 -0.9385,0.1348 -0.4434,0.4419 -0.731,0.106 -0.6499,0.3052 -0.3159,0.1528 -0.1929,0.2583 0.9443,0.1641" /> + style="color:#000000;fill:url(#linearGradient4363);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3310-7"> + style="color:#000000;fill:url(#linearGradient4361);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3314-8"> + id="path3316-4" + d="m 18.7285,14.6665 0.4365,-0.6582 -0.6548,-0.4932 0.2183,1.1514" /> + id="g3216"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3218"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3222"> + d="m 44.0713,20.7144 c 0,0.2627 0,0 0,0 l -0.5449,0.6172 c -0.334,-0.3936 -0.709,-0.7246 -1.0898,-1.0703 l -0.8359,0.123 -0.7637,-0.8633 0,1.0684 0.6543,0.4951 0.4355,0.4932 0.582,-0.6582 c 0.1465,0.2744 0.291,0.5488 0.4365,0.8232 l 0,0.8223 -0.6553,0.7402 -1.1992,0.8232 -0.9082,0.9063 -0.582,-0.6602 0.291,-0.7402 -0.5811,-0.6582 -0.9814,-2.0977 -0.8359,-0.9453 -0.2188,0.2461 0.3281,1.1934 0.6172,0.6992 c 0.3525,1.0176 0.7012,1.9902 1.1641,2.9629 0.7178,0 1.3945,-0.0762 2.1074,-0.166 l 0,0.5762 -0.8721,2.1392 -0.7998,0.9043 -0.6543,1.4004 c 0,0.7676 0,1.5352 0,2.3027 l 0.2188,0.9063 -0.3633,0.4102 -0.8008,0.4941 -0.8359,0.6992 0.6914,0.7813 -0.9453,0.8242 0.1816,0.5332 -1.418,1.6055 -0.9443,0 -0.7998,0.4941 -0.5098,0 0,-0.6582 -0.2168,-1.3184 c -0.2813,-0.8262 -0.5742,-1.6465 -0.8721,-2.4668 0,-0.6055 0.0361,-1.2051 0.0723,-1.8105 l 0.3643,-0.8223 -0.5098,-0.9883 0.0371,-1.3574 -0.6914,-0.7813 0.3457,-1.1309 -0.5625,-0.6382 -0.9824,0 -0.3271,-0.3701 -0.9814,0.6177 -0.3994,-0.4536 -0.9092,0.7817 c -0.6172,-0.6997 -1.2354,-1.3989 -1.8535,-2.0981 l -0.7266,-1.7285 0.6543,-0.9863 -0.3633,-0.4111 0.7988,-1.8936 c 0.6563,-0.8164 1.3418,-1.5996 2.0352,-2.3857 l 1.2363,-0.3291 1.3809,-0.1641 0.9453,0.2471 1.3447,1.3564 0.4727,-0.5342 0.6533,-0.082 1.2363,0.4111 0.9453,0 0.6543,-0.5762 0.291,-0.4111 -0.6553,-0.4111 -1.0908,-0.082 c -0.3027,-0.4199 -0.584,-0.8613 -0.9434,-1.2344 l -0.3643,0.1641 -0.1455,1.0703 -0.6543,-0.7402 -0.1445,-0.8242 -0.7266,-0.5742 -0.292,0 0.7275,0.8223 -0.291,0.7402 -0.5811,0.1641 0.3633,-0.7402 -0.6553,-0.3281 -0.5801,-0.6582 -1.0918,0.2461 -0.1445,0.3281 -0.6543,0.4121 -0.3633,0.9053 -0.9082,0.4521 -0.4004,-0.4521 -0.4355,0 0,-1.4814 0.9453,-0.4941 0.7266,0 -0.1465,-0.5752 -0.5801,-0.5762 0.9805,-0.2061 0.5449,-0.6162 0.4355,-0.7412 0.8008,0 -0.2188,-0.5752 0.5098,-0.3291 0,0.6582 1.0898,0.2461 1.0898,-0.9043 0.0732,-0.4121 0.9443,-0.6577 c -0.3418,0.0425 -0.6836,0.0737 -1.0176,0.1646 l 0,-0.7411 0.3633,-0.8228 -0.3633,0 -0.7984,0.7402 -0.2188,0.4116 0.2188,0.5767 -0.3643,0.9863 -0.5811,-0.3291 -0.5078,-0.5752 -0.8008,0.5752 -0.291,-1.3159 1.3809,-0.9048 0,-0.4941 0.873,-0.5757 1.3809,-0.3296 0.9453,0.3296 1.7441,0.3291 -0.4355,0.4932 -0.9453,0 0.9453,0.9873 0.7266,-0.8223 0.2207,-0.3618 c 0,0 2.7871,2.498 4.3799,5.2305 1.5928,2.7334 2.3408,5.9551 2.3408,6.6094 z" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3226"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3230"> + d="m 26.0703,9.2363 -0.0732,0.4932 0.5098,0.3291 0.8711,-0.5757 -0.4355,-0.4937 -0.582,0.3296 -0.29,-0.0825" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3234"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3238"> + d="m 26.8701,5.8633 -1.8906,-0.7407 -2.1797,0.2466 -2.6904,0.7402 -0.5088,0.4941 1.6719,1.1514 0,0.6582 -0.6543,0.6582 0.873,1.729 0.5801,-0.3301 0.7285,-1.1514 c 1.123,-0.3472 2.1299,-0.7407 3.1973,-1.2344 l 0.873,-2.2212" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3242"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3246"> + d="m 28.833,12.7749 -0.291,-0.7412 -0.5098,0.165 0.1465,0.9043 0.6543,-0.3281" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3250"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3254"> + d="m 29.123,12.6089 -0.1455,0.9883 0.7998,-0.165 0.5811,-0.5752 -0.5088,-0.4941 C 29.6787,11.9078 29.4824,11.483 29.2685,11.0465 l -0.4355,0 0,0.4932 0.29,0.3291 0,0.7402" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3258"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3262"> + d="m 18.3652,28.2422 -0.582,-1.1523 -1.0903,-0.2466 -0.5815,-1.5625 -1.4536,0.1641 -1.2354,-0.9043 -1.3091,1.1514 0,0.1816 c -0.396,-0.1143 -0.8828,-0.1299 -1.2354,-0.3467 l -0.291,-0.8223 0,-0.9053 -0.8721,0.082 c 0.0728,-0.5762 0.145,-1.1514 0.2183,-1.7275 l -0.5093,0 -0.5083,0.6582 -0.5093,0.2461 -0.7271,-0.4102 -0.0728,-0.9053 0.1455,-0.9873 1.0908,-0.8223 0.8721,0 0.145,-0.4941 1.0903,0.2461 0.7998,0.9883 0.1455,-1.6465 1.3813,-1.1514 0.5088,-1.2344 1.0176,-0.4111 0.5815,-0.8223 1.3081,-0.248 0.6548,-0.9863 c -0.6543,0 -1.3086,0 -1.9629,0 l 1.2358,-0.5762 0.8716,0 1.2363,-0.4121 0.1455,-0.4922 -0.4365,-0.4121 -0.5088,-0.165 0.1455,-0.4932 -0.3633,-0.7402 -0.8726,0.3281 0.1455,-0.6577 -1.0176,-0.5762 -0.7993,1.3979 0.0723,0.4941 -0.7993,0.3301 -0.5093,1.0693 -0.2178,-0.9873 -1.3813,-0.5762 -0.2183,-0.7402 1.8174,-1.0703 0.7998,-0.7402 0.0728,-0.9048 -0.436,-0.2471 -0.5815,-0.0825 -0.3633,0.9053 c 0,0 -0.6079,0.1191 -0.7642,0.1577 -1.9961,1.8394 -6.0293,5.8101 -6.9663,13.3062 0.0371,0.1738 0.6792,1.1816 0.6792,1.1816 l 1.5264,0.9043 1.5264,0.4121 0.6548,0.8232 1.0171,0.7402 0.5815,-0.082 0.436,0.1963 0,0.1328 -0.5811,1.563 -0.4365,0.6582 0.1455,0.3301 -0.3633,1.2324 1.3086,2.3867 1.3081,1.1523 0.582,0.8223 -0.0732,1.7285 0.4365,0.9863 -0.4365,1.8926 c 0,0 -0.0342,-0.0117 0.0215,0.1777 0.0562,0.1895 2.3291,1.4512 2.4736,1.3438 0.144,-0.1094 0.2671,-0.2051 0.2671,-0.2051 l -0.145,-0.4102 0.5811,-0.5762 0.2183,-0.5762 0.9453,-0.3301 0.7266,-1.8105 -0.2178,-0.4922 0.5078,-0.7402 1.0908,-0.248 0.582,-1.3164 -0.1455,-1.6445 0.8721,-1.2344 0.1455,-1.2344 C 20.7331,29.4607 19.5495,28.8513 18.365,28.242" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3266"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3270"> + d="m 16.7656,9.5649 0.7266,0.4937 0.582,0 0,-0.5757 -0.7266,-0.3291 -0.582,0.4111" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3274"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3278"> + d="m 14.876,8.9072 -0.3638,0.9048 0.7271,0 0.3638,-0.8228 C 15.9166,8.7675 16.2286,8.5444 16.5479,8.331 l 0.7271,0.2471 c 0.4844,0.3291 0.9688,0.6582 1.4536,0.9868 L 19.4561,8.9072 18.6558,8.5781 18.292,7.8374 16.9111,7.6728 16.8383,7.2612 16.184,7.4262 15.8936,8.002 15.5298,7.2613 l -0.145,0.3291 0.0728,0.8228 -0.5816,0.494" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3282"> + id="g3284" + style="opacity:0.75000000000000000;color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + d="" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3288"> + d="" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3292"> + id="g3294" + style="opacity:0.75000000000000000;color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + d="" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3298"> + d="" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3302"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3306"> + d="M 17.4922,6.8496 17.856,6.521 18.5831,6.3564 c 0.498,-0.2422 0.998,-0.4053 1.5264,-0.5762 l -0.29,-0.4937 -0.9385,0.1348 -0.4434,0.4419 -0.731,0.106 -0.6499,0.3052 -0.3159,0.1528 -0.1929,0.2583 0.9443,0.1641" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3310"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3314"> + id="path3316" + d="m 18.7285,14.6665 0.4365,-0.6582 -0.6548,-0.4932 0.2183,1.1514" /> + d="M 57,13.999113 C 57,27.806675 45.806296,38.999999 32.000317,38.999999 18.193071,38.999999 6.9999999,27.806549 6.9999999,13.999113 6.9999999,0.19218278 18.193071,-11 32.000317,-11 45.806296,-11 57,0.19218278 57,13.999113 l 0,0 z" + style="fill:none;stroke:url(#radialGradient4132);stroke-width:1.99999976;stroke-miterlimit:4;stroke-opacity:1" /> + d="M 58.931508,13.931507 C 58.931508,28.806375 46.872821,40.864925 32,40.864925 17.125816,40.864925 5.0678105,28.806239 5.0678105,13.931507 5.0678105,-0.942678 17.125816,-13 32,-13 c 14.872821,0 26.931508,12.057322 26.931508,26.931507 l 0,0 z" + style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#39396c;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1" /> From 56ef40c4497f25aaedd519170db129900d8ce8c2 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 7 Feb 2020 15:28:07 +0100 Subject: [PATCH 03/15] Sketcher: [skip ci] add create polygon command to sketcher menu --- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 18 ++++++++++-------- src/Mod/Sketcher/Gui/Workbench.cpp | 3 ++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 1cee7286d6..dce2f7c92f 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -7482,7 +7482,7 @@ CmdSketcherCreateRegularPolygon::CmdSketcherCreateRegularPolygon() sToolTipText = QT_TR_NOOP("Create a regular polygon in the sketch"); sWhatsThis = "Sketcher_CreateRegularPolygon"; sStatusTip = sToolTipText; - sPixmap = "CreateRegularPolygon"; + sPixmap = "Sketcher_CreateRegularPolygon"; sAccel = ""; eType = ForEdit; } @@ -7490,7 +7490,11 @@ CmdSketcherCreateRegularPolygon::CmdSketcherCreateRegularPolygon() void CmdSketcherCreateRegularPolygon::activated(int iMsg) { Q_UNUSED(iMsg); - ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(8) ); + + // Pop-up asking for values + SketcherRegularPolygonDialog srpd; + if (srpd.exec() == QDialog::Accepted) + ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(srpd.sides)); } bool CmdSketcherCreateRegularPolygon::isActive(void) @@ -7530,12 +7534,9 @@ void CmdSketcherCompCreateRegularPolygon::activated(int iMsg) case 6: { // Pop-up asking for values - SketcherRegularPolygonDialog * srpd = new SketcherRegularPolygonDialog(); - - if (srpd->exec() == QDialog::Accepted) - ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(srpd->sides)); - - delete srpd; + SketcherRegularPolygonDialog srpd; + if (srpd.exec() == QDialog::Accepted) + ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(srpd.sides)); } break; default: @@ -7688,6 +7689,7 @@ void CreateSketcherCommandsCreateGeo(void) rcCmdMgr.addCommand(new CmdSketcherCreateHexagon()); rcCmdMgr.addCommand(new CmdSketcherCreateHeptagon()); rcCmdMgr.addCommand(new CmdSketcherCreateOctagon()); + rcCmdMgr.addCommand(new CmdSketcherCreateRegularPolygon()); rcCmdMgr.addCommand(new CmdSketcherCreateSlot()); rcCmdMgr.addCommand(new CmdSketcherCreateFillet()); //rcCmdMgr.addCommand(new CmdSketcherCreateText()); diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index d9d784bfc4..d870eadcd8 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -182,7 +182,8 @@ inline void SketcherAddWorkspaceRegularPolygon(Gui::MenuItem& geo << "Sketcher_CreatePentagon" << "Sketcher_CreateHexagon" << "Sketcher_CreateHeptagon" - << "Sketcher_CreateOctagon"; + << "Sketcher_CreateOctagon" + << "Sketcher_CreateRegularPolygon"; } template <> inline void SketcherAddWorkspaceRegularPolygon(Gui::ToolBarItem& geom){ From 3382fdacce34fef4d620db6b79ec35735dbd67c9 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 7 Feb 2020 18:05:01 +0100 Subject: [PATCH 04/15] FEM: result mechanical task panel, typo in obj attribut, thanks ur_0 --- src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py index c3c9fd8f22..27e81b677b 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py @@ -480,7 +480,7 @@ class _TaskPanelFemResultShow: s2y = np.array(ps2vector[:, 1]) s2z = np.array(ps2vector[:, 2]) if self.result_obj.PS3Vector: - ps3vector = np.array(self.result_obj.PS1Vector) + ps3vector = np.array(self.result_obj.PS3Vector) s3x = np.array(ps3vector[:, 0]) s3y = np.array(ps3vector[:, 1]) s3z = np.array(ps3vector[:, 2]) From fe32c79c3331fe737788425bc37e664cc252e741 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Thu, 6 Feb 2020 14:32:52 -0500 Subject: [PATCH 05/15] [TD]fix Preference dialog keys --- src/Mod/TechDraw/App/DrawView.cpp | 3 +- src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui | 44 +++++++++++++---------- src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui | 4 +-- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp index 4920d6228d..f23caf1293 100644 --- a/src/Mod/TechDraw/App/DrawView.cpp +++ b/src/Mod/TechDraw/App/DrawView.cpp @@ -441,11 +441,10 @@ double DrawView::prefScale(void) { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); - double result = hGrp->GetInt("DefaultViewScale", 1.0); + double result = hGrp->GetFloat("DefaultViewScale", 1.0); return result; } - void DrawView::requestPaint(void) { // Base::Console().Message("DV::requestPaint() - %s\n", getNameInDocument()); diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui index 27c66fc48a..2ee018e38b 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui @@ -6,7 +6,7 @@ 0 0 - 439 + 460 829 @@ -216,7 +216,7 @@ for ProjectionGroups Normal line color - + 0 0 @@ -286,7 +286,7 @@ for ProjectionGroups Preselection color - + 255 255 @@ -318,7 +318,7 @@ for ProjectionGroups Section face color - + 225 225 @@ -350,7 +350,7 @@ for ProjectionGroups Selected item color - + 28 173 @@ -382,7 +382,7 @@ for ProjectionGroups Section face hatch color - + 0 0 @@ -414,7 +414,7 @@ for ProjectionGroups Window background color - + 80 80 @@ -446,7 +446,7 @@ for ProjectionGroups Geometric hatch color - + 0 0 @@ -473,7 +473,7 @@ for ProjectionGroups Color of Dimension lines and text. - + 0 0 @@ -565,7 +565,7 @@ for ProjectionGroups Face color - + 255 255 @@ -597,7 +597,7 @@ for ProjectionGroups Default color for annotations - + 0 0 @@ -733,7 +733,7 @@ for ProjectionGroups - + 0 @@ -743,7 +743,7 @@ for ProjectionGroups Label size - + 8.000000000000000 @@ -793,7 +793,7 @@ for ProjectionGroups - + 0 @@ -844,7 +844,7 @@ for ProjectionGroups - + 0 @@ -854,6 +854,9 @@ for ProjectionGroups Starting directory for menu 'Insert Page using Template' + + Gui::FileChooser::Directory + TemplateDir @@ -881,7 +884,7 @@ for ProjectionGroups - + 0 @@ -918,7 +921,7 @@ for ProjectionGroups - + 0 @@ -955,7 +958,7 @@ for ProjectionGroups - + 0 @@ -965,6 +968,9 @@ for ProjectionGroups Default directory for welding symbols + + Gui::FileChooser::Directory + WeldingDir @@ -992,7 +998,7 @@ for ProjectionGroups - + 0 diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui index aa7d47f037..3df8e9177e 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui @@ -172,10 +172,10 @@ can be a performance penalty in complex models. true - UseGlobalDecimals + HandleFaces - /Mod/TechDraw/Dimensions + /Mod/TechDraw/General From 2873a819bcf343da5a56511f7403c6f53aa6d47a Mon Sep 17 00:00:00 2001 From: wandererfan Date: Fri, 7 Feb 2020 08:20:14 -0500 Subject: [PATCH 06/15] [TD]add Hatch limit parameters --- src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui | 255 +++++++++++------- src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp | 4 + 2 files changed, 166 insertions(+), 93 deletions(-) diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui index 3df8e9177e..6d1470267e 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui @@ -28,8 +28,20 @@ - - + + + + + true + + + + Edge End Cap + + + + + 0 @@ -37,31 +49,25 @@ - Dump intermediate results during Detail processing + Dump intermediate results during Section processing - Debug Detail + Debug Section - debugDetail + debugSection - Mod/TechDraw/debugDetail + Mod/TechDraw/debug - - - - Qt::Horizontal + + + + Max Svg Hatch Tiles - - - 40 - 20 - - - + @@ -90,6 +96,116 @@ + + + + + 0 + 0 + + + + Dump intermediate results during Detail processing + + + Debug Detail + + + debugDetail + + + Mod/TechDraw/debugDetail + + + + + + + Limit on number of 64x64 Svg tiles used to hatch a single face + + + 1 + + + 1000000 + + + 100 + + + 10000 + + + MaxSVGTile + + + Mod/TechDraw/Decorations + + + + + + + + 0 + 0 + + + + If checked, TechDraw will attempt to build faces using the +line segments returned by the hidden line removal algorithm. +Faces must be detected in order to use hatching, but there +can be a performance penalty in complex models. + + + Detect Faces + + + true + + + HandleFaces + + + /Mod/TechDraw/General + + + + + + + + 0 + 0 + + + + Include edges with unexpected geometry (zero length etc) to be included in results. + + + Allow Crazy Edges + + + allowCrazyEdge + + + Mod/TechDraw/debug + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -129,68 +245,6 @@ - - - - - 0 - 0 - - - - Include edges with unexpected geometry (zero length etc) to be included in results. - - - Allow Crazy Edges - - - allowCrazyEdge - - - Mod/TechDraw/debug - - - - - - - - 0 - 0 - - - - If checked, TechDraw will attempt to build faces using the -line segments returned by the hidden line removal algorithm. -Faces must be detected in order to use hatching, but there -can be a performance penalty in complex models. - - - Detect Faces - - - true - - - HandleFaces - - - /Mod/TechDraw/General - - - - - - - - true - - - - Edge End Cap - - - @@ -213,25 +267,35 @@ can be a performance penalty in complex models. - - - - - 0 - 0 - - - - Dump intermediate results during Section processing - + + - Debug Section + Max PAT Hatch Segs + + + + + + + The maximum number of hatch line segments to use when hatching a face with a PAT pattern + + + 1 + + + 1000000 + + + 100 + + + 10000 - debugSection + MaxSeg - Mod/TechDraw/debug + Mod/TechDraw/PAT @@ -275,6 +339,11 @@ can be a performance penalty in complex models. + + Gui::PrefSpinBox + QSpinBox +
Gui/PrefWidgets.h
+ Gui::PrefCheckBox QCheckBox diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp index 9a61cee942..7ade224bc3 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp @@ -50,6 +50,8 @@ void DlgPrefsTechDraw4Imp::saveSettings() cbDebugDetail->onSave(); cbShowSectionEdges->onSave(); cbFuseBeforeSection->onSave(); + sbMaxTiles->onSave(); + sbMaxPat->onSave(); } void DlgPrefsTechDraw4Imp::loadSettings() @@ -61,6 +63,8 @@ void DlgPrefsTechDraw4Imp::loadSettings() cbDebugDetail->onRestore(); cbShowSectionEdges->onRestore(); cbFuseBeforeSection->onRestore(); + sbMaxTiles->onRestore(); + sbMaxPat->onRestore(); } /** From 5e8dd82f5c0700f67a129f5d0e2ec6a1391ca85b Mon Sep 17 00:00:00 2001 From: UR-0 Date: Fri, 7 Feb 2020 17:00:37 +0100 Subject: [PATCH 07/15] ResultShow.ui improved labels concerning user defined equations --- src/Mod/Fem/Gui/Resources/ui/ResultShow.ui | 170 ++++++++++++++++----- 1 file changed, 132 insertions(+), 38 deletions(-) diff --git a/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui b/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui index 60b42077ad..765fe657ef 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui @@ -6,7 +6,7 @@ 0 0 - 446 + 451 768 @@ -308,55 +308,64 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">P1-P3 # Stress intensity stress equation. Available values are numpy array format. Calculation np.function can be used on available values. </span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">P1-P3 # Stress intensity stress equation. Available values are numpy array format. Calculation np.function can be used on available values. </span></p></body></html> - + + + + + + + + min. principal stress vector: s1x, s1y, s1z + + + + + + + med. principal stress vector: s2x, s2y, s2z + + + + + + + principal stresses: P1, P2, P3 + + + + + + + equivalent plastic strain: Peeq + + + + + + + reinforcement ratio: rx, ry, rz + + + + <html><head/><body><p><span style=" text-decoration: underline;">Available result types:</span></p></body></html> - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - 1 - + + - <html><head/><body><p>displacement (x,y,z) and strain (exx,eyy,ezz,exy,exz,eyz)</p></body></html> - - - false - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - -1 - - - Qt::NoTextInteraction + strain: exx, eyy, ezz, exy, exz, eyz - + @@ -374,7 +383,7 @@ p, li { white-space: pre-wrap; } 1 - <html><head/><body><p>stresses (sxx,syy,szz,sxy,sxz,syz) and principal stresses (P1,P2,P3)</p></body></html> + stress: sxx, syy, szz, sxy, sxz, syz false @@ -393,6 +402,91 @@ p, li { white-space: pre-wrap; } + + + + von Mises stress: Von + + + + + + + mass flow rate: MF + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + 1 + + + displacement: x, y, z + + + false + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + -1 + + + Qt::NoTextInteraction + + + + + + + + 0 + 0 + + + + network pressure: NP + + + + + + + temperature: T + + + + + + + Mohr Coulomb: mc + + + + + + + max. principal stress vector: s3x, s3y, s3z + + + From 3ea4428b47c6f5d90028f52148c4edc9431e60cb Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 8 Feb 2020 11:07:06 +0100 Subject: [PATCH 08/15] Part: [skip ci] use the right value from the user settings to set point size --- src/Gui/ViewParams.h | 1 + src/Mod/Part/Gui/DlgSettingsObjectColor.cpp | 4 ++-- src/Mod/Part/Gui/DlgSettingsObjectColor.ui | 4 ++-- src/Mod/Part/Gui/ViewProviderExt.cpp | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Gui/ViewParams.h b/src/Gui/ViewParams.h index 9a94004658..92ac24dd72 100644 --- a/src/Gui/ViewParams.h +++ b/src/Gui/ViewParams.h @@ -56,6 +56,7 @@ public: FC_VIEW_PARAM(DefaultShapeLineColor,unsigned long,Unsigned,421075455UL) \ FC_VIEW_PARAM(DefaultShapeColor,unsigned long,Unsigned,0xCCCCCC00) \ FC_VIEW_PARAM(DefaultShapeLineWidth,int,Int,2) \ + FC_VIEW_PARAM(DefaultShapePointSize,int,Int,2) \ FC_VIEW_PARAM(CoinCycleCheck,bool,Bool,true) \ FC_VIEW_PARAM(EnablePropertyViewForInactiveDocument,bool,Bool,true) \ FC_VIEW_PARAM(ShowSelectionBoundingBox,bool,Bool,false) \ diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp index 09ed8ba420..fb86da0bbf 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp @@ -62,7 +62,7 @@ void DlgSettingsObjectColor::saveSettings() ui->DefaultShapeLineColor->onSave(); ui->DefaultShapeLineWidth->onSave(); ui->DefaultShapeVertexColor->onSave(); - ui->DefaultShapeVertexWidth->onSave(); + ui->DefaultShapeVertexSize->onSave(); ui->BoundingBoxColor->onSave(); // Annotations ui->AnnotationTextColor->onSave(); @@ -76,7 +76,7 @@ void DlgSettingsObjectColor::loadSettings() ui->DefaultShapeLineColor->onRestore(); ui->DefaultShapeLineWidth->onRestore(); ui->DefaultShapeVertexColor->onRestore(); - ui->DefaultShapeVertexWidth->onRestore(); + ui->DefaultShapeVertexSize->onRestore(); ui->BoundingBoxColor->onRestore(); // Annotations ui->AnnotationTextColor->onRestore(); diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui index 51e135edbd..01a8a1cb7b 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui @@ -124,7 +124,7 @@ - + The default size for new vertices @@ -138,7 +138,7 @@ 2 - DefaultShapeVertexWidth + DefaultShapePointSize View diff --git a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp index 4b592f63a1..edd28bae5a 100644 --- a/src/Mod/Part/Gui/ViewProviderExt.cpp +++ b/src/Mod/Part/Gui/ViewProviderExt.cpp @@ -240,6 +240,7 @@ ViewProviderPartExt::ViewProviderPartExt() float r,g,b; r = ((lcol >> 24) & 0xff) / 255.0; g = ((lcol >> 16) & 0xff) / 255.0; b = ((lcol >> 8) & 0xff) / 255.0; int lwidth = Gui::ViewParams::instance()->getDefaultShapeLineWidth(); + int psize = Gui::ViewParams::instance()->getDefaultShapePointSize(); ParameterGrp::handle hPart = App::GetApplication().GetParameterGroupByPath ("User parameter:BaseApp/Preferences/Mod/Part"); @@ -268,7 +269,7 @@ ViewProviderPartExt::ViewProviderPartExt() ADD_PROPERTY(LineWidth,(lwidth)); LineWidth.setConstraints(&sizeRange); PointSize.setConstraints(&sizeRange); - ADD_PROPERTY(PointSize,(lwidth)); + ADD_PROPERTY(PointSize,(psize)); ADD_PROPERTY(Deviation,(0.5f)); Deviation.setConstraints(&tessRange); ADD_PROPERTY(AngularDeflection,(28.65)); From b9b7f5ce89c76e8e19e43ff40aba1bce7dff9d65 Mon Sep 17 00:00:00 2001 From: triplus Date: Sun, 26 Jan 2020 21:07:03 +0100 Subject: [PATCH 09/15] Option to opt-out from using a Linux desktop icon theme. --- src/Gui/Application.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 9dd7c1db10..b4330209f6 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -1895,12 +1895,22 @@ void Application::runApplication(void) Base::Console().Log("No OpenGL is present or no OpenGL context is current\n"); #endif + ParameterGrp::handle hTheme = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Bitmaps/Theme"); #if !defined(Q_OS_LINUX) QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QString::fromLatin1(":/icons/FreeCAD-default")); QIcon::setThemeName(QLatin1String("FreeCAD-default")); +#else + // Option to opt-out from using a Linux desktop icon theme. + // https://forum.freecadweb.org/viewtopic.php?f=4&t=35624 + bool themePaths = hTheme->GetBool("ThemeSearchPaths",true); + if (!themePaths) { + QStringList searchPaths; + searchPaths.prepend(QString::fromUtf8(":/icons")); + QIcon::setThemeSearchPaths(searchPaths); + QIcon::setThemeName(QLatin1String("FreeCAD-default")); + } #endif - ParameterGrp::handle hTheme = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Bitmaps/Theme"); std::string searchpath = hTheme->GetASCII("SearchPath"); if (!searchpath.empty()) { QStringList searchPaths = QIcon::themeSearchPaths(); From da246940897b652d1b8fd2d895be1b86a88f674c Mon Sep 17 00:00:00 2001 From: sgrogan Date: Fri, 7 Feb 2020 18:05:27 -0500 Subject: [PATCH 10/15] Update Libpack link --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fab2ec052b..6347a0e33b 100755 --- a/.travis.yml +++ b/.travis.yml @@ -258,7 +258,7 @@ before_install: # clcache stats before compilation cmd.exe /C 'C:\Users\travis\build\FreeCAD\FreeCAD\clcache.exe -s' - curl -L https://github.com/apeltauer/FreeCAD/releases/download/LibPack_12.1/FreeCADLibs_12.1.2_x64_VC15.7z --output FreeCADLibs.7z + curl -L https://github.com/FreeCAD/FreeCAD/releases/download/0.19_pre/FreeCADLibs_12.1.4_x64_VC15.7z --output FreeCADLibs.7z 7z x FreeCADLibs.7z -oFreeCADLibs > /dev/null rm -f FreeCADLibs.7z export LIBPACK_DIR="$TRAVIS_BUILD_DIR\FreeCADLibs" From c89a62ba5249f91d364bc60e80254031add2955a Mon Sep 17 00:00:00 2001 From: "Zheng, Lei" Date: Wed, 5 Feb 2020 07:40:46 +0800 Subject: [PATCH 11/15] Gui: fix tree view mode option in general preference --- src/Gui/DlgGeneral.ui | 10 +++++----- src/Gui/DlgGeneralImp.cpp | 32 ++++++++++++++++++++++++++------ src/Gui/MainWindow.cpp | 19 +++++++++++++++---- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index 43e1144fa1..0b83dac463 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -214,11 +214,11 @@ this according to your screen size or personal taste - Tree View Mode provides the option the option to -customize the properties panel. The options are: -1. 'Combiview' -2. 'TreeView + PropertyView -3. 'Both' + Customize how tree view is shown in the panel (restart required). + +'ComboView': combine tree view and property view into one panel. +'TreeView and PropertyView': split tree view and property view into separate panel. +'Both': keep all three panels, and you can have two sets of tree view and property view. diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp index 4dfcd10260..ff893d920e 100644 --- a/src/Gui/DlgGeneralImp.cpp +++ b/src/Gui/DlgGeneralImp.cpp @@ -144,7 +144,21 @@ void DlgGeneralImp::saveSettings() hGrp->SetInt("ToolbarIconSize", pixel); getMainWindow()->setIconSize(QSize(pixel,pixel)); - hGrp->SetInt("TreeViewMode",ui->treeMode->currentIndex()); + hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows"); + bool treeView=false, propertyView=false, comboView=true; + switch(ui->treeMode->currentIndex()) { + case 1: + treeView = propertyView = true; + comboView = false; + break; + case 2: + comboView = true; + treeView = propertyView = true; + break; + } + hGrp->GetGroup("ComboView")->SetBool("Enabled",comboView); + hGrp->GetGroup("TreeView")->SetBool("Enabled",treeView); + hGrp->GetGroup("PropertyView")->SetBool("Enabled",propertyView); hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow"); hGrp->SetBool("TiledBackground", ui->tiledBackground->isChecked()); @@ -261,12 +275,18 @@ void DlgGeneralImp::loadSettings() } ui->toolbarIconSize->setCurrentIndex(index); - ui->treeMode->addItem(tr("CombiView")); - ui->treeMode->addItem(tr("TreeView + PropertyView")); + ui->treeMode->addItem(tr("Combo View")); + ui->treeMode->addItem(tr("TreeView and PropertyView")); ui->treeMode->addItem(tr("Both")); - index = hGrp->GetInt("TreeViewMode"); - if (index<0 || index>2) - index=0; + + hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows"); + bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled",false); + bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled",false); + bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled",true); + index = 0; + if(propertyView || treeView) { + index = comboView?2:1; + } ui->treeMode->setCurrentIndex(index); hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow"); diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 10b3f95961..be027982eb 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -381,6 +381,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) } #endif + bool treeView = false, propertyView = false; if (hiddenDockWindows.find("Std_TreeView") == std::string::npos) { //work through parameter. ParameterGrp::handle group = App::GetApplication().GetUserParameter(). @@ -392,6 +393,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) } group->SetBool("Enabled", enabled); //ensure entry exists. if (enabled) { + treeView = true; TreeDockWidget* tree = new TreeDockWidget(0, this); tree->setObjectName (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Tree view"))); @@ -412,6 +414,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) } group->SetBool("Enabled", enabled); //ensure entry exists. if (enabled) { + propertyView = true; PropertyDockView* pcPropView = new PropertyDockView(0, this); pcPropView->setObjectName (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Property view"))); @@ -431,10 +434,18 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) // Combo view if (hiddenDockWindows.find("Std_CombiView") == std::string::npos) { - CombiView* pcCombiView = new CombiView(0, this); - pcCombiView->setObjectName(QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Combo View"))); - pcCombiView->setMinimumWidth(150); - pDockMgr->registerDockWindow("Std_CombiView", pcCombiView); + bool enable = !treeView || !propertyView; + if(!enable) { + ParameterGrp::handle group = App::GetApplication().GetUserParameter(). + GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("ComboView"); + enable = group->GetBool("Enabled", true); + } + if(enable) { + CombiView* pcCombiView = new CombiView(0, this); + pcCombiView->setObjectName(QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Combo View"))); + pcCombiView->setMinimumWidth(150); + pDockMgr->registerDockWindow("Std_CombiView", pcCombiView); + } } #if QT_VERSION < 0x040500 From 8648bbe3dfa9b8714c8b537d0e4f754fa3d08f69 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 8 Feb 2020 13:43:44 +0100 Subject: [PATCH 12/15] Gui: fix naming inconsistency and rename 'combi' to 'combo' --- src/Gui/CMakeLists.txt | 6 +-- src/Gui/{CombiView.cpp => ComboView.cpp} | 24 +++++------ src/Gui/{CombiView.h => ComboView.h} | 12 +++--- src/Gui/Control.cpp | 54 ++++++++++++------------ src/Gui/DockWindowManager.cpp | 2 +- src/Gui/MainWindow.cpp | 21 ++++----- src/Gui/TaskView/TaskView.h | 4 +- src/Gui/Workbench.cpp | 4 +- src/Mod/Start/Gui/Workbench.cpp | 2 +- src/Mod/Web/Gui/Workbench.cpp | 2 +- 10 files changed, 66 insertions(+), 65 deletions(-) rename src/Gui/{CombiView.cpp => ComboView.cpp} (86%) rename src/Gui/{CombiView.h => ComboView.h} (90%) diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index d95df3122c..51decf4a19 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -280,7 +280,7 @@ set(Gui_MOC_HDRS Assistant.h AutoSaver.h CallTips.h - CombiView.h + ComboView.h Control.h Clipping.h DemoMode.h @@ -701,7 +701,7 @@ SOURCE_GROUP("Dialog\\Settings" FILES ${Dialog_Settings_SRCS}) # The dock windows sources SET(Dock_Windows_CPP_SRCS - CombiView.cpp + ComboView.cpp DockWindow.cpp PropertyView.cpp ReportView.cpp @@ -717,7 +717,7 @@ SET(Dock_Windows_CPP_SRCS DAGView/DAGFilter.cpp ) SET(Dock_Windows_HPP_SRCS - CombiView.h + ComboView.h DockWindow.h PropertyView.h ReportView.h diff --git a/src/Gui/CombiView.cpp b/src/Gui/ComboView.cpp similarity index 86% rename from src/Gui/CombiView.cpp rename to src/Gui/ComboView.cpp index 42a705cec1..3c5bfd81bf 100644 --- a/src/Gui/CombiView.cpp +++ b/src/Gui/ComboView.cpp @@ -28,7 +28,7 @@ /// Here the FreeCAD includes sorted by Base,App,Gui...... -#include "CombiView.h" +#include "ComboView.h" #include "BitmapFactory.h" #include "PropertyView.h" #include "ProjectView.h" @@ -42,12 +42,12 @@ using namespace Gui; using namespace Gui::DockWnd; -/* TRANSLATOR Gui::DockWnd::CombiView */ +/* TRANSLATOR Gui::DockWnd::ComboView */ -CombiView::CombiView(Gui::Document* pcDocument, QWidget *parent) +ComboView::ComboView(Gui::Document* pcDocument, QWidget *parent) : DockWindow(pcDocument,parent), oldTabIndex(0) { - setWindowTitle(tr("CombiView")); + setWindowTitle(tr("Combo View")); QGridLayout* pLayout = new QGridLayout(this); pLayout->setSpacing( 0 ); @@ -80,11 +80,11 @@ CombiView::CombiView(Gui::Document* pcDocument, QWidget *parent) //tabs->addTab(projectView, trUtf8("Project")); } -CombiView::~CombiView() +ComboView::~ComboView() { } -void CombiView::showDialog(Gui::TaskView::TaskDialog *dlg) +void ComboView::showDialog(Gui::TaskView::TaskDialog *dlg) { static QIcon icon = Gui::BitmapFactory().pixmap("edit-edit.svg"); @@ -96,13 +96,13 @@ void CombiView::showDialog(Gui::TaskView::TaskDialog *dlg) taskPanel->showDialog(dlg); } -void CombiView::closeDialog() +void ComboView::closeDialog() { // close the dialog taskPanel->removeDialog(); } -void CombiView::closedDialog() +void ComboView::closedDialog() { static QIcon icon = QIcon(); @@ -111,19 +111,19 @@ void CombiView::closedDialog() tabs->setTabIcon(1, icon); } -void CombiView::showTreeView() +void ComboView::showTreeView() { // switch to the tree view tabs->setCurrentIndex(0); } -void CombiView::showTaskView() +void ComboView::showTaskView() { // switch to the task view tabs->setCurrentIndex(1); } -void CombiView::changeEvent(QEvent *e) +void ComboView::changeEvent(QEvent *e) { if (e->type() == QEvent::LanguageChange) { tabs->setTabText(0, trUtf8("Model")); @@ -135,4 +135,4 @@ void CombiView::changeEvent(QEvent *e) } -#include "moc_CombiView.cpp" +#include "moc_ComboView.cpp" diff --git a/src/Gui/CombiView.h b/src/Gui/ComboView.h similarity index 90% rename from src/Gui/CombiView.h rename to src/Gui/ComboView.h index 4dc1cd70e1..632c89fc66 100644 --- a/src/Gui/CombiView.h +++ b/src/Gui/ComboView.h @@ -22,8 +22,8 @@ -#ifndef GUI_DOCKWND_COMBIVIEW_H -#define GUI_DOCKWND_COMBIVIEW_H +#ifndef GUI_DOCKWND_COMBOVIEW_H +#define GUI_DOCKWND_COMBOVIEW_H #include "DockWindow.h" #include "Selection.h" @@ -57,11 +57,11 @@ namespace Gui { class ControlSingleton; namespace DockWnd { -/** Combi View +/** Combo View * is a combination of a tree, property and TaskPanel for * integrated user action. */ -class GuiExport CombiView : public Gui::DockWindow +class GuiExport ComboView : public Gui::DockWindow { Q_OBJECT @@ -70,13 +70,13 @@ public: * A constructor. * A more elaborate description of the constructor. */ - CombiView(Gui::Document* pcDocument, QWidget *parent=0); + ComboView(Gui::Document* pcDocument, QWidget *parent=0); /** * A destructor. * A more elaborate description of the destructor. */ - virtual ~CombiView(); + virtual ~ComboView(); Gui::TaskView::TaskView *getTaskPanel(void){return taskPanel;} QTabWidget* getTabPanel() const { return tabs;} diff --git a/src/Gui/Control.cpp b/src/Gui/Control.cpp index 91c8c987fa..cf2eb9f55b 100644 --- a/src/Gui/Control.cpp +++ b/src/Gui/Control.cpp @@ -36,7 +36,7 @@ #include "TaskView/TaskView.h" #include -#include +#include #include @@ -61,11 +61,11 @@ ControlSingleton::~ControlSingleton() Gui::TaskView::TaskView* ControlSingleton::taskPanel() const { - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); // should return the pointer to combo view - if (pcCombiView) - return pcCombiView->getTaskPanel(); + if (pcComboView) + return pcComboView->getTaskPanel(); // not all workbenches have the combo view enabled else if (_taskPanel) return _taskPanel; @@ -76,20 +76,20 @@ Gui::TaskView::TaskView* ControlSingleton::taskPanel() const void ControlSingleton::showTaskView() { - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); - if (pcCombiView) - pcCombiView->showTaskView(); + if (pcComboView) + pcComboView->showTaskView(); else if (_taskPanel) _taskPanel->raise(); } void ControlSingleton::showModelView() { - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); - if (pcCombiView) - pcCombiView->showTreeView(); + if (pcComboView) + pcComboView->showTreeView(); else if (_taskPanel) _taskPanel->raise(); } @@ -108,13 +108,13 @@ void ControlSingleton::showDialog(Gui::TaskView::TaskDialog *dlg) } return; } - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); // should return the pointer to combo view - if (pcCombiView) { - pcCombiView->showDialog(dlg); + if (pcComboView) { + pcComboView->showDialog(dlg); // make sure that the combo view is shown - QDockWidget* dw = qobject_cast(pcCombiView->parentWidget()); + QDockWidget* dw = qobject_cast(pcComboView->parentWidget()); if (dw) { dw->setVisible(true); dw->toggleViewAction()->setVisible(true); @@ -151,11 +151,11 @@ void ControlSingleton::showDialog(Gui::TaskView::TaskDialog *dlg) QTabWidget* ControlSingleton::tabPanel() const { - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); // should return the pointer to combo view - if (pcCombiView) - return pcCombiView->getTabPanel(); + if (pcComboView) + return pcComboView->getTabPanel(); return 0; } @@ -167,10 +167,10 @@ Gui::TaskView::TaskDialog* ControlSingleton::activeDialog() const Gui::TaskView::TaskView* ControlSingleton::getTaskPanel() { // should return the pointer to combo view - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); - if (pcCombiView) - return pcCombiView->getTaskPanel(); + if (pcComboView) + return pcComboView->getTaskPanel(); else return _taskPanel; } @@ -197,11 +197,11 @@ void ControlSingleton::reject() void ControlSingleton::closeDialog() { - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); // should return the pointer to combo view - if (pcCombiView) - pcCombiView->closeDialog(); + if (pcComboView) + pcComboView->closeDialog(); else if (_taskPanel) _taskPanel->removeDialog(); } @@ -209,13 +209,13 @@ void ControlSingleton::closeDialog() void ControlSingleton::closedDialog() { ActiveDialog = 0; - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); // should return the pointer to combo view - assert(pcCombiView); - pcCombiView->closedDialog(); + assert(pcComboView); + pcComboView->closedDialog(); // make sure that the combo view is shown - QDockWidget* dw = qobject_cast(pcCombiView->parentWidget()); + QDockWidget* dw = qobject_cast(pcComboView->parentWidget()); if (dw) dw->setFeatures(QDockWidget::AllDockWidgetFeatures); } diff --git a/src/Gui/DockWindowManager.cpp b/src/Gui/DockWindowManager.cpp index 4548ac8901..1ddc4ef5c4 100644 --- a/src/Gui/DockWindowManager.cpp +++ b/src/Gui/DockWindowManager.cpp @@ -257,7 +257,7 @@ void DockWindowManager::retranslate() * \li Std_PropertyView * \li Std_ReportView * \li Std_ToolBox - * \li Std_CombiView + * \li Std_ComboView * \li Std_SelectionView * * To avoid name clashes the caller should use names of the form \a module_widgettype, i. e. if a analyse dialog for diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index be027982eb..d33731001b 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -99,7 +99,7 @@ #include "MenuManager.h" //#include "ToolBox.h" #include "ReportView.h" -#include "CombiView.h" +#include "ComboView.h" #include "PythonConsole.h" #include "TaskView/TaskView.h" #include "DAGView/DAGView.h" @@ -387,7 +387,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("TreeView"); bool enabled = group->GetBool("Enabled", true); - if(enabled != group->GetBool("Enabled", false)) { + if (enabled != group->GetBool("Enabled", false)) { enabled = App::GetApplication().GetUserParameter().GetGroup("BaseApp") ->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_TreeView",false); } @@ -408,7 +408,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("PropertyView"); bool enabled = group->GetBool("Enabled", true); - if(enabled != group->GetBool("Enabled", false)) { + if (enabled != group->GetBool("Enabled", false)) { enabled = App::GetApplication().GetUserParameter().GetGroup("BaseApp") ->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_PropertyView",false); } @@ -433,18 +433,19 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) } // Combo view - if (hiddenDockWindows.find("Std_CombiView") == std::string::npos) { + if (hiddenDockWindows.find("Std_ComboView") == std::string::npos) { bool enable = !treeView || !propertyView; - if(!enable) { + if (!enable) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("ComboView"); enable = group->GetBool("Enabled", true); } - if(enable) { - CombiView* pcCombiView = new CombiView(0, this); - pcCombiView->setObjectName(QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Combo View"))); - pcCombiView->setMinimumWidth(150); - pDockMgr->registerDockWindow("Std_CombiView", pcCombiView); + + if (enable) { + ComboView* pcComboView = new ComboView(0, this); + pcComboView->setObjectName(QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Combo View"))); + pcComboView->setMinimumWidth(150); + pDockMgr->registerDockWindow("Std_ComboView", pcComboView); } } diff --git a/src/Gui/TaskView/TaskView.h b/src/Gui/TaskView/TaskView.h index e1678c90f7..20463eee64 100644 --- a/src/Gui/TaskView/TaskView.h +++ b/src/Gui/TaskView/TaskView.h @@ -47,7 +47,7 @@ class Property; namespace Gui { class ControlSingleton; namespace DockWnd{ -class CombiView; +class ComboView; } namespace TaskView { @@ -180,7 +180,7 @@ public: virtual void OnChange(Gui::SelectionSingleton::SubjectType &rCaller, Gui::SelectionSingleton::MessageType Reason); - friend class Gui::DockWnd::CombiView; + friend class Gui::DockWnd::ComboView; friend class Gui::ControlSingleton; void addTaskWatcher(const std::vector &Watcher); diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp index 513ecef5c2..2a778b9d6a 100644 --- a/src/Gui/Workbench.cpp +++ b/src/Gui/Workbench.cpp @@ -41,7 +41,7 @@ #include "Window.h" #include "Selection.h" #include "MainWindow.h" -#include +#include #include #include @@ -704,7 +704,7 @@ DockWindowItems* StdWorkbench::setupDockWindows() const root->addDockWidget("Std_TreeView", Qt::LeftDockWidgetArea, true, false); root->addDockWidget("Std_PropertyView", Qt::LeftDockWidgetArea, true, false); root->addDockWidget("Std_SelectionView", Qt::LeftDockWidgetArea, false, false); - root->addDockWidget("Std_CombiView", Qt::LeftDockWidgetArea, false, false); + root->addDockWidget("Std_ComboView", Qt::LeftDockWidgetArea, false, false); root->addDockWidget("Std_ReportView", Qt::BottomDockWidgetArea, true, true); root->addDockWidget("Std_PythonView", Qt::BottomDockWidgetArea, true, true); diff --git a/src/Mod/Start/Gui/Workbench.cpp b/src/Mod/Start/Gui/Workbench.cpp index 2851329ce1..41baf3deaf 100644 --- a/src/Mod/Start/Gui/Workbench.cpp +++ b/src/Mod/Start/Gui/Workbench.cpp @@ -168,6 +168,6 @@ Gui::DockWindowItems* StartGui::Workbench::setupDockWindows() const { Gui::DockWindowItems* root = Gui::StdWorkbench::setupDockWindows(); root->setVisibility(false); // hide all dock windows by default - root->setVisibility("Std_CombiView",true); // except of the combi view + root->setVisibility("Std_ComboView",true); // except of the combo view return root; } diff --git a/src/Mod/Web/Gui/Workbench.cpp b/src/Mod/Web/Gui/Workbench.cpp index aa54f2e176..950549f897 100644 --- a/src/Mod/Web/Gui/Workbench.cpp +++ b/src/Mod/Web/Gui/Workbench.cpp @@ -351,6 +351,6 @@ Gui::DockWindowItems* Workbench::setupDockWindows() const { Gui::DockWindowItems* root = Gui::StdWorkbench::setupDockWindows(); //root->setVisibility(false); // hide all dock windows by default - //root->setVisibility("Std_CombiView",true); // except of the combi view + //root->setVisibility("Std_ComboView",true); // except of the combo view return root; } From 7b1e0ae7ba2d0148c50e49d30f822593e7096609 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 8 Feb 2020 14:04:53 +0100 Subject: [PATCH 13/15] Gui: [skip ci] fix naming inconsistency and rename 'combi' to 'combo' --- src/Gui/Language/FreeCAD_af.qm | Bin 186216 -> 186223 bytes src/Gui/Language/FreeCAD_af.ts | 6 +++--- src/Gui/Language/FreeCAD_ar.qm | Bin 181845 -> 181852 bytes src/Gui/Language/FreeCAD_ar.ts | 6 +++--- src/Gui/Language/FreeCAD_ca.qm | Bin 193555 -> 193557 bytes src/Gui/Language/FreeCAD_ca.ts | 4 ++-- src/Gui/Language/FreeCAD_cs.qm | Bin 186812 -> 186819 bytes src/Gui/Language/FreeCAD_cs.ts | 6 +++--- src/Gui/Language/FreeCAD_de.qm | Bin 197258 -> 197266 bytes src/Gui/Language/FreeCAD_de.ts | 4 ++-- src/Gui/Language/FreeCAD_el.qm | Bin 205454 -> 205459 bytes src/Gui/Language/FreeCAD_el.ts | 4 ++-- src/Gui/Language/FreeCAD_es-ES.qm | Bin 196302 -> 196307 bytes src/Gui/Language/FreeCAD_es-ES.ts | 4 ++-- src/Gui/Language/FreeCAD_eu.qm | Bin 193536 -> 193541 bytes src/Gui/Language/FreeCAD_eu.ts | 4 ++-- src/Gui/Language/FreeCAD_fi.qm | Bin 189902 -> 189907 bytes src/Gui/Language/FreeCAD_fi.ts | 4 ++-- src/Gui/Language/FreeCAD_fil.qm | Bin 196419 -> 196431 bytes src/Gui/Language/FreeCAD_fil.ts | 4 ++-- src/Gui/Language/FreeCAD_fr.qm | Bin 199202 -> 199207 bytes src/Gui/Language/FreeCAD_fr.ts | 4 ++-- src/Gui/Language/FreeCAD_gl.qm | Bin 192410 -> 192415 bytes src/Gui/Language/FreeCAD_gl.ts | 4 ++-- src/Gui/Language/FreeCAD_hr.qm | Bin 189827 -> 189832 bytes src/Gui/Language/FreeCAD_hr.ts | 4 ++-- src/Gui/Language/FreeCAD_hu.qm | Bin 192487 -> 192492 bytes src/Gui/Language/FreeCAD_hu.ts | 4 ++-- src/Gui/Language/FreeCAD_id.qm | Bin 187619 -> 187624 bytes src/Gui/Language/FreeCAD_id.ts | 4 ++-- src/Gui/Language/FreeCAD_it.qm | Bin 196380 -> 196385 bytes src/Gui/Language/FreeCAD_it.ts | 4 ++-- src/Gui/Language/FreeCAD_ja.qm | Bin 158619 -> 158624 bytes src/Gui/Language/FreeCAD_ja.ts | 4 ++-- src/Gui/Language/FreeCAD_kab.qm | Bin 194531 -> 194536 bytes src/Gui/Language/FreeCAD_kab.ts | 4 ++-- src/Gui/Language/FreeCAD_ko.qm | Bin 169573 -> 169578 bytes src/Gui/Language/FreeCAD_ko.ts | 4 ++-- src/Gui/Language/FreeCAD_lt.qm | Bin 195292 -> 195297 bytes src/Gui/Language/FreeCAD_lt.ts | 4 ++-- src/Gui/Language/FreeCAD_nl.qm | Bin 192168 -> 192173 bytes src/Gui/Language/FreeCAD_nl.ts | 4 ++-- src/Gui/Language/FreeCAD_no.qm | Bin 184954 -> 184959 bytes src/Gui/Language/FreeCAD_no.ts | 4 ++-- src/Gui/Language/FreeCAD_pl.qm | Bin 190416 -> 190421 bytes src/Gui/Language/FreeCAD_pl.ts | 4 ++-- src/Gui/Language/FreeCAD_pt-BR.qm | Bin 192706 -> 192711 bytes src/Gui/Language/FreeCAD_pt-BR.ts | 4 ++-- src/Gui/Language/FreeCAD_pt-PT.qm | Bin 192922 -> 192927 bytes src/Gui/Language/FreeCAD_pt-PT.ts | 4 ++-- src/Gui/Language/FreeCAD_ro.qm | Bin 195081 -> 195086 bytes src/Gui/Language/FreeCAD_ro.ts | 4 ++-- src/Gui/Language/FreeCAD_ru.qm | Bin 194259 -> 194264 bytes src/Gui/Language/FreeCAD_ru.ts | 4 ++-- src/Gui/Language/FreeCAD_sk.qm | Bin 187146 -> 187151 bytes src/Gui/Language/FreeCAD_sk.ts | 4 ++-- src/Gui/Language/FreeCAD_sl.qm | Bin 186603 -> 186608 bytes src/Gui/Language/FreeCAD_sl.ts | 4 ++-- src/Gui/Language/FreeCAD_sr.qm | Bin 185193 -> 185198 bytes src/Gui/Language/FreeCAD_sr.ts | 4 ++-- src/Gui/Language/FreeCAD_sv-SE.qm | Bin 183630 -> 183635 bytes src/Gui/Language/FreeCAD_sv-SE.ts | 4 ++-- src/Gui/Language/FreeCAD_tr.qm | Bin 188661 -> 188666 bytes src/Gui/Language/FreeCAD_tr.ts | 4 ++-- src/Gui/Language/FreeCAD_uk.qm | Bin 192757 -> 192762 bytes src/Gui/Language/FreeCAD_uk.ts | 4 ++-- src/Gui/Language/FreeCAD_val-ES.qm | Bin 194979 -> 194991 bytes src/Gui/Language/FreeCAD_val-ES.ts | 4 ++-- src/Gui/Language/FreeCAD_vi.qm | Bin 187993 -> 187998 bytes src/Gui/Language/FreeCAD_vi.ts | 4 ++-- src/Gui/Language/FreeCAD_zh-CN.qm | Bin 148121 -> 148126 bytes src/Gui/Language/FreeCAD_zh-CN.ts | 4 ++-- src/Gui/Language/FreeCAD_zh-TW.qm | Bin 151333 -> 151338 bytes src/Gui/Language/FreeCAD_zh-TW.ts | 4 ++-- 74 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/Gui/Language/FreeCAD_af.qm b/src/Gui/Language/FreeCAD_af.qm index b7b8f0201f98aa2779bf96814b5d40fbb4e11939..7321deb2118d58f75acf32018382fefd33454356 100644 GIT binary patch delta 8644 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 delta 8541 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 dKc32Q93D4r_?X1lgy_|Qnbe&3Hj~b5^?% - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView - SaamgesteldeVoorkoms + Combo View + Saamgestelde Voorkoms Tasks diff --git a/src/Gui/Language/FreeCAD_ar.qm b/src/Gui/Language/FreeCAD_ar.qm index e35197192726fc97d5a6c80621f2b6bea34b3ee9..1baa6177ad466d92d7456d065724097e6dc7cb4a 100644 GIT binary patch delta 8374 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 delta 8523 zcmXY$30zF;8^@pbotZOp=FB2ujM5}AT1T63B_tuT6w$3vLXfdDWR$b`Ab zFyw9kIt8FbJaRsev%1xNr}KIMSw4`H^H<-{@d3DT6*sb1SLyf!+<1T+mzkP)TQ~rC z!~@B10N`2Ad^U&#kN~!s7%dtCJ#ran6AO@d``~x&*d1adPuUM*0qsTAzBEKokq}H8&^O(ri3ifr6PWRtBT^?4$jKNe|F{N`$rwlN}G zeimsz_cyD}Y)OrK#2sylMLG-@={QT|0vVetF%k>5Q(}m{3etCNfou*HdG(jb$`p~$ z-OQxqyGXi3q|{m@_peC#Igw2;s(3!C+bh!UzR1Wj<{~v&{0p+SfdCn8k=a1vPqKKa zf!t?lQXR==JEguOwt?*CWgvB!7)aXijz|xCkv`5MyM&AMYa()lwa8J9B1Z>_9Fr+B zwnXHDXUtz_um}WQRSkgmdaz#q5~$%kn=8{L-2z9<96C<}j`+anJRfi@84Ykm4~{q{ z=o@S%oi_%YmLCAxssxJm5Bm%c@ zgLC)i0Q_liUX=_)^&DLK`vKW-5KK1~0I)`!0~yAAI9(DCUe3ihrPhP@oO+&x_Qv`Q zKMEbY>wsJx1fA-?CjxXj=?8F-nMwVpL8ppnfZT~@(g;WJotOeJd;$30e+<<13HY~a z39zLd_}`rgq-rVztjPc}^(OKnK$Ec$@B|}3TV7#zxas^U=ou;jns9{;l6&)E(A#MN zkc)XNQ*P>&0ey;#fCdhRzH3787M__&`}BmMHD>`92AW9@%`%hD{uBEB6%63w2mJ+G zfL8;df5>?tH+nL)!ZdU&1kYLtqu8V@t6=8QbU6IZ zOgdyDt5TTwKnP1|iRZe&TJff&h4AMn4-A>F$d8^PKUImWZ6xwnxS7;a+@^LQZaYsB z=_wc4%?RQBa{+1(K=}M)K>tK0=K(BUYbIG~fQZ2QIORjchn)Z&U)#a(o~MD7oQKgb zy92qL4`XbK06si`vC0cTY;7T)BFocYVo!gdq&rMeb_VhRm|E$rw}R|xmdpfOhP-@W}nj+aAqT|lnMpD}DKcKTyScFQ)pC(T|OM(2H#^$PYZULlDWeeoy zRPr;p7m!j%D!o4eNX)x&!vH2&Q0>`^KqKN=fy&?(ObveTfh@Zta(#c1 zIsItca@;??F?Bz!1Q^Mv=Zi)_tzWaoYQunAv{!Bv(2xw;f8P`!Eh1_El21UsdD9`v zZUA5J(^07fK!O{KJbZ|b9gGh7xh)<0%m&D|<22480gqos$8W$1CbwXV)ZXMeJEhjS zInbrEo&oJK3Rw;`ARAc$v}ZA0XTKRp(FVFD22)o3kZ$`~2V_(wlW9y{Z_-?xTy)-g znwyCk^3snUNyc1AK}#*U12j609!=Q^WL2h_)LKK2t;ajr{X*n5CzhZwIdr8b?Gu4K zJWnsqUV+;4l@ zB87z_RU1UQE)!{bC(=zP(%nU**9Vd9%0#vg6xrd5$UkO_O!B)ce(-k`*`uk*fWabr zE)dyki^$%`MFxHr*{4`!-vW{S4vOqA5jkL&$l$gjLpqBblwoEP4Gj}_3~BwFbt1z& zME)81n?FT{KNJ}mA~I@{$Y?8(BY%%{Y!`8R+!2xS;UdR>5;@Vio=HF_{SNh{-y@nl znLcad*F%#H@CTt{mTj0dv%5dCtl75esO`lWz9ZQx1Xvc?t$GKhIu zcsm@HxYgHaC!R?>{ak_cTqo(~za8K|y~MBH+47f5{07Q_w(H6=EsT0ENyJmko<5F} zVGrK}?ebOGDIe_>u_+ z_FA&+DY}~QMY3YiE)?>vl9kdbfR>gL7Lg95(R)co?oOaBM@X_lF{ACSn@OWwM2JYd&~OZeL2|_>1T{KY zQW$j($hjGk(%38@&2CHXK0?JPER+0u0QIwdo#g)eQmh=lNXo*Bu=-jrc{11p5Fc(P zDHt!QkfV;e8bn@nlss4C)s&f%mx&B3k7UWuIvLQJoK!N#1_&KJp0#RZ=(<(f;2?%8 z*+*)XWdic?t<+)hXrM#3NnMPOf!x|CZQCmmNJ5CzeN+L^X&t1VO;Er*Pf6R|L;1e= zh%IVlB+Xe)BOT96BOfgU+ITX%(a7X>UK;oHCy=ELq_f6;1sJwlI#1C9XmFu4xdWO| zU@z&y@)RKM3hCmT_@JKsU@n$A2aR+^?N=Zk{?ax7L|}~|m`VM5O3iX*l8Gz|V)2$b z(uXawG+6YIX3a?iSiMx5bvF~pn>j4c(!j?^cc!AST}@|YmeU;;Nb|C%VuqiT{v$*I zggZ+Aali*UG+KJ*6aMylxb$qeJ&>7dHn*{XIIzu)bxE$$@=g^1@3N&8L*@YV9Azf) z{~)dW9)q%VOZvhEv-rSu>C4!OKsLRWzK)v$uwc6M&GL~zLOrE#YSDK4rAe!d$o^FN z@pcXnQ;f)>7t-ow`1|rc(l3ja03@`Le!I8?Xy+%=pMw_x891XO!XGGYCDJV0(H^<65nuxbpHYbCR|@e{z5B(qw8xiBV1X5XX&$kA$<H*YkB)ikZNTS(~Cb|}BvN3(I zgsCl*jroBOv*f2N?ikLGwOh?3L9dyY&PcE#(CPTsvZZHhfz0a0=IRV2ifz{Ek`%Jk z>lx_&cVubraH!QqvQ@**1ElqrWhCNu##>qDwE!Tee#qA1d?HJ;Woz%EGk0hy+qiTc zK;{WENl28){VLfer);c$>tve>Zv!d5D9f641n7)#+15^Y-movSZ7Xp9$v3j?A(j9Q zzj?^E@5utPBuBQr%n~T5n154aFE`n~s{0tozOn-@7%(?q*}=JJsOnp?Q&C&c1RKlF zG;jvGda&$FP!W))H)LnKj0D)KHj@mikX_gk3Dh=|PHHCgyee|oN|D1S%E~|Cxh?Z#uLLYGoQdpRdkS!Gn(SRk zHPB9PWmSP=f$T_>{ikb$(q$>Dy|xt#uQFNPi!79yy?XtKA)IQX6sT8cPSXX$HFP_t zd4#&%aS5kgQ2=o6BWLl>6{zDbuHieJi~r2yEQh`XGP{gxe9INck>y;|va0}ZrJP=Y zzl;9P=@avSbT8rbnHzA{k7ccz83wH4+MKol(DdLOx8PDi=gv8Mqnhvfi*wG}4%F!+ z=X`oQz-U*_B{vixdm-n#F#*eyNt|gSig55{Gs(_%oaw`9EQZFi%w`6MNnFR$BLL(3 zaGhRZ^?%6TOxo8<_s6rcW;%W&*QZl1%Kj1dqnXYjoBQ*jHO}HuTx29x z#<%RaVf{<706fVJ8)pe*$ZT%7l?2Dvk@;8|I#_YzmS8=7^fnjQ2(RC?jEncR2T0E6 z#@p~1X(w)4J3m~@eBq`$yutgOVkX(ylVw^N$at1#Wk?#qrEmNUB+r^#tHCQzI>xPA z>R$_vPV zZQSw0xZJvRo;&|z8IZOQxeJGIY9|(Om*Q{)mHFJI!b-f?4&0Shm=!G8+QPw=yS)Uz zi!J6#^vH1AVSOm2BpDfMVKvuCFYh8!A+`GfSfLsdU{`UgM z7&Ddo{C+<`gOz5I_+BD6bm4vi3c$Y=a;U_tyV8mMur{<<;nZr$Jy8SlRRiSRuOZ5$_L)+4pjZOd~kU`AomjF z;r2BEjmMZt4q3<}UVOrsrig4d?wj}_K3C+#neyn~73ifKnA%3CZ!RDAEC{ITwLH!@ z4MROc?XPgRC9zeyBBuE3im@BrX%^^lW)v zJ2Z~W&+;>&I4viX$qP>4L^@+5zn+3;&0jCSQ9d2Wi$Hm?vIc0<75Sq>7_b-lEZ(5& zWhH+%2S?=+C9kUv0gzhDzm!J;9rQ;2)%_AC{Q`9jv* z*1)GKhUTczvNke*TVqn0V)T<30R4T%tSOj)X^Rz!emhY%k1FP!LQ^k4u2|Tx03dFP zV(~Tfr|@Ya^G+z1RM-KOZd5Gmwi-yPOk|q3B1L%`NbWbq@;*3uR((=1c`G3QE^l)B`WHjzYz$SD5)(lND#9ZUH%#s<`-z!#ZWY;?lWBsI%T|Q47<6E{gIS zSlCVIrl<(E0rKvi;$!bw01gcl)w&Bn`4q+1S`3@EmM7mc0j^o|vhYNlb31rp7?xcl zmhozf&RG2Y%Ui^vNuD~x)OJRT-n`Y#IDm^cc-tvqc&(?*-_F=IoA;77#1_j0-mCjI zfN}%h&dCm2U)6lOW&S{}J?7hw-HdwLmTzBM3gpjid+;bpRjxEd^lKcRsEMy3fo|KCb6S z)F~YwH=+i|TUpD;jlvyACyT5c$WJWW2juMte$rJ6G_o;2JNORJp)2`B#ZK(vx$#TO zJOG-t;g@B~FiZFH%l^6tbkuM@bs7eEn4DkHs}$h)Fn)DQE#63!$kf$*`toc%?i)J*ng+9rg}wKwXA^Oxpa1oC$de;Iv<sF(8AYm2LNC z;PPUG(k&0gU|+n_Ln;M$>8|w9<8uq@uKZ)vCcLMI%1*uSVOK0#=~H2e7gP|UlbZX`yW8>4npH| zPtXKDvAi}0eV$;f!qL7m2~Js9?+um&HrbN~|BMd;BC7Y@U^nMu`-BJ~Z0fT|z3zBwcErn4~c)_*{< zZVI87aDPOt5QEwSqn8Pz9NGgpvrCB8c>>ix7RKeRLR(9>5E2^Uf=g~IBxD3&f2dHH zjwCt1dFGLjVv_`<;Es?c`2-|8P~@&SAv19#u7^g7JggGd{EK3{th2E0?gW6?;bxNm z?G-jGN0GW;D{Qo#4A_bjvh+FFyFM-Kc%*_r!Xkwo-&L4-w!+`NcA%2B7TN5fu;LAeZ}gquTA4Z6e$#djkyr{)WHy|9~dV1e+!>p9jt9>SA+ zoZk;R3(uSuVr}RuJUfSXHTSUaMzIK8?xyhW`3Hca?ZW#W*=VyP%p}9@gqkb&vAXZr zT&Szsf(G$a_JLEu4&sDXoXCSCrpV0!AWRy$)tl%OG~jNk{Ni0UkM-eR3K$w3}+FFUs#aZ`JZ4xccn>MwOaZ z32?(wl|BiVXz52)8NST`T3=JG@0o>DW{PTktRujhy{b(nDK4s?sy2N`u{?HFm30jT zr{77{U;A+s(qfk5Y;^moD%`5UiX=l-_!tv?;tti-`9VN#2dHi={E4!sQQdsB0-((# zRq-ygai0}T=3>yts^0EH(~PxIRSOvKwtuMV2H>{~)-xX$-=sn{Hzp1zWtCdhAqZgi z1huNSEmll%YVDQ|05v&koh$)+L>6jm|4^Xu5_R*E&RA#mR2%LM!VZo?Z98=skS#T8 z2XDLw`x$CyD~#u)UTV)4ivX-s)ZOaP*&a+&`x!a|7+$J-kDLWC=Zw1FgCgwQtQpLH zxR~_$>QU=aO(S-S+#4?PSuXQ;HSlHX8NH?e?N-dxpaOkJ;P`c9aF>xM>} zzSl8j^y!-ZukPT38Lk;%#L;Aq(ga(VV7a(fGZ=M^WIoh{CY57zf@+57Lx7rGSwvgk z0acoX(+*&PvPrYCPZ5A(oXDVonytnAvBl6uv$OdTTmyB~?4DDD&6b9m-J25ud~Ry? zHbGTu0h)tnF;j>7i#ru{>7=6p|x`P1rUE&YdDw*kUmLk?^A)v9Hwm@isNdVqjjzC z=sj}McJf5E5BFeIZbtnjZI3KJAT2j&1CHQR7?`B(+i(b0Fu$0KyG}n+JF062_9U)r zN8QCcxPM3+>xb{qj`J+SUFR05oxA}(*ZRJ8_5@dab+S%7zw>CU8BS@JtuMuO>Qrqi z;EVecQD)L)p6zru==*55*Vy380y}N?B0GE;@rL2{QG3kP~_&)yPfWP)`Kh({XK#Q*YW**gkQQ~?t z{J8e}nKNiVI_sO^A<*9UL1oeeJ - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView - CombiView + Combo View + Combo View Tasks diff --git a/src/Gui/Language/FreeCAD_ca.qm b/src/Gui/Language/FreeCAD_ca.qm index 25fcce15ad480275b4ddb3bab8f82cdc85347e3c..acb8fcd596fd45af9f246468f08718f15a8a095b 100644 GIT binary patch delta 8378 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