Mercurial > octave
view libgui/graphics/ToolBarButton.cc @ 31639:ca7d58406f82
eliminate unnecessary uses of octave_qobject in GUI classes
* BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h,
ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h,
CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h,
ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h,
Figure.cc, Figure.h, GLCanvas.cc, GLCanvas.h, ListBoxControl.cc,
ListBoxControl.h, Menu.cc, Menu.h, Object.cc, Object.h, Panel.cc,
Panel.h, PopupMenuControl.cc, PopupMenuControl.h,
PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h,
RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc,
SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h,
ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc,
ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc,
ToolBarButton.h, annotation-dialog.cc, annotation-dialog.h,
qt-graphics-toolkit.cc, qt-graphics-toolkit.h, command-widget.h,
community-news.cc, community-news.h, documentation-bookmarks.cc,
documentation-bookmarks.h, documentation.cc,
external-editor-interface.cc, external-editor-interface.h,
find-files-dialog.cc, find-files-dialog.h, graphics-init.cc,
graphics-init.h, interpreter-qobject.cc, file-editor.cc,
find-dialog.cc, find-dialog.h, main-window.cc, main-window.h,
news-reader.cc, news-reader.h, octave-qobject.cc, release-notes.cc,
resource-manager.cc, set-path-dialog.cc, set-path-dialog.h,
shortcut-manager.cc, shortcut-manager.h, welcome-wizard.cc,
welcome-wizard.h, workspace-model.cc:
Don't store references to octave_qobject in GUI classes where it is
no longer needed. Eliminate unnecessary octave_qobject constructor
arguments. Change all uses.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 04 Dec 2022 22:57:02 -0500 |
parents | c11d34f72b3c |
children | 431f80aba37a |
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/>. // //////////////////////////////////////////////////////////////////////// // This file should not include config.h. It is only included in other // C++ source files that should have included config.h before including // this file. #include <QAction> #include <QIcon> #include <QString> #include <QWidget> #include "ToolBarButton.h" #include "QtHandlesUtils.h" #include "gui-preferences-global.h" namespace octave { template <typename T> ToolBarButton<T>::ToolBarButton (octave::interpreter& interp, const graphics_object& go, QAction *action) : Object (interp, go, action), m_separator (nullptr) { typename T::properties& tp = properties<T> (); action->setToolTip (Utils::fromStdString (tp.get_tooltipstring ())); action->setVisible (tp.is_visible ()); // Get the icon data from cdata or as a named icon QImage img = Utils::makeImageFromCData (tp.get_cdata (), 24, 24); if (img.width () == 0) { QIcon ico; std::string name = tp.get___named_icon__ (); if (! name.empty ()) ico = get_icon (name); action->setIcon (ico); } else action->setIcon (QIcon (QPixmap::fromImage (img))); if (tp.is_separator ()) { m_separator = new QAction (action); m_separator->setSeparator (true); m_separator->setVisible (tp.is_visible ()); } action->setEnabled (tp.is_enable ()); QWidget *w = qobject_cast<QWidget *> (action->parent ()); w->insertAction (w->actions ().back (), action); if (m_separator) w->insertAction (action, m_separator); } template <typename T> ToolBarButton<T>::~ToolBarButton (void) { } template <typename T> void ToolBarButton<T>::update (int pId) { typename T::properties& tp = properties<T> (); QAction *action = qWidget<QAction> (); switch (pId) { case base_properties::ID_VISIBLE: action->setVisible (tp.is_visible ()); if (m_separator) m_separator->setVisible (tp.is_visible ()); break; case T::properties::ID_TOOLTIPSTRING: action->setToolTip (Utils::fromStdString (tp.get_tooltipstring ())); break; case T::properties::ID_CDATA: { // Get the icon data from cdata or as a named icon QImage img = Utils::makeImageFromCData (tp.get_cdata (), 24, 24); if (img.width () == 0) { QIcon ico; std::string name = tp.get___named_icon__ (); if (! name.empty ()) ico = get_icon (name); action->setIcon (ico); } else action->setIcon (QIcon (QPixmap::fromImage (img))); } break; case T::properties::ID_SEPARATOR: if (tp.is_separator ()) { if (! m_separator) { m_separator = new QAction (action); m_separator->setSeparator (true); m_separator->setVisible (tp.is_visible ()); QWidget *w = qobject_cast<QWidget *> (action->parent ()); w->insertAction (action, m_separator); } } else { if (m_separator) delete m_separator; m_separator = nullptr; } break; case T::properties::ID_ENABLE: action->setEnabled (tp.is_enable ()); break; default: Object::update (pId); break; } } template <typename T> QIcon ToolBarButton<T>::get_icon (const std::string& name) { return QIcon (global_icon_paths.at (ICON_THEME_OCTAVE) + QString::fromStdString (name) + ".png"); } }