Mercurial > octave
diff libgui/graphics/Canvas.cc @ 31621:0645ea65ca6b
handle icons and themes in gui_settings class, not resource_manager
* resource-manager.h, resource-manager.cc
(resource_manager::config_icon_theme, resource_manager::icon):
Move funtcions to gui-settings.h and gui-settings.cc.
* Canvas.cc, QTerminal.cc, documentation-bookmarks.cc,
documentation.cc, dw-main-window.cc, files-dock-widget.cc,
find-files-dialog.cc, gui-settings.cc, gui-settings.h,
history-dock-widget.cc, file-editor.cc, main-window.cc,
octave-dock-widget.cc, octave-qobject.cc, qt-interpreter-events.cc,
resource-manager.cc, resource-manager.h, variable-editor.cc:
Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 02 Dec 2022 18:43:12 -0500 |
| parents | 796f54d4ddbf |
| children | ca7d58406f82 |
line wrap: on
line diff
--- a/libgui/graphics/Canvas.cc Fri Dec 02 18:31:30 2022 -0500 +++ b/libgui/graphics/Canvas.cc Fri Dec 02 18:43:12 2022 -0500 @@ -43,6 +43,7 @@ #include "qt-graphics-toolkit.h" #include "annotation-dialog.h" +#include "gui-settings.h" #include "octave-qobject.h" #include "qt-interpreter-events.h" @@ -77,9 +78,9 @@ QCursor Canvas::make_cursor (const QString& name, int hot_x, int hot_y) { - octave::resource_manager& rmgr = m_octave_qobj.get_resource_manager (); + gui_settings settings; - QIcon icon = rmgr.icon (name); + QIcon icon = settings.icon (name); return QCursor (icon.pixmap (22, 22), hot_x, hot_y); }