diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp index d86661f786..09bd6830a4 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp @@ -132,7 +132,7 @@ void CmdSketcherCloseShape::activated(int iMsg) int GeoIdLast=-1; // undo command open - openCommand("add coincident constraint"); + openCommand("Add coincident constraint"); // go through the selected subelements for (unsigned int i=0; i<(SubNames.size()-1); i++ ) { // only handle edges @@ -234,7 +234,7 @@ void CmdSketcherConnect::activated(int iMsg) Sketcher::SketchObject* Obj = static_cast(selection[0].getObject()); // undo command open - openCommand("add coincident constraint"); + openCommand("Add coincident constraint"); // go through the selected subelements for (unsigned int i=0; i<(SubNames.size()-1); i++ ) { @@ -1042,13 +1042,18 @@ void CmdSketcherSymmetry::activated(int iMsg) if ( geoids == 0 || (geoids == 1 && LastGeoId>=0 && !lastvertexoraxis) ) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("A symmetric construction requires at least two geometric elements, the last geometric element being the reference for the symmetry construction.")); + QObject::tr("A symmetric construction requires " + "at least two geometric elements, " + "the last geometric element being the reference " + "for the symmetry construction.")); return; } if ( lastgeotype == invalid ) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("The last element must be a point or a line serving as reference for the symmetry construction.")); + QObject::tr("The last element must be a point " + "or a line serving as reference " + "for the symmetry construction.")); return; } @@ -1106,6 +1111,7 @@ public: virtual void activate() = 0; }; +// TODO: replace XPM cursor with SVG file static const char *cursor_createcopy[]={ "32 32 3 1", "+ c white", @@ -1350,7 +1356,7 @@ void SketcherCopy::activate(SketcherCopy::Op op) if (geoids < 1) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("A copy requires at least one selected non-external geometric element")); + QObject::tr("A copy requires at least one selected non-external geometric element")); return; } @@ -1375,23 +1381,24 @@ void SketcherCopy::activate(SketcherCopy::Op op) } // Ask the user if he wants to clone or to simple copy - /*int ret = QMessageBox::question(Gui::getMainWindow(), QObject::tr("Dimensional/Geometric constraints"), - * QObject::tr("Do you want to clone the object, i.e. substitute dimensional constraints by geometric constraints?"), - * QMessageBox::Yes, QMessageBox::No, QMessageBox::Cancel); - * // use an equality constraint - * if (ret == QMessageBox::Yes) { - * clone = true; -} -else if (ret == QMessageBox::Cancel) { +/* + int ret = QMessageBox::question(Gui::getMainWindow(), QObject::tr("Dimensional/Geometric constraints"), + QObject::tr("Do you want to clone the object, i.e. substitute dimensional constraints by geometric constraints?"), + QMessageBox::Yes, QMessageBox::No, QMessageBox::Cancel); + // use an equality constraint + if (ret == QMessageBox::Yes) { + clone = true; + } + else if (ret == QMessageBox::Cancel) { // do nothing return; -}*/ + } +*/ ActivateAcceleratorHandler(getActiveGuiDocument(),new DrawSketchHandlerCopy(geoIdList, LastGeoId, LastPointPos, geoids, op)); } - class CmdSketcherCopy : public SketcherCopy { public: @@ -1622,6 +1629,7 @@ bool CmdSketcherCompCopy::isActive(void) } +// TODO: replace XPM cursor with SVG file /* XPM */ static const char *cursor_createrectangulararray[]={ "32 32 3 1", diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index 98db684254..87616619eb 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -61,10 +61,6 @@ icons/Sketcher_CarbonCopy.svg icons/Sketcher_CarbonCopy_Constr.svg - icons/Sketcher_Clone.svg - icons/Sketcher_CloseShape.svg - icons/Sketcher_ConnectLines.svg - icons/Sketcher_Copy.svg icons/geometry/Sketcher_Conics.svg @@ -167,7 +163,6 @@ icons/Sketcher_MapSketch.svg icons/Sketcher_MergeSketch.svg icons/Sketcher_MirrorSketch.svg - icons/Sketcher_Move.svg icons/Sketcher_NewSketch.svg icons/Sketcher_NewSketch.svg @@ -193,20 +188,27 @@ icons/pointers/Sketcher_Pointer_Slot.svg icons/pointers/Sketcher_Pointer_Trimming.svg + + icons/tools/Sketcher_Clone.svg + icons/tools/Sketcher_CloseShape.svg + icons/tools/Sketcher_ConnectLines.svg + icons/tools/Sketcher_Copy.svg + icons/tools/Sketcher_Move.svg + icons/tools/Sketcher_RectangularArray.svg + icons/tools/Sketcher_SelectConflictingConstraints.svg + icons/tools/Sketcher_SelectConstraints.svg + icons/tools/Sketcher_SelectElementsAssociatedWithConstraints.svg + icons/tools/Sketcher_SelectElementsWithDoFs.svg + icons/tools/Sketcher_SelectHorizontalAxis.svg + icons/tools/Sketcher_SelectOrigin.svg + icons/tools/Sketcher_SelectRedundantConstraints.svg + icons/tools/Sketcher_SelectVerticalAxis.svg + icons/tools/Sketcher_Symmetry.svg + icons/Sketcher_ProfilesHexagon1.svg - icons/Sketcher_RectangularArray.svg - icons/Sketcher_SelectConflictingConstraints.svg - icons/Sketcher_SelectConstraints.svg - icons/Sketcher_SelectElementsAssociatedWithConstraints.svg - icons/Sketcher_SelectElementsWithDoFs.svg - icons/Sketcher_SelectHorizontalAxis.svg - icons/Sketcher_SelectOrigin.svg - icons/Sketcher_SelectRedundantConstraints.svg - icons/Sketcher_SelectVerticalAxis.svg icons/Sketcher_Sketch.svg icons/Sketcher_SwitchVirtualSpace.svg - icons/Sketcher_Symmetry.svg icons/Sketcher_ToggleActiveConstraint.svg icons/Sketcher_ToggleConstraint.svg icons/Sketcher_Toggle_Constraint_Driven.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Clone.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Clone.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Clone.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Clone.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CloseShape.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_CloseShape.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CloseShape.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_CloseShape.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConnectLines.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_ConnectLines.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConnectLines.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_ConnectLines.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Copy.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Copy.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Copy.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Copy.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Move.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Move.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Move.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Move.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_RectangularArray.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_RectangularArray.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_RectangularArray.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_RectangularArray.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConflictingConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConflictingConstraints.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConflictingConstraints.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConflictingConstraints.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConstraints.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConstraints.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectConstraints.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectElementsAssociatedWithConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectElementsAssociatedWithConstraints.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectElementsAssociatedWithConstraints.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectElementsAssociatedWithConstraints.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectElementsWithDoFs.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectElementsWithDoFs.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectElementsWithDoFs.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectElementsWithDoFs.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectHorizontalAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectHorizontalAxis.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectHorizontalAxis.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectHorizontalAxis.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectOrigin.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectOrigin.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectOrigin.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectOrigin.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectRedundantConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectRedundantConstraints.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectRedundantConstraints.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectRedundantConstraints.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectVerticalAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectVerticalAxis.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectVerticalAxis.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_SelectVerticalAxis.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Symmetry.svg b/src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Symmetry.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Symmetry.svg rename to src/Mod/Sketcher/Gui/Resources/icons/tools/Sketcher_Symmetry.svg diff --git a/src/Mod/Sketcher/InitGui.py b/src/Mod/Sketcher/InitGui.py index 9d8eb008a4..fe82c6932a 100644 --- a/src/Mod/Sketcher/InitGui.py +++ b/src/Mod/Sketcher/InitGui.py @@ -48,6 +48,7 @@ class SketcherWorkbench ( Workbench ): # Gui.addIconPath(":/icons/obsolete") Gui.addIconPath(":/icons/pointers") Gui.addIconPath(":/icons/splines") + Gui.addIconPath(":/icons/tools") try: import Profiles except ImportError: