Mercurial > octave
diff libgui/src/module.mk @ 31435:6737f0f0d420 stable
maint: Merge default to stable to begin version 8 release process
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 15 Nov 2022 13:15:28 -0800 |
| parents | a103cfd738c5 |
| children | 670f3f17c280 |
line wrap: on
line diff
--- a/libgui/src/module.mk Tue Nov 15 13:25:31 2022 -0300 +++ b/libgui/src/module.mk Tue Nov 15 13:15:28 2022 -0800 @@ -1,113 +1,254 @@ 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/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%/icons/license.md \ + %reldir%/icons/cursors/bottom_left_corner.png \ + %reldir%/icons/cursors/bottom_right_corner.png \ + %reldir%/icons/cursors/bottom_side.png \ + %reldir%/icons/cursors/circle.png \ + %reldir%/icons/cursors/cross.png \ + %reldir%/icons/cursors/fleur.png \ + %reldir%/icons/cursors/hand2.png \ + %reldir%/icons/cursors/left_side.png \ + %reldir%/icons/cursors/right_side.png \ + %reldir%/icons/cursors/top_left_corner.png \ + %reldir%/icons/cursors/top_right_corner.png \ + %reldir%/icons/cursors/top_side.png \ + %reldir%/icons/octave/index.theme \ + %reldir%/icons/octave/128x128/applications-system.png \ + %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/bookmark-new.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/dialog-information.png \ + %reldir%/icons/octave/128x128/dialog-error.png \ + %reldir%/icons/octave/128x128/document-new.png \ + %reldir%/icons/octave/128x128/document-open.png \ + %reldir%/icons/octave/128x128/document-print.png \ + %reldir%/icons/octave/128x128/document-save-as.png \ + %reldir%/icons/octave/128x128/document-save.png \ + %reldir%/icons/octave/128x128/edit-copy.png \ + %reldir%/icons/octave/128x128/edit-cut.png \ + %reldir%/icons/octave/128x128/edit-find-replace.png \ + %reldir%/icons/octave/128x128/edit-find.png \ + %reldir%/icons/octave/128x128/edit-paste.png \ + %reldir%/icons/octave/128x128/edit-redo.png \ + %reldir%/icons/octave/128x128/edit-undo.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/folder-new.png \ + %reldir%/icons/octave/128x128/folder-settings.png \ + %reldir%/icons/octave/128x128/folder-up.png \ + %reldir%/icons/octave/128x128/folder.png \ + %reldir%/icons/octave/128x128/go-down.png \ + %reldir%/icons/octave/128x128/go-first.png \ + %reldir%/icons/octave/128x128/go-home.png \ + %reldir%/icons/octave/128x128/go-last.png \ + %reldir%/icons/octave/128x128/go-next.png \ + %reldir%/icons/octave/128x128/go-previous.png \ + %reldir%/icons/octave/128x128/go-up.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_ReleaseWidget.png \ + %reldir%/icons/octave/128x128/graphic_logo_TerminalDockWidget.png \ + %reldir%/icons/octave/128x128/graphic_logo_VariableEditor.png \ + %reldir%/icons/octave/128x128/graphic_logo_WorkspaceView.png \ + %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_ReleaseWidget.png \ + %reldir%/icons/octave/128x128/letter_logo_TerminalDockWidget.png \ + %reldir%/icons/octave/128x128/letter_logo_VariableEditor.png \ + %reldir%/icons/octave/128x128/letter_logo_WorkspaceView.png \ + %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/user-home.png \ + %reldir%/icons/octave/128x128/view-zoom-in.png \ + %reldir%/icons/octave/128x128/view-zoom-original.png \ + %reldir%/icons/octave/128x128/view-zoom-out.png \ + %reldir%/icons/octave/128x128/widget-close-light.png \ + %reldir%/icons/octave/128x128/widget-close.png \ + %reldir%/icons/octave/128x128/widget-dock-light.png \ + %reldir%/icons/octave/128x128/widget-dock.png \ + %reldir%/icons/octave/128x128/widget-undock-light.png \ + %reldir%/icons/octave/128x128/widget-undock.png \ + %reldir%/icons/octave/scalable/applications-system.svg \ + %reldir%/icons/octave/scalable/bookmark-new.svg \ + %reldir%/icons/octave/scalable/bp-next.svg \ + %reldir%/icons/octave/scalable/bp-prev.svg \ + %reldir%/icons/octave/scalable/bp-rm-all.svg \ + %reldir%/icons/octave/scalable/bp-toggle.svg \ + %reldir%/icons/octave/scalable/db-cont.svg \ + %reldir%/icons/octave/scalable/db-step-in.svg \ + %reldir%/icons/octave/scalable/db-step-out.svg \ + %reldir%/icons/octave/scalable/db-step.svg \ + %reldir%/icons/octave/scalable/db-stop.svg \ + %reldir%/icons/octave/scalable/dialog-information.svg \ + %reldir%/icons/octave/scalable/dialog-error.svg \ + %reldir%/icons/octave/scalable/document-new.svg \ + %reldir%/icons/octave/scalable/document-open.svg \ + %reldir%/icons/octave/scalable/document-print.svg \ + %reldir%/icons/octave/scalable/document-save-as.svg \ + %reldir%/icons/octave/scalable/document-save.svg \ + %reldir%/icons/octave/scalable/edit-copy.svg \ + %reldir%/icons/octave/scalable/edit-cut.svg \ + %reldir%/icons/octave/scalable/edit-find-replace.svg \ + %reldir%/icons/octave/scalable/edit-find.svg \ + %reldir%/icons/octave/scalable/edit-paste.svg \ + %reldir%/icons/octave/scalable/edit-redo.svg \ + %reldir%/icons/octave/scalable/edit-undo.svg \ + %reldir%/icons/octave/scalable/figure-axes.svg \ + %reldir%/icons/octave/scalable/figure-grid.svg \ + %reldir%/icons/octave/scalable/figure-pan.svg \ + %reldir%/icons/octave/scalable/figure-rotate.svg \ + %reldir%/icons/octave/scalable/figure-text.svg \ + %reldir%/icons/octave/scalable/figure-zoom-in.svg \ + %reldir%/icons/octave/scalable/figure-zoom-original.svg \ + %reldir%/icons/octave/scalable/figure-zoom-out.svg \ + %reldir%/icons/octave/scalable/folder-new.svg \ + %reldir%/icons/octave/scalable/folder-settings.svg \ + %reldir%/icons/octave/scalable/folder-up.svg \ + %reldir%/icons/octave/scalable/folder.svg \ + %reldir%/icons/octave/scalable/go-down.svg \ + %reldir%/icons/octave/scalable/go-first.svg \ + %reldir%/icons/octave/scalable/go-home.svg \ + %reldir%/icons/octave/scalable/go-last.svg \ + %reldir%/icons/octave/scalable/go-next.svg \ + %reldir%/icons/octave/scalable/go-previous.svg \ + %reldir%/icons/octave/scalable/go-up.svg \ + %reldir%/icons/octave/scalable/graphic_logo_DocumentationDockWidget.svg \ + %reldir%/icons/octave/scalable/graphic_logo_Figure.svg \ + %reldir%/icons/octave/scalable/graphic_logo_FileEditor.svg \ + %reldir%/icons/octave/scalable/graphic_logo_FilesDockWidget.svg \ + %reldir%/icons/octave/scalable/graphic_logo_HistoryDockWidget.svg \ + %reldir%/icons/octave/scalable/graphic_logo_NewsDockWidget.svg \ + %reldir%/icons/octave/scalable/graphic_logo_ReleaseWidget.svg \ + %reldir%/icons/octave/scalable/graphic_logo_TerminalDockWidget.svg \ + %reldir%/icons/octave/scalable/graphic_logo_VariableEditor.svg \ + %reldir%/icons/octave/scalable/graphic_logo_WorkspaceView.svg \ + %reldir%/icons/octave/scalable/letter_logo_DocumentationDockWidget.svg \ + %reldir%/icons/octave/scalable/letter_logo_FileEditor.svg \ + %reldir%/icons/octave/scalable/letter_logo_FilesDockWidget.svg \ + %reldir%/icons/octave/scalable/letter_logo_HistoryDockWidget.svg \ + %reldir%/icons/octave/scalable/letter_logo_NewsDockWidget.svg \ + %reldir%/icons/octave/scalable/letter_logo_ReleaseWidget.svg \ + %reldir%/icons/octave/scalable/letter_logo_TerminalDockWidget.svg \ + %reldir%/icons/octave/scalable/letter_logo_VariableEditor.svg \ + %reldir%/icons/octave/scalable/letter_logo_WorkspaceView.svg \ + %reldir%/icons/octave/scalable/plot-xy-curve.svg \ + %reldir%/icons/octave/scalable/system-run.svg \ + %reldir%/icons/octave/scalable/user-home.svg \ + %reldir%/icons/octave/scalable/view-zoom-in.svg \ + %reldir%/icons/octave/scalable/view-zoom-original.svg \ + %reldir%/icons/octave/scalable/view-zoom-out.svg \ + %reldir%/icons/octave/scalable/widget-close-light.svg \ + %reldir%/icons/octave/scalable/widget-close.svg \ + %reldir%/icons/octave/scalable/widget-dock-light.svg \ + %reldir%/icons/octave/scalable/widget-dock.svg \ + %reldir%/icons/octave/scalable/widget-undock-light.svg \ + %reldir%/icons/octave/scalable/widget-undock.svg \ + %reldir%/icons/tango/index.theme \ + %reldir%/icons/tango/128x128/applications-system.png \ + %reldir%/icons/tango/128x128/bookmark-new.png \ + %reldir%/icons/tango/128x128/bp-next.png \ + %reldir%/icons/tango/128x128/bp-prev.png \ + %reldir%/icons/tango/128x128/bp-rm-all.png \ + %reldir%/icons/tango/128x128/bp-toggle.png \ + %reldir%/icons/tango/128x128/db-cont.png \ + %reldir%/icons/tango/128x128/db-step-in.png \ + %reldir%/icons/tango/128x128/db-step-out.png \ + %reldir%/icons/tango/128x128/db-step.png \ + %reldir%/icons/tango/128x128/db-stop.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-replace.png \ + %reldir%/icons/tango/128x128/edit-find.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-new.png \ + %reldir%/icons/tango/128x128/folder.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 \ + %reldir%/icons/tango/scalable/applications-system.svg \ + %reldir%/icons/tango/scalable/bookmark-new.svg \ + %reldir%/icons/tango/scalable/bp-next.svg \ + %reldir%/icons/tango/scalable/bp-prev.svg \ + %reldir%/icons/tango/scalable/bp-rm-all.svg \ + %reldir%/icons/tango/scalable/bp-toggle.svg \ + %reldir%/icons/tango/scalable/db-cont.svg \ + %reldir%/icons/tango/scalable/db-step-in.svg \ + %reldir%/icons/tango/scalable/db-step-out.svg \ + %reldir%/icons/tango/scalable/db-step.svg \ + %reldir%/icons/tango/scalable/db-stop.svg \ + %reldir%/icons/tango/scalable/dialog-error.svg \ + %reldir%/icons/tango/scalable/dialog-information.svg \ + %reldir%/icons/tango/scalable/dialog-warning.svg \ + %reldir%/icons/tango/scalable/document-new.svg \ + %reldir%/icons/tango/scalable/document-open.svg \ + %reldir%/icons/tango/scalable/document-print.svg \ + %reldir%/icons/tango/scalable/document-save.svg \ + %reldir%/icons/tango/scalable/document-save-as.svg \ + %reldir%/icons/tango/scalable/edit-copy.svg \ + %reldir%/icons/tango/scalable/edit-cut.svg \ + %reldir%/icons/tango/scalable/edit-delete.svg \ + %reldir%/icons/tango/scalable/edit-find-replace.svg \ + %reldir%/icons/tango/scalable/edit-find.svg \ + %reldir%/icons/tango/scalable/edit-paste.svg \ + %reldir%/icons/tango/scalable/edit-redo.svg \ + %reldir%/icons/tango/scalable/edit-undo.svg \ + %reldir%/icons/tango/scalable/folder-new.svg \ + %reldir%/icons/tango/scalable/folder.svg \ + %reldir%/icons/tango/scalable/go-down.svg \ + %reldir%/icons/tango/scalable/go-first.svg \ + %reldir%/icons/tango/scalable/go-home.svg \ + %reldir%/icons/tango/scalable/go-last.svg \ + %reldir%/icons/tango/scalable/go-next.svg \ + %reldir%/icons/tango/scalable/go-previous.svg \ + %reldir%/icons/tango/scalable/go-up.svg \ + %reldir%/icons/tango/scalable/preferences-system.svg \ + %reldir%/icons/tango/scalable/user-home.svg \ + %reldir%/icons/tango/scalable/view-refresh.svg \ + %reldir%/icons/tango/scalable/view-zoom-in.svg \ + %reldir%/icons/tango/scalable/view-zoom-original.svg \ + %reldir%/icons/tango/scalable/view-zoom-out.svg octave_gui_MOC = @@ -124,8 +265,14 @@ $(OCTAVE_GUI_SRC_M_EDITOR_MOC): | %reldir%/m-editor/$(octave_dirstamp) +OCTAVE_GUI_SRC_COMMAND_WIDGET_MOC = \ + %reldir%/moc-command-widget.cc + +$(OCTAVE_GUI_SRC_COMMAND_WIDGET_MOC): | %reldir%/$(octave_dirstamp) + octave_gui_MOC += \ - $(OCTAVE_GUI_SRC_M_EDITOR_MOC) + $(OCTAVE_GUI_SRC_M_EDITOR_MOC) \ + $(OCTAVE_GUI_SRC_COMMAND_WIDGET_MOC) DIRSTAMP_FILES += \ %reldir%/m-editor/$(octave_dirstamp) @@ -134,7 +281,6 @@ OCTAVE_GUI_SRC_MOC = \ %reldir%/moc-external-editor-interface.cc \ - %reldir%/moc-command-widget.cc \ %reldir%/moc-community-news.cc \ %reldir%/moc-dialog.cc \ %reldir%/moc-documentation-dock-widget.cc \