Mercurial > octave-nkf

comparison libgui/graphics/ToolBar.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 2f4406e9dad6
children f0e61a67ad9f
comparison
equal deleted inserted replaced
20001:40b2c4323c16 20002:3cc0734283dc
39 #include "QtHandlesUtils.h" 39 #include "QtHandlesUtils.h"
40 40
41 namespace QtHandles 41 namespace QtHandles
42 { 42 {
43 43
44 static QAction* addEmptyAction (QToolBar* bar) 44 static QAction*
45 addEmptyAction (QToolBar* bar)
45 { 46 {
46 static QIcon _empty; 47 static QIcon _empty;
47 48
48 if (_empty.isNull ()) 49 if (_empty.isNull ())
49 { 50 {
60 a->setToolTip (""); 61 a->setToolTip ("");
61 62
62 return a; 63 return a;
63 } 64 }
64 65
65 ToolBar* ToolBar::create (const graphics_object& go) 66 ToolBar*
67 ToolBar::create (const graphics_object& go)
66 { 68 {
67 Object* parent = Object::parentObject (go); 69 Object* parent = Object::parentObject (go);
68 70
69 if (parent) 71 if (parent)
70 { 72 {
76 78
77 return 0; 79 return 0;
78 } 80 }
79 81
80 ToolBar::ToolBar (const graphics_object& go, QToolBar* bar) 82 ToolBar::ToolBar (const graphics_object& go, QToolBar* bar)
81 : Object (go, bar), m_empty (0), m_figure (0) 83 : Object (go, bar), m_empty (0), m_figure (0)
82 { 84 {
83 uitoolbar::properties& tp = properties<uitoolbar> (); 85 uitoolbar::properties& tp = properties<uitoolbar> ();
84 86
85 bar->setFloatable (false); 87 bar->setFloatable (false);
86 bar->setMovable (false); 88 bar->setMovable (false);
99 101
100 ToolBar::~ToolBar (void) 102 ToolBar::~ToolBar (void)
101 { 103 {
102 } 104 }
103 105
104 void ToolBar::update (int pId) 106 void
107 ToolBar::update (int pId)
105 { 108 {
106 uitoolbar::properties& tp = properties<uitoolbar> (); 109 uitoolbar::properties& tp = properties<uitoolbar> ();
107 QToolBar* bar = qWidget<QToolBar> (); 110 QToolBar* bar = qWidget<QToolBar> ();
108 111
109 switch (pId) 112 switch (pId)
110 { 113 {
111 case base_properties::ID_VISIBLE: 114 case base_properties::ID_VISIBLE:
112 if (m_figure) 115 if (m_figure)
113 m_figure->showCustomToolBar (bar, tp.is_visible ()); 116 m_figure->showCustomToolBar (bar, tp.is_visible ());
114 break; 117 break;
118
115 default: 119 default:
116 Object::update (pId); 120 Object::update (pId);
117 break; 121 break;
118 } 122 }
119 } 123 }
120 124
121 bool ToolBar::eventFilter (QObject* watched, QEvent* xevent) 125 bool
126 ToolBar::eventFilter (QObject* watched, QEvent* xevent)
122 { 127 {
123 if (watched == qObject ()) 128 if (watched == qObject ())
124 { 129 {
125 switch (xevent->type ()) 130 switch (xevent->type ())
126 { 131 {
143 m_empty->setVisible (true); 148 m_empty->setVisible (true);
144 } 149 }
145 } 150 }
146 } 151 }
147 break; 152 break;
153
148 default: 154 default:
149 break; 155 break;
150 } 156 }
151 } 157 }
152 158
153 return false; 159 return false;
154 } 160 }
155 161
156 void ToolBar::hideEmpty (void) 162 void
163 ToolBar::hideEmpty (void)
157 { 164 {
158 m_empty->setVisible (false); 165 m_empty->setVisible (false);
159 } 166 }
160 167
161 void ToolBar::beingDeleted (void) 168 void
169 ToolBar::beingDeleted (void)
162 { 170 {
163 if (m_figure) 171 if (m_figure)
164 { 172 {
165 QToolBar* bar = qWidget<QToolBar> (); 173 QToolBar* bar = qWidget<QToolBar> ();
166 174