Mercurial > octave-nkf

comparison libgui/graphics/ButtonControl.cc @ 20002:3cc0734283dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes in Qt graphics code * Backend.cc, BaseControl.cc, ButtonControl.cc, Canvas.cc, CheckBoxControl.cc, Container.cc, ContextMenu.cc, EditControl.cc, Figure.cc, FigureWindow.cc, GLCanvas.cc, KeyMap.cc, ListBoxControl.cc, Logger.cc, Menu.cc, MouseModeActionGroup.cc, Object.cc, ObjectFactory.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc, RadioButtonControl.cc, SliderControl.cc, TextControl.cc, TextEdit.cc, ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBarButton.cc, __init_qt__.cc: Follow a few more Octave coding conventions.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Mar 2015 12:27:54 -0400
parents fe0e34be5576
children f0e61a67ad9f
comparison
equal deleted inserted replaced
20001:40b2c4323c16 20002:3cc0734283dc
32 32
33 namespace QtHandles 33 namespace QtHandles
34 { 34 {
35 35
36 ButtonControl::ButtonControl (const graphics_object& go, QAbstractButton* btn) 36 ButtonControl::ButtonControl (const graphics_object& go, QAbstractButton* btn)
37 : BaseControl (go, btn), m_blockCallback (false) 37 : BaseControl (go, btn), m_blockCallback (false)
38 { 38 {
39 uicontrol::properties& up = properties<uicontrol> (); 39 uicontrol::properties& up = properties<uicontrol> ();
40 40
41 btn->setText (Utils::fromStdString (up.get_string_string ())); 41 btn->setText (Utils::fromStdString (up.get_string_string ()));
42 if (btn->isCheckable () || up.style_is ("togglebutton")) 42 if (btn->isCheckable () || up.style_is ("togglebutton"))
55 55
56 ButtonControl::~ButtonControl (void) 56 ButtonControl::~ButtonControl (void)
57 { 57 {
58 } 58 }
59 59
60 void ButtonControl::update (int pId) 60 void
61 ButtonControl::update (int pId)
61 { 62 {
62 uicontrol::properties& up = properties<uicontrol> (); 63 uicontrol::properties& up = properties<uicontrol> ();
63 QAbstractButton* btn = qWidget<QAbstractButton> (); 64 QAbstractButton* btn = qWidget<QAbstractButton> ();
64 65
65 switch (pId) 66 switch (pId)
66 { 67 {
67 case uicontrol::properties::ID_STRING: 68 case uicontrol::properties::ID_STRING:
68 btn->setText (Utils::fromStdString (up.get_string_string ())); 69 btn->setText (Utils::fromStdString (up.get_string_string ()));
69 break; 70 break;
71
70 case uicontrol::properties::ID_VALUE: 72 case uicontrol::properties::ID_VALUE:
71 m_blockCallback = true; 73 m_blockCallback = true;
72 if (btn->isCheckable ()) 74 if (btn->isCheckable ())
73 { 75 {
74 Matrix value = up.get_value ().matrix_value (); 76 Matrix value = up.get_value ().matrix_value ();
83 btn->setChecked (true); 85 btn->setChecked (true);
84 } 86 }
85 } 87 }
86 m_blockCallback = false; 88 m_blockCallback = false;
87 break; 89 break;
90
88 default: 91 default:
89 BaseControl::update (pId); 92 BaseControl::update (pId);
90 break; 93 break;
91 } 94 }
92 } 95 }
93 96
94 void ButtonControl::toggled (bool checked) 97 void
98 ButtonControl::toggled (bool checked)
95 { 99 {
96 QAbstractButton* btn = qWidget<QAbstractButton> (); 100 QAbstractButton* btn = qWidget<QAbstractButton> ();
97 101
98 if (! m_blockCallback && btn->isCheckable ()) 102 if (! m_blockCallback && btn->isCheckable ())
99 { 103 {
109 gh_manager::post_set (m_handle, "value", newValue, false); 113 gh_manager::post_set (m_handle, "value", newValue, false);
110 gh_manager::post_callback (m_handle, "callback"); 114 gh_manager::post_callback (m_handle, "callback");
111 } 115 }
112 } 116 }
113 117
114 void ButtonControl::clicked (void) 118 void
119 ButtonControl::clicked (void)
115 { 120 {
116 QAbstractButton* btn = qWidget<QAbstractButton> (); 121 QAbstractButton* btn = qWidget<QAbstractButton> ();
117 122
118 if (! btn->isCheckable ()) 123 if (! btn->isCheckable ())
119 gh_manager::post_callback (m_handle, "callback"); 124 gh_manager::post_callback (m_handle, "callback");