summaryrefslogtreecommitdiff
path: root/core/launcher/taskbar.cpp
Side-by-side diff
Diffstat (limited to 'core/launcher/taskbar.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/taskbar.cpp19
1 files changed, 13 insertions, 6 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
@@ -18,12 +18,13 @@
**
*********************************************************************/
#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"
@@ -152,24 +153,27 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
//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 );
@@ -193,32 +197,34 @@ void TaskBar::setStatusMessage( const QString &text )
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 );
@@ -308,9 +314,10 @@ void TaskBar::toggleSymbolInput()
inputMethods->showInputMethod("Unicode");
}
}
bool TaskBar::recoverMemory()
{
- return mru->quitOldApps();
+ //eturn mru->quitOldApps();
+ return true;
}