author | harlekin <harlekin> | 2002-09-09 18:28:50 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-09 18:28:50 (UTC) |
commit | 8ef3adf9504f27df8bf0e057221704b1ee077dc8 (patch) (side-by-side diff) | |
tree | 98987fc4789abb6d26293eca56e80ca938320640 | |
parent | c9442bf567252553da8ce216de1e64cbf70db3bd (diff) | |
download | opie-8ef3adf9504f27df8bf0e057221704b1ee077dc8.zip opie-8ef3adf9504f27df8bf0e057221704b1ee077dc8.tar.gz opie-8ef3adf9504f27df8bf0e057221704b1ee077dc8.tar.bz2 |
next time i will also compile it for ipaq too before commiting so i also see compile problems in ipaq ifdefs .-)
-rw-r--r-- | core/launcher/taskbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index 9f397eb..988d072 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp @@ -141,65 +141,65 @@ TaskBar::~TaskBar() } TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOnTop | WGroupLeader) { Global::setBuiltinCommands(builtins); 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 ); 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 ); -y#else +#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() ) ); clearer = new QTimer( this ); QObject::connect(clearer, SIGNAL(timeout()), SLOT(clearStatusBar())); QObject::connect(clearer, SIGNAL(timeout()), sysTray, SLOT(show())); } 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(runningAppBar); // stack->raiseWidget( mru ); } |