From ec0acf44f1e9558af7506cfce460cd5388026081 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Tue, 22 Sep 2020 16:58:17 -0500 Subject: [PATCH] Sketcher: rename constraint icons to be more consistent with the rest `Sketcher_ConstrainBlock` to `Constraint_Block`. `Sketcher_ConstrainLock` to `Constraint_Lock`, and the corresponding `_Driven` variant. Adjust the icons in the taskpanel for the sketcher constraints, elements, and for the action menu for constraints. Adjust the icon order in the `Sketcher.qrc` resource file. --- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 28 +++++++----- src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 44 +++++++++---------- ...onstrainBlock.svg => Constraint_Block.svg} | 0 ..._ConstrainLock.svg => Constraint_Lock.svg} | 0 ..._Driven.svg => Constraint_Lock_Driven.svg} | 0 .../Sketcher/Gui/TaskSketcherConstrains.cpp | 6 +-- src/Mod/Sketcher/Gui/TaskSketcherElements.cpp | 32 ++++++++------ src/Mod/Sketcher/Gui/TaskSketcherElements.h | 28 ++++++------ 8 files changed, 75 insertions(+), 63 deletions(-) rename src/Mod/Sketcher/Gui/Resources/icons/{Sketcher_ConstrainBlock.svg => Constraint_Block.svg} (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{Sketcher_ConstrainLock.svg => Constraint_Lock.svg} (100%) rename src/Mod/Sketcher/Gui/Resources/icons/{Sketcher_ConstrainLock_Driven.svg => Constraint_Lock_Driven.svg} (100%) diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index fb752ad631..94763aa510 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -1430,10 +1430,13 @@ CmdSketcherConstrainLock::CmdSketcherConstrainLock() sAppModule = "Sketcher"; sGroup = QT_TR_NOOP("Sketcher"); sMenuText = QT_TR_NOOP("Constrain lock"); - sToolTipText = QT_TR_NOOP("Create a lock constraint on the selected item"); + sToolTipText = QT_TR_NOOP("Lock constraint: " + "create both a horizontal " + "and a vertical distance constraint\n" + "on the selected vertex"); sWhatsThis = "Sketcher_ConstrainLock"; sStatusTip = sToolTipText; - sPixmap = "Sketcher_ConstrainLock"; + sPixmap = "Constraint_Lock"; eType = ForEdit; allowedSelSequences = {{SelVertex}}; @@ -1505,7 +1508,7 @@ void CmdSketcherConstrainLock::activated(int iMsg) Base::Vector3d pnt = Obj->getPoint(GeoId[0],PosId[0]); // undo command open - openCommand("add fixed constraint"); + openCommand("Add Lock constraint"); Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('DistanceX',%d,%d,%f)) ", GeoId[0],PosId[0],pnt.x); Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('DistanceY',%d,%d,%f)) ", @@ -1544,7 +1547,7 @@ void CmdSketcherConstrainLock::activated(int iMsg) Base::Vector3d pnt = Obj->getPoint(*itg,*itp); // undo command open - openCommand("add relative lock constraint"); + openCommand("Add relative Lock constraint"); Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('DistanceX',%d,%d,%d,%d,%f)) ", *itg,*itp,GeoId.back(),PosId.back(),pntr.x-pnt.x); @@ -1621,11 +1624,11 @@ void CmdSketcherConstrainLock::updateAction(int mode) switch (mode) { case Reference: if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_ConstrainLock_Driven")); + getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Lock_Driven")); break; case Driving: if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_ConstrainLock")); + getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Lock")); break; } } @@ -1650,10 +1653,11 @@ CmdSketcherConstrainBlock::CmdSketcherConstrainBlock() sAppModule = "Sketcher"; sGroup = QT_TR_NOOP("Sketcher"); sMenuText = QT_TR_NOOP("Constrain Block"); - sToolTipText = QT_TR_NOOP("Create a Block constraint on the selected item"); + sToolTipText = QT_TR_NOOP("Block constraint: " + "block the selected edge from moving"); sWhatsThis = "Sketcher_ConstrainBlock"; sStatusTip = sToolTipText; - sPixmap = "Sketcher_ConstrainBlock"; + sPixmap = "Constraint_Block"; eType = ForEdit; allowedSelSequences = {{SelEdge}}; @@ -1727,7 +1731,7 @@ void CmdSketcherConstrainBlock::activated(int iMsg) for (std::vector::iterator itg = GeoId.begin(); itg != GeoId.end(); ++itg) { // undo command open - openCommand("add block constraint"); + openCommand("Add Block constraint"); try { @@ -7149,7 +7153,7 @@ void CmdSketcherToggleDrivingConstraint::activated(int iMsg) // only one sketch with its subelements are allowed to be selected if (selection.size() != 1 || !selection[0].isObjectTypeOf(Sketcher::SketchObject::getClassTypeId())) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select constraint(s) from the sketch.")); + QObject::tr("Select constraints from the sketch.")); return; } @@ -7157,7 +7161,7 @@ void CmdSketcherToggleDrivingConstraint::activated(int iMsg) const std::vector &SubNames = selection[0].getSubNames(); if (SubNames.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select constraint(s) from the sketch.")); + QObject::tr("Select constraints from the sketch.")); return; } @@ -7189,7 +7193,7 @@ void CmdSketcherToggleDrivingConstraint::activated(int iMsg) const std::vector &SubNames = selection[0].getSubNames(); if (SubNames.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select constraint(s) from the sketch.")); + QObject::tr("Select constraints from the sketch.")); return; } diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index d95d5a6138..36494f55ab 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -1,5 +1,6 @@ - + + icons/Constraint_Block.svg icons/Constraint_Concentric.svg icons/Constraint_Diameter.svg icons/Constraint_Diameter_Driven.svg @@ -21,6 +22,8 @@ icons/Constraint_InternalAngle_Driven.svg icons/Constraint_Length.svg icons/Constraint_Length_Driven.svg + icons/Constraint_Lock.svg + icons/Constraint_Lock_Driven.svg icons/Constraint_Parallel.svg icons/Constraint_Perpendicular.svg icons/Constraint_PointOnEnd.svg @@ -40,7 +43,6 @@ icons/Constraint_Vertical.svg icons/Constraint_VerticalDistance.svg icons/Constraint_VerticalDistance_Driven.svg - icons/SketcherWorkbench.svg icons/Sketcher_AlterFillet.svg icons/Sketcher_BSplineApproximate.svg icons/Sketcher_BSplineComb.svg @@ -60,13 +62,9 @@ icons/Sketcher_Conics_Ellipse_3points.svg icons/Sketcher_Conics_Ellipse_Center.svg icons/Sketcher_ConnectLines.svg - icons/Sketcher_Crosshair.svg - icons/Sketcher_ConstrainBlock.svg icons/Sketcher_ConstrainCoincident.svg icons/Sketcher_ConstrainDistance.svg icons/Sketcher_ConstrainHorizontal.svg - icons/Sketcher_ConstrainLock.svg - icons/Sketcher_ConstrainLock_Driven.svg icons/Sketcher_ConstrainParallel.svg icons/Sketcher_ConstrainVertical.svg icons/Sketcher_Copy.svg @@ -111,6 +109,7 @@ icons/Sketcher_CreateText.svg icons/Sketcher_CreateTriangle.svg icons/Sketcher_CreateTriangle_Constr.svg + icons/Sketcher_Crosshair.svg icons/Sketcher_DraftLine.svg icons/Sketcher_EditSketch.svg icons/Sketcher_Element_Arc_Edge.svg @@ -160,28 +159,28 @@ icons/Sketcher_Move.svg icons/Sketcher_NewSketch.svg icons/Sketcher_NewSketch.svg - icons/Sketcher_Pointer_Slot.svg - icons/Sketcher_Pointer_Create_Box.svg - icons/Sketcher_Pointer_Create_Line.svg - icons/Sketcher_Pointer_Create_Lineset.svg - icons/Sketcher_Pointer_Create_Arc.svg + icons/Sketcher_Parabolic_Arc.svg + icons/Sketcher_Parabolic_Arc_Constr.svg + icons/Sketcher_Pointer_CarbonCopy.svg icons/Sketcher_Pointer_Create_3PointArc.svg - icons/Sketcher_Pointer_Create_Circle.svg - icons/Sketcher_Pointer_Create_Ellipse.svg + icons/Sketcher_Pointer_Create_3PointCircle.svg + icons/Sketcher_Pointer_Create_Arc.svg icons/Sketcher_Pointer_Create_ArcOfEllipse.svg icons/Sketcher_Pointer_Create_ArcOfHyperbola.svg icons/Sketcher_Pointer_Create_ArcOfParabola.svg + icons/Sketcher_Pointer_Create_Box.svg icons/Sketcher_Pointer_Create_BSpline.svg - icons/Sketcher_Pointer_Create_3PointCircle.svg - icons/Sketcher_Pointer_Create_Point.svg + icons/Sketcher_Pointer_Create_Circle.svg + icons/Sketcher_Pointer_Create_Ellipse.svg icons/Sketcher_Pointer_Create_Fillet.svg - icons/Sketcher_Pointer_Trimming.svg + icons/Sketcher_Pointer_Create_Line.svg + icons/Sketcher_Pointer_Create_Lineset.svg + icons/Sketcher_Pointer_Create_Point.svg icons/Sketcher_Pointer_Extension.svg - icons/Sketcher_Pointer_Regular_Polygon.svg icons/Sketcher_Pointer_External.svg - icons/Sketcher_Pointer_CarbonCopy.svg - icons/Sketcher_Parabolic_Arc.svg - icons/Sketcher_Parabolic_Arc_Constr.svg + icons/Sketcher_Pointer_Regular_Polygon.svg + icons/Sketcher_Pointer_Slot.svg + icons/Sketcher_Pointer_Trimming.svg icons/Sketcher_ProfilesHexagon1.svg icons/Sketcher_RectangularArray.svg icons/Sketcher_SelectConflictingConstraints.svg @@ -197,14 +196,15 @@ icons/Sketcher_Symmetry.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_Toggle_Constraint_Driven.svg - icons/Sketcher_Toggle_Constraint_Driving.svg icons/Sketcher_Trimming.svg icons/Sketcher_ViewSection.svg icons/Sketcher_ViewSketch.svg + icons/SketcherWorkbench.svg icons/small/Constraint_Block_sm.xpm icons/small/Constraint_Concentric_sm.xpm icons/small/Constraint_EqualLength_sm.xpm diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainBlock.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Block.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainBlock.svg rename to src/Mod/Sketcher/Gui/Resources/icons/Constraint_Block.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Lock.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock.svg rename to src/Mod/Sketcher/Gui/Resources/icons/Constraint_Lock.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Lock_Driven.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock_Driven.svg rename to src/Mod/Sketcher/Gui/Resources/icons/Constraint_Lock_Driven.svg diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp index f914a4d94c..d82e3197b0 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp @@ -181,8 +181,8 @@ public: static QIcon vdist( Gui::BitmapFactory().iconFromTheme("Constraint_VerticalDistance") ); static QIcon horiz( Gui::BitmapFactory().iconFromTheme("Constraint_Horizontal") ); static QIcon vert ( Gui::BitmapFactory().iconFromTheme("Constraint_Vertical") ); - //static QIcon lock ( Gui::BitmapFactory().iconFromTheme("Sketcher_ConstrainLock") ); - static QIcon block ( Gui::BitmapFactory().iconFromTheme("Sketcher_ConstrainBlock") ); + //static QIcon lock ( Gui::BitmapFactory().iconFromTheme("Constraint_Lock") ); + static QIcon block ( Gui::BitmapFactory().iconFromTheme("Constraint_Block") ); static QIcon coinc( Gui::BitmapFactory().iconFromTheme("Constraint_PointOnPoint") ); static QIcon para ( Gui::BitmapFactory().iconFromTheme("Constraint_Parallel") ); static QIcon perp ( Gui::BitmapFactory().iconFromTheme("Constraint_Perpendicular") ); @@ -564,7 +564,7 @@ void ConstraintView::deleteSelectedItems() App::Document* doc = App::GetApplication().getActiveDocument(); if (!doc) return; - doc->openTransaction("Delete"); + doc->openTransaction("Delete constraint"); std::vector sel = Gui::Selection().getSelectionEx(doc->getName()); for (std::vector::iterator ft = sel.begin(); ft != sel.end(); ++ft) { Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(ft->getObject()); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index 482df30419..43d52b7194 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -145,7 +145,7 @@ void ElementView::contextMenuEvent (QContextMenuEvent* event) QMenu menu; QList items = selectedItems(); - // CONTEXT_ITEM(ICONSTR,NAMESTR,FUNC,KEY) + // CONTEXT_ITEM(ICONSTR,NAMESTR,CMDSTR,FUNC,ACTSONSELECTION) CONTEXT_ITEM("Constraint_PointOnPoint","Point Coincidence","Sketcher_ConstrainCoincident",doPointCoincidence,true) CONTEXT_ITEM("Constraint_PointOnObject","Point on Object","Sketcher_ConstrainPointOnObject",doPointOnObjectConstraint,true) CONTEXT_ITEM("Constraint_Vertical","Vertical Constraint","Sketcher_ConstrainVertical", doVerticalConstraint,true) @@ -155,7 +155,9 @@ void ElementView::contextMenuEvent (QContextMenuEvent* event) CONTEXT_ITEM("Constraint_Tangent","Tangent Constraint","Sketcher_ConstrainTangent",doTangentConstraint,true) CONTEXT_ITEM("Constraint_EqualLength","Equal Length","Sketcher_ConstrainEqual",doEqualConstraint,true) CONTEXT_ITEM("Constraint_Symmetric","Symmetric","Sketcher_ConstrainSymmetric",doSymmetricConstraint,true) - CONTEXT_ITEM("Sketcher_ConstrainLock","Lock Constraint","Sketcher_ConstrainLock",doLockConstraint,true) + CONTEXT_ITEM("Constraint_Block","Block Constraint","Sketcher_ConstrainBlock",doBlockConstraint,true) + + CONTEXT_ITEM("Constraint_Lock","Lock Constraint","Sketcher_ConstrainLock",doLockConstraint,true) CONTEXT_ITEM("Constraint_HorizontalDistance","Horizontal Distance","Sketcher_ConstrainDistanceX",doHorizontalDistance,true) CONTEXT_ITEM("Constraint_VerticalDistance","Vertical Distance","Sketcher_ConstrainDistanceY",doVerticalDistance,true) CONTEXT_ITEM("Constraint_Length","Length Constraint","Sketcher_ConstrainDistance",doLengthConstraint,true) @@ -187,25 +189,29 @@ void ElementView::contextMenuEvent (QContextMenuEvent* event) menu.exec(event->globalPos()); } -CONTEXT_MEMBER_DEF("Sketcher_ConstrainDistanceX",doHorizontalDistance) -CONTEXT_MEMBER_DEF("Sketcher_ConstrainDistanceY",doVerticalDistance) -CONTEXT_MEMBER_DEF("Sketcher_ConstrainHorizontal",doHorizontalConstraint) -CONTEXT_MEMBER_DEF("Sketcher_ConstrainVertical",doVerticalConstraint) -CONTEXT_MEMBER_DEF("Sketcher_ConstrainLock",doLockConstraint) CONTEXT_MEMBER_DEF("Sketcher_ConstrainCoincident",doPointCoincidence) +CONTEXT_MEMBER_DEF("Sketcher_ConstrainPointOnObject",doPointOnObjectConstraint) +CONTEXT_MEMBER_DEF("Sketcher_ConstrainVertical",doVerticalConstraint) +CONTEXT_MEMBER_DEF("Sketcher_ConstrainHorizontal",doHorizontalConstraint) CONTEXT_MEMBER_DEF("Sketcher_ConstrainParallel",doParallelConstraint) CONTEXT_MEMBER_DEF("Sketcher_ConstrainPerpendicular",doPerpendicularConstraint) +CONTEXT_MEMBER_DEF("Sketcher_ConstrainTangent",doTangentConstraint) +CONTEXT_MEMBER_DEF("Sketcher_ConstrainEqual",doEqualConstraint) +CONTEXT_MEMBER_DEF("Sketcher_ConstrainSymmetric",doSymmetricConstraint) +CONTEXT_MEMBER_DEF("Sketcher_ConstrainBlock",doBlockConstraint) + +CONTEXT_MEMBER_DEF("Sketcher_ConstrainLock",doLockConstraint) +CONTEXT_MEMBER_DEF("Sketcher_ConstrainDistanceX",doHorizontalDistance) +CONTEXT_MEMBER_DEF("Sketcher_ConstrainDistanceY",doVerticalDistance) CONTEXT_MEMBER_DEF("Sketcher_ConstrainDistance",doLengthConstraint) CONTEXT_MEMBER_DEF("Sketcher_ConstrainRadius",doRadiusConstraint) CONTEXT_MEMBER_DEF("Sketcher_ConstrainDiameter",doDiameterConstraint) CONTEXT_MEMBER_DEF("Sketcher_ConstrainAngle",doAngleConstraint) -CONTEXT_MEMBER_DEF("Sketcher_ConstrainEqual",doEqualConstraint) -CONTEXT_MEMBER_DEF("Sketcher_ConstrainPointOnObject",doPointOnObjectConstraint) -CONTEXT_MEMBER_DEF("Sketcher_ConstrainSymmetric",doSymmetricConstraint) -CONTEXT_MEMBER_DEF("Sketcher_ConstrainTangent",doTangentConstraint) + +CONTEXT_MEMBER_DEF("Sketcher_ToggleConstruction",doToggleConstruction) + CONTEXT_MEMBER_DEF("Sketcher_CloseShape",doCloseShape) CONTEXT_MEMBER_DEF("Sketcher_ConnectLines",doConnect) -CONTEXT_MEMBER_DEF("Sketcher_ToggleConstruction",doToggleConstruction) CONTEXT_MEMBER_DEF("Sketcher_SelectConstraints",doSelectConstraints) CONTEXT_MEMBER_DEF("Sketcher_SelectOrigin",doSelectOrigin) CONTEXT_MEMBER_DEF("Sketcher_SelectHorizontalAxis",doSelectHAxis) @@ -216,7 +222,7 @@ void ElementView::deleteSelectedItems() App::Document* doc = App::GetApplication().getActiveDocument(); if (!doc) return; - doc->openTransaction("Delete"); + doc->openTransaction("Delete element"); std::vector sel = Gui::Selection().getSelectionEx(doc->getName()); for (std::vector::iterator ft = sel.begin(); ft != sel.end(); ++ft) { Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(ft->getObject()); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.h b/src/Mod/Sketcher/Gui/TaskSketcherElements.h index 493e81ac8b..3eb325fd23 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.h @@ -57,35 +57,37 @@ protected: void keyPressEvent(QKeyEvent * event); protected Q_SLOTS: - void deleteSelectedItems(); // Constraints - void doHorizontalDistance(); - void doVerticalDistance(); - void doHorizontalConstraint(); - void doVerticalConstraint(); - void doLockConstraint(); void doPointCoincidence(); + void doPointOnObjectConstraint(); + void doVerticalDistance(); + void doHorizontalDistance(); void doParallelConstraint(); void doPerpendicularConstraint(); + void doTangentConstraint(); + void doEqualConstraint(); + void doSymmetricConstraint(); + void doBlockConstraint(); + + void doLockConstraint(); + void doHorizontalConstraint(); + void doVerticalConstraint(); void doLengthConstraint(); void doRadiusConstraint(); void doDiameterConstraint(); void doAngleConstraint(); - void doEqualConstraint(); - void doPointOnObjectConstraint(); - void doSymmetricConstraint(); - void doTangentConstraint(); + // Other Commands void doToggleConstruction(); + // Acelerators void doCloseShape(); void doConnect(); + void doSelectConstraints(); void doSelectOrigin(); void doSelectHAxis(); void doSelectVAxis(); - - void doSelectConstraints(); - + void deleteSelectedItems(); }; class TaskSketcherElements : public Gui::TaskView::TaskBox, public Gui::SelectionObserver