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 /core/launcher/taskbar.cpp | |
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 | 35 |
1 files changed, 3 insertions, 32 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 | |||
@@ -53,35 +53,8 @@ | |||
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 |
@@ -151,15 +124,11 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn | |||
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 | ||
@@ -273,6 +242,8 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data ) | |||
273 | inputMethods->showInputMethod(); | 242 | inputMethods->showInputMethod(); |
274 | } else if ( msg == "reloadInputMethods()" ) { | 243 | } else if ( msg == "reloadInputMethods()" ) { |
275 | inputMethods->loadInputMethods(); | 244 | inputMethods->loadInputMethods(); |
245 | } else if ( msg == "toggleInputMethod()" ) { | ||
246 | inputMethods->shown() ? inputMethods->hideInputMethod() : inputMethods->showInputMethod(); | ||
276 | } else if ( msg == "reloadApps()" ) { | 247 | } else if ( msg == "reloadApps()" ) { |
277 | sm->reloadApps(); | 248 | sm->reloadApps(); |
278 | } else if ( msg == "reloadApplets()" ) { | 249 | } else if ( msg == "reloadApplets()" ) { |
@@ -338,7 +309,7 @@ void TaskBar::toggleSymbolInput() | |||
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 | ||