-rw-r--r-- | core/launcher/taskbar.cpp | 19 |
1 files changed, 13 insertions, 6 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 | |||
@@ -192,9 +192,13 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn | |||
192 | void TaskBar::setStatusMessage( const QString &text ) | 192 | void TaskBar::setStatusMessage( const QString &text ) |
193 | { | 193 | { |
194 | label->setText( text ); | 194 | if ( !text.isEmpty() ) { |
195 | stack->raiseWidget( label ); | 195 | label->setText( text ); |
196 | if ( sysTray && ( label->fontMetrics().width( text ) > label->width() ) ) | 196 | stack->raiseWidget( label ); |
197 | sysTray->hide(); | 197 | if ( sysTray && ( label->fontMetrics().width( text ) > label->width() ) ) |
198 | clearer->start( 3000 ); | 198 | sysTray->hide(); |
199 | clearer->start( 3000, TRUE ); | ||
200 | } else { | ||
201 | clearStatusBar(); | ||
202 | } | ||
199 | } | 203 | } |
200 | 204 | ||
@@ -213,5 +217,5 @@ void TaskBar::startWait() | |||
213 | } | 217 | } |
214 | 218 | ||
215 | void TaskBar::stopWait(const QString& app) | 219 | void TaskBar::stopWait(const QString& /*app*/) |
216 | { | 220 | { |
217 | waitTimer->stop(); | 221 | waitTimer->stop(); |
@@ -274,7 +278,10 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data ) | |||
274 | } else if ( msg == "reloadInputMethods()" ) { | 278 | } else if ( msg == "reloadInputMethods()" ) { |
275 | inputMethods->loadInputMethods(); | 279 | inputMethods->loadInputMethods(); |
280 | } else if ( msg == "reloadApps()" ) { | ||
281 | sm->reloadApps(); | ||
276 | } else if ( msg == "reloadApplets()" ) { | 282 | } else if ( msg == "reloadApplets()" ) { |
277 | sysTray->clearApplets(); | 283 | sysTray->clearApplets(); |
278 | sysTray->addApplets(); | 284 | sysTray->addApplets(); |
285 | sm->reloadApplets(); | ||
279 | } else if ( msg == "soundAlarm()" ) { | 286 | } else if ( msg == "soundAlarm()" ) { |
280 | Desktop::soundAlarm(); | 287 | Desktop::soundAlarm(); |