Mercurial > octave
view libgui/graphics/FigureWindow.cc @ 30777:439eb9bd4c04
icon fallback concept without QIcon::fallbackSearchPaths (bug #62106)
* FigureWindow.cc (FigureWindow): do not use fromTheme
* ToolBarButton.cc: include QString and gui-preferences-global.h;
(get_icon): do not use fromTheme
* gui-preferences-global.h: define QStringList with exisiting icon
fallback paths togehter with an enumeration for the list inidices
* octave-dock-widget.cc (label_dock_widget): use ressource_manager::icon
instead of fromTheme, use constants from gui-preferences for icon paths
instead of literal strings in style sheets
(make_window): dito
(make_widget): dito
* resource-manager.cc (resource_manager): initialize m_icon_fallbacks;
(config_icon_theme): collect fallback paths in a string list depending
on selected icon theme;
(icon): test existance of icon in current theme, if not, test the
fallback locations;
* resource-manager.h: new string list m_icon_fallbacks
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Thu, 24 Feb 2022 22:16:35 +0100 |
parents | 36dc11ee220d |
children | c11d34f72b3c |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2011-2022 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // This file is part of Octave. // // Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <QMenu> #include "FigureWindow.h" #include "gui-preferences-global.h" namespace octave { FigureWindow::FigureWindow (QWidget *xparent) : FigureWindowBase (xparent) { // set icon from application resources setWindowIcon (QIcon (global_icon_fallback_paths.at (ICON_THEME_OCTAVE))); } FigureWindow::~FigureWindow (void) { } QMenu * FigureWindow::createPopupMenu (void) { // For the time being, disable menubar/toolbar popup menu return nullptr; } void FigureWindow::showEvent (QShowEvent *ev) { QMainWindow::showEvent (ev); emit figureWindowShown(); } }