From 0f1ae0d95b71888edb8c9fd7094fa7ff109819df Mon Sep 17 00:00:00 2001 From: jmaustpc Date: Tue, 24 Dec 2013 02:37:47 +1100 Subject: [PATCH] Add new icons to Assembly work bench Including new body icons for the treeview and PartDesign create new body command. Move all Assembly constrains icons into their own sub directory of the icons directory add "STEP, IGES or BREP" to the tool tip of Assembly add existing Component command --- src/Mod/Assembly/Gui/Command.cpp | 8 +- src/Mod/Assembly/Gui/CommandConstraints.cpp | 14 +- src/Mod/Assembly/Gui/Resources/Assembly.qrc | 34 +- .../icons/Assembly_Add_Existing_Part.svg | 497 ++++++++++++ .../Resources/icons/Assembly_Add_New_Part.svg | 553 +++++++++++++ .../Assembly_Assembly_Constraints_Tree.svg | 513 ++++++++++++ .../icons/Assembly_Assembly_Create_New.svg | 739 ++++++++++++++++++ .../icons/Assembly_Assembly_Part_Tree.svg | 493 ++++++++++++ .../icons/Assembly_Assembly_Tree.svg | 582 ++++++++++++++ .../Assembly_ConstraintAlignment.svg | 0 .../Assembly_ConstraintAngle.svg | 0 .../Assembly_ConstraintBidirectional.svg | 0 .../Assembly_ConstraintCoincidence.svg | 0 .../Assembly_ConstraintDistance.svg | 0 .../Assembly_ConstraintEqual.svg | 0 .../Assembly_ConstraintGeneral.svg | 0 .../Assembly_ConstraintLock.svg | 0 .../Assembly_ConstraintOpposite.svg | 0 .../Assembly_ConstraintOrientation.svg | 0 .../Assembly_ConstraintParallel.svg | 0 .../Assembly_ConstraintPerpendicular.svg | 0 .../Assembly_ConstraintUnidirectional1.svg | 0 .../Assembly_ConstraintUnidirectional2.svg | 0 src/Mod/Assembly/Gui/ViewProviderAssembly.cpp | 1 + .../Assembly/Gui/ViewProviderConstraint.cpp | 14 +- .../Gui/ViewProviderConstraintGroup.cpp | 1 + src/Mod/Assembly/Gui/ViewProviderPart.cpp | 1 + src/Mod/PartDesign/Gui/Command.cpp | 2 +- .../PartDesign/Gui/Resources/PartDesign.qrc | 4 +- .../Gui/Resources/PartDesign.qrc.orig | 58 ++ .../icons/PartDesign_Body_Create_New.svg | 661 ++++++++++++++++ .../Resources/icons/PartDesign_Body_Tree.svg | 624 +++++++++++++++ src/Mod/PartDesign/Gui/ViewProviderBody.cpp | 1 + 33 files changed, 4766 insertions(+), 34 deletions(-) create mode 100644 src/Mod/Assembly/Gui/Resources/icons/Assembly_Add_Existing_Part.svg create mode 100644 src/Mod/Assembly/Gui/Resources/icons/Assembly_Add_New_Part.svg create mode 100644 src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Constraints_Tree.svg create mode 100644 src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Create_New.svg create mode 100644 src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Part_Tree.svg create mode 100644 src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Tree.svg rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintAlignment.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintAngle.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintBidirectional.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintCoincidence.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintDistance.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintEqual.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintGeneral.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintLock.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintOpposite.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintOrientation.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintParallel.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintPerpendicular.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintUnidirectional1.svg (100%) rename src/Mod/Assembly/Gui/Resources/icons/{ => constraints}/Assembly_ConstraintUnidirectional2.svg (100%) create mode 100644 src/Mod/PartDesign/Gui/Resources/PartDesign.qrc.orig create mode 100644 src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Create_New.svg create mode 100644 src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Tree.svg diff --git a/src/Mod/Assembly/Gui/Command.cpp b/src/Mod/Assembly/Gui/Command.cpp index fef2f5d246..8a117a5eb2 100644 --- a/src/Mod/Assembly/Gui/Command.cpp +++ b/src/Mod/Assembly/Gui/Command.cpp @@ -53,7 +53,7 @@ CmdAssemblyAddNewPart::CmdAssemblyAddNewPart() sToolTipText = QT_TR_NOOP("Add a new Part into the active Assembly"); sWhatsThis = "Assembly_ConstraintAxle"; sStatusTip = sToolTipText; - sPixmap = "Part_Box"; + sPixmap = "Assembly_Add_New_Part.svg"; } @@ -120,7 +120,7 @@ CmdAssemblyAddNewComponent::CmdAssemblyAddNewComponent() sToolTipText = QT_TR_NOOP("Add a new Subassembly into the active Assembly"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; - sPixmap = "Part_Box"; + sPixmap = "Assembly_Assembly_Create_New"; } @@ -155,10 +155,10 @@ CmdAssemblyAddExistingComponent::CmdAssemblyAddExistingComponent() sAppModule = "Assembly"; sGroup = QT_TR_NOOP("Assembly"); sMenuText = QT_TR_NOOP("Add existing Component..."); - sToolTipText = QT_TR_NOOP("Add a existing Component into the active Assembly"); + sToolTipText = QT_TR_NOOP("Add a existing Component into the active Assembly, STEP, IGES or BREP"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; - sPixmap = "Part_Box"; + sPixmap = "Assembly_Add_Existing_Part"; } diff --git a/src/Mod/Assembly/Gui/CommandConstraints.cpp b/src/Mod/Assembly/Gui/CommandConstraints.cpp index 852d262267..7425979654 100644 --- a/src/Mod/Assembly/Gui/CommandConstraints.cpp +++ b/src/Mod/Assembly/Gui/CommandConstraints.cpp @@ -120,7 +120,7 @@ CmdAssemblyConstraint::CmdAssemblyConstraint() sToolTipText = QT_TR_NOOP("Add arbitrary constraints to the assembly"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; - sPixmap = "Assembly_ConstraintGeneral"; + sPixmap = "constraints/Assembly_ConstraintGeneral"; } @@ -204,7 +204,7 @@ CmdAssemblyConstraintDistance::CmdAssemblyConstraintDistance() sToolTipText = QT_TR_NOOP("Set the distance between two selected entitys"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; - sPixmap = "Assembly_ConstraintDistance"; + sPixmap = "constraints/Assembly_ConstraintDistance"; } @@ -271,7 +271,7 @@ CmdAssemblyConstraintFix::CmdAssemblyConstraintFix() sToolTipText = QT_TR_NOOP("Fix a part in it's rotation and translation"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; - sPixmap = "Assembly_ConstraintLock"; + sPixmap = "constraints/Assembly_ConstraintLock"; } @@ -336,7 +336,7 @@ CmdAssemblyConstraintAngle::CmdAssemblyConstraintAngle() sToolTipText = QT_TR_NOOP("Set the angle between two selected entitys"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; - sPixmap = "Assembly_ConstraintAngle"; + sPixmap = "constraints/Assembly_ConstraintAngle"; } @@ -405,7 +405,7 @@ CmdAssemblyConstraintOrientation::CmdAssemblyConstraintOrientation() sToolTipText = QT_TR_NOOP("Set the orientation of two selected entitys in regard to each other"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; - sPixmap = "Assembly_ConstraintOrientation"; + sPixmap = "constraints/Assembly_ConstraintOrientation"; } @@ -473,7 +473,7 @@ CmdAssemblyConstraintCoincidence::CmdAssemblyConstraintCoincidence() sToolTipText = QT_TR_NOOP("Make the selected entitys coincident"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; - sPixmap = "Assembly_ConstraintCoincidence"; + sPixmap = "constraints/Assembly_ConstraintCoincidence"; } @@ -541,7 +541,7 @@ CmdAssemblyConstraintAlignment::CmdAssemblyConstraintAlignment() sToolTipText = QT_TR_NOOP("Align the selected entitys"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; - sPixmap = "Assembly_ConstraintAlignment"; + sPixmap = "constraints/Assembly_ConstraintAlignment"; } diff --git a/src/Mod/Assembly/Gui/Resources/Assembly.qrc b/src/Mod/Assembly/Gui/Resources/Assembly.qrc index 67337c609c..007db91822 100644 --- a/src/Mod/Assembly/Gui/Resources/Assembly.qrc +++ b/src/Mod/Assembly/Gui/Resources/Assembly.qrc @@ -1,19 +1,25 @@ - icons/Assembly_ConstraintBidirectional.svg - icons/Assembly_ConstraintUnidirectional1.svg - icons/Assembly_ConstraintUnidirectional2.svg - icons/Assembly_ConstraintPerpendicular.svg - icons/Assembly_ConstraintParallel.svg - icons/Assembly_ConstraintOpposite.svg - icons/Assembly_ConstraintEqual.svg - icons/Assembly_ConstraintLock.svg - icons/Assembly_ConstraintDistance.svg - icons/Assembly_ConstraintAngle.svg - icons/Assembly_ConstraintOrientation.svg - icons/Assembly_ConstraintCoincidence.svg - icons/Assembly_ConstraintAlignment.svg - icons/Assembly_ConstraintGeneral.svg + icons/constraints/Assembly_ConstraintBidirectional.svg + icons/constraints/Assembly_ConstraintUnidirectional1.svg + icons/constraints/Assembly_ConstraintUnidirectional2.svg + icons/constraints/Assembly_ConstraintPerpendicular.svg + icons/constraints/Assembly_ConstraintParallel.svg + icons/constraints/Assembly_ConstraintOpposite.svg + icons/constraints/Assembly_ConstraintEqual.svg + icons/constraints/Assembly_ConstraintLock.svg + icons/constraints/Assembly_ConstraintDistance.svg + icons/constraints/Assembly_ConstraintAngle.svg + icons/constraints/Assembly_ConstraintOrientation.svg + icons/constraints/Assembly_ConstraintCoincidence.svg + icons/constraints/Assembly_ConstraintAlignment.svg + icons/constraints/Assembly_ConstraintGeneral.svg + icons/Assembly_Add_Existing_Part.svg + icons/Assembly_Add_New_Part.svg + icons/Assembly_Assembly_Constraints_Tree.svg + icons/Assembly_Assembly_Create_New.svg + icons/Assembly_Assembly_Part_Tree.svg + icons/Assembly_Assembly_Tree.svg translations/Assembly_af.qm translations/Assembly_de.qm translations/Assembly_fi.qm diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_Add_Existing_Part.svg b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Add_Existing_Part.svg new file mode 100644 index 0000000000..77486c355a --- /dev/null +++ b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Add_Existing_Part.svg @@ -0,0 +1,497 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_Add_New_Part.svg b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Add_New_Part.svg new file mode 100644 index 0000000000..33e822654c --- /dev/null +++ b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Add_New_Part.svg @@ -0,0 +1,553 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Constraints_Tree.svg b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Constraints_Tree.svg new file mode 100644 index 0000000000..af158833b7 --- /dev/null +++ b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Constraints_Tree.svg @@ -0,0 +1,513 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Create_New.svg b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Create_New.svg new file mode 100644 index 0000000000..19d6955629 --- /dev/null +++ b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Create_New.svg @@ -0,0 +1,739 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Part_Tree.svg b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Part_Tree.svg new file mode 100644 index 0000000000..f4b2cd8544 --- /dev/null +++ b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Part_Tree.svg @@ -0,0 +1,493 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Tree.svg b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Tree.svg new file mode 100644 index 0000000000..805fa8f766 --- /dev/null +++ b/src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Tree.svg @@ -0,0 +1,582 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintAlignment.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintAlignment.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintAngle.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintAngle.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintAngle.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintAngle.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintBidirectional.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintBidirectional.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintBidirectional.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintBidirectional.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintCoincidence.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintCoincidence.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintDistance.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintDistance.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintDistance.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintDistance.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintEqual.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintEqual.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintEqual.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintEqual.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintGeneral.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintGeneral.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintGeneral.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintGeneral.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintLock.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintLock.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintLock.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintLock.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintOpposite.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintOpposite.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintOpposite.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintOpposite.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintOrientation.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintOrientation.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintParallel.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintParallel.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintParallel.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintParallel.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintPerpendicular.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintPerpendicular.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintPerpendicular.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintPerpendicular.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintUnidirectional1.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional1.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintUnidirectional1.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional1.svg diff --git a/src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintUnidirectional2.svg b/src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional2.svg similarity index 100% rename from src/Mod/Assembly/Gui/Resources/icons/Assembly_ConstraintUnidirectional2.svg rename to src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional2.svg diff --git a/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp b/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp index 7dd53f5ef1..0e2e7f3005 100644 --- a/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp +++ b/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp @@ -43,6 +43,7 @@ PROPERTY_SOURCE(AssemblyGui::ViewProviderItemAssembly,AssemblyGui::ViewProviderI ViewProviderItemAssembly::ViewProviderItemAssembly() { + sPixmap = "Assembly_Assembly_Tree.svg"; } ViewProviderItemAssembly::~ViewProviderItemAssembly() diff --git a/src/Mod/Assembly/Gui/ViewProviderConstraint.cpp b/src/Mod/Assembly/Gui/ViewProviderConstraint.cpp index f488bc9080..4a0e1c3adb 100644 --- a/src/Mod/Assembly/Gui/ViewProviderConstraint.cpp +++ b/src/Mod/Assembly/Gui/ViewProviderConstraint.cpp @@ -204,19 +204,19 @@ void ViewProviderConstraint::updateData(const App::Property* prop) { //set the icon int v = dynamic_cast(getObject())->Type.getValue(); if(v == 4) - sPixmap = "Assembly_ConstraintAlignment"; + sPixmap = "constraints/Assembly_ConstraintAlignment"; if(v == 3) - sPixmap = "Assembly_ConstraintAngle"; + sPixmap = "constraints/Assembly_ConstraintAngle"; if(v == 5) - sPixmap = "Assembly_ConstraintCoincidence"; + sPixmap = "constraints/Assembly_ConstraintCoincidence"; if(v == 1) - sPixmap = "Assembly_ConstraintDistance"; + sPixmap = "constraints/Assembly_ConstraintDistance"; if(v == 0) - sPixmap = "Assembly_ConstraintLock"; + sPixmap = "constraints/Assembly_ConstraintLock"; if(v == 2) - sPixmap = "Assembly_ConstraintOrientation"; + sPixmap = "constraints/Assembly_ConstraintOrientation"; if(v==6) - sPixmap = "Assembly_ConstraintGeneral"; + sPixmap = "constraints/Assembly_ConstraintGeneral"; if(Visibility.getValue() && m_selected) { diff --git a/src/Mod/Assembly/Gui/ViewProviderConstraintGroup.cpp b/src/Mod/Assembly/Gui/ViewProviderConstraintGroup.cpp index b8a7c2d4a8..ab495ead7c 100644 --- a/src/Mod/Assembly/Gui/ViewProviderConstraintGroup.cpp +++ b/src/Mod/Assembly/Gui/ViewProviderConstraintGroup.cpp @@ -39,6 +39,7 @@ PROPERTY_SOURCE(AssemblyGui::ViewProviderConstraintGroup,Gui::ViewProviderDocume ViewProviderConstraintGroup::ViewProviderConstraintGroup() { + sPixmap = "Assembly_Assembly_Constraints_Tree.svg"; } ViewProviderConstraintGroup::~ViewProviderConstraintGroup() diff --git a/src/Mod/Assembly/Gui/ViewProviderPart.cpp b/src/Mod/Assembly/Gui/ViewProviderPart.cpp index 943846e2fe..c1be685e2f 100644 --- a/src/Mod/Assembly/Gui/ViewProviderPart.cpp +++ b/src/Mod/Assembly/Gui/ViewProviderPart.cpp @@ -38,6 +38,7 @@ PROPERTY_SOURCE(AssemblyGui::ViewProviderItemPart,AssemblyGui::ViewProviderItem) ViewProviderItemPart::ViewProviderItemPart() { + sPixmap = "Assembly_Assembly_Part_Tree.svg"; } ViewProviderItemPart::~ViewProviderItemPart() diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 9b6e6d634e..a1136add0e 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -97,7 +97,7 @@ CmdPartDesignBody::CmdPartDesignBody() sToolTipText = QT_TR_NOOP("Create a new body feature"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; - sPixmap = "PartDesign_Body"; + sPixmap = "PartDesign_Body_Create_New"; } void CmdPartDesignBody::activated(int iMsg) diff --git a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc index cda65f8f28..718eaa8b70 100644 --- a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc +++ b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc @@ -19,10 +19,12 @@ icons/PartDesign_Line.svg icons/PartDesign_Point.svg icons/Tree_PartDesign_Pad.svg - icons/Tree_PartDesign_Revolution.svg + icons/Tree_PartDesign_Revolution.svg icons/PartDesign_InternalExternalGear.svg icons/PartDesign_InvoluteGear.svg icons/PartDesignWorkbench.svg + icons/PartDesign_Body_Create_New.svg + icons/PartDesign_Body_Tree.svg translations/PartDesign_af.qm translations/PartDesign_de.qm translations/PartDesign_fi.qm diff --git a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc.orig b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc.orig new file mode 100644 index 0000000000..7711ca2ac1 --- /dev/null +++ b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc.orig @@ -0,0 +1,58 @@ + + + icons/PartDesign_Chamfer.svg + icons/PartDesign_Fillet.svg + icons/PartDesign_Draft.svg + icons/PartDesign_Groove.svg + icons/PartDesign_Pad.svg + icons/PartDesign_Pocket.svg + icons/PartDesign_Revolution.svg + icons/PartDesign_Mirrored.svg + icons/PartDesign_LinearPattern.svg + icons/PartDesign_PolarPattern.svg + icons/PartDesign_Scaled.svg + icons/PartDesign_MultiTransform.svg + icons/PartDesign_Hole.svg + icons/PartDesign_Body.svg + icons/PartDesign_Boolean.svg + icons/PartDesign_Plane.svg + icons/PartDesign_Line.svg + icons/PartDesign_Point.svg + icons/Tree_PartDesign_Pad.svg + icons/Tree_PartDesign_Revolution.svg + icons/PartDesign_InternalExternalGear.svg + icons/PartDesign_InvoluteGear.svg +<<<<<<< bca167ff77a62818ebcd8c2d7030915aa2c9d282 + icons/PartDesignWorkbench.svg +======= + icons/PartDesign_Body_Create_New.svg + icons/PartDesign_Body_Tree.svg +>>>>>>> Add new icons to Assembly work bench + translations/PartDesign_af.qm + translations/PartDesign_de.qm + translations/PartDesign_fi.qm + translations/PartDesign_fr.qm + translations/PartDesign_hr.qm + translations/PartDesign_it.qm + translations/PartDesign_nl.qm + translations/PartDesign_no.qm + translations/PartDesign_pl.qm + translations/PartDesign_ru.qm + translations/PartDesign_uk.qm + translations/PartDesign_tr.qm + translations/PartDesign_sv-SE.qm + translations/PartDesign_zh-TW.qm + translations/PartDesign_pt-BR.qm + translations/PartDesign_cs.qm + translations/PartDesign_sk.qm + translations/PartDesign_es-ES.qm + translations/PartDesign_zh-CN.qm + translations/PartDesign_ja.qm + translations/PartDesign_ro.qm + translations/PartDesign_hu.qm + translations/PartDesign_pt-PT.qm + translations/PartDesign_sr.qm + translations/PartDesign_el.qm + translations/PartDesign_sl.qm + + diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Create_New.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Create_New.svg new file mode 100644 index 0000000000..9e68863e04 --- /dev/null +++ b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Create_New.svg @@ -0,0 +1,661 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Tree.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Tree.svg new file mode 100644 index 0000000000..99d3c53350 --- /dev/null +++ b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Tree.svg @@ -0,0 +1,624 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp index 1279c3308b..091c47f72c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp @@ -51,6 +51,7 @@ ViewProviderBody::ViewProviderBody() pcBodyChildren->ref(); pcBodyTip = new SoGroup(); pcBodyTip->ref(); + sPixmap = "PartDesign_Body_Tree.svg"; } ViewProviderBody::~ViewProviderBody()