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

[TD]sync icon names and menu entries

Browse Source 
- contributed by @uwe
This commit is contained in:
WandererFan
2020-02-02 18:05:50 -05:00
committed by WandererFan
parent fe2c802ed4
commit a92e157a9d
14 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/TechDraw/Gui/Command.cpp
View File

@@ -1132,7 +1132,7 @@ CmdTechDrawArchView::CmdTechDrawArchView()
{
// setting the Gui eye-candy
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert Arch Workbench Object");
sMenuText = QT_TR_NOOP("Insert Section Plane");
sToolTipText = QT_TR_NOOP("Insert a View of a Section Plane from Arch Workbench");
sWhatsThis = "TechDraw_NewArch";
sStatusTip = sToolTipText;
@@ -1241,7 +1241,7 @@ CmdTechDrawExportPageSVG::CmdTechDrawExportPageSVG()
: Command("TechDraw_ExportPageSVG")
{
sGroup = QT_TR_NOOP("File");
sMenuText = QT_TR_NOOP("Export Page as SVG");
sMenuText = QT_TR_NOOP("Export page as SVG");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_ExportPageSVG";
sStatusTip = sToolTipText;
@@ -1285,7 +1285,7 @@ CmdTechDrawExportPageDXF::CmdTechDrawExportPageDXF()
: Command("TechDraw_ExportPageDXF")
{
sGroup = QT_TR_NOOP("File");
sMenuText = QT_TR_NOOP("Export Page as DXF");
sMenuText = QT_TR_NOOP("Export page as DXF");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_ExportPageDXF";
sStatusTip = sToolTipText;

80
src/Mod/TechDraw/Gui/CommandAnnotate.cpp
View File

@@ -78,7 +78,7 @@ bool _checkSelectionHatch(Gui::Command* cmd);
void execCosmeticVertex(Gui::Command* cmd);
void execMidpoints(Gui::Command* cmd);
void execQuadrant(Gui::Command* cmd);
void execQuadrants(Gui::Command* cmd);
void execCenterLine(Gui::Command* cmd);
void exec2LineCenterLine(Gui::Command* cmd);
void exec2PointCenterLine(Gui::Command* cmd);
@@ -97,11 +97,11 @@ CmdTechDrawLeaderLine::CmdTechDrawLeaderLine()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add Leader Line to View");
sMenuText = QT_TR_NOOP("Add Leaderline to View");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_LeaderLine";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-mline";
sPixmap = "actions/techdraw-LeaderLine";
}
void CmdTechDrawLeaderLine::activated(int iMsg)
@@ -234,7 +234,7 @@ void CmdTechDrawCosmeticVertexGroup::activated(int iMsg)
execMidpoints(this);
break;
case 2:
execQuadrant(this);
execQuadrants(this);
break;
default:
Base::Console().Message("CMD::CVGrp - invalid iMsg: %d\n",iMsg);
@@ -248,17 +248,17 @@ Gui::Action * CmdTechDrawCosmeticVertexGroup::createAction(void)
applyCommandData(this->className(), pcAction);
QAction* p1 = pcAction->addAction(QString());
p1->setIcon(Gui::BitmapFactory().iconFromTheme("actions/techdraw-point"));
p1->setIcon(Gui::BitmapFactory().iconFromTheme("actions/techdraw-CosmeticVertex"));
p1->setObjectName(QString::fromLatin1("TechDraw_CosmeticVertex"));
p1->setWhatsThis(QString::fromLatin1("TechDraw_CosmeticVertx"));
QAction* p2 = pcAction->addAction(QString());
p2->setIcon(Gui::BitmapFactory().iconFromTheme("actions/techdraw-midpoint"));
p2->setIcon(Gui::BitmapFactory().iconFromTheme("actions/techdraw-Midpoints"));
p2->setObjectName(QString::fromLatin1("TechDraw_Midpoints"));
p2->setWhatsThis(QString::fromLatin1("TechDraw_Midpoints"));
QAction* p3 = pcAction->addAction(QString());
p3->setIcon(Gui::BitmapFactory().iconFromTheme("actions/techdraw-quadrant"));
p3->setObjectName(QString::fromLatin1("TechDraw_Quadrant"));
p3->setWhatsThis(QString::fromLatin1("TechDraw_Quadrant"));
p3->setIcon(Gui::BitmapFactory().iconFromTheme("actions/techdraw-Quadrants"));
p3->setObjectName(QString::fromLatin1("TechDraw_Quadrants"));
p3->setWhatsThis(QString::fromLatin1("TechDraw_Quadrants"));
_pcAction = pcAction;
languageChange();
@@ -280,16 +280,16 @@ void CmdTechDrawCosmeticVertexGroup::languageChange()
QList<QAction*> a = pcAction->actions();
QAction* arc1 = a[0];
arc1->setText(QApplication::translate("CmdTechDrawCosmeticVertexGroup","Cosmetic Vertex"));
arc1->setToolTip(QApplication::translate("TechDraw_CosmeticVertex","Insert a Cosmetic Vertex into a View"));
arc1->setText(QApplication::translate("CmdTechDrawCosmeticVertexGroup","Add Cosmetic Vertex"));
arc1->setToolTip(QApplication::translate("TechDraw_CosmeticVertex","Inserts a Cosmetic Vertex into a View"));
arc1->setStatusTip(arc1->toolTip());
QAction* arc2 = a[1];
arc2->setText(QApplication::translate("CmdMidpoints","Midpoints"));
arc2->setToolTip(QApplication::translate("TechDraw_Midpoints","Insert Cosmetic Vertex at midpoint of Edge(s)"));
arc2->setText(QApplication::translate("CmdMidpoints","Add Midpoint Vertices"));
arc2->setToolTip(QApplication::translate("TechDraw_Midpoints","Inserts Cosmetic Vertices at Midpoint of selected Edge(s)"));
arc2->setStatusTip(arc2->toolTip());
QAction* arc3 = a[2];
arc3->setText(QApplication::translate("CmdQuadrant","Quadrant"));
arc3->setToolTip(QApplication::translate("TechDraw_Quadrant","Insert Cosmetic Vertex at quadrant points of Circle(s)"));
arc3->setText(QApplication::translate("CmdQuadrants","Add Quadrant Vertices"));
arc3->setToolTip(QApplication::translate("TechDraw_Quadrants","Inserts Cosmetic Vertices at Quadrant Points of selected Circle(s)"));
arc3->setStatusTip(arc3->toolTip());
}
@@ -352,9 +352,9 @@ void execMidpoints(Gui::Command* cmd)
dvp->recomputeFeature();
}
void execQuadrant(Gui::Command* cmd)
void execQuadrants(Gui::Command* cmd)
{
// Base::Console().Message("execQuadrant()\n");
// Base::Console().Message("execQuadrants()\n");
TechDraw::DrawViewPart* dvp = nullptr;
std::vector<std::string> selectedEdges = getSelectedSubElements(cmd, dvp, "Edge");
@@ -388,7 +388,7 @@ CmdTechDrawCosmeticVertex::CmdTechDrawCosmeticVertex()
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_CosmeticVertex";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-point";
sPixmap = "actions/techdraw-CosmeticVertex";
}
void CmdTechDrawCosmeticVertex::activated(int iMsg)
@@ -443,11 +443,11 @@ CmdTechDrawMidpoints::CmdTechDrawMidpoints()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add Midpoint vertices");
sMenuText = QT_TR_NOOP("Add Midpoint Vertices");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_Midpoints";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-midpoint";
sPixmap = "actions/techdraw-Midpoints";
}
void CmdTechDrawMidpoints::activated(int iMsg)
@@ -472,24 +472,24 @@ bool CmdTechDrawMidpoints::isActive(void)
}
//===========================================================================
// TechDraw_Quadrant
// TechDraw_Quadrants
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawQuadrant)
DEF_STD_CMD_A(CmdTechDrawQuadrants)
CmdTechDrawQuadrant::CmdTechDrawQuadrant()
: Command("TechDraw_Quadrant")
CmdTechDrawQuadrants::CmdTechDrawQuadrants()
: Command("TechDraw_Quadrants")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add Quadrant Vertices");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_Quadrant";
sWhatsThis = "TechDraw_Quadrants";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-quadrant";
sPixmap = "actions/techdraw-Quadrants";
}
void CmdTechDrawQuadrant::activated(int iMsg)
void CmdTechDrawQuadrants::activated(int iMsg)
{
Q_UNUSED(iMsg);
Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
@@ -498,12 +498,12 @@ void CmdTechDrawQuadrant::activated(int iMsg)
QObject::tr("Close active task dialog and try again."));
return;
}
execQuadrant(this);
execQuadrants(this);
updateActive();
Gui::Selection().clearSelection();
}
bool CmdTechDrawQuadrant::isActive(void)
bool CmdTechDrawQuadrants::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this, true);
@@ -570,7 +570,7 @@ CmdTechDrawCenterLineGroup::CmdTechDrawCenterLineGroup()
void CmdTechDrawCenterLineGroup::activated(int iMsg)
{
// Base::Console().Message("CMD::CenterLineGrp - activated(%d)\n", iMsg);
// Base::Console().Message("CMD::CenterLineGroup - activated(%d)\n", iMsg);
Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
if (dlg != nullptr) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"),
@@ -634,16 +634,16 @@ void CmdTechDrawCenterLineGroup::languageChange()
QList<QAction*> a = pcAction->actions();
QAction* arc1 = a[0];
arc1->setText(QApplication::translate("CmdTechDrawCenterLineGrp","Center Line"));
arc1->setToolTip(QApplication::translate("TechDraw_FaceCenterLine","Insert a CenterLine into a Face(s)"));
arc1->setText(QApplication::translate("CmdTechDrawCenterLineGroup","Add Centerline to Face(s)"));
arc1->setToolTip(QApplication::translate("TechDraw_FaceCenterLine","Adds a Centerline to Face(s)"));
arc1->setStatusTip(arc1->toolTip());
QAction* arc2 = a[1];
arc2->setText(QApplication::translate("Cmd2LineCenterLine","2 Line CenterLine"));
arc2->setToolTip(QApplication::translate("TechDraw_2LineCenterLine","Insert CenterLine between 2 lines"));
arc2->setText(QApplication::translate("Cmd2LineCenterLine","Add Centerline between 2 Lines"));
arc2->setToolTip(QApplication::translate("TechDraw_2LineCenterLine","Adds a Centerline between 2 Lines"));
arc2->setStatusTip(arc2->toolTip());
QAction* arc3 = a[2];
arc3->setText(QApplication::translate("Cmd2PointCenterLine","2 Point CenterLine"));
arc3->setToolTip(QApplication::translate("TechDraw_2PointCenterLine","Insert CenterLine between 2 points"));
arc3->setText(QApplication::translate("Cmd2PointCenterLine","Add Centerline between 2 Points"));
arc3->setToolTip(QApplication::translate("TechDraw_2PointCenterLine","Adds a Centerline between 2 Points"));
arc3->setStatusTip(arc3->toolTip());
}
@@ -1093,8 +1093,8 @@ CmdTechDrawDecorateLine::CmdTechDrawDecorateLine()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Change Appearance of a Line");
sToolTipText = sMenuText;
sMenuText = QT_TR_NOOP("Change Appearance of Line(s)");
sToolTipText = "Change Appearance of selected Line(s)";
sWhatsThis = "TechDraw_DecorateLine";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-DecorateLine";
@@ -1235,7 +1235,7 @@ CmdTechDrawWeldSymbol::CmdTechDrawWeldSymbol()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add Welding Information to a Leader");
sMenuText = QT_TR_NOOP("Add Welding Information to Leaderline");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_WeldSymbol";
sStatusTip = sToolTipText;
@@ -1296,7 +1296,7 @@ void CreateTechDrawCommandsAnnotate(void)
rcCmdMgr.addCommand(new CmdTechDrawCosmeticVertexGroup());
rcCmdMgr.addCommand(new CmdTechDrawCosmeticVertex());
rcCmdMgr.addCommand(new CmdTechDrawMidpoints());
rcCmdMgr.addCommand(new CmdTechDrawQuadrant());
rcCmdMgr.addCommand(new CmdTechDrawQuadrants());
rcCmdMgr.addCommand(new CmdTechDrawCenterLineGroup());
rcCmdMgr.addCommand(new CmdTechDrawFaceCenterLine());
rcCmdMgr.addCommand(new CmdTechDraw2LineCenterLine());

