Sketcher: move icons to general subdirectory

FreeCAD · Oct 1, 2020 · 3a74255 · 3a74255
1 parent 7626acc
commit 3a74255
Show file tree

Hide file tree

Showing 15 changed files with 74 additions and 141 deletions.
diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
@@ -1,19 +1,8 @@
 <RCC>
     <qresource>
-        <file>icons/Sketcher_EditSketch.svg</file>
-        <file>icons/Sketcher_LeaveSketch.svg</file>
-        <file>icons/Sketcher_MapSketch.svg</file>
-        <file>icons/Sketcher_MergeSketch.svg</file>
-        <file>icons/Sketcher_MirrorSketch.svg</file>
-        <file>icons/Sketcher_NewSketch.svg</file>
-        <file alias="icons/preferences-sketcher.svg">icons/Sketcher_NewSketch.svg</file>
-        <file>icons/Sketcher_ReorientSketch.svg</file>
         <file>icons/Sketcher_Sketch.svg</file>
-        <file>icons/Sketcher_SwitchVirtualSpace.svg</file>
-        <file>icons/Sketcher_ValidateSketch.svg</file>
-        <file>icons/Sketcher_ViewSection.svg</file>
-        <file>icons/Sketcher_ViewSketch.svg</file>
         <file>icons/SketcherWorkbench.svg</file>
+        <file alias="icons/preferences-sketcher.svg">icons/SketcherWorkbench.svg</file>
     </qresource>
     <qresource>
         <file>icons/constraints/Constraint_Block.svg</file>
@@ -101,6 +90,19 @@
         <file>icons/elements/Sketcher_Element_Point_StartingPoint.svg</file>
         <file>icons/elements/Sketcher_Element_SelectionTypeInvalid.svg</file>
     </qresource>
+    <qresource>
+        <file>icons/general/Sketcher_EditSketch.svg</file>
+        <file>icons/general/Sketcher_LeaveSketch.svg</file>
+        <file>icons/general/Sketcher_MapSketch.svg</file>
+        <file>icons/general/Sketcher_MergeSketch.svg</file>
+        <file>icons/general/Sketcher_MirrorSketch.svg</file>
+        <file>icons/general/Sketcher_NewSketch.svg</file>
+        <file>icons/general/Sketcher_ReorientSketch.svg</file>
+        <file>icons/general/Sketcher_SwitchVirtualSpace.svg</file>
+        <file>icons/general/Sketcher_ValidateSketch.svg</file>
+        <file>icons/general/Sketcher_ViewSection.svg</file>
+        <file>icons/general/Sketcher_ViewSketch.svg</file>
+    </qresource>
     <qresource>
         <file>icons/geometry/Sketcher_AlterFillet.svg</file>
         <file>icons/geometry/Sketcher_CarbonCopy.svg</file>

diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg
diff --git a/...i/Resources/icons/Sketcher_EditSketch.svg → ...ces/icons/general/Sketcher_EditSketch.svg b/...i/Resources/icons/Sketcher_EditSketch.svg → ...ces/icons/general/Sketcher_EditSketch.svg
diff --git a/.../Resources/icons/Sketcher_LeaveSketch.svg → ...es/icons/general/Sketcher_LeaveSketch.svg b/.../Resources/icons/Sketcher_LeaveSketch.svg → ...es/icons/general/Sketcher_LeaveSketch.svg
diff --git a/...ui/Resources/icons/Sketcher_MapSketch.svg → ...rces/icons/general/Sketcher_MapSketch.svg b/...ui/Resources/icons/Sketcher_MapSketch.svg → ...rces/icons/general/Sketcher_MapSketch.svg
diff --git a/.../Resources/icons/Sketcher_MergeSketch.svg → ...es/icons/general/Sketcher_MergeSketch.svg b/.../Resources/icons/Sketcher_MergeSketch.svg → ...es/icons/general/Sketcher_MergeSketch.svg
diff --git a/...Resources/icons/Sketcher_MirrorSketch.svg → ...s/icons/general/Sketcher_MirrorSketch.svg b/...Resources/icons/Sketcher_MirrorSketch.svg → ...s/icons/general/Sketcher_MirrorSketch.svg
diff --git a/...ui/Resources/icons/Sketcher_NewSketch.svg → ...rces/icons/general/Sketcher_NewSketch.svg b/...ui/Resources/icons/Sketcher_NewSketch.svg → ...rces/icons/general/Sketcher_NewSketch.svg
diff --git a/...sources/icons/Sketcher_ReorientSketch.svg → ...icons/general/Sketcher_ReorientSketch.svg b/...sources/icons/Sketcher_ReorientSketch.svg → ...icons/general/Sketcher_ReorientSketch.svg
diff --git a/...ces/icons/Sketcher_SwitchVirtualSpace.svg → ...s/general/Sketcher_SwitchVirtualSpace.svg b/...ces/icons/Sketcher_SwitchVirtualSpace.svg → ...s/general/Sketcher_SwitchVirtualSpace.svg
diff --git a/...sources/icons/Sketcher_ValidateSketch.svg → ...icons/general/Sketcher_ValidateSketch.svg b/...sources/icons/Sketcher_ValidateSketch.svg → ...icons/general/Sketcher_ValidateSketch.svg
diff --git a/.../Resources/icons/Sketcher_ViewSection.svg → ...es/icons/general/Sketcher_ViewSection.svg b/.../Resources/icons/Sketcher_ViewSection.svg → ...es/icons/general/Sketcher_ViewSection.svg
diff --git a/...i/Resources/icons/Sketcher_ViewSketch.svg → ...ces/icons/general/Sketcher_ViewSketch.svg b/...i/Resources/icons/Sketcher_ViewSketch.svg → ...ces/icons/general/Sketcher_ViewSketch.svg
diff --git a/...Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointArc.svg b/...Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointArc.svg
diff --git a/src/Mod/Sketcher/InitGui.py b/src/Mod/Sketcher/InitGui.py
@@ -44,6 +44,7 @@ def Initialize(self):
         import Sketcher
         Gui.addIconPath(":/icons/constraints")
         Gui.addIconPath(":/icons/elements")
+        Gui.addIconPath(":/icons/general")
         Gui.addIconPath(":/icons/geometry")
         # Gui.addIconPath(":/icons/obsolete")
         Gui.addIconPath(":/icons/pointers")