author | sandman <sandman> | 2002-10-02 22:06:33 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-02 22:06:33 (UTC) |
commit | b757807635fddb4824eabd87f72c96a0929c5cb1 (patch) (unidiff) | |
tree | 831e4870fe1562507540b386cbcbd1ea93ecb9a8 /core/launcher/taskbar.cpp | |
parent | 2682a282dc87074bdc61d241d5b2d76e8533982c (diff) | |
download | opie-b757807635fddb4824eabd87f72c96a0929c5cb1.zip opie-b757807635fddb4824eabd87f72c96a0929c5cb1.tar.gz opie-b757807635fddb4824eabd87f72c96a0929c5cb1.tar.bz2 |
- Qtopia 1.6 launcher merge (again - should be finished soon)
- Support for O-Menu applets (similiar to Taskbar applets)
-rw-r--r-- | core/launcher/taskbar.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index 46bcdb3..7d1aaf1 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp | |||
@@ -193,2 +193,3 @@ void TaskBar::setStatusMessage( const QString &text ) | |||
193 | { | 193 | { |
194 | if ( !text.isEmpty() ) { | ||
194 | label->setText( text ); | 195 | label->setText( text ); |
@@ -197,3 +198,6 @@ void TaskBar::setStatusMessage( const QString &text ) | |||
197 | sysTray->hide(); | 198 | sysTray->hide(); |
198 | clearer->start( 3000 ); | 199 | clearer->start( 3000, TRUE ); |
200 | } else { | ||
201 | clearStatusBar(); | ||
202 | } | ||
199 | } | 203 | } |
@@ -214,3 +218,3 @@ void TaskBar::startWait() | |||
214 | 218 | ||
215 | void TaskBar::stopWait(const QString& app) | 219 | void TaskBar::stopWait(const QString& /*app*/) |
216 | { | 220 | { |
@@ -275,2 +279,4 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data ) | |||
275 | inputMethods->loadInputMethods(); | 279 | inputMethods->loadInputMethods(); |
280 | } else if ( msg == "reloadApps()" ) { | ||
281 | sm->reloadApps(); | ||
276 | } else if ( msg == "reloadApplets()" ) { | 282 | } else if ( msg == "reloadApplets()" ) { |
@@ -278,2 +284,3 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data ) | |||
278 | sysTray->addApplets(); | 284 | sysTray->addApplets(); |
285 | sm->reloadApplets(); | ||
279 | } else if ( msg == "soundAlarm()" ) { | 286 | } else if ( msg == "soundAlarm()" ) { |