From 323ec08e8e185de32af71c855cc98fc4698b41f6 Mon Sep 17 00:00:00 2001 From: Max Wilfinger Date: Tue, 7 May 2024 12:12:13 +0200 Subject: [PATCH] Update assembly icons to be consistent with main updates. Add commands to menu/toolbar. --- .../Resources/icons/Assembly_ExplodedView.svg | 154 +-- .../icons/Assembly_ExplodedViewGroup.svg | 785 ++++----------- .../Resources/icons/Assembly_ExportASMT.svg | 937 ++++-------------- .../Resources/icons/Assembly_JointGroup.svg | 571 +---------- .../icons/Assembly_SolveAssembly.svg | 230 +---- src/Mod/Assembly/InitGui.py | 14 +- src/Mod/Assembly/JointObject.py | 15 +- 7 files changed, 530 insertions(+), 2176 deletions(-) diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExplodedView.svg b/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExplodedView.svg index 9a388a0b4a..5168ff5754 100644 --- a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExplodedView.svg +++ b/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExplodedView.svg @@ -5,44 +5,16 @@ version="1.1" viewBox="0 0 64 64" id="svg96" - sodipodi:docname="Assembly_ExplodedView4.svg" - inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - + id="linearGradient1"> image/svg+xml - - Path-Stock 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -233,90 +198,46 @@ + style="fill:url(#linearGradient3);stroke:#302b00;stroke-linejoin:round" /> + style="fill:url(#linearGradient4);stroke:#302b00;stroke-linejoin:round" /> + style="fill:url(#linearGradient5);stroke:#302b00;stroke-linejoin:round" /> + style="fill:none;stroke:#fce94f;stroke-width:2" /> - + id="g8"> + style="color:#000000;fill:#cc0000;stroke:#650707;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" + d="m 24.478541,15.553224 a 1.4365924,1.4365924 0 0 0 -1.436592,1.436592 l 0.0029,2.466338 a 1.4365924,1.4365924 0 0 0 1.439398,1.436592 1.4365924,1.4365924 0 0 0 1.433787,-1.439398 l -0.0029,-2.466337 a 1.4365924,1.4365924 0 0 0 -1.436593,-1.433787 z m 0.0056,6.776115 a 1.4365924,1.4365924 0 0 0 -1.436592,1.436592 l 0.0029,2.873185 a 1.4365924,1.4365924 0 0 0 1.439398,1.436592 1.4365924,1.4365924 0 0 0 1.433787,-1.439398 l -0.0029,-2.873185 a 1.4365924,1.4365924 0 0 0 -1.436593,-1.433786 z m 0.0056,7.182962 a 1.4365924,1.4365924 0 0 0 -1.433787,1.436592 v 2.873185 a 1.4365924,1.4365924 0 0 0 1.439398,1.436592 1.4365924,1.4365924 0 0 0 1.433787,-1.439398 v -2.873185 a 1.4365924,1.4365924 0 0 0 -1.439381,-1.433786 z m 0.0056,7.182962 a 1.4365924,1.4365924 0 0 0 -1.433786,1.436592 l 0.0029,2.873185 a 1.4365924,1.4365924 0 0 0 1.436592,1.436592 1.4365924,1.4365924 0 0 0 1.436593,-1.439398 l -0.0029,-2.873185 a 1.4365924,1.4365924 0 0 0 -1.439372,-1.433786 z" + id="path6" /> + style="fill:none;fill-rule:evenodd;stroke:#ef2929;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + d="m 24.915491,23.656877 v 3.057837" + id="path8" /> + style="fill:none;fill-rule:evenodd;stroke:#ef2929;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + d="m 24.915491,38.063657 v 3.057837" + id="path4" /> - - - - - - - - - - + style="fill:none;fill-rule:evenodd;stroke:#ef2929;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + d="m 24.915491,30.860267 v 3.057837" + id="path7" /> + d="M -17,40 V 26 L 2,10.0001 2.0000003,23 Z" /> + style="fill:none;stroke:#fce94f;stroke-width:2;stroke-opacity:1" /> + + style="fill:url(#linearGradient69709);stroke:#0b1521;stroke-width:2;stroke-linejoin:round" /> + style="fill:url(#linearGradient69717);stroke:#0b1521;stroke-width:2;stroke-linejoin:round" /> + + diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExplodedViewGroup.svg b/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExplodedViewGroup.svg index 0119fe3a54..a5d715635a 100644 --- a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExplodedViewGroup.svg +++ b/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExplodedViewGroup.svg @@ -5,44 +5,16 @@ version="1.1" viewBox="0 0 64 64" id="svg96" - sodipodi:docname="Assembly_ExplodedViewGroup.svg" - inkscape:version="1.1-beta1 (77e7b44db3, 2021-03-28)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - + id="linearGradient1"> - - - - + xlink:href="#linearGradient4383" + id="linearGradient9" + x1="32" + y1="64" + x2="32" + y2="14.419661" + gradientUnits="userSpaceOnUse" /> - - + y2="31.5" /> - - - - - + gradientTransform="translate(-1.2435,-2.5881)" + x1="20.244" + y1="37.588" + x2="17.244" + y2="27.588" /> - - - - - - - - + gradientTransform="translate(-12.714,-17.586)" + x1="48.714" + y1="45.586" + x2="44.714" + y2="34.586" /> - - - + gradientTransform="translate(-41.2435,-2.5881)" + x1="20.243999" + y1="37.588001" + x2="17.243999" + y2="27.587999" /> - - - + gradientTransform="translate(-52.714,-17.586)" + x1="48.714001" + y1="45.585999" + x2="44.714001" + y2="34.585999" /> - - - + gradientTransform="matrix(1,-0.026667,0,1,81.696,-5.3735)" + x1="20.244" + y1="37.588" + x2="17.244" + y2="27.588" /> - - - + gradientTransform="translate(61.2256,1.0356)" + x1="50.714" + y1="25.586" + x2="48.714" + y2="20.586" /> + @@ -333,7 +177,6 @@ image/svg+xml - Path-Stock 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -357,377 +200,157 @@ + id="layer3" + style="display:inline"> + + + + + + - + id="g40-3" + style="stroke-width:2" + transform="matrix(0.80408661,0,0,0.80408661,3.6084445,-50.31302)"> + d="M 9,49 V 35 l 28,10 v 14 z" + id="path30-3" + style="font-variation-settings:normal;opacity:1;fill:url(#linearGradient21);fill-opacity:1;stroke:#302b00;stroke-width:1.99978;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + d="M 37,59 V 45 L 55,28 v 13 z" + id="path32-5" + style="fill:url(#linearGradient13);stroke:#302b00;stroke-width:1.99978;stroke-linejoin:round;stroke-dasharray:none" /> + + + + + + + + + + + + + + + + + + + + + + + style="color:#000000;fill:#cc0000;stroke:#650707;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" + d="m 26.441831,-47.827151 a 1.3954961,1.4210831 0 0 0 -1.762541,0.906679 1.3954961,1.4210831 0 0 0 0.892953,1.792215 l 2.652896,0.885533 a 1.3954961,1.4210831 0 0 0 1.759944,-0.90668 1.3954961,1.4210831 0 0 0 -0.892951,-1.792215 z m 6.629645,2.212511 a 1.3954961,1.4210831 0 0 0 -1.759946,0.906681 1.3954961,1.4210831 0 0 0 0.890356,1.794858 l 2.652897,0.885533 a 1.3954961,1.4210831 0 0 0 1.759946,-0.909324 1.3954961,1.4210831 0 0 0 -0.890356,-1.792214 z m 6.629644,2.215156 a 1.3954961,1.4210831 0 0 0 -1.759944,0.906681 1.3954961,1.4210831 0 0 0 0.890355,1.792213 l 2.652897,0.885534 a 1.3954961,1.4210831 0 0 0 1.759945,-0.906681 1.3954961,1.4210831 0 0 0 -0.890356,-1.792213 z m 6.629646,2.212511 a 1.3954961,1.4210831 0 0 0 -1.759946,0.906681 1.3954961,1.4210831 0 0 0 0.890356,1.794858 l 2.652895,0.885534 a 1.3954961,1.4210831 0 0 0 1.759946,-0.909324 1.3954961,1.4210831 0 0 0 -0.890356,-1.792215 z" + id="path5-6" /> - - - - - - - - - - - - - - - + style="fill:none;fill-rule:evenodd;stroke:#ef2929;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + d="m 39.300532,-42.479528 2.818448,0.918371" + id="path3" /> + id="g943-9" + transform="matrix(0.72287451,0,0,0.72287451,-25.415947,-58.269988)"> + d="m 91,33.5 -0.02739,-14.214 12.967,4.3352 v 14.5 z" + id="path54-5" + style="fill:url(#linearGradient19);stroke:#0b1521;stroke-width:2;stroke-linejoin:round" /> + + + + + style="fill:none;fill-rule:evenodd;stroke:#ef2929;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + d="m 26.000232,-46.880657 2.818449,0.918371" + id="path1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="fill:none;fill-rule:evenodd;stroke:#ef2929;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + d="m 32.65834,-44.672757 2.818448,0.918371" + id="path2" /> diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExportASMT.svg b/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExportASMT.svg index 50b1905bd0..f64fc5e402 100644 --- a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExportASMT.svg +++ b/src/Mod/Assembly/Gui/Resources/icons/Assembly_ExportASMT.svg @@ -1,18 +1,12 @@ + + + id="defs2871"> + id="linearGradient5"> - - - - - - + id="stop19" /> + id="stop20" /> + id="swatch18"> - + id="stop18" /> - + id="swatch15"> - + id="stop15" /> - - - + id="linearGradient5-1"> + id="stop5" /> + id="stop6" /> - - - - - - - - - + id="linearGradient3836-9"> + id="stop3838-8" /> + id="stop3840-1" /> - - + id="linearGradient3836-9-3"> + id="stop3838-8-5" /> + id="stop3840-1-6" /> + id="linearGradient2"> + id="stop1" /> + id="stop2" /> + xlink:href="#linearGradient3765" + id="linearGradient3771" + x1="98" + y1="1047.3622" + x2="81" + y2="993.36218" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-60,-988.36218)" /> + + id="stop3767" /> - + id="stop3769" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.73269922,0,0,0.5925111,13.613318,24.513214)" + x1="48.014042" + y1="26.323408" + x2="43.478561" + y2="42.076672" /> + id="linearGradient3806"> + id="stop3808" /> + id="stop3810" /> + + + id="stop3" /> - - - + id="metadata2874"> image/svg+xml - 2005-10-15 - Andreas Nilsson + [maxwxyz] - - - edit - copy - - - - + https://www.freecad.org/wiki/index.php?title=Artwork + - Jakub Steiner + FreeCAD - + + FreeCAD/src/ + + + FreeCAD LGPL2+ + + + 2024 - - - - - - - - + id="layer3" + style="display:inline"> + + + + id="g40" + style="display:inline;stroke-width:2" + transform="matrix(0.71696222,0,0,0.71696222,9.057209,8.9822968)"> - + d="M 9,49 V 35 l 28,10 v 14 z" + id="path30" + style="fill:url(#linearGradient13);stroke:#302b00;stroke-linejoin:round" /> + d="M 37,59 V 45 L 55,28 v 13 z" + id="path32" + style="fill:url(#linearGradient14);stroke:#302b00;stroke-linejoin:round" /> + d="M 11.008,47.606 11,37.9997 l 24,8 0.0081,10.185 z" + id="path34" + style="fill:none;stroke:#fce94f" /> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g943" + transform="matrix(0.71696222,0,0,0.71696222,-33.960524,8.9822968)" + style="display:inline"> + + + + + + + id="g963" + transform="matrix(0.71696222,0,0,0.71696222,37.735698,8.9822968)" + style="display:inline"> + + + + + + style="fill:url(#linearGradient920);fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-linejoin:round" + id="path912" + d="M -31,35 V 21 l 14,5 v 14 z" /> + style="fill:#fce94f;fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-linejoin:round;stroke-opacity:1" + id="path914" + d="M -31,21 -11.415,5.209 2,10.0001 l -19,16 z" /> + + + diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_JointGroup.svg b/src/Mod/Assembly/Gui/Resources/icons/Assembly_JointGroup.svg index ee7e62d2a4..7a1a2df59a 100644 --- a/src/Mod/Assembly/Gui/Resources/icons/Assembly_JointGroup.svg +++ b/src/Mod/Assembly/Gui/Resources/icons/Assembly_JointGroup.svg @@ -3,13 +3,7 @@ width="64px" height="64px" id="svg2821" - sodipodi:version="0.32" - inkscape:version="1.1-beta1 (77e7b44db3, 2021-03-28)" - sodipodi:docname="Assembly_JointGroup.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" @@ -19,7 +13,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient4" + id="linearGradient9" + x1="32" + y1="64" + x2="32" + y2="14.419661" + gradientUnits="userSpaceOnUse" /> - - - @@ -356,7 +76,6 @@ [wmayer] - Part_Cylinder 2011-10-10 https://www.freecad.org/wiki/index.php?title=Artwork @@ -380,235 +99,49 @@ + id="layer1"> - - - - - + id="layer3" + style="display:inline"> + style="fill:#204a87;fill-opacity:1;stroke:#0c1522;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" + id="path4" + d="M 29.921921,10.073012 26.993293,6.1977395 C 26.21651,5.1698698 25.163057,4.5924975 24.064598,4.5924975 H 5.0714589 c -1.1437425,0 -2.0708717,1.2268134 -2.0708717,2.740257 V 58.484215 c 0,0.504481 0.309043,0.913419 0.6902905,0.913419 H 60.294706 c 0.381247,0 0.690291,-0.408938 0.690291,-0.913419 V 12.813269 c 0,-1.513445 -0.927129,-2.740257 -2.070872,-2.740257 z" /> + style="fill:#204a87;fill-opacity:1;stroke:#3465a4;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" + id="path7" + d="M 5.2089844,6.5917969 H 24.064453 c 0.375444,0 0.874561,0.2026195 1.333984,0.8105468 l 3.527344,4.6699223 h 29.84961 c 0.0082,0.01044 0.01784,0.02289 0.02734,0.03711 0.01056,0.0158 0.02193,0.03237 0.0332,0.05273 0.08049,0.145363 0.148438,0.361331 0.148438,0.650391 v 44.58594 H 5 V 7.3320312 C 5,7.0436394 5.0678061,6.828994 5.1484375,6.6835937 c 0.011294,-0.020366 0.022609,-0.038859 0.033203,-0.054687 0.00953,-0.014245 0.019073,-0.026632 0.027344,-0.03711 z" /> + style="fill:#729fcf;fill-opacity:1;stroke:#0c1522;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" + id="path6" + d="m 29.919347,14.419661 -2.927223,3.534545 C 26.215716,18.891703 25.16247,19.41831 24.064012,19.41831 H 3.0000008 l 0.015588,39.156085 c 2.171e-4,0.460126 0.3093777,0.833108 0.6906252,0.833108 h 56.603828 c 0.381248,0 0.690139,-0.372982 0.689957,-0.833108 L 60.983419,16.918986 C 60.982865,15.538609 60.055293,14.419661 58.91155,14.419661 H 29.919344 Z" /> - - - - - - - - - - - - - - - - - - - + style="fill:url(#linearGradient9);fill-opacity:1;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" + id="path8" + d="m 30.861328,16.419922 h 28.050781 c 0,0 0.07225,0.463543 0.07227,0.5 L 59,57.408203 H 5.015625 L 5,21.417969 h 19.064453 c 1.756119,0 3.349555,-0.836095 4.46875,-2.1875 z" /> + transform="matrix(0.61183741,0,0,0.61123957,12.4212,17.998573)" + style="stroke-width:0.854151"> + transform="translate(3.6192085e-6,-0.89630564)" + style="stroke-width:0.854151"> + id="path2994-3" /> + id="path2994-3-6" /> + id="path2994-3-6-9" /> + transform="matrix(0.96000015,0,0,0.96000015,1.2799944,2.2388113)" /> + style="fill:#729fcf;fill-opacity:1;stroke:#302b00;stroke-width:1.7083;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.4;stroke-opacity:1" + id="path1-6" /> + transform="translate(3.6192085e-6,-20.496033)" + style="stroke-width:0.854151"> + id="path1" /> + style="fill:url(#linearGradient3);fill-opacity:1;stroke:#729fcf;stroke-width:2.45283;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.4;stroke-opacity:1" + d="m 53.627745,51.867574 c 0,3.124022 -6.064364,5.779939 -14.514788,6.752122 v 9.88738 c 0,0 -3.337936,0.817369 -6.483138,0.809873 -3.145202,-0.0075 -6.427599,-0.809873 -6.427599,-0.809873 V 58.755519 C 17.072982,57.918034 10.372256,55.151416 10.372256,51.867574 l -1e-6,-15.676047 h 43.25549 z" + id="path2" /> + id="path3" /> - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -353,70 +245,26 @@ style="fill:none;stroke:#babdb6;stroke-width:2;stroke-opacity:1" /> - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/src/Mod/Assembly/InitGui.py b/src/Mod/Assembly/InitGui.py index f4090de97f..5ece952744 100644 --- a/src/Mod/Assembly/InitGui.py +++ b/src/Mod/Assembly/InitGui.py @@ -78,6 +78,7 @@ class AssemblyWorkbench(Workbench): "Assembly_CreateAssembly", "Assembly_InsertLink", "Assembly_SolveAssembly", + "Assembly_CreateView", ] cmdListMenuOnly = [ @@ -93,17 +94,12 @@ class AssemblyWorkbench(Workbench): "Assembly_CreateJointSlider", "Assembly_CreateJointBall", "Assembly_CreateJointDistance", + "Separator", + "Assembly_CreateJointRackPinion", + "Assembly_CreateJointScrew", + "Assembly_CreateJointGearBelt", ] - if Preferences.preferences().GetBool("ExperimentalFeatures", False): - cmdList = cmdList + ["Assembly_CreateView"] - cmdListJoints = cmdListJoints + [ - "Separator", - "Assembly_CreateJointRackPinion", - "Assembly_CreateJointScrew", - "Assembly_CreateJointGearBelt", - ] - self.appendToolbar(QT_TRANSLATE_NOOP("Workbench", "Assembly"), cmdList) self.appendToolbar(QT_TRANSLATE_NOOP("Workbench", "Assembly Joints"), cmdListJoints) diff --git a/src/Mod/Assembly/JointObject.py b/src/Mod/Assembly/JointObject.py index feaa4f977d..ebfec7975a 100644 --- a/src/Mod/Assembly/JointObject.py +++ b/src/Mod/Assembly/JointObject.py @@ -57,16 +57,6 @@ TranslatedJointTypes = [ translate("Assembly", "Belt"), ] -TranslatedJointTypesNoExperimental = [ - translate("Assembly", "Fixed"), - translate("Assembly", "Revolute"), - translate("Assembly", "Cylindrical"), - translate("Assembly", "Slider"), - translate("Assembly", "Ball"), - translate("Assembly", "Distance"), -] - - JointTypes = [ "Fixed", "Revolute", @@ -1186,10 +1176,7 @@ class TaskAssemblyCreateJoint(QtCore.QObject): self.form.setWindowTitle("Match parts") self.form.jointType.hide() - if Preferences.preferences().GetBool("ExperimentalFeatures", True): - self.form.jointType.addItems(TranslatedJointTypes) - else: - self.form.jointType.addItems(TranslatedJointTypesNoExperimental) + self.form.jointType.addItems(TranslatedJointTypes) self.form.jointType.setCurrentIndex(jointTypeIndex) self.form.jointType.currentIndexChanged.connect(self.onJointTypeChanged)