Mercurial > octave
comparison libgui/src/m-editor/file-editor.cc @ 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 | 36dc11ee220d |
children | ba701853b1bf |
comparison
equal
deleted
inserted
replaced
30963:f14ad09af093 | 30964:04601f6c47f4 |
---|---|
1314 #if defined (Q_OS_MAC) | 1314 #if defined (Q_OS_MAC) |
1315 // FIXME: This is a workaround for missing tab close buttons on MacOS | 1315 // FIXME: This is a workaround for missing tab close buttons on MacOS |
1316 // in several Qt versions (https://bugreports.qt.io/browse/QTBUG-61092) | 1316 // in several Qt versions (https://bugreports.qt.io/browse/QTBUG-61092) |
1317 if (! rotated) | 1317 if (! rotated) |
1318 { | 1318 { |
1319 QString icon = global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-close.png"; | |
1320 | |
1319 QString close_button_css_mac ( | 1321 QString close_button_css_mac ( |
1320 "QTabBar::close-button" | 1322 "QTabBar::close-button" |
1321 " { width: 6px; image: url(:/actions/icons/widget-close.png);" | 1323 " { image: url(" + icon + ");" |
1322 " subcontrol-position: button; }\n" | 1324 " padding: 4px;" |
1325 " subcontrol-position: bottom; }\n" | |
1323 "QTabBar::close-button:hover" | 1326 "QTabBar::close-button:hover" |
1324 " { background-color: #cccccc; }"); | 1327 " { background-color: #cccccc; }"); |
1325 | 1328 |
1326 style_sheet = style_sheet + close_button_css_mac; | 1329 style_sheet = style_sheet + close_button_css_mac; |
1327 } | 1330 } |
2365 | 2368 |
2366 connect (m_tab_widget, &file_editor_tab_widget::currentChanged, | 2369 connect (m_tab_widget, &file_editor_tab_widget::currentChanged, |
2367 this, &file_editor::active_tab_changed); | 2370 this, &file_editor::active_tab_changed); |
2368 | 2371 |
2369 resize (500, 400); | 2372 resize (500, 400); |
2370 setWindowIcon (QIcon (":/actions/icons/logo.png")); | |
2371 set_title (tr ("Editor")); | 2373 set_title (tr ("Editor")); |
2372 | 2374 |
2373 check_actions (); | 2375 check_actions (); |
2374 } | 2376 } |
2375 | 2377 |