2
src/Mod/TechDraw/Gui/CommandDecorate.cpp
View File

@@ -86,7 +86,7 @@ bool _checkSelectionHatch(Gui::Command* cmd);
// sToolTipText = QT_TR_NOOP("Add a line to a view");
// sWhatsThis = "TechDraw_LeaderLine";
// sStatusTip = sToolTipText;
// sPixmap = "actions/techdraw-mline";
// sPixmap = "actions/techdraw-LeaderLine";
//}
//void CmdTechDrawLeaderLine::activated(int iMsg)

8
src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
View File

@@ -65,11 +65,11 @@
<file>icons/actions/techdraw-SpreadsheetView.svg</file>
<file>icons/actions/techdraw-image.svg</file>
<file>icons/actions/techdraw-DetailView.svg</file>
<file>icons/actions/techdraw-mline.svg</file>
<file>icons/actions/techdraw-LeaderLine.svg</file>
<file>icons/actions/techdraw-RichTextAnnotation.svg</file>
<file>icons/actions/techdraw-point.svg</file>
<file>icons/actions/techdraw-midpoint.svg</file>
<file>icons/actions/techdraw-quadrant.svg</file>
<file>icons/actions/techdraw-CosmeticVertex.svg</file>
<file>icons/actions/techdraw-Midpoints.svg</file>
<file>icons/actions/techdraw-Quadrants.svg</file>
<file>icons/actions/techdraw-facecenterline.svg</file>
<file>icons/actions/techdraw-2linecenterline.svg</file>
<file>icons/actions/techdraw-2pointcenterline.svg</file>

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-point.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-CosmeticVertex.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-mline.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-LeaderLine.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-midpoint.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-Midpoints.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-quadrant.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-Quadrants.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

