diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index fbd3bf4248..4c00e45ffc 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -770,7 +770,7 @@ CmdTechDrawDraftView::CmdTechDrawDraftView() sToolTipText = QT_TR_NOOP("Inserts a Draft WB object into the active drawing"); sWhatsThis = "TechDraw_DraftView"; sStatusTip = QT_TR_NOOP("Inserts a Draft WB object into the active drawing"); - sPixmap = "actions/drawing-draft-view"; + sPixmap = "actions/techdraw-draft-view"; } void CmdTechDrawDraftView::activated(int iMsg) @@ -821,7 +821,7 @@ CmdTechDrawExportPage::CmdTechDrawExportPage() sToolTipText = QT_TR_NOOP("Export a page to an SVG file"); sWhatsThis = "TechDraw_ExportPage"; sStatusTip = QT_TR_NOOP("Export a page to an SVG file"); - sPixmap = "actions/saveSVG"; + sPixmap = "actions/techdraw-saveSVG"; } void CmdTechDrawExportPage::activated(int iMsg) diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index ff77c5459f..4a4fe5eb9b 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -140,7 +140,7 @@ CmdTechDrawNewDimension::CmdTechDrawNewDimension() sToolTipText = QT_TR_NOOP("Insert a new dimension"); sWhatsThis = "TechDraw_NewDimension"; sStatusTip = sToolTipText; - sPixmap = "Dimension"; + sPixmap = "TechDraw_Dimension"; } void CmdTechDrawNewDimension::activated(int iMsg) @@ -276,7 +276,7 @@ CmdTechDrawNewRadiusDimension::CmdTechDrawNewRadiusDimension() sToolTipText = QT_TR_NOOP("Insert a new radius dimension feature for the selected view"); sWhatsThis = "TechDraw_NewRadiusDimension"; sStatusTip = sToolTipText; - sPixmap = "Dimension_Radius"; + sPixmap = "TechDraw_Dimension_Radius"; } void CmdTechDrawNewRadiusDimension::activated(int iMsg) @@ -369,7 +369,7 @@ CmdTechDrawNewDiameterDimension::CmdTechDrawNewDiameterDimension() sToolTipText = QT_TR_NOOP("Insert a new diameter dimension feature for the selected view"); sWhatsThis = "TechDraw_NewDiameterDimension"; sStatusTip = sToolTipText; - sPixmap = "Dimension_Diameter"; + sPixmap = "TechDraw_Dimension_Diameter"; } void CmdTechDrawNewDiameterDimension::activated(int iMsg) @@ -462,7 +462,7 @@ CmdTechDrawNewLengthDimension::CmdTechDrawNewLengthDimension() sToolTipText = QT_TR_NOOP("Insert a new length dimension"); sWhatsThis = "TechDraw_NewLengthDimension"; sStatusTip = sToolTipText; - sPixmap = "Dimension_Length"; + sPixmap = "TechDraw_Dimension_Length"; } void CmdTechDrawNewLengthDimension::activated(int iMsg) @@ -561,7 +561,7 @@ CmdTechDrawNewDistanceXDimension::CmdTechDrawNewDistanceXDimension() sToolTipText = QT_TR_NOOP("Insert a new horizontal-distance dimension"); sWhatsThis = "TechDraw_NewDistanceXDimension"; sStatusTip = sToolTipText; - sPixmap = "Dimension_Horizontal"; + sPixmap = "TechDraw_Dimension_Horizontal"; } void CmdTechDrawNewDistanceXDimension::activated(int iMsg) @@ -658,7 +658,7 @@ CmdTechDrawNewDistanceYDimension::CmdTechDrawNewDistanceYDimension() sToolTipText = QT_TR_NOOP("Insert a new vertical distance dimension"); sWhatsThis = "TechDraw_NewDistanceYDimension"; sStatusTip = sToolTipText; - sPixmap = "Dimension_Vertical"; + sPixmap = "TechDraw_Dimension_Vertical"; } void CmdTechDrawNewDistanceYDimension::activated(int iMsg) @@ -754,7 +754,7 @@ CmdTechDrawNewAngleDimension::CmdTechDrawNewAngleDimension() sToolTipText = QT_TR_NOOP("Insert a new angle dimension"); sWhatsThis = "TechDraw_NewAngleDimension"; sStatusTip = sToolTipText; - sPixmap = "Dimension_Angle"; + sPixmap = "TechDraw_Dimension_Angle"; } void CmdTechDrawNewAngleDimension::activated(int iMsg) @@ -842,7 +842,7 @@ CmdTechDrawLinkDimension::CmdTechDrawLinkDimension() sToolTipText = QT_TR_NOOP("Link a dimension to 3D geometry"); sWhatsThis = "TechDraw_LinkDimension"; sStatusTip = sToolTipText; - sPixmap = "LinkDimension"; + sPixmap = "TechDraw_Dimension_Link"; } void CmdTechDrawLinkDimension::activated(int iMsg) diff --git a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc index 0ef78637a9..4123ef78c5 100644 --- a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc +++ b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc @@ -1,58 +1,46 @@ - icons/Annotation.svg - icons/Dimension.svg - icons/Dimension_Angle.svg - icons/Dimension_Diameter.svg - icons/Dimension_Horizontal.svg - icons/Dimension_Length.svg - icons/Dimension_Radius.svg - icons/Dimension_Vertical.svg - icons/LinkDimension.svg - icons/Hatch.svg - icons/Page.svg - icons/Pages.svg - icons/Symbol.svg - icons/View.svg - icons/Section.svg - icons/PageTemplate.svg + icons/TechDraw_Tree_Annotation.svg + icons/TechDraw_Tree_Hatch.svg + icons/TechDraw_Tree_Page.svg + icons/TechDraw_Tree_PageTemplate.svg + icons/TechDraw_Tree_ProjGroup.svg + icons/TechDraw_Tree_Section.svg + icons/TechDraw_Tree_Symbol.svg + icons/TechDraw_Tree_View.svg + icons/TechDraw_Pages.svg + icons/TechDraw_ProjBottom.svg + icons/TechDraw_ProjFront.svg + icons/TechDraw_ProjFrontBottomLeft.svg + icons/TechDraw_ProjFrontBottomRight.svg + icons/TechDraw_ProjFrontTopLeft.svg + icons/TechDraw_ProjFrontTopRight.svg + icons/TechDraw_ProjLeft.svg + icons/TechDraw_ProjRear.svg + icons/TechDraw_ProjRight.svg + icons/TechDraw_ProjTop.svg + icons/TechDraw_Dimension.svg + icons/TechDraw_Dimension_Angle.svg + icons/TechDraw_Dimension_Diameter.svg + icons/TechDraw_Dimension_Horizontal.svg + icons/TechDraw_Dimension_Length.svg + icons/TechDraw_Dimension_Radius.svg + icons/TechDraw_Dimension_Vertical.svg + icons/TechDraw_Dimension_Link.svg icons/preferences-techdraw.svg - icons/actions/document-new.png - icons/actions/document-new.svg icons/actions/techdraw-new-default.svg icons/actions/techdraw-new-pick.svg - icons/actions/techdraw-landscape-A0.svg - icons/actions/techdraw-landscape-A1.svg - icons/actions/techdraw-landscape-A2.svg - icons/actions/techdraw-landscape-A3.svg - icons/actions/techdraw-landscape-A4.svg - icons/actions/techdraw-landscape-new.svg - icons/actions/techdraw-landscape.svg - icons/actions/techdraw-portrait-A4.svg icons/actions/techdraw-view.svg - icons/actions/techdraw-openbrowser.svg icons/actions/techdraw-annotation.svg icons/actions/techdraw-clip.svg icons/actions/techdraw-clipplus.svg icons/actions/techdraw-clipminus.svg icons/actions/techdraw-symbol.svg icons/actions/techdraw-draft-view.svg - icons/actions/saveSVG.svg + icons/actions/techdraw-saveSVG.svg icons/actions/techdraw-viewsection.svg icons/actions/techdraw-hatch.svg icons/actions/techdraw-toggleframe.svg - icons/ProjBottom.svg - icons/ProjFront.svg - icons/ProjGroup.svg - icons/ProjLeft.svg - icons/ProjRear.svg - icons/ProjRight.svg - icons/ProjTop.svg - icons/ProjFrontBottomRight.svg - icons/ProjFrontBottomLeft.svg - icons/ProjFrontTopRight.svg - icons/ProjFrontTopLeft.svg icons/actions/techdraw-projgroup.svg - icons/actions/drawing-draft-view.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Dimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Dimension.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Dimension_Angle.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Angle.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Dimension_Angle.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Angle.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Dimension_Diameter.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Diameter.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Dimension_Diameter.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Diameter.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Dimension_Horizontal.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Horizontal.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Dimension_Horizontal.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Horizontal.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Dimension_Length.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Length.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Dimension_Length.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Length.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/LinkDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Link.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/LinkDimension.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Link.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Dimension_Radius.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Radius.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Dimension_Radius.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Radius.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Dimension_Vertical.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Vertical.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Dimension_Vertical.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Vertical.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Pages.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Pages.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Pages.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Pages.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjBottom.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjBottom.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjBottom.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjBottom.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjFront.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjFront.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjFront.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjFront.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjFrontBottomLeft.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjFrontBottomLeft.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjFrontBottomLeft.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjFrontBottomLeft.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjFrontBottomRight.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjFrontBottomRight.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjFrontBottomRight.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjFrontBottomRight.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjFrontTopLeft.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjFrontTopLeft.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjFrontTopLeft.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjFrontTopLeft.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjFrontTopRight.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjFrontTopRight.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjFrontTopRight.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjFrontTopRight.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjLeft.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjLeft.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjLeft.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjLeft.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjRear.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjRear.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjRear.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjRear.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjRight.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjRight.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjRight.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjRight.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjTop.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjTop.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjTop.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ProjTop.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Annotation.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Annotation.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Annotation.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Annotation.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Hatch.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Hatch.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Hatch.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Hatch.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Page.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Page.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Page.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Page.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/PageTemplate.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_PageTemplate.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/PageTemplate.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_PageTemplate.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/ProjGroup.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_ProjGroup.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/ProjGroup.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_ProjGroup.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Section.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Section.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Section.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Section.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Symbol.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Symbol.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/Symbol.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Symbol.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/View.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_View.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/View.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_View.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/document-new.png b/src/Mod/TechDraw/Gui/Resources/icons/actions/document-new.png deleted file mode 100644 index e3808a108e..0000000000 Binary files a/src/Mod/TechDraw/Gui/Resources/icons/actions/document-new.png and /dev/null differ diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/document-new.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/document-new.svg deleted file mode 100644 index 742732100c..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/document-new.svg +++ /dev/null @@ -1,446 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/drawing-draft-view.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/drawing-draft-view.svg deleted file mode 100644 index 87ee3b46d8..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/drawing-draft-view.svg +++ /dev/null @@ -1,540 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A0.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A0.svg deleted file mode 100644 index c119eb08f2..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A0.svg +++ /dev/null @@ -1,461 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A0 - - - - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A1.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A1.svg deleted file mode 100644 index 3f2012b5cc..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A1.svg +++ /dev/null @@ -1,461 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A1 - - - - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A2.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A2.svg deleted file mode 100644 index ec8aa99f50..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A2.svg +++ /dev/null @@ -1,461 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A2 - - - - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A3.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A3.svg deleted file mode 100644 index eea0f92f69..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A3.svg +++ /dev/null @@ -1,461 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A3 - - - - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A4.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A4.svg deleted file mode 100644 index 0754186682..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-A4.svg +++ /dev/null @@ -1,461 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A4 - - - - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-new.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-new.svg deleted file mode 100644 index bd2c740a0c..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape-new.svg +++ /dev/null @@ -1,450 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape.svg deleted file mode 100644 index e1f797f399..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-landscape.svg +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-openbrowser.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-openbrowser.svg deleted file mode 100755 index cd8d0b0e7a..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-openbrowser.svg +++ /dev/null @@ -1,727 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-portrait-A4.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-portrait-A4.svg deleted file mode 100644 index cd6c1ca451..0000000000 --- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-portrait-A4.svg +++ /dev/null @@ -1,457 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A4 - - diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/saveSVG.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-saveSVG.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/saveSVG.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-saveSVG.svg diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp index dde39f4a1c..fb04a74a03 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp @@ -50,7 +50,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderAnnotation, Gui::ViewProviderDocumentOb ViewProviderAnnotation::ViewProviderAnnotation() { - sPixmap = "Annotation"; + sPixmap = "TechDraw_Tree_Annotation"; } ViewProviderAnnotation::~ViewProviderAnnotation() diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp index 8c46b94641..1d49d3f99c 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp @@ -50,7 +50,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderDimension, TechDrawGui::ViewProviderDra ViewProviderDimension::ViewProviderDimension() { - sPixmap = "Dimension"; + sPixmap = "TechDraw_Dimension"; } ViewProviderDimension::~ViewProviderDimension() @@ -80,15 +80,15 @@ void ViewProviderDimension::updateData(const App::Property* p) { if (p == &(getViewObject()->Type)) { if (getViewObject()->Type.isValue("DistanceX")) { - sPixmap = "Dimension_Horizonatal"; + sPixmap = "TechDraw_Dimension_Horizonatal"; } else if (getViewObject()->Type.isValue("DistanceY")) { - sPixmap = "Dimension_Vertical"; + sPixmap = "TechDraw_Dimension_Vertical"; } else if (getViewObject()->Type.isValue("Radius")) { - sPixmap = "Dimension_Radius"; + sPixmap = "TechDraw_Dimension_Radius"; } else if (getViewObject()->Type.isValue("Diameter")) { - sPixmap = "Dimension_Diameter"; + sPixmap = "TechDraw_Dimension_Diameter"; } else if (getViewObject()->Type.isValue("Angle")) { - sPixmap = "Dimension_Angle"; + sPixmap = "TechDraw_Dimension_Angle"; } } } diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp index ef1f57a417..6c7a641f74 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp @@ -49,7 +49,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderDrawingView, Gui::ViewProviderDocumentO ViewProviderDrawingView::ViewProviderDrawingView() { - sPixmap = "View"; + sPixmap = "TechDraw_Tree_View"; // Do not show in property editor //DisplayMode.StatusBits.set(3, true); @@ -134,4 +134,3 @@ TechDraw::DrawView* ViewProviderDrawingView::getViewObject() const { return dynamic_cast(pcObject); } - diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp index b3c8e56937..6560e6f7ea 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp @@ -50,7 +50,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderHatch, Gui::ViewProviderDocumentObject) ViewProviderHatch::ViewProviderHatch() { - sPixmap = "Hatch"; + sPixmap = "TechDraw_Tree_Hatch"; } ViewProviderHatch::~ViewProviderHatch() diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index dab060221e..9cabc98272 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -75,7 +75,7 @@ ViewProviderPage::ViewProviderPage() : view(0), restoreState(false) { - sPixmap = "Page"; + sPixmap = "TechDraw_Tree_Page"; // ADD_PROPERTY(HintScale,(10.0)); // ADD_PROPERTY(HintOffsetX,(10.0)); @@ -192,7 +192,7 @@ bool ViewProviderPage::showMDIViewPage() (pcObject->getDocument()); view = new MDIViewPage(this, doc, Gui::getMainWindow()); view->setWindowTitle(QObject::tr("Drawing viewer") + QString::fromAscii("[*]")); - view->setWindowIcon(Gui::BitmapFactory().pixmap("actions/techdraw-landscape")); + view->setWindowIcon(Gui::BitmapFactory().pixmap("TechDraw_Tree_Page")); view->updateDrawing(true); // view->updateTemplate(true); //TODO: I don't think this is necessary? Ends up triggering a reload of SVG template, but the MDIViewPage constructor does too. Gui::getMainWindow()->addWindow(view); diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp index 7c77703dfe..84b5236906 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp @@ -63,7 +63,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderProjGroup, Gui::ViewProviderDocumentObj ViewProviderProjGroup::ViewProviderProjGroup() { - sPixmap = "ProjGroup"; + sPixmap = "TechDraw_Tree_ProjGroup"; } ViewProviderProjGroup::~ViewProviderProjGroup() @@ -92,7 +92,7 @@ std::vector ViewProviderProjGroup::getDisplayModes(void) const void ViewProviderProjGroup::updateData(const App::Property* prop) { Gui::ViewProviderDocumentObject::updateData(prop); - + if(prop == &(getObject()->Scale) || prop == &(getObject()->ScaleType) || prop == &(getObject()->Views) || @@ -101,11 +101,11 @@ void ViewProviderProjGroup::updateData(const App::Property* prop) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); TaskDlgProjGroup *projDlg = qobject_cast(dlg); - if (projDlg && + if (projDlg && projDlg->getViewProvider() == dynamic_cast(getObject()) ) { projDlg->update(); } - } + } } diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp index e5bfb2c0c0..0e77c2ff90 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp @@ -95,25 +95,25 @@ void ViewProviderProjGroupItem::updateData(const App::Property* prop) //TODO: Once we know that ProjType is valid, sPixMap = "Proj" + projType if(strcmp(projType.c_str(), "Front") == 0) { - sPixmap = "ProjFront"; + sPixmap = "TechDraw_ProjFront"; } else if(strcmp(projType.c_str(), "Rear") == 0) { - sPixmap = "ProjRear"; + sPixmap = "TechDraw_ProjRear"; } else if(strcmp(projType.c_str(), "Right") == 0) { - sPixmap = "ProjRight"; + sPixmap = "TechDraw_ProjRight"; } else if(strcmp(projType.c_str(), "Left") == 0) { - sPixmap = "ProjLeft"; + sPixmap = "TechDraw_ProjLeft"; } else if(strcmp(projType.c_str(), "Top") == 0) { - sPixmap = "ProjTop"; + sPixmap = "TechDraw_ProjTop"; } else if(strcmp(projType.c_str(), "Bottom") == 0) { - sPixmap = "ProjBottom"; + sPixmap = "TechDraw_ProjBottom"; } else if(strcmp(projType.c_str(), "FrontTopLeft") == 0) { - sPixmap = "ProjFrontTopLeft"; + sPixmap = "TechDraw_ProjFrontTopLeft"; } else if(strcmp(projType.c_str(), "FrontTopRight") == 0) { - sPixmap = "ProjFrontTopRight"; + sPixmap = "TechDraw_ProjFrontTopRight"; } else if(strcmp(projType.c_str(), "FrontBottomRight") == 0) { - sPixmap = "ProjFrontBottomRight"; + sPixmap = "TechDraw_ProjFrontBottomRight"; } else if(strcmp(projType.c_str(), "FrontBottomLeft") == 0) { - sPixmap = "ProjFrontBottomLeft"; + sPixmap = "TechDraw_ProjFrontBottomLeft"; } } } diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp index a5987ad20a..a1cbc5ec66 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp @@ -50,7 +50,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderSymbol, Gui::ViewProviderDocumentObject ViewProviderSymbol::ViewProviderSymbol() { - sPixmap = "Symbol"; + sPixmap = "TechDraw_Tree_Symbol"; } ViewProviderSymbol::~ViewProviderSymbol() diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp index 143b3fa13b..424b5cf428 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp @@ -52,7 +52,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderTemplate, Gui::ViewProviderDocumentObje ViewProviderTemplate::ViewProviderTemplate() { - sPixmap = "PageTemplate"; + sPixmap = "TechDraw_Tree_PageTemplate"; } ViewProviderTemplate::~ViewProviderTemplate() diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp index 30e86741ae..c004c7bc6b 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp @@ -55,7 +55,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderViewPart, TechDrawGui::ViewProviderDraw ViewProviderViewPart::ViewProviderViewPart() { - sPixmap = "View"; + sPixmap = "TechDraw_Tree_View"; } ViewProviderViewPart::~ViewProviderViewPart() diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp index 1d84a4d390..53597b1914 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp @@ -53,7 +53,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderViewSection, TechDrawGui::ViewProviderV ViewProviderViewSection::ViewProviderViewSection() { - sPixmap = "Section"; + sPixmap = "TechDraw_Tree_Section"; } ViewProviderViewSection::~ViewProviderViewSection()