Mercurial > octave
view libgui/graphics/annotation-dialog.h @ 28225:fbced93c9704 stable
Fix reversal of width and height in uicontrol icon creation (bug #58144).
* PushButtonControl.cc (PushButtonControl::PushButtonControl): Reverse order of
parameters in call to Utils::makeImageFromCData which expects order to be
width, height.
* ToggleButtonControl.cc (ToggleButtonControl::ToggleButtonControl): Reverse
order of parameters in call to Utils::makeImageFromCData which expects order to
be width, height.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 16 Apr 2020 11:48:06 -0700 |
parents | bd51beb6205e |
children | 0a5b15007766 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2016-2020 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 (octave_annotation_dialog_h) #define octave_annotation_dialog_h 1 #include <QDialog> #include <QLineEdit> #include <QAbstractButton> #include "ovl.h" namespace octave { class base_qobject; } namespace Ui { class annotation_dialog; } class annotation_dialog : public QDialog { Q_OBJECT public: annotation_dialog (octave::base_qobject& oct_qobj, QWidget *parent, const octave_value_list& pr); ~annotation_dialog (); octave_value_list get_properties () const; private slots: // slots for dialog's buttons void button_clicked (QAbstractButton *button); void edit_string_changed (const QString& str); void prompt_for_color (); private: void init (); void get_gui_props (); void set_gui_props (); octave::base_qobject& m_octave_qobj; Ui::annotation_dialog *ui; octave_value_list props; }; #endif