From 7626accb599fe7787ba2ac68752cd577cab2d417 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Fri, 25 Sep 2020 13:18:06 -0500 Subject: [PATCH] Sketcher: move other icons into their subdirectories --- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 5 +-- src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 32 +++++++++---------- .../{ => constraints}/Sketcher_Crosshair.svg | 0 .../Sketcher_ToggleActiveConstraint.svg | 0 .../Sketcher_ToggleConstraint.svg | 0 .../Sketcher_Toggle_Constraint_Driven.svg | 0 .../Sketcher_Toggle_Constraint_Driving.svg | 0 .../{ => geometry}/Sketcher_AlterFillet.svg | 0 .../{ => geometry}/Sketcher_CarbonCopy.svg | 0 .../Sketcher_CarbonCopy_Constr.svg | 0 .../icons/{ => geometry}/Sketcher_Extend.svg | 0 .../{ => geometry}/Sketcher_External.svg | 0 .../Sketcher_ToggleConstruction.svg | 0 .../{ => geometry}/Sketcher_Trimming.svg | 0 .../{ => obsolete}/Sketcher_DraftLine.svg | 0 .../Sketcher_ProfilesHexagon1.svg | 0 .../Sketcher_ToggleConstruction_old.svg | 0 .../{ => obsolete}/Sketcher_ToggleNormal.svg | 0 18 files changed, 19 insertions(+), 18 deletions(-) rename src/Mod/Sketcher/Gui/Resources/icons/{ => constraints}/Sketcher_Crosshair.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => constraints}/Sketcher_ToggleActiveConstraint.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => constraints}/Sketcher_ToggleConstraint.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => constraints}/Sketcher_Toggle_Constraint_Driven.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => constraints}/Sketcher_Toggle_Constraint_Driving.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => geometry}/Sketcher_AlterFillet.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => geometry}/Sketcher_CarbonCopy.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => geometry}/Sketcher_CarbonCopy_Constr.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => geometry}/Sketcher_Extend.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => geometry}/Sketcher_External.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => geometry}/Sketcher_ToggleConstruction.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => geometry}/Sketcher_Trimming.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => obsolete}/Sketcher_DraftLine.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => obsolete}/Sketcher_ProfilesHexagon1.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => obsolete}/Sketcher_ToggleConstruction_old.svg (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{ => obsolete}/Sketcher_ToggleNormal.svg (100%) diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 04f4f274ab..90ef44ee5a 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -183,7 +183,8 @@ void removeRedundantHorizontalVertical(Sketcher::SketchObject* psketch, const std::map coincidents = psketch->getAllCoincidentPoints((*it).GeoId, (*it).PosId); if(!coincidents.empty()) { - ext = coincidents.begin()->first < 0; // the keys are ordered, so if the first is negative, it is coincident with external + // the keys are ordered, so if the first is negative, it is coincident with external + ext = coincidents.begin()->first < 0; std::map::const_iterator geoId1iterator; @@ -6083,7 +6084,7 @@ namespace SketcherGui { { sAppModule = "Sketcher"; sGroup = QT_TR_NOOP("Sketcher"); - sMenuText = QT_TR_NOOP("CarbonCopy"); + sMenuText = QT_TR_NOOP("Carbon copy"); sToolTipText = QT_TR_NOOP("Copies the geometry of another sketch"); sWhatsThis = "Sketcher_CarbonCopy"; sStatusTip = sToolTipText; diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index 644a5f62ce..e7a1464207 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -1,31 +1,15 @@ - icons/Sketcher_AlterFillet.svg - icons/Sketcher_CarbonCopy.svg - icons/Sketcher_CarbonCopy_Constr.svg - icons/Sketcher_Crosshair.svg - icons/Sketcher_DraftLine.svg icons/Sketcher_EditSketch.svg - icons/Sketcher_Extend.svg - icons/Sketcher_External.svg icons/Sketcher_LeaveSketch.svg icons/Sketcher_MapSketch.svg icons/Sketcher_MergeSketch.svg icons/Sketcher_MirrorSketch.svg icons/Sketcher_NewSketch.svg icons/Sketcher_NewSketch.svg - icons/Sketcher_ProfilesHexagon1.svg icons/Sketcher_ReorientSketch.svg icons/Sketcher_Sketch.svg icons/Sketcher_SwitchVirtualSpace.svg - icons/Sketcher_ToggleActiveConstraint.svg - icons/Sketcher_ToggleConstraint.svg - icons/Sketcher_Toggle_Constraint_Driven.svg - icons/Sketcher_Toggle_Constraint_Driving.svg - icons/Sketcher_ToggleConstruction.svg - icons/Sketcher_ToggleConstruction_old.svg - icons/Sketcher_ToggleNormal.svg - icons/Sketcher_Trimming.svg icons/Sketcher_ValidateSketch.svg icons/Sketcher_ViewSection.svg icons/Sketcher_ViewSketch.svg @@ -75,6 +59,11 @@ icons/constraints/Constraint_Vertical.svg icons/constraints/Constraint_VerticalDistance.svg icons/constraints/Constraint_VerticalDistance_Driven.svg + icons/constraints/Sketcher_Crosshair.svg + icons/constraints/Sketcher_ToggleActiveConstraint.svg + icons/constraints/Sketcher_ToggleConstraint.svg + icons/constraints/Sketcher_Toggle_Constraint_Driven.svg + icons/constraints/Sketcher_Toggle_Constraint_Driving.svg icons/elements/Sketcher_Element_Arc_Edge.svg @@ -113,6 +102,9 @@ icons/elements/Sketcher_Element_SelectionTypeInvalid.svg + icons/geometry/Sketcher_AlterFillet.svg + icons/geometry/Sketcher_CarbonCopy.svg + icons/geometry/Sketcher_CarbonCopy_Constr.svg icons/geometry/Sketcher_Conics.svg icons/geometry/Sketcher_Conics_Constr.svg icons/geometry/Sketcher_Conics_Ellipse_3points.svg @@ -164,6 +156,10 @@ icons/geometry/Sketcher_CreateText.svg icons/geometry/Sketcher_CreateTriangle.svg icons/geometry/Sketcher_CreateTriangle_Constr.svg + icons/geometry/Sketcher_Extend.svg + icons/geometry/Sketcher_External.svg + icons/geometry/Sketcher_ToggleConstruction.svg + icons/geometry/Sketcher_Trimming.svg icons/obsolete/Sketcher_ConstrainCoincident_old.svg @@ -171,6 +167,10 @@ icons/obsolete/Sketcher_ConstrainHorizontal_old.svg icons/obsolete/Sketcher_ConstrainParallel_old.svg icons/obsolete/Sketcher_ConstrainVertical_old.svg + icons/obsolete/Sketcher_DraftLine.svg + icons/obsolete/Sketcher_ProfilesHexagon1.svg + icons/obsolete/Sketcher_ToggleConstruction_old.svg + icons/obsolete/Sketcher_ToggleNormal.svg icons/pointers/Sketcher_Pointer_CarbonCopy.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Crosshair.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Crosshair.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Crosshair.svg rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Crosshair.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleActiveConstraint.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_ToggleActiveConstraint.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleActiveConstraint.svg rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_ToggleActiveConstraint.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstraint.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_ToggleConstraint.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstraint.svg rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_ToggleConstraint.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Toggle_Constraint_Driven.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driven.svg rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Toggle_Constraint_Driven.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driving.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Toggle_Constraint_Driving.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driving.svg rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Toggle_Constraint_Driving.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterFillet.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_AlterFillet.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterFillet.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_AlterFillet.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CarbonCopy.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CarbonCopy.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CarbonCopy.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CarbonCopy.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CarbonCopy_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CarbonCopy_Constr.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CarbonCopy_Constr.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CarbonCopy_Constr.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Extend.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Extend.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Extend.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Extend.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_External.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_External.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_External.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_External.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_ToggleConstruction.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_ToggleConstruction.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Trimming.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Trimming.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Trimming.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Trimming.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_DraftLine.svg b/src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_DraftLine.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_DraftLine.svg rename to src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_DraftLine.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ProfilesHexagon1.svg b/src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ProfilesHexagon1.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ProfilesHexagon1.svg rename to src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ProfilesHexagon1.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction_old.svg b/src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ToggleConstruction_old.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction_old.svg rename to src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ToggleConstruction_old.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleNormal.svg b/src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ToggleNormal.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleNormal.svg rename to src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ToggleNormal.svg