Mercurial > octave

comparison libgui/graphics/annotation-dialog.cc @ 31639:ca7d58406f82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ad014fc78bd6
children aae24eaf89ad
comparison
equal deleted inserted replaced
31638:474e184321d3 31639:ca7d58406f82
32 #include <QPalette> 32 #include <QPalette>
33 33
34 #include "gui-settings.h" 34 #include "gui-settings.h"
35 #include "gui-preferences-gp.h" 35 #include "gui-preferences-gp.h"
36 #include "gui-settings.h" 36 #include "gui-settings.h"
37 #include "octave-qobject.h"
38 37
39 #include "QtHandlesUtils.h" 38 #include "QtHandlesUtils.h"
40 #include "annotation-dialog.h" 39 #include "annotation-dialog.h"
41 #include "ui-annotation-dialog.h" 40 #include "ui-annotation-dialog.h"
42 41
43 using namespace octave; 42 annotation_dialog::annotation_dialog (QWidget *p, const octave_value_list& pr):
44 43 QDialog (p), ui (new Ui::annotation_dialog)
45 annotation_dialog::annotation_dialog (octave::base_qobject& oct_qobj,
46 QWidget *p, const octave_value_list& pr):
47 QDialog (p), m_octave_qobj (oct_qobj), ui (new Ui::annotation_dialog)
48 { 44 {
49 props = pr; 45 props = pr;
50 46
51 init (); 47 init ();
52 } 48 }
158 props.append (ovl ("fontsize", ui->sb_font_size->value ())); 154 props.append (ovl ("fontsize", ui->sb_font_size->value ()));
159 props.append (ovl ("fontweight", 155 props.append (ovl ("fontweight",
160 ui->cb_font_bold->isChecked () ? "bold" : "normal")); 156 ui->cb_font_bold->isChecked () ? "bold" : "normal"));
161 props.append (ovl ("fontangle", 157 props.append (ovl ("fontangle",
162 ui->cb_font_italic->isChecked () ? "italic" : "normal")); 158 ui->cb_font_italic->isChecked () ? "italic" : "normal"));
163 props.append (ovl ("color", Utils::toRgb (ui->btn_color->palette (). 159 props.append (ovl ("color", octave::Utils::toRgb (ui->btn_color->palette ().
164 color (QPalette::Button)))); 160 color (QPalette::Button))));
165 161
166 // FIXME: only "none" linestyle is selectable, change the code bellow 162 // FIXME: only "none" linestyle is selectable, change the code bellow
167 // once more linestyles are added in the UI. 163 // once more linestyles are added in the UI.
168 props.append (ovl ("linestyle", "none")); 164 props.append (ovl ("linestyle", "none"));
243 } 239 }
244 else if (name == "color") 240 else if (name == "color")
245 { 241 {
246 QColor color; 242 QColor color;
247 if (props(1*i +1).is_matrix_type ()) 243 if (props(1*i +1).is_matrix_type ())
248 color = Utils::fromRgb (props(2*i +1).matrix_value ()); 244 color = octave::Utils::fromRgb (props(2*i +1).matrix_value ());
249 else 245 else
250 color.setNamedColor (props(2*i +1).string_value ().c_str ()); 246 color.setNamedColor (props(2*i +1).string_value ().c_str ());
251 247
252 if (color.isValid ()) 248 if (color.isValid ())
253 ui->btn_color->setPalette (QPalette (color)); 249 ui->btn_color->setPalette (QPalette (color));