From fe3d5d07280afbbc9e6d59ccf554a329f5b045be Mon Sep 17 00:00:00 2001 From: luz paz Date: Fri, 9 Apr 2021 07:19:28 -0400 Subject: [PATCH] [TD] icon name uniformity (cont.) `WeldSymbol`, `PageDefault`, `PageTemplate`, `Symbol`, `ExportPageSVG`. `ExportPageDXF`, and `Tile` Moved `icons/arrow*` files further down the list + continuing to sort. --- src/Mod/TechDraw/Gui/Command.cpp | 10 +++---- src/Mod/TechDraw/Gui/CommandAnnotate.cpp | 2 +- src/Mod/TechDraw/Gui/Resources/TechDraw.qrc | 30 +++++++++---------- ...PageDXF.svg => TechDraw_ExportPageDXF.svg} | 4 +-- ...PageSVG.svg => TechDraw_ExportPageSVG.svg} | 6 ++-- ...geDefault.svg => TechDraw_PageDefault.svg} | 0 ...Template.svg => TechDraw_PageTemplate.svg} | 0 ...echdraw-symbol.svg => TechDraw_Symbol.svg} | 6 ++-- .../{techdraw-tile.svg => TechDraw_Tile.svg} | 2 +- ...weldsymbol.svg => TechDraw_WeldSymbol.svg} | 2 +- src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp | 4 +-- src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui | 2 +- src/Mod/TechDraw/Gui/ViewProviderTile.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderWeld.cpp | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-ExportPageDXF.svg => TechDraw_ExportPageDXF.svg} (99%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-ExportPageSVG.svg => TechDraw_ExportPageSVG.svg} (99%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-PageDefault.svg => TechDraw_PageDefault.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-PageTemplate.svg => TechDraw_PageTemplate.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-symbol.svg => TechDraw_Symbol.svg} (99%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-tile.svg => TechDraw_Tile.svg} (99%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-weldsymbol.svg => TechDraw_WeldSymbol.svg} (99%) diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index 4a46756f92..9dbdcad86a 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -114,7 +114,7 @@ CmdTechDrawPageDefault::CmdTechDrawPageDefault() sToolTipText = sMenuText; sWhatsThis = "TechDraw_PageDefault"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-PageDefault"; + sPixmap = "actions/TechDraw_PageDefault"; } void CmdTechDrawPageDefault::activated(int iMsg) @@ -177,7 +177,7 @@ CmdTechDrawPageTemplate::CmdTechDrawPageTemplate() sToolTipText = sMenuText; sWhatsThis = "TechDraw_PageTemplate"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-PageTemplate"; + sPixmap = "actions/TechDraw_PageTemplate"; } void CmdTechDrawPageTemplate::activated(int iMsg) @@ -1058,7 +1058,7 @@ CmdTechDrawSymbol::CmdTechDrawSymbol() sToolTipText = QT_TR_NOOP("Insert symbol from an SVG file"); sWhatsThis = "TechDraw_Symbol"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-symbol"; + sPixmap = "actions/TechDraw_Symbol"; } void CmdTechDrawSymbol::activated(int iMsg) @@ -1307,7 +1307,7 @@ CmdTechDrawExportPageSVG::CmdTechDrawExportPageSVG() sToolTipText = sMenuText; sWhatsThis = "TechDraw_ExportPageSVG"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-ExportPageSVG"; + sPixmap = "actions/TechDraw_ExportPageSVG"; } void CmdTechDrawExportPageSVG::activated(int iMsg) @@ -1351,7 +1351,7 @@ CmdTechDrawExportPageDXF::CmdTechDrawExportPageDXF() sToolTipText = sMenuText; sWhatsThis = "TechDraw_ExportPageDXF"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-ExportPageDXF"; + sPixmap = "actions/TechDraw_ExportPageDXF"; } void CmdTechDrawExportPageDXF::activated(int iMsg) diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp index 0096539fee..fcdfed6e63 100644 --- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp +++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp @@ -1401,7 +1401,7 @@ CmdTechDrawWeldSymbol::CmdTechDrawWeldSymbol() sToolTipText = sMenuText; sWhatsThis = "TechDraw_WeldSymbol"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-weldsymbol"; + sPixmap = "actions/TechDraw_WeldSymbol"; } void CmdTechDrawWeldSymbol::activated(int iMsg) diff --git a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc index a947b7304e..dfb31be550 100644 --- a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc +++ b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc @@ -36,16 +36,6 @@ icons/TechDraw_VerticalExtentDimension.svg icons/techdraw-landmarkdistance.svg icons/preferences-techdraw.svg - icons/arrownone.svg - icons/arrowdot.svg - icons/arrowopendot.svg - icons/arrowfilled.svg - icons/arrowopen.svg - icons/arrowtick.svg - icons/arrowfork.svg - icons/arrowpyramid.svg - icons/actions/techdraw-PageDefault.svg - icons/actions/techdraw-PageTemplate.svg icons/actions/techdraw-View.svg icons/actions/TechDraw_ActiveView.svg icons/actions/techdraw-multiview.svg @@ -53,17 +43,18 @@ icons/actions/techdraw-ClipGroup.svg icons/actions/techdraw-ClipGroupAdd.svg icons/actions/techdraw-ClipGroupRemove.svg - icons/actions/techdraw-symbol.svg icons/actions/techdraw-DraftView.svg icons/actions/techdraw-ArchView.svg - icons/actions/techdraw-ExportPageSVG.svg - icons/actions/techdraw-ExportPageDXF.svg + icons/actions/TechDraw_ExportPageDXF.svg + icons/actions/TechDraw_ExportPageSVG.svg icons/actions/techdraw-SectionView.svg icons/actions/techdraw-hatch.svg icons/actions/techdraw-GeometricHatch.svg icons/actions/techdraw-toggleframe.svg icons/actions/TechDraw_RedrawPage.svg icons/actions/techdraw-ProjectionGroup.svg + icons/actions/TechDraw_PageDefault.svg + icons/actions/TechDraw_PageTemplate.svg icons/actions/techdraw-SpreadsheetView.svg icons/actions/techdraw-image.svg icons/actions/techdraw-DetailView.svg @@ -80,8 +71,9 @@ icons/actions/techdraw-DecorateLine.svg icons/actions/techdraw-facedecor.svg icons/actions/techdraw-showall.svg - icons/actions/techdraw-weldsymbol.svg - icons/actions/techdraw-tile.svg + icons/actions/TechDraw_Symbol.svg + icons/actions/TechDraw_Tile.svg + icons/actions/TechDraw_WeldSymbol.svg icons/actions/section-up.svg icons/actions/section-down.svg icons/actions/section-left.svg @@ -92,6 +84,14 @@ icons/arrow-down.svg icons/arrow-ccw.svg icons/arrow-cw.svg + icons/arrowdot.svg + icons/arrowfilled.svg + icons/arrowfork.svg + icons/arrownone.svg + icons/arrowopen.svg + icons/arrowopendot.svg + icons/arrowpyramid.svg + icons/arrowtick.svg icons/continuous-line.svg icons/dot-line.svg icons/dashDot-line.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageDXF.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageDXF.svg similarity index 99% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageDXF.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageDXF.svg index f187bfc7ec..9c6c19b996 100644 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageDXF.svg +++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageDXF.svg @@ -24,7 +24,7 @@ [WandererFan] - techdraw-symbol + TechDraw_ExportPageDXF 2016-01-14 http://www.freecadweb.org/wiki/index.php?title=Artwork @@ -32,7 +32,7 @@ FreeCAD - FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg + FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageDXF.svg FreeCAD LGPL2+ diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageSVG.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageSVG.svg similarity index 99% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageSVG.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageSVG.svg index 763e2e7382..f5b104c478 100644 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageSVG.svg +++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageSVG.svg @@ -15,7 +15,7 @@ height="64" id="svg2160" inkscape:version="0.48.5 r10040" - sodipodi:docname="techdraw-saveSVG.svg"> + sodipodi:docname="TechDraw_ExportPageSVG.svg"> @@ -30,7 +30,7 @@ [WandererFan] - techdraw-symbol + TechDraw_ExportPageSVG 2016-01-14 http://www.freecadweb.org/wiki/index.php?title=Artwork @@ -38,7 +38,7 @@ FreeCAD - FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg + FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageSVG.svg FreeCAD LGPL2+ diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageDefault.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_PageDefault.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageDefault.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_PageDefault.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageTemplate.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_PageTemplate.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageTemplate.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_PageTemplate.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg similarity index 99% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg index 211de461ba..246f289925 100644 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg +++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg @@ -15,7 +15,7 @@ height="64" id="svg2160" inkscape:version="0.48.5 r10040" - sodipodi:docname="techdraw-symbol.svg"> + sodipodi:docname="TechDraw_Symbol.svg"> @@ -30,7 +30,7 @@ [WandererFan] - techdraw-symbol + TechDraw_Symbol 2016-01-14 http://www.freecadweb.org/wiki/index.php?title=Artwork @@ -38,7 +38,7 @@ FreeCAD - FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg + FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg FreeCAD LGPL2+ diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-tile.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Tile.svg similarity index 99% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-tile.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Tile.svg index e746e04f5a..e6a39f3c39 100644 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-tile.svg +++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Tile.svg @@ -14,7 +14,7 @@ width="64" height="64" id="svg3085" - sodipodi:docname="techdraw-tile.svg" + sodipodi:docname="TechDraw_Tile.svg" inkscape:version="0.92.4 (unknown)"> windowTitle(), true, 0); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); @@ -701,7 +701,7 @@ TaskDlgWeldingSymbol::TaskDlgWeldingSymbol(TechDraw::DrawWeldSymbol* weld) : TaskDialog() { widget = new TaskWeldingSymbol(weld); - taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-weldsymbol"), + taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_WeldSymbol"), widget->windowTitle(), true, 0); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui index 504f12f6b9..dd2fa839df 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui @@ -27,7 +27,7 @@ - :/icons/actions/techdraw-weldsymbol.svg:/icons/actions/techdraw-weldsymbol.svg + :/icons/actions/TechDraw_WeldSymbol.svg:/icons/actions/TechDraw_WeldSymbol.svg diff --git a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp index 2cf4ad10c5..6e888a97dd 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp @@ -48,7 +48,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderTile, Gui::ViewProviderDocumentObject) ViewProviderTile::ViewProviderTile() { - sPixmap = "actions/techdraw-tile"; + sPixmap = "actions/TechDraw_Tile"; } ViewProviderTile::~ViewProviderTile() diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp index 89baae9274..8bd2fd00c1 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp @@ -59,7 +59,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderWeld, TechDrawGui::ViewProviderDrawingV ViewProviderWeld::ViewProviderWeld() { - sPixmap = "actions/techdraw-weldsymbol"; + sPixmap = "actions/TechDraw_WeldSymbol"; static const char *group = "Text"; ADD_PROPERTY_TYPE(Font, (prefFontName().c_str()),group,App::Prop_None, "The name of the font to use");