2
src/Mod/TechDraw/Gui/TaskCosVertex.cpp
View File

@@ -345,7 +345,7 @@ TaskDlgCosVertex::TaskDlgCosVertex(TechDraw::DrawViewPart* baseFeat,
: TaskDialog()
{
widget = new TaskCosVertex(baseFeat,page);
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-mline"),
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-LeaderLine"),
widget->windowTitle(), true, 0);
taskbox->groupLayout()->addWidget(widget);
Content.push_back(taskbox);

2
src/Mod/TechDraw/Gui/TaskCosVertex.ui
View File

@@ -27,7 +27,7 @@
</property>
<property name="windowIcon">
<iconset resource="Resources/TechDraw.qrc">
<normaloff>:/icons/actions/techdraw-point.svg</normaloff>:/icons/actions/techdraw-point.svg</iconset>
<normaloff>:/icons/actions/techdraw-CosmeticVertex.svg</normaloff>:/icons/actions/techdraw-CosmeticVertex.svg</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>

4
src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
View File

@@ -758,7 +758,7 @@ TaskDlgLeaderLine::TaskDlgLeaderLine(TechDraw::DrawView* baseFeat,
: TaskDialog()
{
widget = new TaskLeaderLine(baseFeat,page);
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-mline"),
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-LeaderLine"),
widget->windowTitle(), true, 0);
taskbox->groupLayout()->addWidget(widget);
Content.push_back(taskbox);
@@ -768,7 +768,7 @@ TaskDlgLeaderLine::TaskDlgLeaderLine(TechDrawGui::ViewProviderLeader* leadVP)
: TaskDialog()
{
widget = new TaskLeaderLine(leadVP);
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-mline"),
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-LeaderLine"),
widget->windowTitle(), true, 0);
taskbox->groupLayout()->addWidget(widget);
Content.push_back(taskbox);

2
src/Mod/TechDraw/Gui/TaskLeaderLine.ui
View File

@@ -27,7 +27,7 @@
</property>
<property name="windowIcon">
<iconset resource="Resources/TechDraw.qrc">
<normaloff>:/icons/actions/techdraw-mline.svg</normaloff>:/icons/actions/techdraw-mline.svg</iconset>
<normaloff>:/icons/actions/techdraw-LeaderLine.svg</normaloff>:/icons/actions/techdraw-LeaderLine.svg</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>

2
src/Mod/TechDraw/Gui/ViewProviderLeader.cpp
View File

@@ -69,7 +69,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderLeader, TechDrawGui::ViewProviderDrawin
ViewProviderLeader::ViewProviderLeader()
{
sPixmap = "actions/techdraw-mline";
sPixmap = "actions/techdraw-LeaderLine";
static const char *group = "Line Format";

2
src/Mod/TechDraw/Gui/Workbench.cpp
View File

@@ -72,7 +72,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
Gui::MenuItem* vertices = new Gui::MenuItem;
vertices->setCommand("Add Vertices");
*vertices << "TechDraw_CosmeticVertex" << "TechDraw_Midpoints"
<< "TechDraw_Quadrant";
<< "TechDraw_Quadrants";
// main menu
draw->setCommand("TechDraw");