diff libgui/src/gui-preferences-dw.h @ 30964:04601f6c47f4

fix broken icon path after new icon structure in GUI * community-news.cc: use window icon configured in the preferences * documentation-dock-widget.cc (documentation_dock_widget) * files-dock-widget.cc (files_dock_widget) * history-dock-widget.cc (history_dock_widget) * terminal-dock-widget.cc (terminal_dock_widget) * variable-editor.cc (variable_editor) * workspace-view.cc (workspace_view) do not set window icon here as it is set in the main window * gui-preferences-dw.h: organize dw_icon_set_names in a hash * file-editor.cc (notice_settings): fix path to tab close icon on mac * find-dialog.cc (find_dialog): do not set window icon here, it is already set by the editor * main-window.cc (notice_settings): set dok widget icons using the new hash structure of available icon sets (construct): use global const settings instead of literal string for main window icon * octave-qobject.cc (release_notes_widget): pass base qobject to the release note constructor * release-notes.cc (release_notes): get qbase object as argument, get desired window icon from settings * release-notes.h: constructor with base object as argument * variable-editor.cc (toplevel_change): use icon path from const preferences instead of literal strings * welcome-wizard.cc (make_octave_logo): use icon path from const preferences instead of literal strings
author Torsten Lilge <ttl-octave@mailbox.org>
date Sat, 23 Apr 2022 18:10:45 +0200
parents 796f54d4ddbf
children 94488ab70e12
line wrap: on
line diff
--- a/libgui/src/gui-preferences-dw.h	Sat Mar 26 23:21:59 2022 -0300
+++ b/libgui/src/gui-preferences-dw.h	Sat Apr 23 18:10:45 2022 +0200
@@ -51,14 +51,13 @@
 
 const gui_pref dw_icon_set ("DockWidgets/widget_icon_set", QVariant ("NONE"));
 
-const struct { QString name; QString path; } dw_icon_set_names[]
+const QHash <QString, QString> dw_icon_set_names
   = {
       // array of possible icon sets (name, path (complete for NONE))
       // the first entry here is the default!
-      {"NONE",    ":/actions/icons/logo.png"},
-      {"GRAPHIC", ":/actions/icons/graphic_logo_"},
-      {"LETTER",  ":/actions/icons/letter_logo_"},
-      {"", ""} // end marker has empty name
+      {"NONE",    ":/icons/octave/128x128/logo.png"},
+      {"GRAPHIC", ":/icons/octave/128x128/graphic_logo_"},
+      {"LETTER",  ":/icons/octave/128x128/letter_logo_"}
     };
 
 // The following keys have to be used with .arg (objectName ())