kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: rename constraint icons to be more consistent with the rest

Browse Source 
`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.
This commit is contained in:
vocx-fc
2020-09-22 16:58:17 -05:00
committed by Yorik van Havre
parent ba69518c36
commit ec0acf44f1
8 changed files with 75 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Mod/Sketcher/Gui/CommandConstraints.cpp
View File

@@ -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<int>::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<std::string> &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<std::string> &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;
}

44
src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
View File

@@ -1,5 +1,6 @@
<RCC>
<qresource>
<qresource>
<file>icons/Constraint_Block.svg</file>
<file>icons/Constraint_Concentric.svg</file>
<file>icons/Constraint_Diameter.svg</file>
<file>icons/Constraint_Diameter_Driven.svg</file>
@@ -21,6 +22,8 @@
<file>icons/Constraint_InternalAngle_Driven.svg</file>
<file>icons/Constraint_Length.svg</file>
<file>icons/Constraint_Length_Driven.svg</file>
<file>icons/Constraint_Lock.svg</file>
<file>icons/Constraint_Lock_Driven.svg</file>
<file>icons/Constraint_Parallel.svg</file>
<file>icons/Constraint_Perpendicular.svg</file>
<file>icons/Constraint_PointOnEnd.svg</file>
@@ -40,7 +43,6 @@
<file>icons/Constraint_Vertical.svg</file>
<file>icons/Constraint_VerticalDistance.svg</file>
<file>icons/Constraint_VerticalDistance_Driven.svg</file>
<file>icons/SketcherWorkbench.svg</file>
<file>icons/Sketcher_AlterFillet.svg</file>
<file>icons/Sketcher_BSplineApproximate.svg</file>
<file>icons/Sketcher_BSplineComb.svg</file>
@@ -60,13 +62,9 @@
<file>icons/Sketcher_Conics_Ellipse_3points.svg</file>
<file>icons/Sketcher_Conics_Ellipse_Center.svg</file>
<file>icons/Sketcher_ConnectLines.svg</file>
<file>icons/Sketcher_Crosshair.svg</file>
<file>icons/Sketcher_ConstrainBlock.svg</file>
<file>icons/Sketcher_ConstrainCoincident.svg</file>
<file>icons/Sketcher_ConstrainDistance.svg</file>
<file>icons/Sketcher_ConstrainHorizontal.svg</file>
<file>icons/Sketcher_ConstrainLock.svg</file>
<file>icons/Sketcher_ConstrainLock_Driven.svg</file>
<file>icons/Sketcher_ConstrainParallel.svg</file>
<file>icons/Sketcher_ConstrainVertical.svg</file>
<file>icons/Sketcher_Copy.svg</file>
@@ -111,6 +109,7 @@
<file>icons/Sketcher_CreateText.svg</file>
<file>icons/Sketcher_CreateTriangle.svg</file>
<file>icons/Sketcher_CreateTriangle_Constr.svg</file>
<file>icons/Sketcher_Crosshair.svg</file>
<file>icons/Sketcher_DraftLine.svg</file>
<file>icons/Sketcher_EditSketch.svg</file>
<file>icons/Sketcher_Element_Arc_Edge.svg</file>
@@ -160,28 +159,28 @@
<file>icons/Sketcher_Move.svg</file>
<file>icons/Sketcher_NewSketch.svg</file>
<file alias="icons/preferences-sketcher.svg">icons/Sketcher_NewSketch.svg</file>
<file>icons/Sketcher_Pointer_Slot.svg</file>
<file>icons/Sketcher_Pointer_Create_Box.svg</file>
<file>icons/Sketcher_Pointer_Create_Line.svg</file>
<file>icons/Sketcher_Pointer_Create_Lineset.svg</file>
<file>icons/Sketcher_Pointer_Create_Arc.svg</file>
<file>icons/Sketcher_Parabolic_Arc.svg</file>
<file>icons/Sketcher_Parabolic_Arc_Constr.svg</file>
<file>icons/Sketcher_Pointer_CarbonCopy.svg</file>
<file>icons/Sketcher_Pointer_Create_3PointArc.svg</file>
<file>icons/Sketcher_Pointer_Create_Circle.svg</file>
<file>icons/Sketcher_Pointer_Create_Ellipse.svg</file>
<file>icons/Sketcher_Pointer_Create_3PointCircle.svg</file>
<file>icons/Sketcher_Pointer_Create_Arc.svg</file>
<file>icons/Sketcher_Pointer_Create_ArcOfEllipse.svg</file>
<file>icons/Sketcher_Pointer_Create_ArcOfHyperbola.svg</file>
<file>icons/Sketcher_Pointer_Create_ArcOfParabola.svg</file>
<file>icons/Sketcher_Pointer_Create_Box.svg</file>
<file>icons/Sketcher_Pointer_Create_BSpline.svg</file>
<file>icons/Sketcher_Pointer_Create_3PointCircle.svg</file>
<file>icons/Sketcher_Pointer_Create_Point.svg</file>
<file>icons/Sketcher_Pointer_Create_Circle.svg</file>
<file>icons/Sketcher_Pointer_Create_Ellipse.svg</file>
<file>icons/Sketcher_Pointer_Create_Fillet.svg</file>
<file>icons/Sketcher_Pointer_Trimming.svg</file>
<file>icons/Sketcher_Pointer_Create_Line.svg</file>
<file>icons/Sketcher_Pointer_Create_Lineset.svg</file>
<file>icons/Sketcher_Pointer_Create_Point.svg</file>
<file>icons/Sketcher_Pointer_Extension.svg</file>
<file>icons/Sketcher_Pointer_Regular_Polygon.svg</file>
<file>icons/Sketcher_Pointer_External.svg</file>
<file>icons/Sketcher_Pointer_CarbonCopy.svg</file>
<file>icons/Sketcher_Parabolic_Arc.svg</file>
<file>icons/Sketcher_Parabolic_Arc_Constr.svg</file>
<file>icons/Sketcher_Pointer_Regular_Polygon.svg</file>
<file>icons/Sketcher_Pointer_Slot.svg</file>
<file>icons/Sketcher_Pointer_Trimming.svg</file>
<file>icons/Sketcher_ProfilesHexagon1.svg</file>
<file>icons/Sketcher_RectangularArray.svg</file>
<file>icons/Sketcher_SelectConflictingConstraints.svg</file>
@@ -197,14 +196,15 @@
<file>icons/Sketcher_Symmetry.svg</file>
<file>icons/Sketcher_ToggleActiveConstraint.svg</file>
<file>icons/Sketcher_ToggleConstraint.svg</file>
<file>icons/Sketcher_Toggle_Constraint_Driven.svg</file>
<file>icons/Sketcher_Toggle_Constraint_Driving.svg</file>
<file>icons/Sketcher_ToggleConstruction.svg</file>
<file>icons/Sketcher_ToggleConstruction_old.svg</file>
<file>icons/Sketcher_ToggleNormal.svg</file>
<file>icons/Sketcher_Toggle_Constraint_Driven.svg</file>
<file>icons/Sketcher_Toggle_Constraint_Driving.svg</file>
<file>icons/Sketcher_Trimming.svg</file>
<file>icons/Sketcher_ViewSection.svg</file>
<file>icons/Sketcher_ViewSketch.svg</file>
<file>icons/SketcherWorkbench.svg</file>
<file>icons/small/Constraint_Block_sm.xpm</file>
<file>icons/small/Constraint_Concentric_sm.xpm</file>
<file>icons/small/Constraint_EqualLength_sm.xpm</file>

0
src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainBlock.svg → src/Mod/Sketcher/Gui/Resources/icons/Constraint_Block.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 608 B

0
src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock.svg → src/Mod/Sketcher/Gui/Resources/icons/Constraint_Lock.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock_Driven.svg → src/Mod/Sketcher/Gui/Resources/icons/Constraint_Lock_Driven.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

6
src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp
View File

@@ -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<Gui::SelectionObject> sel = Gui::Selection().getSelectionEx(doc->getName());
for (std::vector<Gui::SelectionObject>::iterator ft = sel.begin(); ft != sel.end(); ++ft) {
Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(ft->getObject());

32
src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
View File

@@ -145,7 +145,7 @@ void ElementView::contextMenuEvent (QContextMenuEvent* event)
QMenu menu;
QList<QListWidgetItem *> 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<Gui::SelectionObject> sel = Gui::Selection().getSelectionEx(doc->getName());
for (std::vector<Gui::SelectionObject>::iterator ft = sel.begin(); ft != sel.end(); ++ft) {
Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(ft->getObject());

28
src/Mod/Sketcher/Gui/TaskSketcherElements.h
View File

@@ -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