summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/taskbar.cpp119
-rw-r--r--core/launcher/taskbar.h2
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
@@ -55,31 +55,4 @@ using namespace Opie;
-#define FACTORY(T) \
- static QWidget *new##T( bool maximized ) { \
- QWidget *w = new T( 0, "test", QWidget::WDestructiveClose | QWidget::WGroupLeader ); \
- if ( maximized ) { \
- if ( qApp->desktop()->width() <= 350 ) { \
- w->showMaximized(); \
- } else { \
- w->resize( QSize( 300, 300 ) ); \
- } \
- } \
- w->show(); \
- return w; \
- }
-
-
-#ifdef SINGLE_APP
-#define APP(a,b,c,d) FACTORY(b)
-#include "../launcher/apps.h"
-#undef APP
-#endif // SINGLE_APP
-
static Global::Command builtins[] = {
-#ifdef SINGLE_APP
-#define APP(a,b,c,d) { a, new##b, c },
-#include "../launcher/apps.h"
-#undef APP
-#endif
-
#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX)
@@ -153,3 +126,2 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
this, SLOT(calcMaxWindowRect()) );
- //new QuickLauncher( this );
@@ -159,5 +131,2 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
- //mru = new MRUList( stack );
- //stack->raiseWidget( mru );
-
runningAppBar = new RunningAppBar(stack);
@@ -264,44 +233,46 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
{
- QDataStream stream( data, IO_ReadOnly );
- if ( msg == "message(QString)" ) {
- QString text;
- stream >> text;
- setStatusMessage( text );
- } else if ( msg == "hideInputMethod()" ) {
- inputMethods->hideInputMethod();
- } else if ( msg == "showInputMethod()" ) {
- inputMethods->showInputMethod();
- } else if ( msg == "reloadInputMethods()" ) {
- inputMethods->loadInputMethods();
- } else if ( msg == "reloadApps()" ) {
- sm->reloadApps();
- } else if ( msg == "reloadApplets()" ) {
- sysTray->clearApplets();
- sysTray->addApplets();
- sm->reloadApplets();
- } else if ( msg == "soundAlarm()" ) {
- DesktopApplication::soundAlarm ( );
- }
- else if ( msg == "setLed(int,bool)" ) {
- int led, status;
- stream >> led >> status;
-
- QValueList <OLed> ll = ODevice::inst ( )-> ledList ( );
- if ( ll. count ( )) {
- OLed l = ll. contains ( Led_Mail ) ? Led_Mail : ll [0];
- bool canblink = ODevice::inst ( )-> ledStateList ( l ). contains ( Led_BlinkSlow );
-
- ODevice::inst ( )-> setLedState ( l, status ? ( canblink ? Led_BlinkSlow : Led_On ) : Led_Off );
- }
- }
- else if ( msg == "toggleMenu()" ) {
- if ( sm-> launchMenu-> isVisible ( ))
- sm-> launch ( );
- else {
- QCopEnvelope e ( "QPE/System", "toggleApplicationMenu()" );
- }
- }
- else if ( msg == "toggleStartMenu()" ) {
- sm-> launch ( );
- }
+ QDataStream stream( data, IO_ReadOnly );
+ if ( msg == "message(QString)" ) {
+ QString text;
+ stream >> text;
+ setStatusMessage( text );
+ } else if ( msg == "hideInputMethod()" ) {
+ inputMethods->hideInputMethod();
+ } else if ( msg == "showInputMethod()" ) {
+ inputMethods->showInputMethod();
+ } else if ( msg == "reloadInputMethods()" ) {
+ inputMethods->loadInputMethods();
+ } else if ( msg == "toggleInputMethod()" ) {
+ inputMethods->shown() ? inputMethods->hideInputMethod() : inputMethods->showInputMethod();
+ } else if ( msg == "reloadApps()" ) {
+ sm->reloadApps();
+ } else if ( msg == "reloadApplets()" ) {
+ sysTray->clearApplets();
+ sysTray->addApplets();
+ sm->reloadApplets();
+ } else if ( msg == "soundAlarm()" ) {
+ DesktopApplication::soundAlarm ( );
+ }
+ else if ( msg == "setLed(int,bool)" ) {
+ int led, status;
+ stream >> led >> status;
+
+ QValueList <OLed> ll = ODevice::inst ( )-> ledList ( );
+ if ( ll. count ( )) {
+ OLed l = ll. contains ( Led_Mail ) ? Led_Mail : ll [0];
+ bool canblink = ODevice::inst ( )-> ledStateList ( l ). contains ( Led_BlinkSlow );
+
+ ODevice::inst ( )-> setLedState ( l, status ? ( canblink ? Led_BlinkSlow : Led_On ) : Led_Off );
+ }
+ }
+ else if ( msg == "toggleMenu()" ) {
+ if ( sm-> launchMenu-> isVisible ( ))
+ sm-> launch ( );
+ else {
+ QCopEnvelope e ( "QPE/System", "toggleApplicationMenu()" );
+ }
+ }
+ else if ( msg == "toggleStartMenu()" ) {
+ sm-> launch ( );
+ }
}
@@ -340,3 +311,3 @@ bool TaskBar::recoverMemory()
{
- //eturn mru->quitOldApps();
+ //mru->quitOldApps() is no longer supported
return true;
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
@@ -30,3 +30,2 @@ class Wait;
class SysTray;
-//class MRUList;
class RunningAppBar;
@@ -74,3 +73,2 @@ private:
SysTray *sysTray;
- // MRUList *mru;
RunningAppBar* runningAppBar;