Mercurial > octave

comparison libgui/src/welcome-wizard.cc @ 30964:04601f6c47f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e2c8c852399e
children ad014fc78bd6 c6d54dd31a7e
comparison
equal deleted inserted replaced
30963:f14ad09af093 30964:04601f6c47f4
35 #if defined (OCTAVE_USE_WINDOWS_API) 35 #if defined (OCTAVE_USE_WINDOWS_API)
36 #define WIN32_LEAN_AND_MEAN 36 #define WIN32_LEAN_AND_MEAN
37 #include <windows.h> 37 #include <windows.h>
38 #endif 38 #endif
39 39
40 #include "gui-preferences-dw.h"
40 #include "gui-preferences-nr.h" 41 #include "gui-preferences-nr.h"
41 #include "octave-qobject.h" 42 #include "octave-qobject.h"
42 #include "welcome-wizard.h" 43 #include "welcome-wizard.h"
43 44
44 namespace octave 45 namespace octave
45 { 46 {
46 static QLabel * 47 static QLabel *
47 make_octave_logo (QWidget *p = nullptr, int height = 100) 48 make_octave_logo (QWidget *p = nullptr, int height = 100)
48 { 49 {
49 QLabel *logo = new QLabel (p); 50 QLabel *logo = new QLabel (p);
50 QPixmap logo_pixmap (":/actions/icons/logo.png"); 51 QPixmap logo_pixmap (dw_icon_set_names["NONE"]);
51 logo->setPixmap (logo_pixmap.scaledToHeight (height)); 52 logo->setPixmap (logo_pixmap.scaledToHeight (height));
52 return logo; 53 return logo;
53 }; 54 };
54 55
55 welcome_wizard::welcome_wizard (base_qobject& oct_qobj, QWidget *p) 56 welcome_wizard::welcome_wizard (base_qobject& oct_qobj, QWidget *p)