author | mickeyl <mickeyl> | 2003-05-19 13:56:38 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-05-19 13:56:38 (UTC) |
commit | 75d4ec5369e4c5d64e3becaa2a31dd78a5f8f998 (patch) (unidiff) | |
tree | be80eb3ee447deab179dbc6ceb7ecbf04f77f5df | |
parent | 250291019cac863e50ffce981a9c93b627448253 (diff) | |
download | opie-75d4ec5369e4c5d64e3becaa2a31dd78a5f8f998.zip opie-75d4ec5369e4c5d64e3becaa2a31dd78a5f8f998.tar.gz opie-75d4ec5369e4c5d64e3becaa2a31dd78a5f8f998.tar.bz2 |
- remove dangling SINGLE_APP support leftovers
- add new QCOP message toggleInputMethod() which is especially interesting for the use with opie-buttonsettings
-rw-r--r-- | core/launcher/taskbar.cpp | 119 | ||||
-rw-r--r-- | core/launcher/taskbar.h | 2 |
2 files changed, 45 insertions, 76 deletions
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index 8af568d..feeba79 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp | |||
@@ -8,203 +8,172 @@ | |||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | *********************************************************************/ | 19 | *********************************************************************/ |
20 | 20 | ||
21 | #include "startmenu.h" | 21 | #include "startmenu.h" |
22 | #include "inputmethods.h" | 22 | #include "inputmethods.h" |
23 | #include "runningappbar.h" | 23 | #include "runningappbar.h" |
24 | #include "systray.h" | 24 | #include "systray.h" |
25 | #include "calibrate.h" | 25 | #include "calibrate.h" |
26 | #include "wait.h" | 26 | #include "wait.h" |
27 | #include "appicons.h" | 27 | #include "appicons.h" |
28 | 28 | ||
29 | #include "taskbar.h" | 29 | #include "taskbar.h" |
30 | #include "desktop.h" | 30 | #include "desktop.h" |
31 | 31 | ||
32 | #include <qpe/qpeapplication.h> | 32 | #include <qpe/qpeapplication.h> |
33 | #include <qpe/qcopenvelope_qws.h> | 33 | #include <qpe/qcopenvelope_qws.h> |
34 | #include <qpe/global.h> | 34 | #include <qpe/global.h> |
35 | 35 | ||
36 | #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) | 36 | #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) |
37 | #include <qpe/custom.h> | 37 | #include <qpe/custom.h> |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | #include <opie/odevice.h> | 40 | #include <opie/odevice.h> |
41 | 41 | ||
42 | #include <qlabel.h> | 42 | #include <qlabel.h> |
43 | #include <qlayout.h> | 43 | #include <qlayout.h> |
44 | #include <qtimer.h> | 44 | #include <qtimer.h> |
45 | #include <qwindowsystem_qws.h> | 45 | #include <qwindowsystem_qws.h> |
46 | #include <qwidgetstack.h> | 46 | #include <qwidgetstack.h> |
47 | 47 | ||
48 | #if defined( Q_WS_QWS ) | 48 | #if defined( Q_WS_QWS ) |
49 | #include <qwsdisplay_qws.h> | 49 | #include <qwsdisplay_qws.h> |
50 | #include <qgfx_qws.h> | 50 | #include <qgfx_qws.h> |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | 53 | ||
54 | using namespace Opie; | 54 | using namespace Opie; |
55 | 55 | ||
56 | #define FACTORY(T) \ | ||
57 | static QWidget *new##T( bool maximized ) { \ | ||
58 | QWidget *w = new T( 0, "test", QWidget::WDestructiveClose | QWidget::WGroupLeader ); \ | ||
59 | if ( maximized ) { \ | ||
60 | if ( qApp->desktop()->width() <= 350 ) { \ | ||
61 | w->showMaximized(); \ | ||
62 | } else { \ | ||
63 | w->resize( QSize( 300, 300 ) ); \ | ||
64 | } \ | ||
65 | } \ | ||
66 | w->show(); \ | ||
67 | return w; \ | ||
68 | } | ||
69 | |||
70 | |||
71 | #ifdef SINGLE_APP | ||
72 | #define APP(a,b,c,d) FACTORY(b) | ||
73 | #include "../launcher/apps.h" | ||
74 | #undef APP | ||
75 | #endif // SINGLE_APP | ||
76 | |||
77 | static Global::Command builtins[] = { | 56 | static Global::Command builtins[] = { |
78 | 57 | ||
79 | #ifdef SINGLE_APP | ||
80 | #define APP(a,b,c,d) { a, new##b, c }, | ||
81 | #include "../launcher/apps.h" | ||
82 | #undef APP | ||
83 | #endif | ||
84 | |||
85 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) | 58 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) |
86 | { "calibrate", TaskBar::calibrate, 1, 0 }, | 59 | { "calibrate", TaskBar::calibrate, 1, 0 }, |
87 | #endif | 60 | #endif |
88 | #if !defined(QT_QWS_CASSIOPEIA) | 61 | #if !defined(QT_QWS_CASSIOPEIA) |
89 | { "shutdown", Global::shutdown, 1, 0 }, | 62 | { "shutdown", Global::shutdown, 1, 0 }, |
90 | // { "run", run, 1, 0 }, | 63 | // { "run", run, 1, 0 }, |
91 | #endif | 64 | #endif |
92 | 65 | ||
93 | { 0, TaskBar::calibrate, 0, 0 }, | 66 | { 0, TaskBar::calibrate, 0, 0 }, |
94 | }; | 67 | }; |
95 | 68 | ||
96 | static bool initNumLock() | 69 | static bool initNumLock() |
97 | { | 70 | { |
98 | #ifdef QPE_INITIAL_NUMLOCK_STATE | 71 | #ifdef QPE_INITIAL_NUMLOCK_STATE |
99 | QPE_INITIAL_NUMLOCK_STATE | 72 | QPE_INITIAL_NUMLOCK_STATE |
100 | #endif | 73 | #endif |
101 | return FALSE; | 74 | return FALSE; |
102 | } | 75 | } |
103 | 76 | ||
104 | class LockKeyState : public QWidget | 77 | class LockKeyState : public QWidget |
105 | { | 78 | { |
106 | public: | 79 | public: |
107 | LockKeyState( QWidget *parent ) : | 80 | LockKeyState( QWidget *parent ) : |
108 | QWidget(parent), | 81 | QWidget(parent), |
109 | nl(initNumLock()), cl(FALSE) | 82 | nl(initNumLock()), cl(FALSE) |
110 | { | 83 | { |
111 | nl_pm = Resource::loadPixmap("numlock"); | 84 | nl_pm = Resource::loadPixmap("numlock"); |
112 | cl_pm = Resource::loadPixmap("capslock"); | 85 | cl_pm = Resource::loadPixmap("capslock"); |
113 | } | 86 | } |
114 | QSize sizeHint() const | 87 | QSize sizeHint() const |
115 | { | 88 | { |
116 | return QSize(nl_pm.width()+2,nl_pm.width()+nl_pm.height()+1); | 89 | return QSize(nl_pm.width()+2,nl_pm.width()+nl_pm.height()+1); |
117 | } | 90 | } |
118 | void toggleNumLockState() | 91 | void toggleNumLockState() |
119 | { | 92 | { |
120 | nl = !nl; repaint(); | 93 | nl = !nl; repaint(); |
121 | } | 94 | } |
122 | void toggleCapsLockState() | 95 | void toggleCapsLockState() |
123 | { | 96 | { |
124 | cl = !cl; repaint(); | 97 | cl = !cl; repaint(); |
125 | } | 98 | } |
126 | void paintEvent( QPaintEvent * ) | 99 | void paintEvent( QPaintEvent * ) |
127 | { | 100 | { |
128 | int y = (height()-sizeHint().height())/2; | 101 | int y = (height()-sizeHint().height())/2; |
129 | QPainter p(this); | 102 | QPainter p(this); |
130 | if ( nl ) | 103 | if ( nl ) |
131 | p.drawPixmap(1,y,nl_pm); | 104 | p.drawPixmap(1,y,nl_pm); |
132 | if ( cl ) | 105 | if ( cl ) |
133 | p.drawPixmap(1,y+nl_pm.height()+1,cl_pm); | 106 | p.drawPixmap(1,y+nl_pm.height()+1,cl_pm); |
134 | } | 107 | } |
135 | private: | 108 | private: |
136 | QPixmap nl_pm, cl_pm; | 109 | QPixmap nl_pm, cl_pm; |
137 | bool nl, cl; | 110 | bool nl, cl; |
138 | }; | 111 | }; |
139 | 112 | ||
140 | TaskBar::~TaskBar() | 113 | TaskBar::~TaskBar() |
141 | { | 114 | { |
142 | } | 115 | } |
143 | 116 | ||
144 | 117 | ||
145 | TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOnTop | WGroupLeader) | 118 | TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOnTop | WGroupLeader) |
146 | { | 119 | { |
147 | Global::setBuiltinCommands(builtins); | 120 | Global::setBuiltinCommands(builtins); |
148 | 121 | ||
149 | sm = new StartMenu( this ); | 122 | sm = new StartMenu( this ); |
150 | 123 | ||
151 | inputMethods = new InputMethods( this ); | 124 | inputMethods = new InputMethods( this ); |
152 | connect( inputMethods, SIGNAL(inputToggled(bool)), | 125 | connect( inputMethods, SIGNAL(inputToggled(bool)), |
153 | this, SLOT(calcMaxWindowRect()) ); | 126 | this, SLOT(calcMaxWindowRect()) ); |
154 | //new QuickLauncher( this ); | ||
155 | 127 | ||
156 | stack = new QWidgetStack( this ); | 128 | stack = new QWidgetStack( this ); |
157 | stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); | 129 | stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); |
158 | label = new QLabel(stack); | 130 | label = new QLabel(stack); |
159 | 131 | ||
160 | //mru = new MRUList( stack ); | ||
161 | //stack->raiseWidget( mru ); | ||
162 | |||
163 | runningAppBar = new RunningAppBar(stack); | 132 | runningAppBar = new RunningAppBar(stack); |
164 | stack->raiseWidget(runningAppBar); | 133 | stack->raiseWidget(runningAppBar); |
165 | 134 | ||
166 | waitIcon = new Wait( this ); | 135 | waitIcon = new Wait( this ); |
167 | (void) new AppIcons( this ); | 136 | (void) new AppIcons( this ); |
168 | 137 | ||
169 | sysTray = new SysTray( this ); | 138 | sysTray = new SysTray( this ); |
170 | 139 | ||
171 | // ## make customizable in some way? | 140 | // ## make customizable in some way? |
172 | lockState = new LockKeyState( this ); | 141 | lockState = new LockKeyState( this ); |
173 | 142 | ||
174 | #if defined(Q_WS_QWS) | 143 | #if defined(Q_WS_QWS) |
175 | #if !defined(QT_NO_COP) | 144 | #if !defined(QT_NO_COP) |
176 | QCopChannel *channel = new QCopChannel( "QPE/TaskBar", this ); | 145 | QCopChannel *channel = new QCopChannel( "QPE/TaskBar", this ); |
177 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | 146 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), |
178 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 147 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
179 | #endif | 148 | #endif |
180 | #endif | 149 | #endif |
181 | waitTimer = new QTimer( this ); | 150 | waitTimer = new QTimer( this ); |
182 | connect( waitTimer, SIGNAL( timeout() ), this, SLOT( stopWait() ) ); | 151 | connect( waitTimer, SIGNAL( timeout() ), this, SLOT( stopWait() ) ); |
183 | clearer = new QTimer( this ); | 152 | clearer = new QTimer( this ); |
184 | QObject::connect(clearer, SIGNAL(timeout()), SLOT(clearStatusBar())); | 153 | QObject::connect(clearer, SIGNAL(timeout()), SLOT(clearStatusBar())); |
185 | QObject::connect(clearer, SIGNAL(timeout()), sysTray, SLOT(show())); | 154 | QObject::connect(clearer, SIGNAL(timeout()), sysTray, SLOT(show())); |
186 | } | 155 | } |
187 | 156 | ||
188 | void TaskBar::setStatusMessage( const QString &text ) | 157 | void TaskBar::setStatusMessage( const QString &text ) |
189 | { | 158 | { |
190 | if ( !text.isEmpty() ) { | 159 | if ( !text.isEmpty() ) { |
191 | label->setText( text ); | 160 | label->setText( text ); |
192 | stack->raiseWidget( label ); | 161 | stack->raiseWidget( label ); |
193 | if ( sysTray && ( label->fontMetrics().width( text ) > label->width() ) ) | 162 | if ( sysTray && ( label->fontMetrics().width( text ) > label->width() ) ) |
194 | sysTray->hide(); | 163 | sysTray->hide(); |
195 | clearer->start( 3000, TRUE ); | 164 | clearer->start( 3000, TRUE ); |
196 | } else { | 165 | } else { |
197 | clearStatusBar(); | 166 | clearStatusBar(); |
198 | } | 167 | } |
199 | } | 168 | } |
200 | 169 | ||
201 | void TaskBar::clearStatusBar() | 170 | void TaskBar::clearStatusBar() |
202 | { | 171 | { |
203 | label->clear(); | 172 | label->clear(); |
204 | stack->raiseWidget(runningAppBar); | 173 | stack->raiseWidget(runningAppBar); |
205 | // stack->raiseWidget( mru ); | 174 | // stack->raiseWidget( mru ); |
206 | } | 175 | } |
207 | 176 | ||
208 | void TaskBar::startWait() | 177 | void TaskBar::startWait() |
209 | { | 178 | { |
210 | waitIcon->setWaiting( true ); | 179 | waitIcon->setWaiting( true ); |
@@ -217,128 +186,130 @@ void TaskBar::stopWait(const QString& /*app*/) | |||
217 | waitTimer->stop(); | 186 | waitTimer->stop(); |
218 | //mru->addTask(sm->execToLink(app)); | 187 | //mru->addTask(sm->execToLink(app)); |
219 | waitIcon->setWaiting( false ); | 188 | waitIcon->setWaiting( false ); |
220 | } | 189 | } |
221 | 190 | ||
222 | void TaskBar::stopWait() | 191 | void TaskBar::stopWait() |
223 | { | 192 | { |
224 | waitTimer->stop(); | 193 | waitTimer->stop(); |
225 | 194 | ||
226 | waitIcon->setWaiting( false ); | 195 | waitIcon->setWaiting( false ); |
227 | } | 196 | } |
228 | 197 | ||
229 | void TaskBar::resizeEvent( QResizeEvent *e ) | 198 | void TaskBar::resizeEvent( QResizeEvent *e ) |
230 | { | 199 | { |
231 | QHBox::resizeEvent( e ); | 200 | QHBox::resizeEvent( e ); |
232 | calcMaxWindowRect(); | 201 | calcMaxWindowRect(); |
233 | } | 202 | } |
234 | 203 | ||
235 | void TaskBar::styleChange( QStyle &s ) | 204 | void TaskBar::styleChange( QStyle &s ) |
236 | { | 205 | { |
237 | QHBox::styleChange( s ); | 206 | QHBox::styleChange( s ); |
238 | calcMaxWindowRect(); | 207 | calcMaxWindowRect(); |
239 | } | 208 | } |
240 | 209 | ||
241 | void TaskBar::calcMaxWindowRect() | 210 | void TaskBar::calcMaxWindowRect() |
242 | { | 211 | { |
243 | #ifdef Q_WS_QWS | 212 | #ifdef Q_WS_QWS |
244 | QRect wr; | 213 | QRect wr; |
245 | int displayWidth = qApp->desktop()->width(); | 214 | int displayWidth = qApp->desktop()->width(); |
246 | QRect ir = inputMethods->inputRect(); | 215 | QRect ir = inputMethods->inputRect(); |
247 | if ( ir.isValid() ) { | 216 | if ( ir.isValid() ) { |
248 | wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 ); | 217 | wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 ); |
249 | } else { | 218 | } else { |
250 | wr.setCoords( 0, 0, displayWidth-1, y()-1 ); | 219 | wr.setCoords( 0, 0, displayWidth-1, y()-1 ); |
251 | } | 220 | } |
252 | 221 | ||
253 | #if QT_VERSION < 300 | 222 | #if QT_VERSION < 300 |
254 | QWSServer::setMaxWindowRect( qt_screen->mapToDevice(wr, | 223 | QWSServer::setMaxWindowRect( qt_screen->mapToDevice(wr, |
255 | QSize(qt_screen->width(),qt_screen->height())) | 224 | QSize(qt_screen->width(),qt_screen->height())) |
256 | ); | 225 | ); |
257 | #else | 226 | #else |
258 | QWSServer::setMaxWindowRect( wr ); | 227 | QWSServer::setMaxWindowRect( wr ); |
259 | #endif | 228 | #endif |
260 | #endif | 229 | #endif |
261 | } | 230 | } |
262 | 231 | ||
263 | void TaskBar::receive( const QCString &msg, const QByteArray &data ) | 232 | void TaskBar::receive( const QCString &msg, const QByteArray &data ) |
264 | { | 233 | { |
265 | QDataStream stream( data, IO_ReadOnly ); | 234 | QDataStream stream( data, IO_ReadOnly ); |
266 | if ( msg == "message(QString)" ) { | 235 | if ( msg == "message(QString)" ) { |
267 | QString text; | 236 | QString text; |
268 | stream >> text; | 237 | stream >> text; |
269 | setStatusMessage( text ); | 238 | setStatusMessage( text ); |
270 | } else if ( msg == "hideInputMethod()" ) { | 239 | } else if ( msg == "hideInputMethod()" ) { |
271 | inputMethods->hideInputMethod(); | 240 | inputMethods->hideInputMethod(); |
272 | } else if ( msg == "showInputMethod()" ) { | 241 | } else if ( msg == "showInputMethod()" ) { |
273 | inputMethods->showInputMethod(); | 242 | inputMethods->showInputMethod(); |
274 | } else if ( msg == "reloadInputMethods()" ) { | 243 | } else if ( msg == "reloadInputMethods()" ) { |
275 | inputMethods->loadInputMethods(); | 244 | inputMethods->loadInputMethods(); |
276 | } else if ( msg == "reloadApps()" ) { | 245 | } else if ( msg == "toggleInputMethod()" ) { |
277 | sm->reloadApps(); | 246 | inputMethods->shown() ? inputMethods->hideInputMethod() : inputMethods->showInputMethod(); |
278 | } else if ( msg == "reloadApplets()" ) { | 247 | } else if ( msg == "reloadApps()" ) { |
279 | sysTray->clearApplets(); | 248 | sm->reloadApps(); |
280 | sysTray->addApplets(); | 249 | } else if ( msg == "reloadApplets()" ) { |
281 | sm->reloadApplets(); | 250 | sysTray->clearApplets(); |
282 | } else if ( msg == "soundAlarm()" ) { | 251 | sysTray->addApplets(); |
283 | DesktopApplication::soundAlarm ( ); | 252 | sm->reloadApplets(); |
284 | } | 253 | } else if ( msg == "soundAlarm()" ) { |
285 | else if ( msg == "setLed(int,bool)" ) { | 254 | DesktopApplication::soundAlarm ( ); |
286 | int led, status; | 255 | } |
287 | stream >> led >> status; | 256 | else if ( msg == "setLed(int,bool)" ) { |
288 | 257 | int led, status; | |
289 | QValueList <OLed> ll = ODevice::inst ( )-> ledList ( ); | 258 | stream >> led >> status; |
290 | if ( ll. count ( )){ | 259 | |
291 | OLed l = ll. contains ( Led_Mail ) ? Led_Mail : ll [0]; | 260 | QValueList <OLed> ll = ODevice::inst ( )-> ledList ( ); |
292 | bool canblink = ODevice::inst ( )-> ledStateList ( l ). contains ( Led_BlinkSlow ); | 261 | if ( ll. count ( )){ |
293 | 262 | OLed l = ll. contains ( Led_Mail ) ? Led_Mail : ll [0]; | |
294 | ODevice::inst ( )-> setLedState ( l, status ? ( canblink ? Led_BlinkSlow : Led_On ) : Led_Off ); | 263 | bool canblink = ODevice::inst ( )-> ledStateList ( l ). contains ( Led_BlinkSlow ); |
295 | } | 264 | |
296 | } | 265 | ODevice::inst ( )-> setLedState ( l, status ? ( canblink ? Led_BlinkSlow : Led_On ) : Led_Off ); |
297 | else if ( msg == "toggleMenu()" ) { | 266 | } |
298 | if ( sm-> launchMenu-> isVisible ( )) | 267 | } |
299 | sm-> launch ( ); | 268 | else if ( msg == "toggleMenu()" ) { |
300 | else { | 269 | if ( sm-> launchMenu-> isVisible ( )) |
301 | QCopEnvelope e ( "QPE/System", "toggleApplicationMenu()" ); | 270 | sm-> launch ( ); |
302 | } | 271 | else { |
303 | } | 272 | QCopEnvelope e ( "QPE/System", "toggleApplicationMenu()" ); |
304 | else if ( msg == "toggleStartMenu()" ) { | 273 | } |
305 | sm-> launch ( ); | 274 | } |
306 | } | 275 | else if ( msg == "toggleStartMenu()" ) { |
276 | sm-> launch ( ); | ||
277 | } | ||
307 | } | 278 | } |
308 | 279 | ||
309 | QWidget *TaskBar::calibrate(bool) | 280 | QWidget *TaskBar::calibrate(bool) |
310 | { | 281 | { |
311 | #ifdef Q_WS_QWS | 282 | #ifdef Q_WS_QWS |
312 | Calibrate *c = new Calibrate; | 283 | Calibrate *c = new Calibrate; |
313 | c->show(); | 284 | c->show(); |
314 | return c; | 285 | return c; |
315 | #else | 286 | #else |
316 | return 0; | 287 | return 0; |
317 | #endif | 288 | #endif |
318 | } | 289 | } |
319 | 290 | ||
320 | void TaskBar::toggleNumLockState() | 291 | void TaskBar::toggleNumLockState() |
321 | { | 292 | { |
322 | if ( lockState ) lockState->toggleNumLockState(); | 293 | if ( lockState ) lockState->toggleNumLockState(); |
323 | } | 294 | } |
324 | 295 | ||
325 | void TaskBar::toggleCapsLockState() | 296 | void TaskBar::toggleCapsLockState() |
326 | { | 297 | { |
327 | if ( lockState ) lockState->toggleCapsLockState(); | 298 | if ( lockState ) lockState->toggleCapsLockState(); |
328 | } | 299 | } |
329 | 300 | ||
330 | void TaskBar::toggleSymbolInput() | 301 | void TaskBar::toggleSymbolInput() |
331 | { | 302 | { |
332 | if ( inputMethods->currentShown() == "Unicode" ) { | 303 | if ( inputMethods->currentShown() == "Unicode" ) { |
333 | inputMethods->hideInputMethod(); | 304 | inputMethods->hideInputMethod(); |
334 | } else { | 305 | } else { |
335 | inputMethods->showInputMethod("Unicode"); | 306 | inputMethods->showInputMethod("Unicode"); |
336 | } | 307 | } |
337 | } | 308 | } |
338 | 309 | ||
339 | bool TaskBar::recoverMemory() | 310 | bool TaskBar::recoverMemory() |
340 | { | 311 | { |
341 | //eturn mru->quitOldApps(); | 312 | //mru->quitOldApps() is no longer supported |
342 | return true; | 313 | return true; |
343 | } | 314 | } |
344 | 315 | ||
diff --git a/core/launcher/taskbar.h b/core/launcher/taskbar.h index a0bf395..0cfc123 100644 --- a/core/launcher/taskbar.h +++ b/core/launcher/taskbar.h | |||
@@ -1,85 +1,83 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #ifndef __TASKBAR_H__ | 21 | #ifndef __TASKBAR_H__ |
22 | #define __TASKBAR_H__ | 22 | #define __TASKBAR_H__ |
23 | 23 | ||
24 | #include <qhbox.h> | 24 | #include <qhbox.h> |
25 | 25 | ||
26 | class QLabel; | 26 | class QLabel; |
27 | class QTimer; | 27 | class QTimer; |
28 | class InputMethods; | 28 | class InputMethods; |
29 | class Wait; | 29 | class Wait; |
30 | class SysTray; | 30 | class SysTray; |
31 | //class MRUList; | ||
32 | class RunningAppBar; | 31 | class RunningAppBar; |
33 | class QWidgetStack; | 32 | class QWidgetStack; |
34 | class QTimer; | 33 | class QTimer; |
35 | class QLabel; | 34 | class QLabel; |
36 | class StartMenu; | 35 | class StartMenu; |
37 | class LockKeyState; | 36 | class LockKeyState; |
38 | 37 | ||
39 | class TaskBar : public QHBox { | 38 | class TaskBar : public QHBox { |
40 | Q_OBJECT | 39 | Q_OBJECT |
41 | public: | 40 | public: |
42 | TaskBar(); | 41 | TaskBar(); |
43 | ~TaskBar(); | 42 | ~TaskBar(); |
44 | 43 | ||
45 | static QWidget *calibrate( bool ); | 44 | static QWidget *calibrate( bool ); |
46 | 45 | ||
47 | bool recoverMemory(); | 46 | bool recoverMemory(); |
48 | 47 | ||
49 | StartMenu *startMenu() const { return sm; } | 48 | StartMenu *startMenu() const { return sm; } |
50 | public slots: | 49 | public slots: |
51 | void startWait(); | 50 | void startWait(); |
52 | void stopWait(const QString&); | 51 | void stopWait(const QString&); |
53 | void stopWait(); | 52 | void stopWait(); |
54 | void clearStatusBar(); | 53 | void clearStatusBar(); |
55 | void toggleNumLockState(); | 54 | void toggleNumLockState(); |
56 | void toggleCapsLockState(); | 55 | void toggleCapsLockState(); |
57 | void toggleSymbolInput(); | 56 | void toggleSymbolInput(); |
58 | 57 | ||
59 | protected: | 58 | protected: |
60 | void resizeEvent( QResizeEvent * ); | 59 | void resizeEvent( QResizeEvent * ); |
61 | void styleChange( QStyle & ); | 60 | void styleChange( QStyle & ); |
62 | void setStatusMessage( const QString &text ); | 61 | void setStatusMessage( const QString &text ); |
63 | 62 | ||
64 | public slots: | 63 | public slots: |
65 | void calcMaxWindowRect(); | 64 | void calcMaxWindowRect(); |
66 | private slots: | 65 | private slots: |
67 | void receive( const QCString &msg, const QByteArray &data ); | 66 | void receive( const QCString &msg, const QByteArray &data ); |
68 | 67 | ||
69 | private: | 68 | private: |
70 | 69 | ||
71 | QTimer *waitTimer; | 70 | QTimer *waitTimer; |
72 | Wait *waitIcon; | 71 | Wait *waitIcon; |
73 | InputMethods *inputMethods; | 72 | InputMethods *inputMethods; |
74 | SysTray *sysTray; | 73 | SysTray *sysTray; |
75 | // MRUList *mru; | ||
76 | RunningAppBar* runningAppBar; | 74 | RunningAppBar* runningAppBar; |
77 | QWidgetStack *stack; | 75 | QWidgetStack *stack; |
78 | QTimer *clearer; | 76 | QTimer *clearer; |
79 | QLabel *label; | 77 | QLabel *label; |
80 | LockKeyState* lockState; | 78 | LockKeyState* lockState; |
81 | StartMenu *sm; | 79 | StartMenu *sm; |
82 | }; | 80 | }; |
83 | 81 | ||
84 | 82 | ||
85 | #endif // __TASKBAR_H__ | 83 | #endif // __TASKBAR_H__ |