diff libgui/src/module.mk @ 30772:36dc11ee220d

reorganize GUIs icons * FigureWindow.cc (FigureWIndow.cc): use QIcon::fromTheme * ToolBarButton.cc (get_icon): dito * libgui/src/icons/*.png: moved into tango/128x128/, octave/128x128/ or cursor/ * libgui/src/icons/*.svg: moved into tango/scalable/ or octave/scalable/ * libgui/src/cursors/licence.md of cursors * libgui/src/icons/licence.md of icons * libgui/src/icons/icons_license: removed ol file * documentation.cc (construct_toolbar): use standard icon names for zoom icons * m-editor/file-editor.cc (construct): dito * main-window.cc (main_window) call ressource_manger::config_icon_theme * module.mk: update icon paths * octave-dock-widget.cc (label_dock_widget): use QIcon::fromTheme; (octave_dock_widget): use QIcon::fromTheme and update icon paths in css; (make_window): update icon paths in css; (make_widget): update icon paths in css; (set_style): update icon paths in css, use QIcon::fromTheme; * octave-qobject.cc (base_object): call config_icon_theme if no gui is started; * ressource_mamager.cc (config_icon_theme): new function setting the * resource-manager.h: new function config_icon_theme * libgui/src/resource.qrc: update paths of graphics files
author Torsten Lilge <ttl-octave@mailbox.org>
date Tue, 22 Feb 2022 20:54:15 +0100
parents efe8550a0aae
children bc390b9d14f9
line wrap: on
line diff
--- a/libgui/src/module.mk	Mon Feb 21 13:26:57 2022 -0500
+++ b/libgui/src/module.mk	Tue Feb 22 20:54:15 2022 +0100
@@ -1,114 +1,117 @@
 octave_gui_ICONS = \
-  %reldir%/icons/applications-system.png \
-  %reldir%/icons/bookmark-new.png \
-  %reldir%/icons/bottom_left_corner.png \
-  %reldir%/icons/bottom_right_corner.png \
-  %reldir%/icons/bottom_side.png \
-  %reldir%/icons/bp-next.png \
-  %reldir%/icons/bp-prev.png \
-  %reldir%/icons/bp-rm-all.png \
-  %reldir%/icons/bp-toggle.png \
-  %reldir%/icons/circle.png \
-  %reldir%/icons/cross.png \
-  %reldir%/icons/db-cont.png \
-  %reldir%/icons/db-step-in.png \
-  %reldir%/icons/db-step-out.png \
-  %reldir%/icons/db-step.png \
-  %reldir%/icons/db-stop.png \
-  %reldir%/icons/dialog-error.png \
-  %reldir%/icons/dialog-information.png \
-  %reldir%/icons/dialog-warning.png \
-  %reldir%/icons/document-new.png \
-  %reldir%/icons/document-open.png \
-  %reldir%/icons/document-print.png \
-  %reldir%/icons/document-save.png \
-  %reldir%/icons/document-save-as.png \
-  %reldir%/icons/edit-copy.png \
-  %reldir%/icons/edit-cut.png \
-  %reldir%/icons/edit-delete.png \
-  %reldir%/icons/edit-find.png \
-  %reldir%/icons/edit-find-replace.png \
-  %reldir%/icons/edit-paste.png \
-  %reldir%/icons/edit-redo.png \
-  %reldir%/icons/edit-undo.png \
-  %reldir%/icons/figure-axes.png \
-  %reldir%/icons/figure-grid.png \
-  %reldir%/icons/figure-pan.png \
-  %reldir%/icons/figure-rotate.png \
-  %reldir%/icons/figure-text.png \
-  %reldir%/icons/figure-zoom-in.png \
-  %reldir%/icons/figure-zoom-original.png \
-  %reldir%/icons/figure-zoom-out.png \
-  %reldir%/icons/fleur.png \
-  %reldir%/icons/folder.png \
-  %reldir%/icons/folder-new.png \
-  %reldir%/icons/folder-up.png \
-  %reldir%/icons/go-down.png \
-  %reldir%/icons/go-first.png \
-  %reldir%/icons/go-home.png \
-  %reldir%/icons/go-last.png \
-  %reldir%/icons/go-next.png \
-  %reldir%/icons/go-previous.png \
-  %reldir%/icons/go-up.png \
-  %reldir%/icons/graphic_logo_DocumentationDockWidget.png \
-  %reldir%/icons/graphic_logo_Figure.png \
-  %reldir%/icons/graphic_logo_FileEditor.png \
-  %reldir%/icons/graphic_logo_FilesDockWidget.png \
-  %reldir%/icons/graphic_logo_HistoryDockWidget.png \
-  %reldir%/icons/graphic_logo_NewsDockWidget.png \
-  %reldir%/icons/graphic_logo_TerminalDockWidget.png \
-  %reldir%/icons/graphic_logo_WorkspaceView.png \
-  %reldir%/icons/graphic_logo_ReleaseWidget.png \
-  %reldir%/icons/graphic_logo_VariableEditor.png \
-  %reldir%/icons/graphic_logo_DocumentationDockWidget.svg \
-  %reldir%/icons/graphic_logo_FileEditor.svg \
-  %reldir%/icons/graphic_logo_FilesDockWidget.svg \
-  %reldir%/icons/graphic_logo_HistoryDockWidget.svg \
-  %reldir%/icons/graphic_logo_NewsDockWidget.svg \
-  %reldir%/icons/graphic_logo_TerminalDockWidget.svg \
-  %reldir%/icons/graphic_logo_WorkspaceView.svg \
-  %reldir%/icons/graphic_logo_ReleaseWidget.svg \
-  %reldir%/icons/graphic_logo_VariableEditor.svg \
-  %reldir%/icons/hand2.png \
-  %reldir%/icons/icons_license \
-  %reldir%/icons/left_side.png \
-  %reldir%/icons/letter_logo_DocumentationDockWidget.png \
-  %reldir%/icons/letter_logo_FileEditor.png \
-  %reldir%/icons/letter_logo_FilesDockWidget.png \
-  %reldir%/icons/letter_logo_HistoryDockWidget.png \
-  %reldir%/icons/letter_logo_NewsDockWidget.png \
-  %reldir%/icons/letter_logo_TerminalDockWidget.png \
-  %reldir%/icons/letter_logo_WorkspaceView.png \
-  %reldir%/icons/letter_logo_ReleaseWidget.png \
-  %reldir%/icons/letter_logo_VariableEditor.png \
-  %reldir%/icons/letter_logo_DocumentationDockWidget.svg \
-  %reldir%/icons/letter_logo_FileEditor.svg \
-  %reldir%/icons/letter_logo_FilesDockWidget.svg \
-  %reldir%/icons/letter_logo_HistoryDockWidget.svg \
-  %reldir%/icons/letter_logo_NewsDockWidget.svg \
-  %reldir%/icons/letter_logo_TerminalDockWidget.svg \
-  %reldir%/icons/letter_logo_WorkspaceView.svg \
-  %reldir%/icons/letter_logo_ReleaseWidget.svg \
-  %reldir%/icons/letter_logo_VariableEditor.svg \
-  %reldir%/icons/logo.png \
-  %reldir%/icons/plot-xy-curve.png \
-  %reldir%/icons/preferences-system.png \
-  %reldir%/icons/right_side.png \
-  %reldir%/icons/system-run.png \
-  %reldir%/icons/top_left_corner.png \
-  %reldir%/icons/top_right_corner.png \
-  %reldir%/icons/top_side.png \
-  %reldir%/icons/user-home.png \
-  %reldir%/icons/view-refresh.png \
-  %reldir%/icons/widget-close.png \
-  %reldir%/icons/widget-dock.png \
-  %reldir%/icons/widget-undock.png \
-  %reldir%/icons/widget-close-light.png \
-  %reldir%/icons/widget-dock-light.png \
-  %reldir%/icons/widget-undock-light.png \
-  %reldir%/icons/zoom-in.png \
-  %reldir%/icons/zoom-original.png \
-  %reldir%/icons/zoom-out.png
+  %reldir%/cursors/license.md \
+  %reldir%/cursors/bottom_left_corner.png \
+  %reldir%/cursors/bottom_right_corner.png \
+  %reldir%/cursors/bottom_side.png \
+  %reldir%/cursors/circle.png \
+  %reldir%/cursors/cross.png \
+  %reldir%/cursors/fleur.png \
+  %reldir%/cursors/hand2.png \
+  %reldir%/cursors/left_side.png \
+  %reldir%/cursors/right_side.png \
+  %reldir%/cursors/top_left_corner.png \
+  %reldir%/cursors/top_right_corner.png \
+  %reldir%/cursors/top_side.png \
+  %reldir%/icons/license.md \
+  %reldir%/icons/octave/index.theme \
+  %reldir%/icons/octave/128x128/bp-next.png \
+  %reldir%/icons/octave/128x128/bp-prev.png \
+  %reldir%/icons/octave/128x128/bp-rm-all.png \
+  %reldir%/icons/octave/128x128/bp-toggle.png \
+  %reldir%/icons/octave/128x128/db-cont.png \
+  %reldir%/icons/octave/128x128/db-step-in.png \
+  %reldir%/icons/octave/128x128/db-step-out.png \
+  %reldir%/icons/octave/128x128/db-step.png \
+  %reldir%/icons/octave/128x128/db-stop.png \
+  %reldir%/icons/octave/128x128/figure-axes.png \
+  %reldir%/icons/octave/128x128/figure-grid.png \
+  %reldir%/icons/octave/128x128/figure-pan.png \
+  %reldir%/icons/octave/128x128/figure-rotate.png \
+  %reldir%/icons/octave/128x128/figure-text.png \
+  %reldir%/icons/octave/128x128/figure-zoom-in.png \
+  %reldir%/icons/octave/128x128/figure-zoom-original.png \
+  %reldir%/icons/octave/128x128/figure-zoom-out.png \
+  %reldir%/icons/octave/128x128/graphic_logo_DocumentationDockWidget.png \
+  %reldir%/icons/octave/128x128/graphic_logo_Figure.png \
+  %reldir%/icons/octave/128x128/graphic_logo_FileEditor.png \
+  %reldir%/icons/octave/128x128/graphic_logo_FilesDockWidget.png \
+  %reldir%/icons/octave/128x128/graphic_logo_HistoryDockWidget.png \
+  %reldir%/icons/octave/128x128/graphic_logo_NewsDockWidget.png \
+  %reldir%/icons/octave/128x128/graphic_logo_TerminalDockWidget.png \
+  %reldir%/icons/octave/128x128/graphic_logo_WorkspaceView.png \
+  %reldir%/icons/octave/128x128/graphic_logo_ReleaseWidget.png \
+  %reldir%/icons/octave/128x128/graphic_logo_VariableEditor.png \
+  %reldir%/icons/octave/128x128/graphic_logo_DocumentationDockWidget.svg \
+  %reldir%/icons/octave/128x128/graphic_logo_FileEditor.svg \
+  %reldir%/icons/octave/128x128/graphic_logo_FilesDockWidget.svg \
+  %reldir%/icons/octave/128x128/graphic_logo_HistoryDockWidget.svg \
+  %reldir%/icons/octave/128x128/graphic_logo_NewsDockWidget.svg \
+  %reldir%/icons/octave/128x128/graphic_logo_TerminalDockWidget.svg \
+  %reldir%/icons/octave/128x128/graphic_logo_WorkspaceView.svg \
+  %reldir%/icons/octave/128x128/graphic_logo_ReleaseWidget.svg \
+  %reldir%/icons/octave/128x128/graphic_logo_VariableEditor.svg \
+  %reldir%/icons/octave/128x128/letter_logo_DocumentationDockWidget.png \
+  %reldir%/icons/octave/128x128/letter_logo_FileEditor.png \
+  %reldir%/icons/octave/128x128/letter_logo_FilesDockWidget.png \
+  %reldir%/icons/octave/128x128/letter_logo_HistoryDockWidget.png \
+  %reldir%/icons/octave/128x128/letter_logo_NewsDockWidget.png \
+  %reldir%/icons/octave/128x128/letter_logo_TerminalDockWidget.png \
+  %reldir%/icons/octave/128x128/letter_logo_WorkspaceView.png \
+  %reldir%/icons/octave/128x128/letter_logo_ReleaseWidget.png \
+  %reldir%/icons/octave/128x128/letter_logo_VariableEditor.png \
+  %reldir%/icons/octave/128x128/letter_logo_DocumentationDockWidget.svg \
+  %reldir%/icons/octave/128x128/letter_logo_FileEditor.svg \
+  %reldir%/icons/octave/128x128/letter_logo_FilesDockWidget.svg \
+  %reldir%/icons/octave/128x128/letter_logo_HistoryDockWidget.svg \
+  %reldir%/icons/octave/128x128/letter_logo_NewsDockWidget.svg \
+  %reldir%/icons/octave/128x128/letter_logo_TerminalDockWidget.svg \
+  %reldir%/icons/octave/128x128/letter_logo_WorkspaceView.svg \
+  %reldir%/icons/octave/128x128/letter_logo_ReleaseWidget.svg \
+  %reldir%/icons/octave/128x128/letter_logo_VariableEditor.svg \
+  %reldir%/icons/octave/128x128/logo.png \
+  %reldir%/icons/octave/128x128/plot-xy-curve.png \
+  %reldir%/icons/octave/128x128/system-run.png \
+  %reldir%/icons/octave/128x128/widget-close.png \
+  %reldir%/icons/octave/128x128/widget-dock.png \
+  %reldir%/icons/octave/128x128/widget-undock.png \
+  %reldir%/icons/octave/128x128/widget-close-light.png \
+  %reldir%/icons/octave/128x128/widget-dock-light.png \
+  %reldir%/icons/octave/128x128/widget-undock-light.png \
+  %reldir%/icons/tango/index.theme \
+  %reldir%/icons/tango/128x128/applications-system.png \
+  %reldir%/icons/tango/128x128/bookmark-new.png \
+  %reldir%/icons/tango/128x128/dialog-error.png \
+  %reldir%/icons/tango/128x128/dialog-information.png \
+  %reldir%/icons/tango/128x128/dialog-warning.png \
+  %reldir%/icons/tango/128x128/document-new.png \
+  %reldir%/icons/tango/128x128/document-open.png \
+  %reldir%/icons/tango/128x128/document-print.png \
+  %reldir%/icons/tango/128x128/document-save.png \
+  %reldir%/icons/tango/128x128/document-save-as.png \
+  %reldir%/icons/tango/128x128/edit-copy.png \
+  %reldir%/icons/tango/128x128/edit-cut.png \
+  %reldir%/icons/tango/128x128/edit-delete.png \
+  %reldir%/icons/tango/128x128/edit-find.png \
+  %reldir%/icons/tango/128x128/edit-find-replace.png \
+  %reldir%/icons/tango/128x128/edit-paste.png \
+  %reldir%/icons/tango/128x128/edit-redo.png \
+  %reldir%/icons/tango/128x128/edit-undo.png \
+  %reldir%/icons/tango/128x128/folder.png \
+  %reldir%/icons/tango/128x128/folder-new.png \
+  %reldir%/icons/tango/128x128/folder-up.png \
+  %reldir%/icons/tango/128x128/go-down.png \
+  %reldir%/icons/tango/128x128/go-first.png \
+  %reldir%/icons/tango/128x128/go-home.png \
+  %reldir%/icons/tango/128x128/go-last.png \
+  %reldir%/icons/tango/128x128/go-next.png \
+  %reldir%/icons/tango/128x128/go-previous.png \
+  %reldir%/icons/tango/128x128/go-up.png \
+  %reldir%/icons/tango/128x128/preferences-system.png \
+  %reldir%/icons/tango/128x128/user-home.png \
+  %reldir%/icons/tango/128x128/view-refresh.png \
+  %reldir%/icons/tango/128x128/view-zoom-in.png \
+  %reldir%/icons/tango/128x128/view-zoom-original.png \
+  %reldir%/icons/tango/128x128/view-zoom-out.png
 
 octave_gui_MOC =