diff --git a/src/Mod/Arch/CMakeLists.txt b/src/Mod/Arch/CMakeLists.txt index 7f3952550..a60d31657 100644 --- a/src/Mod/Arch/CMakeLists.txt +++ b/src/Mod/Arch/CMakeLists.txt @@ -74,5 +74,13 @@ INSTALL( Presets DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Arch - FILES_MATCHING PATTERN "*.csv*" + FILES_MATCHING PATTERN "*.csv*" ) + +SET(ArchGuiIcon_SVG + Resources/icons/ArchWorkbench.svg +) + +fc_copy_sources(Arch "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Arch" ${ArchGuiIcon_SVG}) + +INSTALL(FILES ${ArchGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Arch/Resources/icons") diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 44903c5a2..08cf42668 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -23,46 +23,10 @@ class ArchWorkbench(Workbench): "Arch workbench object" - Icon = """ - /* XPM */ - static char * arch_xpm[] = { - "16 16 17 1", - " c None", - ". c #373936", - "+ c #464845", - "@ c #545553", - "# c #626461", - "$ c #6B6D6A", - "% c #727471", - "& c #7E807D", - "* c #8A8C89", - "= c #949693", - "- c #A1A3A0", - "; c #ADAFAC", - "> c #BEC1BD", - ", c #C9CBC8", - "' c #D9DCD8", - ") c #E4E6E3", - "! c #FDFFFC", - " ", - " ", - " & ", - " >)'-% ", - " #,))))),@ ", - " >%*-))))*# ", - " $')>!)**>%*% ", - "@=')>!!!!$==# ", - "=!=**;'!!&=$++ ", - "=!!!)*@&-%#@#&-.", - " ,!!!!#>&#=,'=%@", - " ;)!#!!!-*$&=@", - " *@!!!!!$=* ", - " =>!!$& ", - " -+ ", - " "};""" - - MenuText = "Arch" - ToolTip = "Architecture workbench" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Arch/Resources/icons/ArchWorkbench.svg" + self.__class__.MenuText = "Arch" + self.__class__.ToolTip = "Architecture workbench" def Initialize(self): import DraftTools,DraftGui,Arch_rc,Arch,Draft_rc diff --git a/src/Mod/Arch/Resources/Arch.qrc b/src/Mod/Arch/Resources/Arch.qrc index f6ca7b970..a8af096f2 100644 --- a/src/Mod/Arch/Resources/Arch.qrc +++ b/src/Mod/Arch/Resources/Arch.qrc @@ -57,6 +57,7 @@ icons/Arch_Material.svg icons/Arch_Material_Group.svg icons/Arch_Schedule.svg + icons/ArchWorkbench.svg ui/preferences-arch.ui ui/preferences-archdefaults.ui ui/preferences-ifc.ui diff --git a/src/Mod/Arch/Resources/icons/ArchWorkbench.svg b/src/Mod/Arch/Resources/icons/ArchWorkbench.svg new file mode 100755 index 000000000..94d505329 --- /dev/null +++ b/src/Mod/Arch/Resources/icons/ArchWorkbench.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Complete/Gui/CMakeLists.txt b/src/Mod/Complete/Gui/CMakeLists.txt index 2e8ebfe92..9b5a3e534 100644 --- a/src/Mod/Complete/Gui/CMakeLists.txt +++ b/src/Mod/Complete/Gui/CMakeLists.txt @@ -38,3 +38,11 @@ SET_BIN_DIR(CompleteGui CompleteGui /Mod/Complete) SET_PYTHON_PREFIX_SUFFIX(CompleteGui) install(TARGETS CompleteGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(CompleteGuiIcon_SVG + Resources/icons/CompleteWorkbench.svg +) + +fc_copy_sources(CompleteGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Complete" ${CompleteGuiIcon_SVG}) + +INSTALL(FILES ${CompleteGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Complete/Resources/icons") diff --git a/src/Mod/Complete/Gui/Resources/Complete.qrc b/src/Mod/Complete/Gui/Resources/Complete.qrc index 046cfab70..e6fc223f4 100644 --- a/src/Mod/Complete/Gui/Resources/Complete.qrc +++ b/src/Mod/Complete/Gui/Resources/Complete.qrc @@ -1,5 +1,6 @@ - + + icons/CompleteWorkbench.svg translations/Complete_af.qm translations/Complete_de.qm translations/Complete_fi.qm @@ -27,4 +28,4 @@ translations/Complete_el.qm translations/Complete_sl.qm - + diff --git a/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg b/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg new file mode 100644 index 000000000..6474ee144 --- /dev/null +++ b/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + \ No newline at end of file diff --git a/src/Mod/Complete/InitGui.py b/src/Mod/Complete/InitGui.py index 02d6e943e..380c6ccf2 100644 --- a/src/Mod/Complete/InitGui.py +++ b/src/Mod/Complete/InitGui.py @@ -32,44 +32,17 @@ class CompleteWorkbench ( Workbench ): - "Complete workbench object" - Icon = """ - /* XPM */ - static char * complete_xpm[] = { - "16 15 9 1", - " c None", - ". c #DB7B07", - "+ c #DA8100", - "@ c #F49500", - "# c #E89900", - "$ c #FEA200", - "% c #FEAD00", - "& c #FFBB00", - "* c #FDC500", - " + ", - " ++ ", - " +##+ ", - " +&*+ ", - " +#&*#+ ", - "++.++#&&**#+.++ ", - " +$%%%&&&*****++", - " +$%%%&&&***++ ", - " +$%%%&&*&+ ", - " .+%%%&&&+ ", - " .@%%%%&&# ", - " .@$%$%%&#+ ", - " .@@++++%%+ ", - " ..+ +++ ", - " . ++ "}; - """ - MenuText = "Complete" - ToolTip = "Complete workbench" + "Complete workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Complete/Resources/icons/CompleteWorkbench.svg" + self.__class__.MenuText = "Complete" + self.__class__.ToolTip = "Complete workbench" - def Initialize(self): - # load the module - import CompleteGui - import Complete - def GetClassName(self): - return "CompleteGui::Workbench" + def Initialize(self): + # load the module + import CompleteGui + import Complete + def GetClassName(self): + return "CompleteGui::Workbench" Gui.addWorkbench(CompleteWorkbench()) diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt index 90ba029b9..8ca57a9ff 100644 --- a/src/Mod/Draft/CMakeLists.txt +++ b/src/Mod/Draft/CMakeLists.txt @@ -44,3 +44,11 @@ INSTALL( DESTINATION Mod/Draft ) + +SET(DraftGuiIcon_SVG + Resources/icons/DraftWorkbench.svg +) + +fc_copy_sources(Draft "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Draft" ${DraftGuiIcon_SVG}) + +INSTALL(FILES ${DraftGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Draft/Resources/icons") diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py index a9e1e525c..52c6f5330 100644 --- a/src/Mod/Draft/InitGui.py +++ b/src/Mod/Draft/InitGui.py @@ -26,46 +26,10 @@ __url__ = ["http://www.freecadweb.org"] class DraftWorkbench (Workbench): "the Draft Workbench" - Icon = """ - /* XPM */ - static char * draft_xpm[] = { - "16 16 17 1", - " c None", - ". c #5F4A1C", - "+ c #5A4E36", - "@ c #8A4D00", - "# c #835A04", - "$ c #7E711F", - "% c #847954", - "& c #C27400", - "* c #817D74", - "= c #E79300", - "- c #BFAB0C", - "; c #ADA791", - "> c #B3AE87", - ", c #B0B2AE", - "' c #ECD200", - ") c #D6D8D5", - "! c #FCFEFA", - " ,!!)!!!!!!!!!", - " ,!!>;!!!!!!!!", - " ,!!>-,!!!!!!!", - " ,!!>'$)!!!!!!", - " ,!!>-'%!!!!!!", - " ,!!>-$-;!!!!!", - " ,!!>-*-$)!!!!", - " @&+!!>-*;-%!!!!", - "@&=+)!;'-''-*!!!", - ".@@.;;%%....+;;!", - ".&&===========$,", - ".&&=====&&####.,", - ".&&.++***,,)))!!", - "#==+)!!!!!!!!!!!", - " ##+)!!!!!!!!!!!", - " *,,,,,,,,,,,,"};""" - - MenuText = "Draft" - ToolTip = "The Draft module is used for basic 2D CAD Drafting" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Draft/Resources/icons/DraftWorkbench.svg" + self.__class__.MenuText = "Draft" + self.__class__.ToolTip = "The Draft module is used for basic 2D CAD Drafting" def Initialize(self): def QT_TRANSLATE_NOOP(scope, text): diff --git a/src/Mod/Draft/Resources/Draft.qrc b/src/Mod/Draft/Resources/Draft.qrc index de2b61fdd..dbdbe12cf 100644 --- a/src/Mod/Draft/Resources/Draft.qrc +++ b/src/Mod/Draft/Resources/Draft.qrc @@ -68,6 +68,7 @@ icons/Draft_FlipDimension.svg icons/Draft_Mirror.svg icons/Draft_Grid.svg + icons/DraftWorkbench.svg patterns/concrete.svg patterns/cross.svg patterns/line.svg diff --git a/src/Mod/Draft/Resources/icons/DraftWorkbench.svg b/src/Mod/Draft/Resources/icons/DraftWorkbench.svg new file mode 100644 index 000000000..775756410 --- /dev/null +++ b/src/Mod/Draft/Resources/icons/DraftWorkbench.svg @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt index 1414ab392..33423d5d1 100644 --- a/src/Mod/Drawing/Gui/CMakeLists.txt +++ b/src/Mod/Drawing/Gui/CMakeLists.txt @@ -95,16 +95,15 @@ fc_target_copy_resource(DrawingGui ${CMAKE_BINARY_DIR}/Mod/Drawing InitGui.py) -SET(DrawingGuiIcon_SVG - Resources/icons/actions/drawing-landscape.svg -) - -fc_copy_sources(DrawingGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Drawing" ${DrawingGuiIcon_SVG}) - -INSTALL(FILES ${DrawingGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Drawing/Resources/icons/actions") - - SET_BIN_DIR(DrawingGui DrawingGui /Mod/Drawing) SET_PYTHON_PREFIX_SUFFIX(DrawingGui) INSTALL(TARGETS DrawingGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(DrawingGuiIcon_SVG + Resources/icons/DrawingWorkbench.svg +) + +fc_copy_sources(DrawingGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Drawing" ${DrawingGuiIcon_SVG}) + +INSTALL(FILES ${DrawingGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Drawing/Resources/icons") diff --git a/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg b/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg new file mode 100644 index 000000000..2cc6b6705 --- /dev/null +++ b/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg @@ -0,0 +1,436 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Document + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Drawing/InitGui.py b/src/Mod/Drawing/InitGui.py index 7f9c6212d..915a12e79 100644 --- a/src/Mod/Drawing/InitGui.py +++ b/src/Mod/Drawing/InitGui.py @@ -33,7 +33,7 @@ class DrawingWorkbench (Workbench): "Drawing workbench object" def __init__(self): - self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Drawing/Resources/icons/actions/drawing-landscape.svg" + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Drawing/Resources/icons/DrawingWorkbench.svg" self.__class__.MenuText = "Drawing" self.__class__.ToolTip = "Drawing workbench" diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 83ec8fda1..a54e1d6a4 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -225,7 +225,7 @@ fc_target_copy_resource(FemGui ) SET(FemGuiIcon_SVG - Resources/icons/preferences-fem.svg + Resources/icons/FemWorkbench.svg ) fc_copy_sources(FemGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Fem" ${FemGuiIcon_SVG}) diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc index 0b60ce9f1..a9a414239 100755 --- a/src/Mod/Fem/Gui/Resources/Fem.qrc +++ b/src/Mod/Fem/Gui/Resources/Fem.qrc @@ -24,6 +24,7 @@ icons/fem-shell-thickness.svg icons/fem-beam-section.svg icons/preferences-fem.svg + icons/FemWorkbench.svg translations/Fem_af.qm translations/Fem_de.qm translations/Fem_fi.qm diff --git a/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg b/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg new file mode 100755 index 000000000..7b98dcaa7 --- /dev/null +++ b/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg @@ -0,0 +1,1692 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py index 05b9300a8..dc14d0e08 100644 --- a/src/Mod/Fem/InitGui.py +++ b/src/Mod/Fem/InitGui.py @@ -37,7 +37,7 @@ import FreeCADGui class FemWorkbench (Workbench): "Fem workbench object" def __init__(self): - self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Fem/Resources/icons/preferences-fem.svg" + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Fem/Resources/icons/FemWorkbench.svg" self.__class__.MenuText = "FEM" self.__class__.ToolTip = "FEM workbench" diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt index 1dafc9919..f2bf148dd 100644 --- a/src/Mod/Image/Gui/CMakeLists.txt +++ b/src/Mod/Image/Gui/CMakeLists.txt @@ -78,3 +78,11 @@ SET_BIN_DIR(ImageGui ImageGui /Mod/Image) SET_PYTHON_PREFIX_SUFFIX(ImageGui) INSTALL(TARGETS ImageGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(ImageGuiIcon_SVG + Resources/icons/ImageWorkbench.svg +) + +fc_copy_sources(ImageGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Image" ${ImageGuiIcon_SVG}) + +INSTALL(FILES ${ImageGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Image/Resources/icons") diff --git a/src/Mod/Image/Gui/Resources/Image.qrc b/src/Mod/Image/Gui/Resources/Image.qrc index 404a95be7..cdabd7c45 100644 --- a/src/Mod/Image/Gui/Resources/Image.qrc +++ b/src/Mod/Image/Gui/Resources/Image.qrc @@ -1,6 +1,7 @@ icons/image-import.svg + icons/ImageWorkbench.svg translations/Image_af.qm translations/Image_de.qm translations/Image_fi.qm diff --git a/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg b/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg new file mode 100644 index 000000000..230fd84ef --- /dev/null +++ b/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Mod/Image/InitGui.py b/src/Mod/Image/InitGui.py index cf2e9a405..b5f547218 100644 --- a/src/Mod/Image/InitGui.py +++ b/src/Mod/Image/InitGui.py @@ -32,170 +32,17 @@ class ImageWorkbench ( Workbench ): - "Image workbench object" - Icon = """ - /* XPM */ - static const char *colors[]={ - "16 16 134 2", - "Qt c None", - ".# c #000000", - "#y c #000000", - ".L c #000000", - ".e c #000000", - "#X c #000000", - "#M c #000000", - "#z c #000000", - "#L c #120000", - ".Y c #000000", - ".d c #0c0c00", - ".K c #140a00", - "ad c #120900", - ".a c #1b0909", - "ab c #0f0800", - ".A c #231106", - "ac c #1b0b00", - ".c c #291a0f", - ".b c #2e2012", - ".X c #311f09", - "#l c #362104", - "#Y c #241000", - "## c #2b1900", - ".l c #402300", - ".J c #3f2611", - ".M c #372000", - "#7 c #3b1f00", - "#. c #503511", - ".s c #51361e", - "#6 c #542d00", - "#N c #462700", - ".f c #603805", - "#m c #4d2b00", - "aa c #693900", - "#A c #583000", - ".k c #71553d", - ".B c #6b4100", - ".t c #754800", - ".G c #764d27", - "#x c #94651a", - ".W c #946b35", - "#8 c #8e5100", - ".I c #a07749", - "#W c #a5660d", - "#Z c #945200", - ".R c #9f6932", - ".Z c #9d5d00", - "#K c #ba801a", - ".j c #c4aa92", - ".V c #cea05c", - "a# c #c67700", - ".F c #c69869", - ".g c #cda881", - "#9 c #c57700", - "#O c #b87700", - ".9 c #d4a558", - ".z c #dab68c", - "#k c #c99c51", - "#a c #d47c00", - "a. c #d58300", - ".i c #e6d2bf", - ".m c #e88400", - "#B c #d88300", - ".h c #ead8c7", - "#n c #e88600", - ".S c #e8b877", - ".N c #e98600", - "#0 c #e98d00", - ".U c #efc27c", - ".Q c #f0bd7e", - ".H c #ecc28c", - "#5 c #f3a204", - ".r c #f2d9bb", - ".x c #f3d3b0", - ".y c #f4d6b1", - ".3 c #fcc478", - ".4 c #fdc878", - "#D c #0ccd06", - "#p c #13950d", - "#v c #4547cc", - "#u c #5e589f", - "#C c #62a200", - "#q c #69af39", - "#i c #6e6ba1", - "#I c #7a668f", - "#P c #80ac00", - "#j c #9084a1", - "#E c #91831e", - "#d c #95a24e", - "#Q c #a08500", - "#h c #a28d84", - "#F c #a62f2f", - "#t c #a8745f", - "#w c #ae9381", - "#J c #af8e6c", - "#R c #b21e07", - "#H c #b56e49", - "#G c #b93932", - "#o c #bd8900", - "#s c #c77d4b", - "#S c #cc0d12", - "#T c #da2d17", - "#2 c #da5100", - "#3 c #db3b01", - "#c c #de8f0e", - "#e c #e0bb65", - "#1 c #ea8300", - "#r c #ebb04b", - "#U c #eda11a", - ".8 c #edc882", - "#4 c #ee9603", - ".7 c #f3cc83", - "#g c #fcc664", - ".C c #fe8c00", - ".O c #ff8500", - ".D c #ff890a", - ".u c #ff8a00", - ".1 c #ff8c05", - ".0 c #ff8d00", - "#b c #ff8e00", - ".v c #ff9f38", - ".P c #ffa336", - ".2 c #ffb352", - "#V c #ffbf1c", - "#f c #ffc563", - ".n c #ffc683", - ".E c #ffc885", - ".5 c #ffcd7c", - ".6 c #ffd17d", - ".T c #ffd894", - ".w c #ffe1bf", - ".p c #fff3e2", - ".o c #fff3e4", - ".q c #fff6e4", - "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", - "QtQt.#.a.b.c.d.#QtQtQtQtQtQtQtQt", - "Qt.e.f.g.h.i.j.k.dQtQtQtQtQtQtQt", - "Qt.l.m.n.o.p.q.r.sQtQtQtQtQtQtQt", - "Qt.t.u.v.w.x.y.z.AQtQtQtQtQtQtQt", - "Qt.B.C.D.E.F.G.H.I.J.K.LQtQtQtQt", - "Qt.M.N.O.P.Q.R.S.T.U.V.W.X.#QtQt", - "Qt.Y.Z.0.1.2.3.4.5.6.7.8.9#..#Qt", - "QtQt###a#b#c#d#e#f#g#h#i#j#k#lQt", - "QtQt.L#m#n#o#p#q#r#s#t#u#v#w#x#y", - "QtQtQt#z#A#B#C#D#E#F#G#H#I#J#K#L", - "QtQtQtQt#M#N#O#P#Q#R#S#T#U#V#W#X", - "QtQtQtQtQt#y#Y#Z#0#1#2#3#4#5#6Qt", - "QtQtQtQtQtQtQt.Y#7#8#9a.a#aa#zQt", - "QtQtQtQtQtQtQtQtQt#zabacad#yQtQt", - "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"}; - """ - MenuText = "Image" - ToolTip = "Image workbench" + "Image workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Image/Resources/icons/ImageWorkbench.svg" + self.__class__.MenuText = "Image" + self.__class__.ToolTip = "Image workbench" - def Initialize(self): - # load the module - import ImageGui - def GetClassName(self): - return "ImageGui::Workbench" + def Initialize(self): + # load the module + import ImageGui + def GetClassName(self): + return "ImageGui::Workbench" Gui.addWorkbench(ImageWorkbench()) diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt index d2b41a106..940f89081 100644 --- a/src/Mod/Inspection/Gui/CMakeLists.txt +++ b/src/Mod/Inspection/Gui/CMakeLists.txt @@ -61,3 +61,11 @@ SET_BIN_DIR(InspectionGui InspectionGui /Mod/Inspection) SET_PYTHON_PREFIX_SUFFIX(InspectionGui) INSTALL(TARGETS InspectionGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(InspectionGuiIcon_SVG + Resources/icons/InspectionWorkbench.svg +) + +fc_copy_sources(InspectionGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Inspection" ${InspectionGuiIcon_SVG}) + +INSTALL(FILES ${InspectionGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Inspection/Resources/icons") diff --git a/src/Mod/Inspection/Gui/Resources/Inspection.qrc b/src/Mod/Inspection/Gui/Resources/Inspection.qrc index 0a98c5322..c049f6272 100644 --- a/src/Mod/Inspection/Gui/Resources/Inspection.qrc +++ b/src/Mod/Inspection/Gui/Resources/Inspection.qrc @@ -1,5 +1,6 @@ icons/inspect_pipette.svg + icons/InspectionWorkbench.svg diff --git a/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg b/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg new file mode 100644 index 000000000..d8e4524ee --- /dev/null +++ b/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/Mod/Inspection/InitGui.py b/src/Mod/Inspection/InitGui.py index cdb0165c6..f5f54b5c4 100644 --- a/src/Mod/Inspection/InitGui.py +++ b/src/Mod/Inspection/InitGui.py @@ -32,13 +32,16 @@ class InspectionWorkbench ( Workbench ): - "Inspection workbench object" - MenuText = "Inspection" - ToolTip = "Inspection workbench" - def Initialize(self): - # load the module - import InspectionGui - def GetClassName(self): - return "InspectionGui::Workbench" + "Inspection workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Inspection/Resources/icons/InspectionWorkbench.svg" + self.__class__.MenuText = "Inspection" + self.__class__.ToolTip = "Inspection workbench" + + def Initialize(self): + # load the module + import InspectionGui + def GetClassName(self): + return "InspectionGui::Workbench" Gui.addWorkbench(InspectionWorkbench()) diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 37df2ad5d..2a6bd3802 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/src/Mod/Mesh/Gui/CMakeLists.txt @@ -133,16 +133,15 @@ fc_target_copy_resource(MeshGui ${CMAKE_BINARY_DIR}/Mod/Mesh InitGui.py) +SET_BIN_DIR(MeshGui MeshGui /Mod/Mesh) +SET_PYTHON_PREFIX_SUFFIX(MeshGui) + +INSTALL(TARGETS MeshGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + SET(MeshGuiIcon_SVG - Resources/icons/Tree_Mesh.svg + Resources/icons/MeshWorkbench.svg ) fc_copy_sources(MeshGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Mesh" ${MeshGuiIcon_SVG}) INSTALL(FILES ${MeshGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Mesh/Resources/icons") - - -SET_BIN_DIR(MeshGui MeshGui /Mod/Mesh) -SET_PYTHON_PREFIX_SUFFIX(MeshGui) - -INSTALL(TARGETS MeshGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/Mod/Mesh/Gui/Resources/Mesh.qrc b/src/Mod/Mesh/Gui/Resources/Mesh.qrc index defe45312..55c7e1e55 100644 --- a/src/Mod/Mesh/Gui/Resources/Mesh.qrc +++ b/src/Mod/Mesh/Gui/Resources/Mesh.qrc @@ -13,6 +13,7 @@ icons/Mesh_Regular_Solid.svg icons/Mesh_Remove_Components.svg icons/Mesh_Tree_Curvature_Plot.svg + icons/MeshWorkbench.svg icons/RegularSolids/Mesh_Cone.svg icons/RegularSolids/Mesh_Cube.svg icons/RegularSolids/Mesh_Cylinder.svg diff --git a/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg b/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg new file mode 100644 index 000000000..4b9130372 --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/InitGui.py b/src/Mod/Mesh/InitGui.py index d2f6a7d3a..bcfd0c1a2 100644 --- a/src/Mod/Mesh/InitGui.py +++ b/src/Mod/Mesh/InitGui.py @@ -33,7 +33,7 @@ class MeshWorkbench (Workbench): "Mesh workbench object" def __init__(self): - self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Mesh/Resources/icons/Tree_Mesh.svg" + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Mesh/Resources/icons/MeshWorkbench.svg" self.__class__.MenuText = "Mesh Design" self.__class__.ToolTip = "Mesh design workbench" @@ -43,4 +43,4 @@ class MeshWorkbench (Workbench): def GetClassName(self): return "MeshGui::Workbench" -Gui.addWorkbench(MeshWorkbench()) \ No newline at end of file +Gui.addWorkbench(MeshWorkbench()) diff --git a/src/Mod/OpenSCAD/CMakeLists.txt b/src/Mod/OpenSCAD/CMakeLists.txt index 462ac7a79..d2bf4b9c5 100644 --- a/src/Mod/OpenSCAD/CMakeLists.txt +++ b/src/Mod/OpenSCAD/CMakeLists.txt @@ -54,3 +54,11 @@ INSTALL( DESTINATION Mod/OpenSCAD ) + +SET(OpenSCADGuiIcon_SVG + Resources/icons/OpenSCADWorkbench.svg +) + +fc_copy_sources(OpenSCAD "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/OpenSCAD" ${OpenSCADGuiIcon_SVG}) + +INSTALL(FILES ${OpenSCADGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/OpenSCAD/Resources/icons") diff --git a/src/Mod/OpenSCAD/InitGui.py b/src/Mod/OpenSCAD/InitGui.py index ca192b39b..229c40335 100644 --- a/src/Mod/OpenSCAD/InitGui.py +++ b/src/Mod/OpenSCAD/InitGui.py @@ -36,62 +36,11 @@ openscadfilename = param.GetString('openscadexecutable') class OpenSCADWorkbench ( Workbench ): "OpenSCAD workbench object" - Icon = """ -/* XPM */ -static char * openscadlogo_xpm[] = { -"16 16 33 1", -" c None", -". c #61320B", -"+ c #5D420B", -"@ c #4F4C09", -"# c #564930", -"$ c #754513", -"% c #815106", -"& c #666509", -"* c #875F55", -"= c #6E7000", -"- c #756A53", -"; c #717037", -"> c #946637", -", c #92710E", -"' c #797A0A", -") c #7C7720", -"! c #8A8603", -"~ c #88886F", -"{ c #AF8181", -"] c #999908", -"^ c #BB8D8D", -"/ c #AAAA00", -"( c #A9A880", -"_ c #B5B419", -": c #C1A9A9", -"< c #B1B19A", -"[ c #BEBE00", -"} c #B9B8B4", -"| c #CACC00", -"1 c #D4D4BC", -"2 c #DBD2D0", -"3 c #EEEEED", -"4 c None", -"4444444444444444", -"4444443113444444", -"4444<;']]!;<^^24", -"444(&@!]]]=&#^{3", -"44<']')@++)!&*{^", -"44)]/[|//[/]'@{{", -"42=/_|||||[]!&*{", -"4(&][|||||[/'@#}", -"3-..,|||||[)&&~4", -"^*$%.!|||[!+/](4", -"^{%%%._[[_&/[_14", -":{>%%.!//])_[_44", -"2{{%%+!]!!)]]344", -"4:{{#@&=&&@#3444", -"44224}~--~}44444", -"4444444444444444"}; -""" - MenuText = "OpenSCAD" - ToolTip = "OpenSCAD workbench" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg" + self.__class__.MenuText = "OpenSCAD" + self.__class__.ToolTip = "OpenSCAD workbench" + def Initialize(self): def QT_TRANSLATE_NOOP(scope, text): return text diff --git a/src/Mod/OpenSCAD/Resources/OpenSCAD.qrc b/src/Mod/OpenSCAD/Resources/OpenSCAD.qrc index bbdc1225f..570d8984e 100644 --- a/src/Mod/OpenSCAD/Resources/OpenSCAD.qrc +++ b/src/Mod/OpenSCAD/Resources/OpenSCAD.qrc @@ -11,6 +11,7 @@ icons/OpenSCAD_MeshBooleans.svg icons/OpenSCAD_Hull.svg icons/OpenSCAD_Minkowski.svg + icons/OpenSCADWorkbench.svg ui/openscadprefs-base.ui translations/OpenSCAD_tr.qm translations/OpenSCAD_sv-SE.qm diff --git a/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg b/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg new file mode 100644 index 000000000..efc7fa00f --- /dev/null +++ b/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index b893df5dd..b3d3da528 100644 --- a/src/Mod/Part/Gui/CMakeLists.txt +++ b/src/Mod/Part/Gui/CMakeLists.txt @@ -238,3 +238,11 @@ SET_BIN_DIR(PartGui PartGui /Mod/Part) SET_PYTHON_PREFIX_SUFFIX(PartGui) INSTALL(TARGETS PartGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(PartGuiIcon_SVG + Resources/icons/PartWorkbench.svg +) + +fc_copy_sources(PartGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Part" ${PartGuiIcon_SVG}) + +INSTALL(FILES ${PartGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Part/Resources/icons") diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc index 397365d21..01154437e 100644 --- a/src/Mod/Part/Gui/Resources/Part.qrc +++ b/src/Mod/Part/Gui/Resources/Part.qrc @@ -63,6 +63,7 @@ icons/Part_JoinConnect.svg icons/Part_JoinCutout.svg icons/Part_JoinEmbed.svg + icons/PartWorkbench.svg translations/Part_af.qm translations/Part_de.qm translations/Part_fi.qm diff --git a/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg b/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg new file mode 100644 index 000000000..120774161 --- /dev/null +++ b/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Mod/Part/InitGui.py b/src/Mod/Part/InitGui.py index 1a905eb81..046b42af8 100644 --- a/src/Mod/Part/InitGui.py +++ b/src/Mod/Part/InitGui.py @@ -33,38 +33,10 @@ class PartWorkbench ( Workbench ): "Part workbench object" - Icon = """ - /* XPM */ - static char * part_xpm[] = { - "16 16 9 1", - " c None", - ". c #000209", - "+ c #00061D", - "@ c #010A2F", - "# c #001152", - "$ c #001772", - "% c #00209F", - "& c #0025B8", - "* c #0032FF", - " ........ ", - " ..+$&%%$$#+..", - "....#%*****%..$.", - ".##@.....+..%*&.", - ".%*****&%#.***&.", - ".%*******%.***&.", - ".%*******%.***%.", - ".&*******%.***%.", - ".&*******%.***%.", - ".&*******%.***%.", - ".&*******%.***%.", - ".&*******%.***$.", - ".&*******%.**#. ", - ".@$%&****%.%.. ", - " ......@##.. ", - " ... "}; - """ - MenuText = "Part" - ToolTip = "Part workbench" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Part/Resources/icons/PartWorkbench.svg" + self.__class__.MenuText = "Part" + self.__class__.ToolTip = "Part workbench" def Initialize(self): # load the module diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index 45743b306..186c5f1c4 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -193,3 +193,10 @@ SET_PYTHON_PREFIX_SUFFIX(PartDesignGui) INSTALL(TARGETS PartDesignGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) +SET(PartDesignGuiIcon_SVG + Resources/icons/PartDesignWorkbench.svg +) + +fc_copy_sources(PartDesignGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/PartDesign" ${PartDesignGuiIcon_SVG}) + +INSTALL(FILES ${PartDesignGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/PartDesign/Resources/icons") diff --git a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc index 892727c2f..e3631515b 100644 --- a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc +++ b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc @@ -1,8 +1,8 @@ - + icons/PartDesign_Chamfer.svg icons/PartDesign_Fillet.svg - icons/PartDesign_Draft.svg + icons/PartDesign_Draft.svg icons/PartDesign_Groove.svg icons/PartDesign_Pad.svg icons/PartDesign_Pocket.svg @@ -17,6 +17,7 @@ icons/Tree_PartDesign_Revolution.svg icons/PartDesign_InternalExternalGear.svg icons/PartDesign_InvoluteGear.svg + icons/PartDesignWorkbench.svg translations/PartDesign_af.qm translations/PartDesign_de.qm translations/PartDesign_fi.qm @@ -44,4 +45,4 @@ translations/PartDesign_el.qm translations/PartDesign_sl.qm - + diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg new file mode 100644 index 000000000..f4572a1ce --- /dev/null +++ b/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Mod/PartDesign/InitGui.py b/src/Mod/PartDesign/InitGui.py index 4df3d65cc..ad3fc358c 100644 --- a/src/Mod/PartDesign/InitGui.py +++ b/src/Mod/PartDesign/InitGui.py @@ -30,53 +30,25 @@ #***************************************************************************/ class PartDesignWorkbench ( Workbench ): - "PartDesign workbench object" - Icon = """ - /* XPM */ - static char * partdesign_xpm[] = { - "16 16 9 1", - " c None", - ". c #040006", - "+ c #070F38", - "@ c #002196", - "# c #0030F3", - "$ c #5A4D20", - "% c #858EB2", - "& c #DEB715", - "* c #BFB99D", - " & ........ ", - "&&&$..@@@@@@+...", - "&&&&$@#####@..@.", - "&&&&&$......@#@.", - "&&&&&&@@@+.###@.", - "$&&&&&&@#@.###@.", - ".$&&&&&%#@.###@.", - ".@*&&&*%#@.###@.", - ".@#*&**%#@.###@.", - ".@#@%%%.@@.###@.", - ".@@@@@@@#@.###@.", - ".@#######@.###@.", - ".@#######@.##+. ", - ".+@@@####@.@.. ", - " ......+++.. ", - " ... "}; - """ - MenuText = "Part Design" - ToolTip = "Part Design workbench" + "PartDesign workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/PartDesign/Resources/icons/PartDesignWorkbench.svg" + self.__class__.MenuText = "Part Design" + self.__class__.ToolTip = "Part Design workbench" - def Initialize(self): - # load the module - try: - from WizardShaft import WizardShaft - except ImportError: - print "Wizard shaft module cannot be loaded" - import PartDesignGui - import PartDesign - try: - import InvoluteGearFeature - except ImportError: - print "Involute gear module cannot be loaded" - def GetClassName(self): - return "PartDesignGui::Workbench" + def Initialize(self): + # load the module + try: + from WizardShaft import WizardShaft + except ImportError: + print "Wizard shaft module cannot be loaded" + import PartDesignGui + import PartDesign + try: + import InvoluteGearFeature + except ImportError: + print "Involute gear module cannot be loaded" + def GetClassName(self): + return "PartDesignGui::Workbench" Gui.addWorkbench(PartDesignWorkbench()) diff --git a/src/Mod/Path/Gui/CMakeLists.txt b/src/Mod/Path/Gui/CMakeLists.txt index d6d572330..43df8f04c 100644 --- a/src/Mod/Path/Gui/CMakeLists.txt +++ b/src/Mod/Path/Gui/CMakeLists.txt @@ -97,3 +97,11 @@ SET_BIN_DIR(PathGui PathGui /Mod/Path) SET_PYTHON_PREFIX_SUFFIX(PathGui) INSTALL(TARGETS PathGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(PathGuiIcon_SVG + Resources/icons/PathWorkbench.svg +) + +fc_copy_sources(PathGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Path" ${PathGuiIcon_SVG}) + +INSTALL(FILES ${PathGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Path/Resources/icons") diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc index d4b8df68e..b9c878540 100644 --- a/src/Mod/Path/Gui/Resources/Path.qrc +++ b/src/Mod/Path/Gui/Resources/Path.qrc @@ -30,6 +30,7 @@ icons/Path-Inspect.svg icons/Path-ToolChange.svg icons/Path-SimpleCopy.svg + icons/PathWorkbench.svg translations/Path_de.qm translations/Path_af.qm translations/Path_zh-CN.qm diff --git a/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg b/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg new file mode 100644 index 000000000..0a6fa189b --- /dev/null +++ b/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg @@ -0,0 +1,527 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index 36d693994..5c3d9eddb 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -24,38 +24,10 @@ class PathWorkbench ( Workbench ): "Path workbench" - Icon = """ - /* XPM */ - static char * Path_xpm[] = { - "16 16 9 1", - " c None", - ". c #262623", - "+ c #452F16", - "@ c #525451", - "# c #7E5629", - "$ c #838582", - "% c #BE823B", - "& c #989A97", - "* c #CFD1CE", - " .@@@@@@@@@@. ", - " $**********$ ", - " @$$$&&&&$$$@ ", - " .$&&&&$. ", - " @******. ", - " @******. ", - " ...@@... ", - " .&&@. ", - " .@. . ", - " .&&. ", - " .$*$. ", - " .$. . ", - "+###+ .@&.+###+", - "+%%%+ .$$. +%%%+", - "+%%%%#.. .#%%%%+", - ".++++++..++++++."}; - """ - MenuText = "Path" - ToolTip = "Path workbench" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Path/Resources/icons/PathWorkbench.svg" + self.__class__.MenuText = "Path" + self.__class__.ToolTip = "Path workbench" def Initialize(self): # load the builtin modules diff --git a/src/Mod/Plot/CMakeLists.txt b/src/Mod/Plot/CMakeLists.txt index 03b8201ac..fd94bcd1d 100644 --- a/src/Mod/Plot/CMakeLists.txt +++ b/src/Mod/Plot/CMakeLists.txt @@ -3,50 +3,50 @@ IF (BUILD_GUI) ENDIF (BUILD_GUI) SET(PlotMain_SRCS - Plot.py - InitGui.py - PlotGui.py + Plot.py + InitGui.py + PlotGui.py ) SOURCE_GROUP("" FILES ${PlotMain_SRCS}) SET(PlotAxes_SRCS - plotAxes/__init__.py - plotAxes/TaskPanel.py - plotAxes/TaskPanel.ui + plotAxes/__init__.py + plotAxes/TaskPanel.py + plotAxes/TaskPanel.ui ) SOURCE_GROUP("plotaxes" FILES ${PlotAxes_SRCS}) SET(PlotLabels_SRCS - plotLabels/__init__.py - plotLabels/TaskPanel.py - plotLabels/TaskPanel.ui + plotLabels/__init__.py + plotLabels/TaskPanel.py + plotLabels/TaskPanel.ui ) SOURCE_GROUP("plotlabels" FILES ${PlotLabels_SRCS}) SET(PlotPositions_SRCS - plotPositions/__init__.py - plotPositions/TaskPanel.py - plotPositions/TaskPanel.ui + plotPositions/__init__.py + plotPositions/TaskPanel.py + plotPositions/TaskPanel.ui ) SOURCE_GROUP("plotpositions" FILES ${PlotPositions_SRCS}) SET(PlotSave_SRCS - plotSave/__init__.py - plotSave/TaskPanel.py - plotSave/TaskPanel.ui + plotSave/__init__.py + plotSave/TaskPanel.py + plotSave/TaskPanel.ui ) SOURCE_GROUP("plotsave" FILES ${PlotSave_SRCS}) SET(PlotSeries_SRCS - plotSeries/__init__.py - plotSeries/TaskPanel.py - plotSeries/TaskPanel.ui + plotSeries/__init__.py + plotSeries/TaskPanel.py + plotSeries/TaskPanel.ui ) SOURCE_GROUP("plotseries" FILES ${PlotSeries_SRCS}) SET(PlotUtils_SRCS - plotUtils/__init__.py - plotUtils/Paths.py + plotUtils/__init__.py + plotUtils/Paths.py ) SOURCE_GROUP("plotutils" FILES ${PlotUtils_SRCS}) @@ -109,4 +109,10 @@ INSTALL( Mod/Plot ) +SET(PlotGuiIcon_SVG + resources/icons/PlotWorkbench.svg +) +fc_copy_sources(Plot "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Plot" ${PlotGuiIcon_SVG}) + +INSTALL(FILES ${PlotGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Plot/resources/icons") diff --git a/src/Mod/Plot/InitGui.py b/src/Mod/Plot/InitGui.py index c72e1dfa6..8950e29d5 100644 --- a/src/Mod/Plot/InitGui.py +++ b/src/Mod/Plot/InitGui.py @@ -24,14 +24,14 @@ class PlotWorkbench(Workbench): """Workbench of Plot module.""" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Plot/resources/icons/PlotWorkbench.svg" + self.__class__.MenuText = "Plot" + self.__class__.ToolTip = "The Plot module is used to edit/save output plots performed by other tools" + from plotUtils import Paths import PlotGui - Icon = 'Icon.svg' - MenuText = "Plot" - ToolTip = ("The Plot module is used to edit/save output plots performed " - "by other tools") - def Initialize(self): from PySide import QtCore, QtGui cmdlst = ["Plot_SaveFig", diff --git a/src/Mod/Plot/resources/Plot.qrc b/src/Mod/Plot/resources/Plot.qrc index 4fc0d2934..8344bddcd 100644 --- a/src/Mod/Plot/resources/Plot.qrc +++ b/src/Mod/Plot/resources/Plot.qrc @@ -1,5 +1,5 @@ - + icons/Axes.svg icons/Grid.svg icons/Icon.svg @@ -8,6 +8,7 @@ icons/Positions.svg icons/Save.svg icons/Series.svg + icons/PlotWorkbench.svg translations/Plot_af.qm translations/Plot_cs.qm translations/Plot_de.qm @@ -35,4 +36,4 @@ translations/Plot_el.qm translations/Plot_sl.qm - + diff --git a/src/Mod/Plot/resources/icons/PlotWorkbench.svg b/src/Mod/Plot/resources/icons/PlotWorkbench.svg new file mode 100755 index 000000000..ff800bde3 --- /dev/null +++ b/src/Mod/Plot/resources/icons/PlotWorkbench.svg @@ -0,0 +1,403 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt index 88ea30be9..a4936c9e1 100644 --- a/src/Mod/Points/Gui/CMakeLists.txt +++ b/src/Mod/Points/Gui/CMakeLists.txt @@ -69,3 +69,11 @@ SET_BIN_DIR(PointsGui PointsGui /Mod/Points) SET_PYTHON_PREFIX_SUFFIX(PointsGui) INSTALL(TARGETS PointsGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(PointsGuiIcon_SVG + Resources/icons/PointsWorkbench.svg +) + +fc_copy_sources(PointsGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Points" ${PointsGuiIcon_SVG}) + +INSTALL(FILES ${PointsGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Points/Resources/icons") diff --git a/src/Mod/Points/Gui/Resources/Points.qrc b/src/Mod/Points/Gui/Resources/Points.qrc index 46b260a6a..f630dffd8 100644 --- a/src/Mod/Points/Gui/Resources/Points.qrc +++ b/src/Mod/Points/Gui/Resources/Points.qrc @@ -2,6 +2,7 @@ icons/Points_Export_Point_cloud.svg icons/Points_Import_Point_cloud.svg + icons/PointsWorkbench.svg translations/Points_af.qm translations/Points_de.qm translations/Points_fi.qm @@ -29,4 +30,4 @@ translations/Points_el.qm translations/Points_sl.qm - + diff --git a/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg b/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg new file mode 100644 index 000000000..d19c46c97 --- /dev/null +++ b/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Points/InitGui.py b/src/Mod/Points/InitGui.py index 228a347f8..a1c290f99 100644 --- a/src/Mod/Points/InitGui.py +++ b/src/Mod/Points/InitGui.py @@ -32,37 +32,16 @@ class PointsWorkbench ( Workbench ): - "Points workbench object" - Icon = """ - /* XPM */ - static const char *test_icon[]={ - "16 16 2 1", - "a c #000000", - ". c None", - "......##......##", - "............##..", - "..##....##......", - "......##.....##.", - "....##....##....", - "##..............", - "....##....##....", - ".......##.......", - "...##......##...", - ".....##.........", - ".........##.....", - "...##........##.", - ".....##.........", - ".........##.....", - "...##......##...", - "................"}; - """ - MenuText = "Points" - ToolTip = "Points workbench" + "Points workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Points/Resources/icons/PointsWorkbench.svg" + self.__class__.MenuText = "Points" + self.__class__.ToolTip = "Points workbench" - def Initialize(self): - # load the module - import PointsGui - def GetClassName(self): - return "PointsGui::Workbench" + def Initialize(self): + # load the module + import PointsGui + def GetClassName(self): + return "PointsGui::Workbench" Gui.addWorkbench(PointsWorkbench()) diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt index f6225ec7d..308f3dcc7 100644 --- a/src/Mod/Raytracing/Gui/CMakeLists.txt +++ b/src/Mod/Raytracing/Gui/CMakeLists.txt @@ -88,3 +88,11 @@ SET_BIN_DIR(RaytracingGui RaytracingGui /Mod/Raytracing) SET_PYTHON_PREFIX_SUFFIX(RaytracingGui) INSTALL(TARGETS RaytracingGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(RaytracingGuiIcon_SVG + Resources/icons/RaytracingWorkbench.svg +) + +fc_copy_sources(RaytracingGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Raytracing" ${RaytracingGuiIcon_SVG}) + +INSTALL(FILES ${RaytracingGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Raytracing/Resources/icons") diff --git a/src/Mod/Raytracing/Gui/Resources/Raytracing.qrc b/src/Mod/Raytracing/Gui/Resources/Raytracing.qrc index 5277f4b0a..4949877b7 100644 --- a/src/Mod/Raytracing/Gui/Resources/Raytracing.qrc +++ b/src/Mod/Raytracing/Gui/Resources/Raytracing.qrc @@ -1,5 +1,5 @@ - + icons/preferences-raytracing.svg icons/Raytrace_Camera.svg icons/Raytrace_Export.svg @@ -10,6 +10,7 @@ icons/Raytrace_Render.svg icons/Raytrace_ResetCamera.svg icons/Raytrace_Lux.svg + icons/RaytracingWorkbench.svg translations/Raytracing_af.qm translations/Raytracing_de.qm translations/Raytracing_fi.qm @@ -37,4 +38,4 @@ translations/Raytracing_el.qm translations/Raytracing_sl.qm - + diff --git a/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg b/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg new file mode 100644 index 000000000..ec9db97b1 --- /dev/null +++ b/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/Mod/Raytracing/InitGui.py b/src/Mod/Raytracing/InitGui.py index 0c67b22f0..afc43b08b 100644 --- a/src/Mod/Raytracing/InitGui.py +++ b/src/Mod/Raytracing/InitGui.py @@ -32,46 +32,18 @@ class RaytracingWorkbench ( Workbench ): - "Raytracing workbench object" - Icon = """ - /* XPM */ - static char * raytracing_xpm[] = { - "16 16 9 1", - " c None", - ". c #000100", - "+ c #0C1731", - "@ c #1D3154", - "# c #29476F", - "$ c #3C6291", - "% c #7394BB", - "& c #B0BFD3", - "* c #FBFDFB", - " ", - " $$ ", - " %&%$$$# ", - " %&***$$### ", - " %****$###@@ ", - " $%***%###@@@ ", - " $$%&$###@@@+ ", - " $$$####@@@++ ", - " $$####@@@+++ ", - " $####@@@++++ ", - " ###@@@+++++ ", - " ##@@@+++++ ", - " @@@+++++... ", - " ++++..... ", - " ", - " "}; - """ - MenuText = "Raytracing" - ToolTip = "Raytracing workbench" + "Raytracing workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Raytracing/Resources/icons/RaytracingWorkbench.svg" + self.__class__.MenuText = "Raytracing" + self.__class__.ToolTip = "Raytracing workbench" - def Initialize(self): - # load the module - import PartGui - import RaytracingGui - def GetClassName(self): - return "RaytracingGui::Workbench" + def Initialize(self): + # load the module + import PartGui + import RaytracingGui + def GetClassName(self): + return "RaytracingGui::Workbench" Gui.addWorkbench(RaytracingWorkbench()) diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 555b7ac1c..42e84db9c 100644 --- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt @@ -72,3 +72,11 @@ SET_BIN_DIR(ReverseEngineeringGui ReverseEngineeringGui /Mod/ReverseEngineering) SET_PYTHON_PREFIX_SUFFIX(ReverseEngineeringGui) install(TARGETS ReverseEngineeringGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(ReverseEngineeringGuiIcon_SVG + Resources/icons/ReverseEngineeringWorkbench.svg +) + +fc_copy_sources(ReverseEngineeringGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/ReverseEngineering" ${ReverseEngineeringGuiIcon_SVG}) + +INSTALL(FILES ${ReverseEngineeringGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/ReverseEngineering/Resources/icons") diff --git a/src/Mod/ReverseEngineering/Gui/Resources/ReverseEngineering.qrc b/src/Mod/ReverseEngineering/Gui/Resources/ReverseEngineering.qrc index c173e6be9..1e45b7f8d 100644 --- a/src/Mod/ReverseEngineering/Gui/Resources/ReverseEngineering.qrc +++ b/src/Mod/ReverseEngineering/Gui/Resources/ReverseEngineering.qrc @@ -1,6 +1,7 @@ - + icons/actions/FitSurface.svg + icons/ReverseEngineeringWorkbench.svg translations/ReverseEngineering_af.qm translations/ReverseEngineering_de.qm translations/ReverseEngineering_fi.qm @@ -28,4 +29,4 @@ translations/ReverseEngineering_el.qm translations/ReverseEngineering_sl.qm - + diff --git a/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg b/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg new file mode 100644 index 000000000..2cfc707fc --- /dev/null +++ b/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg @@ -0,0 +1,554 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/Mod/ReverseEngineering/InitGui.py b/src/Mod/ReverseEngineering/InitGui.py index f46336a1a..5e3612a6e 100644 --- a/src/Mod/ReverseEngineering/InitGui.py +++ b/src/Mod/ReverseEngineering/InitGui.py @@ -32,39 +32,17 @@ class ReverseEngineeringWorkbench ( Workbench ): - "ReverseEngineering workbench object" - Icon = """ - /* XPM */ - static const char *ReverseEngineering_Box[]={ - "16 16 3 1", - ". c None", - "# c #000000", - "a c #c6c642", - "................", - ".......#######..", - "......#aaaaa##..", - ".....#aaaaa###..", - "....#aaaaa##a#..", - "...#aaaaa##aa#..", - "..#aaaaa##aaa#..", - ".########aaaa#..", - ".#aaaaa#aaaaa#..", - ".#aaaaa#aaaa##..", - ".#aaaaa#aaa##...", - ".#aaaaa#aa##....", - ".#aaaaa#a##... .", - ".#aaaaa###......", - ".########.......", - "................"}; - """ - MenuText = "Reverse Engineering" - ToolTip = "Reverse Engineering workbench" + "ReverseEngineering workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/ReverseEngineering/Resources/icons/ReverseEngineeringWorkbench.svg" + self.__class__.MenuText = "Reverse Engineering" + self.__class__.ToolTip = "Reverse Engineering workbench" - def Initialize(self): - # load the module - import ReverseEngineeringGui - import ReverseEngineering - def GetClassName(self): - return "ReverseEngineeringGui::Workbench" + def Initialize(self): + # load the module + import ReverseEngineeringGui + import ReverseEngineering + def GetClassName(self): + return "ReverseEngineeringGui::Workbench" Gui.addWorkbench(ReverseEngineeringWorkbench()) diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index 611c0d546..24e9c2497 100644 --- a/src/Mod/Robot/Gui/CMakeLists.txt +++ b/src/Mod/Robot/Gui/CMakeLists.txt @@ -156,3 +156,11 @@ SET_BIN_DIR(RobotGui RobotGui /Mod/Robot) SET_PYTHON_PREFIX_SUFFIX(RobotGui) INSTALL(TARGETS RobotGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(RobotGuiIcon_SVG + Resources/icons/RobotWorkbench.svg +) + +fc_copy_sources(RobotGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Robot" ${RobotGuiIcon_SVG}) + +INSTALL(FILES ${RobotGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Robot/Resources/icons") diff --git a/src/Mod/Robot/Gui/Resources/Robot.qrc b/src/Mod/Robot/Gui/Resources/Robot.qrc index f10112c84..2f0324816 100644 --- a/src/Mod/Robot/Gui/Resources/Robot.qrc +++ b/src/Mod/Robot/Gui/Resources/Robot.qrc @@ -13,6 +13,7 @@ icons/Robot_Simulate.svg icons/Robot_TrajectoryCompound.svg icons/Robot_TrajectoryDressUp.svg + icons/RobotWorkbench.svg translations/Robot_af.qm translations/Robot_de.qm translations/Robot_fi.qm diff --git a/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg b/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg new file mode 100644 index 000000000..e2e9490c6 --- /dev/null +++ b/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Mod/Robot/InitGui.py b/src/Mod/Robot/InitGui.py index c56a3ba10..912b36221 100644 --- a/src/Mod/Robot/InitGui.py +++ b/src/Mod/Robot/InitGui.py @@ -32,45 +32,17 @@ class RobotWorkbench ( Workbench ): - "Robot workbench object" - Icon = """ - /* XPM */ - static char * robot_xpm[] = { - "16 16 9 1", - " c None", - ". c #000300", - "+ c #070905", - "@ c #0E100C", - "# c #171816", - "$ c #2D2E2C", - "% c #434542", - "& c #838582", - "* c #FEFFFC", - " ", - " $+$$$$$$$$$$ ", - " $**********$ ", - " $*+.****@@*$ ", - " $*+.****@@*$ ", - " $**********$ ", - " #$&&&&&&&&&+ ", - " $$$$$$$$$$$+ ", - " **& ", - "++++++++++++++..", - ".%&&$&&&&&&&&&&.", - "+&*************+", - "+&*************+", - "+&*************+", - "+&*************+", - "+.+++++++++++++."}; - """ - MenuText = "Robot" - ToolTip = "Robot workbench" + "Robot workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Robot/Resources/icons/RobotWorkbench.svg" + self.__class__.MenuText = "Robot" + self.__class__.ToolTip = "Robot workbench" - def Initialize(self): - # load the module - import RobotGui - import Robot - def GetClassName(self): - return "RobotGui::Workbench" + def Initialize(self): + # load the module + import RobotGui + import Robot + def GetClassName(self): + return "RobotGui::Workbench" Gui.addWorkbench(RobotWorkbench()) diff --git a/src/Mod/Ship/CMakeLists.txt b/src/Mod/Ship/CMakeLists.txt index dfbe44c76..5a7e881d4 100644 --- a/src/Mod/Ship/CMakeLists.txt +++ b/src/Mod/Ship/CMakeLists.txt @@ -12,77 +12,77 @@ SET(ShipMain_SRCS SOURCE_GROUP("" FILES ${ShipMain_SRCS}) SET(ShipExamples_SRCS - resources/examples/s60.fcstd - resources/examples/s60_katamaran.fcstd - resources/examples/wigley.fcstd - resources/examples/wigley_katamaran.fcstd + resources/examples/s60.fcstd + resources/examples/s60_katamaran.fcstd + resources/examples/wigley.fcstd + resources/examples/wigley_katamaran.fcstd ) SOURCE_GROUP("shipexamples" FILES ${ShipExamples_SRCS}) SET(ShipLoadExample_SRCS - shipLoadExample/__init__.py - shipLoadExample/TaskPanel.py - shipLoadExample/TaskPanel.ui + shipLoadExample/__init__.py + shipLoadExample/TaskPanel.py + shipLoadExample/TaskPanel.ui ) SOURCE_GROUP("shiploadexample" FILES ${ShipLoadExample_SRCS}) SET(ShipCreateShip_SRCS - shipCreateShip/__init__.py - shipCreateShip/Preview.py - shipCreateShip/TaskPanel.py - shipCreateShip/TaskPanel.ui - shipCreateShip/Tools.py + shipCreateShip/__init__.py + shipCreateShip/Preview.py + shipCreateShip/TaskPanel.py + shipCreateShip/TaskPanel.ui + shipCreateShip/Tools.py ) SOURCE_GROUP("shipcreateship" FILES ${ShipCreateShip_SRCS}) SET(ShipOutlineDraw_SRCS - shipOutlineDraw/__init__.py - shipOutlineDraw/Preview.py - shipOutlineDraw/TaskPanel.py - shipOutlineDraw/TaskPanel.ui + shipOutlineDraw/__init__.py + shipOutlineDraw/Preview.py + shipOutlineDraw/TaskPanel.py + shipOutlineDraw/TaskPanel.ui ) SOURCE_GROUP("shipoutlinedraw" FILES ${ShipOutlineDraw_SRCS}) SET(ShipAreasCurve_SRCS - shipAreasCurve/__init__.py - shipAreasCurve/PlotAux.py - shipAreasCurve/Preview.py - shipAreasCurve/TaskPanel.py - shipAreasCurve/TaskPanel.ui + shipAreasCurve/__init__.py + shipAreasCurve/PlotAux.py + shipAreasCurve/Preview.py + shipAreasCurve/TaskPanel.py + shipAreasCurve/TaskPanel.ui ) SOURCE_GROUP("shipareascurve" FILES ${ShipAreasCurve_SRCS}) SET(ShipHydrostatics_SRCS - shipHydrostatics/__init__.py - shipHydrostatics/PlotAux.py - shipHydrostatics/TaskPanel.py - shipHydrostatics/TaskPanel.ui - shipHydrostatics/Tools.py + shipHydrostatics/__init__.py + shipHydrostatics/PlotAux.py + shipHydrostatics/TaskPanel.py + shipHydrostatics/TaskPanel.ui + shipHydrostatics/Tools.py ) SOURCE_GROUP("shiphydrostatics" FILES ${ShipHydrostatics_SRCS}) SET(ShipCreateWeight_SRCS - shipCreateWeight/__init__.py - shipCreateWeight/TaskPanel.py - shipCreateWeight/TaskPanel.ui - shipCreateWeight/Tools.py + shipCreateWeight/__init__.py + shipCreateWeight/TaskPanel.py + shipCreateWeight/TaskPanel.ui + shipCreateWeight/Tools.py ) SOURCE_GROUP("shipcreateweight" FILES ${ShipCreateWeight_SRCS}) SET(ShipCreateTank_SRCS - shipCreateTank/__init__.py - shipCreateTank/TaskPanel.py - shipCreateTank/TaskPanel.ui - shipCreateTank/Tools.py + shipCreateTank/__init__.py + shipCreateTank/TaskPanel.py + shipCreateTank/TaskPanel.ui + shipCreateTank/Tools.py ) SOURCE_GROUP("shipcreatetank" FILES ${ShipCreateTank_SRCS}) SET(ShipCapacityCurve_SRCS - shipCapacityCurve/__init__.py - shipCapacityCurve/PlotAux.py - shipCapacityCurve/TaskPanel.py - shipCapacityCurve/TaskPanel.ui - shipCapacityCurve/Tools.py + shipCapacityCurve/__init__.py + shipCapacityCurve/PlotAux.py + shipCapacityCurve/TaskPanel.py + shipCapacityCurve/TaskPanel.ui + shipCapacityCurve/Tools.py ) SOURCE_GROUP("shipcapacitycurve" FILES ${ShipCapacityCurve_SRCS}) @@ -93,20 +93,20 @@ SET(ShipCreateLoadCondition_SRCS SOURCE_GROUP("shipcreateloadcondition" FILES ${ShipCreateLoadCondition_SRCS}) SET(ShipGZ_SRCS - shipGZ/__init__.py - shipGZ/PlotAux.py - shipGZ/TaskPanel.py - shipGZ/TaskPanel.ui - shipGZ/Tools.py + shipGZ/__init__.py + shipGZ/PlotAux.py + shipGZ/TaskPanel.py + shipGZ/TaskPanel.ui + shipGZ/Tools.py ) SOURCE_GROUP("shipgz" FILES ${ShipGZ_SRCS}) SET(ShipUtils_SRCS - shipUtils/__init__.py - shipUtils/Locale.py - shipUtils/Math.py - shipUtils/Paths.py - shipUtils/Units.py + shipUtils/__init__.py + shipUtils/Locale.py + shipUtils/Math.py + shipUtils/Paths.py + shipUtils/Units.py ) SOURCE_GROUP("shiputils" FILES ${ShipUtils_SRCS}) @@ -205,4 +205,10 @@ INSTALL( Mod/Ship ) +SET(ShipGuiIcon_SVG + resources/icons/ShipWorkbench.svg +) +fc_copy_sources(Ship "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Ship" ${ShipGuiIcon_SVG}) + +INSTALL(FILES ${ShipGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Ship/resources/icons") diff --git a/src/Mod/Ship/InitGui.py b/src/Mod/Ship/InitGui.py index 68cd5499f..fc34cb41b 100644 --- a/src/Mod/Ship/InitGui.py +++ b/src/Mod/Ship/InitGui.py @@ -24,14 +24,14 @@ class ShipWorkbench(Workbench): """Ships design workbench.""" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Ship/resources/icons/ShipWorkbench.svg" + self.__class__.MenuText = "Ship" + self.__class__.ToolTip = "Ship module provides some of the commonly used tool to design ship forms" + from shipUtils import Paths import ShipGui - Icon = "Ship_Module.svg" - MenuText = "Ship" - ToolTip = ("Ship module provides some of the commonly used tool to design" - " ship forms") - def Initialize(self): from PySide import QtCore, QtGui diff --git a/src/Mod/Ship/resources/Ship.qrc b/src/Mod/Ship/resources/Ship.qrc index e5287ce42..d0abbff6b 100644 --- a/src/Mod/Ship/resources/Ship.qrc +++ b/src/Mod/Ship/resources/Ship.qrc @@ -1,5 +1,5 @@ - + icons/Ship_AreaCurve.svg icons/Ship_CapacityCurve.svg icons/Ship_Instance.svg @@ -12,6 +12,7 @@ icons/Ship_OutlineDraw.svg icons/Ship_Tank.svg icons/Ship_Weight.svg + icons/ShipWorkbench.svg translations/Ship.qm translations/Ship_af.qm translations/Ship_cs.qm @@ -40,4 +41,4 @@ translations/Ship_el.qm translations/Ship_sl.qm - + diff --git a/src/Mod/Ship/resources/icons/ShipWorkbench.svg b/src/Mod/Ship/resources/icons/ShipWorkbench.svg new file mode 100644 index 000000000..1a7e203d3 --- /dev/null +++ b/src/Mod/Ship/resources/icons/ShipWorkbench.svg @@ -0,0 +1,427 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + FreeCAD + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sh + p + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index a3e29e0ff..7e0b0f6a9 100644 --- a/src/Mod/Sketcher/Gui/CMakeLists.txt +++ b/src/Mod/Sketcher/Gui/CMakeLists.txt @@ -141,3 +141,11 @@ SET_BIN_DIR(SketcherGui SketcherGui /Mod/Sketcher) SET_PYTHON_PREFIX_SUFFIX(SketcherGui) INSTALL(TARGETS SketcherGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(SketcherGuiIcon_SVG + Resources/icons/SketcherWorkbench.svg +) + +fc_copy_sources(SketcherGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Sketcher" ${SketcherGuiIcon_SVG}) + +INSTALL(FILES ${SketcherGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Sketcher/Resources/icons") diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index 224afdda5..3315296f7 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -1,5 +1,5 @@ - + icons/Constraint_Concentric.svg icons/Constraint_Ellipse_Axis_Angle.svg icons/Constraint_Ellipse_Major_Radius.svg @@ -141,6 +141,7 @@ icons/Sketcher_Toggle_Constraint_Driving.svg icons/Sketcher_Trimming.svg icons/Sketcher_ViewSketch.svg + icons/SketcherWorkbench.svg icons/small/Constraint_Concentric_sm.xpm icons/small/Constraint_EqualLength_sm.xpm icons/small/Constraint_ExternalAngle_sm.xpm @@ -192,4 +193,4 @@ translations/Sketcher_el.qm translations/Sketcher_sl.qm - + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg b/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg new file mode 100644 index 000000000..7fab95aac --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/InitGui.py b/src/Mod/Sketcher/InitGui.py index 860945689..b71b1d75d 100644 --- a/src/Mod/Sketcher/InitGui.py +++ b/src/Mod/Sketcher/InitGui.py @@ -32,50 +32,22 @@ class SketcherWorkbench ( Workbench ): - "Sketcher workbench object" - Icon = """ - /* XPM */ - static char * sketcher_xpm[] = { - "16 16 9 1", - " c None", - ". c #0D0F0C", - "+ c #4D1007", - "@ c #FF1A00", - "# c #4D4C4D", - "$ c #6C6B69", - "% c #6F7A78", - "& c #8B8D8A", - "* c #C8C5C3", - " @@@@@ ", - " @@@ @@@ ", - " @@ %# @@ ", - " @@ *$ @@", - " @ @@", - "@@@@@@@@@@@ @", - "@@@@@@@@@@@@ @", - "@ @ @@ @@", - "@ $ @@ @@ @@ ", - "@+*& @@@ @@@@ ", - "@ .. @@@@@ ", - "@ *% @@ ", - "@ # @@ ", - "@ @@ ", - "@@@@@@@@@@@@ ", - "@@@@@@@@@@@ "}; - """ - MenuText = "Sketcher" - ToolTip = "Sketcher workbench" + "Sketcher workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Sketcher/Resources/icons/SketcherWorkbench.svg" + self.__class__.MenuText = "Sketcher" + self.__class__.ToolTip = "Sketcher workbench" - def Initialize(self): - # load the module - import SketcherGui - import Sketcher - try: - import Profiles - except ImportError: - print "Error in Profiles module" - - def GetClassName(self): - return "SketcherGui::Workbench" + def Initialize(self): + # load the module + import SketcherGui + import Sketcher + try: + import Profiles + except ImportError: + print "Error in Profiles module" + + def GetClassName(self): + return "SketcherGui::Workbench" Gui.addWorkbench(SketcherWorkbench()) diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt index 439b05b7e..4e86da3e5 100644 --- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt +++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt @@ -90,3 +90,11 @@ SET_BIN_DIR(SpreadsheetGui SpreadsheetGui /Mod/Spreadsheet) SET_PYTHON_PREFIX_SUFFIX(SpreadsheetGui) INSTALL(TARGETS SpreadsheetGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(SpreadsheetGuiIcon_SVG + Resources/icons/SpreadsheetWorkbench.svg +) + +fc_copy_sources(SpreadsheetGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Spreadsheet" ${SpreadsheetGuiIcon_SVG}) + +INSTALL(FILES ${SpreadsheetGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Spreadsheet/Resources/icons") diff --git a/src/Mod/Spreadsheet/Gui/Resources/Spreadsheet.qrc b/src/Mod/Spreadsheet/Gui/Resources/Spreadsheet.qrc index a4111bd21..e2f4de466 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/Spreadsheet.qrc +++ b/src/Mod/Spreadsheet/Gui/Resources/Spreadsheet.qrc @@ -15,6 +15,7 @@ icons/SpreadsheetStyleUnderline.svg icons/SpreadsheetStyleItalic.svg icons/SpreadsheetStyleBold.svg + icons/SpreadsheetWorkbench.svg translations/Spreadsheet_de.qm translations/Spreadsheet_af.qm translations/Spreadsheet_zh-CN.qm diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg new file mode 100644 index 000000000..9249d108a --- /dev/null +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/Mod/Spreadsheet/InitGui.py b/src/Mod/Spreadsheet/InitGui.py index 677d6e59b..96fe431ce 100644 --- a/src/Mod/Spreadsheet/InitGui.py +++ b/src/Mod/Spreadsheet/InitGui.py @@ -32,41 +32,18 @@ class SpreadsheetWorkbench ( Workbench ): - "Spreadsheet workbench object" - Icon = """ - /* XPM */ - static char * Spreadsheet_xpm[] = { - "16 16 5 1", - " c None", - ". c #151614", - "+ c #575956", - "@ c #969895", - "# c #F7F9F6", - " ", - " ", - " ...............", - ".@##@+########@.", - ".+@@+.@@@@@@@@+.", - "..+++.+++++++++.", - ".@##@+########@.", - ".+@@+.@@@@@@@@+.", - "..+++.+++++++++.", - ".@##@+########@.", - ".+@@+.@@@@@@@@+.", - "..+++.+++++++++.", - ".@##@+########@.", - "..+++.+++++++++.", - " ", - " "};""" - MenuText = "Spreadsheet" - ToolTip = "Spreadsheet workbench" + "Spreadsheet workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Spreadsheet/Resources/icons/SpreadsheetWorkbench.svg" + self.__class__.MenuText = "Spreadsheet" + self.__class__.ToolTip = "Spreadsheet workbench" - def Initialize(self): - # load the module - import SpreadsheetGui + def Initialize(self): + # load the module + import SpreadsheetGui - def GetClassName(self): - return "SpreadsheetGui::Workbench" + def GetClassName(self): + return "SpreadsheetGui::Workbench" Gui.addWorkbench(SpreadsheetWorkbench()) diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt index 99bfa6e1d..68f318639 100644 --- a/src/Mod/Start/Gui/CMakeLists.txt +++ b/src/Mod/Start/Gui/CMakeLists.txt @@ -47,3 +47,11 @@ SET_BIN_DIR(StartGui StartGui /Mod/Start) SET_PYTHON_PREFIX_SUFFIX(StartGui) INSTALL(TARGETS StartGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(StartGuiIcon_SVG + Resources/icons/StartWorkbench.svg +) + +fc_copy_sources(StartGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Start" ${StartGuiIcon_SVG}) + +INSTALL(FILES ${StartGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Start/Resources/icons") diff --git a/src/Mod/Start/Gui/Resources/Start.qrc b/src/Mod/Start/Gui/Resources/Start.qrc index 48e05675c..d888edbc8 100644 --- a/src/Mod/Start/Gui/Resources/Start.qrc +++ b/src/Mod/Start/Gui/Resources/Start.qrc @@ -1,5 +1,6 @@ - + + icons/StartWorkbench.svg translations/StartPage_af.qm translations/StartPage_de.qm translations/StartPage_fi.qm @@ -27,4 +28,4 @@ translations/StartPage_el.qm translations/StartPage_sl.qm - + diff --git a/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg b/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg new file mode 100644 index 000000000..fc572a2a3 --- /dev/null +++ b/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/Mod/Start/InitGui.py b/src/Mod/Start/InitGui.py index bd013fcd6..17e455546 100644 --- a/src/Mod/Start/InitGui.py +++ b/src/Mod/Start/InitGui.py @@ -32,45 +32,17 @@ class StartWorkbench ( Workbench ): - "Start workbench object" - Icon = """ - /* XPM */ - static char * start_xpm[] = { - "16 16 9 1", - " c None", - ". c #000200", - "+ c #081938", - "@ c #113155", - "# c #1133A0", - "$ c #1D56DC", - "% c #2161A8", - "& c #2670EB", - "* c #2C86F2", - " ", - " . ", - " #+ ", - " .#$+ ", - " .#$&+ ", - " ####$$$&&&+ ", - " .#$$$$$&&&&*@ ", - " .#$$$$&&&&***@ ", - " .#$$$&&&&***% ", - " .#$$&&&&***% ", - " .++++++%**% ", - " .%*@ ", - " .%@ ", - " .. ", - " ", - " "}; - """ - MenuText = "Start" - ToolTip = "Start workbench" + "Start workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Start/Resources/icons/StartWorkbench.svg" + self.__class__.MenuText = "Start" + self.__class__.ToolTip = "Start workbench" - def Initialize(self): - # load the module - import StartGui - import Start - def GetClassName(self): - return "StartGui::Workbench" + def Initialize(self): + # load the module + import StartGui + import Start + def GetClassName(self): + return "StartGui::Workbench" Gui.addWorkbench(StartWorkbench()) diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt index 264e26060..8c274cedf 100644 --- a/src/Mod/Test/Gui/CMakeLists.txt +++ b/src/Mod/Test/Gui/CMakeLists.txt @@ -61,3 +61,10 @@ SET_PYTHON_PREFIX_SUFFIX(QtUnitGui) INSTALL(TARGETS QtUnitGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) INSTALL(FILES ${TestGuiPy_SRCS} DESTINATION Mod/Test) +SET(TestGuiIcon_SVG + Resources/icons/TestWorkbench.svg +) + +fc_copy_sources(QtUnitGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Test" ${TestGuiIcon_SVG}) + +INSTALL(FILES ${TestGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Test/Resources/icons") diff --git a/src/Mod/Test/Gui/Resources/Test.qrc b/src/Mod/Test/Gui/Resources/Test.qrc index 47890931b..4e4f1e062 100644 --- a/src/Mod/Test/Gui/Resources/Test.qrc +++ b/src/Mod/Test/Gui/Resources/Test.qrc @@ -1,5 +1,6 @@ + icons/TestWorkbench.svg translations/Test_af.qm translations/Test_de.qm translations/Test_fi.qm diff --git a/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg b/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg new file mode 100644 index 000000000..01d3df77e --- /dev/null +++ b/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg @@ -0,0 +1,84 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/Mod/Test/InitGui.py b/src/Mod/Test/InitGui.py index f56a6ebba..c64cba0df 100644 --- a/src/Mod/Test/InitGui.py +++ b/src/Mod/Test/InitGui.py @@ -29,72 +29,51 @@ class TestWorkbench ( Workbench ): - "Test workbench object" - Icon = """ - /* XPM */ - static const char *test_icon[]={ - "16 16 2 1", - "a c #000000", - ". c None", - "................", - "................", - "..############..", - "..############..", - "..############..", - "......####......", - "......####......", - "......####......", - "......####......", - "......####......", - "......####......", - "......####......", - "......####......", - "......####......", - "................", - "................"}; - """ - MenuText = "Test framework" - ToolTip = "Test framework" - - def Initialize(self): - import TestGui + "Test workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Test/Resources/icons/TestWorkbench.svg" + self.__class__.MenuText = "Test framework" + self.__class__.ToolTip = "Test framework" - list = ["Test_Test","Test_TestAll","Test_TestDoc","Test_TestBase"] - self.appendToolbar("TestTools",list) + def Initialize(self): + import TestGui - menu = ["Test &Commands","TestToolsGui"] - list = ["Std_TestQM","Std_TestReloadQM","Test_Test","Test_TestAll","Test_TestDoc","Test_TestBase"] - self.appendCommandbar("TestToolsGui",list) - self.appendMenu(menu,list) + list = ["Test_Test","Test_TestAll","Test_TestDoc","Test_TestBase"] + self.appendToolbar("TestTools",list) - menu = ["Test &Commands","TestToolsText"] - list = ["Test_TestAllText","Test_TestDocText","Test_TestBaseText"] - self.appendCommandbar("TestToolsText",list) - self.appendMenu(menu,list) + menu = ["Test &Commands","TestToolsGui"] + list = ["Std_TestQM","Std_TestReloadQM","Test_Test","Test_TestAll","Test_TestDoc","Test_TestBase"] + self.appendCommandbar("TestToolsGui",list) + self.appendMenu(menu,list) - menu = ["Test &Commands","TestToolsMenu"] - list = ["Test_TestCreateMenu", "Test_TestDeleteMenu", "Test_TestWork"] - self.appendCommandbar("TestToolsMenu",list) - self.appendMenu(menu,list) + menu = ["Test &Commands","TestToolsText"] + list = ["Test_TestAllText","Test_TestDocText","Test_TestBaseText"] + self.appendCommandbar("TestToolsText",list) + self.appendMenu(menu,list) - menu = ["Test &Commands","TestFeatureMenu"] - list = ["Test_InsertFeature"] - self.appendCommandbar("TestFeature",list) - self.appendMenu(menu,list) + menu = ["Test &Commands","TestToolsMenu"] + list = ["Test_TestCreateMenu", "Test_TestDeleteMenu", "Test_TestWork"] + self.appendCommandbar("TestToolsMenu",list) + self.appendMenu(menu,list) - menu = ["Test &Commands","Progress bar"] - list = ["Std_TestProgress1", "Std_TestProgress2", "Std_TestProgress3", "Std_TestProgress4", "Std_TestProgress5"] - self.appendMenu(menu,list) + menu = ["Test &Commands","TestFeatureMenu"] + list = ["Test_InsertFeature"] + self.appendCommandbar("TestFeature",list) + self.appendMenu(menu,list) - menu = ["Test &Commands","Console"] - list = ["Std_TestConsoleOutput"] - self.appendMenu(menu,list) + menu = ["Test &Commands","Progress bar"] + list = ["Std_TestProgress1", "Std_TestProgress2", "Std_TestProgress3", "Std_TestProgress4", "Std_TestProgress5"] + self.appendMenu(menu,list) - menu = ["Test &Commands","MDI"] - list = ["Std_MDITest1", "Std_MDITest2", "Std_MDITest3"] - self.appendMenu(menu,list) + menu = ["Test &Commands","Console"] + list = ["Std_TestConsoleOutput"] + self.appendMenu(menu,list) - list = ["Std_ViewExample1", "Std_ViewExample2", "Std_ViewExample3"] - self.appendMenu("Inventor View",list) + menu = ["Test &Commands","MDI"] + list = ["Std_MDITest1", "Std_MDITest2", "Std_MDITest3"] + self.appendMenu(menu,list) + + list = ["Std_ViewExample1", "Std_ViewExample2", "Std_ViewExample3"] + self.appendMenu("Inventor View",list) Gui.addWorkbench(TestWorkbench()) diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt index 8fa3cfd40..9df138834 100644 --- a/src/Mod/Web/Gui/CMakeLists.txt +++ b/src/Mod/Web/Gui/CMakeLists.txt @@ -45,3 +45,11 @@ SET_BIN_DIR(WebGui WebGui /Mod/Web) SET_PYTHON_PREFIX_SUFFIX(WebGui) INSTALL(TARGETS WebGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +SET(WebGuiIcon_SVG + Resources/icons/WebWorkbench.svg +) + +fc_copy_sources(WebGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Web" ${WebGuiIcon_SVG}) + +INSTALL(FILES ${WebGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Web/Resources/icons") diff --git a/src/Mod/Web/Gui/Resources/Web.qrc b/src/Mod/Web/Gui/Resources/Web.qrc index 431ec779e..d54202d45 100644 --- a/src/Mod/Web/Gui/Resources/Web.qrc +++ b/src/Mod/Web/Gui/Resources/Web.qrc @@ -1,13 +1,14 @@ - - icons/actions/web-browser.svg - icons/actions/web-home.svg - icons/actions/web-next.svg - icons/actions/web-previous.svg - icons/actions/web-refresh.svg - icons/actions/web-stop.svg - icons/actions/web-zoom-in.svg - icons/actions/web-zoom-out.svg + + icons/actions/web-browser.svg + icons/actions/web-home.svg + icons/actions/web-next.svg + icons/actions/web-previous.svg + icons/actions/web-refresh.svg + icons/actions/web-stop.svg + icons/actions/web-zoom-in.svg + icons/actions/web-zoom-out.svg + icons/WebWorkbench.svg translations/Web_de.qm translations/Web_af.qm translations/Web_zh-CN.qm @@ -35,4 +36,4 @@ translations/Web_tr.qm translations/Web_sl.qm - + diff --git a/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg b/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg new file mode 100644 index 000000000..7b2d6aa39 --- /dev/null +++ b/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg @@ -0,0 +1,708 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/Mod/Web/InitGui.py b/src/Mod/Web/InitGui.py index f8006c8de..d5b845f24 100644 --- a/src/Mod/Web/InitGui.py +++ b/src/Mod/Web/InitGui.py @@ -32,45 +32,17 @@ class WebWorkbench ( Workbench ): - "Web workbench object" - Icon = """ - /* XPM */ - static char * web_xpm[] = { - "16 16 9 1", - " c None", - ". c #102D45", - "+ c #2B4A60", - "@ c #194E74", - "# c #306996", - "$ c #426882", - "% c #4D83A8", - "& c #69A4CA", - "* c #A4DCF8", - " $$$+ ", - " %%&&$..+ ", - " %****&%@.+ ", - " %&****&%@@.+ ", - " $&******%%@.. ", - " $&*****&%##@.+ ", - " $&*****&##@@.+ ", - " +&&&&&&%##@..+ ", - " .@##%%###%%$.+ ", - " .@@@###@%%%+.+ ", - " +.@&%####%$+. ", - " +.%&&%##@..$ ", - " ++$%%#@..$ ", - " ++++..++ ", - " .++++. ", - " "}; - """ - MenuText = "Web" - ToolTip = "Web workbench" + "Web workbench object" + def __init__(self): + self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Web/Resources/icons/WebWorkbench.svg" + self.__class__.MenuText = "Web" + self.__class__.ToolTip = "Web workbench" - def Initialize(self): - # load the module - import WebGui + def Initialize(self): + # load the module + import WebGui - def GetClassName(self): - return "WebGui::Workbench" + def GetClassName(self): + return "WebGui::Workbench" Gui.addWorkbench(WebWorkbench())