1 files changed, 14 insertions, 7 deletions

diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index e38b9fe..9f397eb 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -12,24 +12,25 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 *********************************************************************/
 
 #include "startmenu.h"
 #include "inputmethods.h"
 #include "mrulist.h"
+#include "runningappbar.h"
 #include "systray.h"
 #include "calibrate.h"
 #include "wait.h"
 #include "appicons.h"
 
 #include "taskbar.h"
 #include "desktop.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 
@@ -146,36 +147,39 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
 
     sm = new StartMenu( this );
 
     inputMethods = new InputMethods( this );
     connect( inputMethods, SIGNAL(inputToggled(bool)),
        this, SLOT(calcMaxWindowRect()) );
     //new QuickLauncher( this );
 
     stack = new QWidgetStack( this );
     stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
     label = new QLabel(stack);
 
-    mru = new MRUList( stack );
-    stack->raiseWidget( mru );
+    //mru = new MRUList( stack );
+    //stack->raiseWidget( mru );
+
+    runningAppBar = new RunningAppBar(stack);
+    stack->raiseWidget(runningAppBar);
 
     waitIcon = new Wait( this );
     (void) new AppIcons( this );
 
     sysTray = new SysTray( this );
 
     // ## make customizable in some way?
 #ifdef QT_QWS_CUSTOM
     lockState = new LockKeyState( this );
-#else
+y#else
     lockState = 0;
 #endif
 
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     QCopChannel *channel = new QCopChannel( "QPE/TaskBar", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
   this, SLOT(receive(const QCString&, const QByteArray&)) );
 #endif
 #endif
     waitTimer = new QTimer( this );
     connect( waitTimer, SIGNAL( timeout() ), this, SLOT( stopWait() ) );
@@ -187,44 +191,46 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
 void TaskBar::setStatusMessage( const QString &text )
 {
     label->setText( text );
     stack->raiseWidget( label );
     if ( sysTray && ( label->fontMetrics().width( text ) > label->width() ) )
   sysTray->hide();
     clearer->start( 3000 );
 }
 
 void TaskBar::clearStatusBar()
 {
     label->clear();
-    stack->raiseWidget( mru );
+    stack->raiseWidget(runningAppBar);
+     //  stack->raiseWidget( mru );
 }
 
 void TaskBar::startWait()
 {
     waitIcon->setWaiting( true );
     // a catchall stop after 10 seconds...
     waitTimer->start( 10 * 1000, true );
 }
 
 void TaskBar::stopWait(const QString& app)
 {
     waitTimer->stop();
-    mru->addTask(sm->execToLink(app));
+    //mru->addTask(sm->execToLink(app));
     waitIcon->setWaiting( false );
 }
 
 void TaskBar::stopWait()
 {
     waitTimer->stop();
+
     waitIcon->setWaiting( false );
 }
 
 void TaskBar::resizeEvent( QResizeEvent *e )
 {
     QHBox::resizeEvent( e );
     calcMaxWindowRect();
 }
 
 void TaskBar::styleChange( QStyle &s )
 {
     QHBox::styleChange( s );
@@ -265,25 +271,25 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
 	} else if ( msg == "showInputMethod()" ) {
 		inputMethods->showInputMethod();
 	} else if ( msg == "reloadInputMethods()" ) {
 		inputMethods->loadInputMethods();
 	} else if ( msg == "reloadApplets()" ) {
 		sysTray->loadApplets();
 	} else if ( msg == "soundAlarm()" ) {
 		Desktop::soundAlarm();
 	}
 	else if ( msg == "setLed(int,bool)" ) {
 		int led, status;
 		stream >> led >> status;
-		
+
 		ODevice::inst ( )-> setLed ( led, status ? OLED_BlinkSlow : OLED_Off );
 	}
 }
 
 QWidget *TaskBar::calibrate(bool)
 {
 #ifdef Q_WS_QWS
     Calibrate *c = new Calibrate;
     c->show();
     return c;
 #else
     return 0;
@@ -302,15 +308,16 @@ void TaskBar::toggleCapsLockState()
 
 void TaskBar::toggleSymbolInput()
 {
     if ( inputMethods->currentShown() == "Unicode" ) {
   inputMethods->hideInputMethod();
     } else {
   inputMethods->showInputMethod("Unicode");
     }
 }
 
 bool TaskBar::recoverMemory()
 {
-    return mru->quitOldApps();
+    //eturn mru->quitOldApps();
+    return true;
 }