summaryrefslogtreecommitdiff
path: root/core
Unidiff
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp18
-rw-r--r--core/launcher/desktop.h2
-rw-r--r--core/launcher/startmenu.cpp304
-rw-r--r--core/launcher/startmenu.h31
-rw-r--r--core/launcher/systray.cpp2
-rw-r--r--core/launcher/taskbar.cpp19
6 files changed, 318 insertions, 58 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 68949e6..1a33b36 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -380,6 +380,9 @@ void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray &
380 else if ( msg == "suspend()" ) { 380 else if ( msg == "suspend()" ) {
381 emit power(); 381 emit power();
382 } 382 }
383 else if ( msg == "home()" ) {
384 qpedesktop-> home ( );
385 }
383#endif 386#endif
384} 387}
385 388
@@ -717,10 +720,7 @@ void Desktop::raiseLauncher()
717 QString tempItem; 720 QString tempItem;
718 tempItem = cfg.readEntry( "Middle", "Home" ); 721 tempItem = cfg.readEntry( "Middle", "Home" );
719 if ( tempItem == "Home" || tempItem.isEmpty() ) { 722 if ( tempItem == "Home" || tempItem.isEmpty() ) {
720 if ( isVisibleWindow( launcher->winId() ) ) 723 home ( );
721 launcher->nextView();
722 else
723 launcher->raise();
724 } 724 }
725 else { 725 else {
726 QCopEnvelope e( "QPE/System", "execute(QString)" ); 726 QCopEnvelope e( "QPE/System", "execute(QString)" );
@@ -728,6 +728,14 @@ void Desktop::raiseLauncher()
728 } 728 }
729} 729}
730 730
731void Desktop::home ( )
732 {
733 if ( isVisibleWindow( launcher->winId() ) )
734 launcher->nextView();
735 else
736 launcher->raise();
737}
738
731void Desktop::executeOrModify( const QString& appLnkFile ) 739void Desktop::executeOrModify( const QString& appLnkFile )
732{ 740{
733 AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile ); 741 AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile );
@@ -837,6 +845,8 @@ void Desktop::togglePower()
837{ 845{
838 static bool excllock = false; 846 static bool excllock = false;
839 847
848 qDebug ( "togglePower (locked == %d)", excllock ? 1 : 0 );
849
840 if ( excllock ) 850 if ( excllock )
841 return ; 851 return ;
842 852
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index f7c3e3f..09ffe1c 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -118,6 +118,8 @@ public slots:
118 void terminateServers(); 118 void terminateServers();
119 void rereadVolumes(); 119 void rereadVolumes();
120 120
121 void home ( );
122
121protected: 123protected:
122 void executeOrModify( const QString& appLnkFile ); 124 void executeOrModify( const QString& appLnkFile );
123 void styleChange( QStyle & ); 125 void styleChange( QStyle & );
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index b008a30..647d0f2 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -1,7 +1,7 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
@@ -18,6 +18,8 @@
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#define INCLUDE_MENUITEM_DEF
22
21#include "startmenu.h" 23#include "startmenu.h"
22#include "sidething.h" 24#include "sidething.h"
23//#include "mrulist.h" 25//#include "mrulist.h"
@@ -28,8 +30,10 @@
28#include <qpe/applnk.h> 30#include <qpe/applnk.h>
29#include <qpe/global.h> 31#include <qpe/global.h>
30#include <qpe/resource.h> 32#include <qpe/resource.h>
33#include <qpe/qlibrary.h>
31 34
32#include <qdict.h> 35#include <qintdict.h>
36#include <qdir.h>
33 37
34#include <stdlib.h> 38#include <stdlib.h>
35 39
@@ -41,13 +45,20 @@ StartMenu::StartMenu(QWidget *parent) : QLabel( parent )
41{ 45{
42 loadOptions(); 46 loadOptions();
43 47
44 setPixmap( Resource::loadPixmap( startButtonPixmap ) ); 48 int sz = AppLnk::smallIconSize()+3;
49 QPixmap pm;
50 pm.convertFromImage(Resource::loadImage(startButtonPixmap).smoothScale(sz,sz));
51 setPixmap(pm);
45 setFocusPolicy( NoFocus ); 52 setFocusPolicy( NoFocus );
46 //setFlat( startButtonIsFlat ); 53 //setFlat( startButtonIsFlat );
47 54
48 apps = new AppLnkSet( QPEApplication::qpeDir() + "apps" ); 55 apps = 0;
49 56 launchMenu = 0;
50 createMenu(); 57 applets. setAutoDelete ( true );
58 sepId = 0;
59
60 reloadApps ( );
61 reloadApplets ( );
51} 62}
52 63
53 64
@@ -75,70 +86,157 @@ void StartMenu::loadOptions()
75 useWidePopupMenu = ( tmpBoolString1 == "TRUE" ) ? TRUE : FALSE; 86 useWidePopupMenu = ( tmpBoolString1 == "TRUE" ) ? TRUE : FALSE;
76 QString tmpBoolString2 = config.readEntry( "StartButtonIsFlat", "TRUE" ); 87 QString tmpBoolString2 = config.readEntry( "StartButtonIsFlat", "TRUE" );
77 startButtonIsFlat = ( tmpBoolString2 == "TRUE" ) ? TRUE : FALSE; 88 startButtonIsFlat = ( tmpBoolString2 == "TRUE" ) ? TRUE : FALSE;
78// QString tmpBoolString3 = config.readEntry( "UseMRUList", "TRUE" ); 89 QString tmpBoolString3 = config.readEntry( "UseMRUList", "TRUE" );
79 popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "launcher/sidebar" ); 90 popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "launcher/sidebar" );
80 startButtonPixmap = config.readEntry( "StartButtonPixmap", "go" ); 91 startButtonPixmap = config.readEntry( "StartButtonPixmap", "launcher/start_button" );
81#else 92#else
82 // Basically just #include the .qpe_menu.conf file settings 93 // Basically just #include the .qpe_menu.conf file settings
83 useWidePopupMenu = FALSE; 94 useWidePopupMenu = FALSE;
84 popupMenuSidePixmap = "launcher/sidebar"; 95 popupMenuSidePixmap = "launcher/sidebar";
85 startButtonIsFlat = TRUE; 96 startButtonIsFlat = TRUE;
86 startButtonPixmap = "launcher/start_button"; 97 startButtonPixmap = "launcher/start_button"; // No tr
87#endif 98#endif
88} 99}
89 100
90 101
91void StartMenu::createMenu() 102void StartMenu::createMenu()
92{ 103{
104 delete launchMenu;
93 if ( useWidePopupMenu ) 105 if ( useWidePopupMenu )
94 launchMenu = new PopupWithLaunchSideThing( this, &popupMenuSidePixmap ); 106 launchMenu = new PopupWithLaunchSideThing( this, &popupMenuSidePixmap );
95 else 107 else
96 launchMenu = new StartPopupMenu( this ); 108 launchMenu = new StartPopupMenu( this );
97 109
98 loadMenu( apps, launchMenu ); 110 loadMenu ( apps, launchMenu );
111 loadApplets ( );
112
113 connect( launchMenu, SIGNAL(activated(int)), SLOT(itemSelected(int)) );
114}
99 115
116void StartMenu::reloadApps()
117{
118 Config cfg("StartMenu");
119 cfg.setGroup("Menu");
120 bool ltabs = cfg.readBoolEntry("LauncherTabs",TRUE);
121 bool lot = cfg.readBoolEntry("LauncherOther",TRUE);
122 bool lt = ltabs || lot;
123 if ( launchMenu && apps && !lt )
124 return; // nothing to do
125
126 if ( lt ) {
127 delete apps;
128 apps = new AppLnkSet( QPEApplication::qpeDir() + "apps" );
129 }
130 if ( launchMenu ) {
131 launchMenu-> hide ( );
132
133 for ( QIntDictIterator<QPopupMenu> it ( tabdict ); it. current ( ); ++it ) {
134 launchMenu-> removeItem ( it. currentKey ( ));
135 delete it.current ( );
136 }
137 tabdict. clear ( );
138 loadMenu(apps,launchMenu);
139 } else {
140 createMenu();
141 }
142}
143
144void StartMenu::reloadApplets()
145{
146 if ( launchMenu ) {
147 clearApplets ( );
148 loadApplets ( );
149 }
150 else
151 createMenu ( );
100} 152}
101 153
102void StartMenu::itemSelected( int id ) 154void StartMenu::itemSelected( int id )
103{ 155{
104 const AppLnk *app = apps->find( id ); 156 const AppLnk *app = apps->find( id );
105 if ( app ) 157 if ( app )
106 app->execute(); 158 app->execute();
159 else {
160 MenuApplet *applet = applets. find ( id );
161
162 if ( applet )
163 applet-> iface-> activated ( );
164 }
107} 165}
108 166
109bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu ) 167bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
110{ 168{
111 bool result = FALSE; 169 bool result = FALSE;
112 170
113 QStringList typs = folder->types(); 171 Config cfg("StartMenu");
114 QDict<QPopupMenu> typpop; 172 cfg.setGroup("Menu");
115 for (QStringList::Iterator tit=typs.begin(); tit!=typs.end(); ++tit) { 173
116 if ( !(*tit).isEmpty() ) { 174 bool ltabs = cfg.readBoolEntry("LauncherTabs",TRUE);
117 QPopupMenu *new_menu = new StartPopupMenu( menu ); 175 bool lot = cfg.readBoolEntry("LauncherOther",TRUE);
118 typpop.insert(*tit, new_menu); 176
119 connect( new_menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) ); 177 tabdict. clear ( );
120 menu->insertItem( folder->typePixmap(*tit), folder->typeName(*tit), new_menu ); 178
121 } 179 if ( sepId )
122 } 180 menu-> removeItem ( sepId );
123 181 sepId = ( menu-> count ( )) ? menu-> insertSeparator ( 0 ) : 0;
124 QListIterator<AppLnk> it( folder->children() ); 182
125 for ( ; it.current(); ++it ) { 183 if ( ltabs || lot ) {
126 AppLnk *app = it.current(); 184 QDict<QPopupMenu> typpop;
127 if ( app->type() == "Separator" ) { 185 QStringList typs = folder->types();
128 menu->insertSeparator(); 186 for (QStringList::Iterator tit=typs.fromLast(); ; --tit) {
129 } else { 187 if ( !(*tit).isEmpty() ) {
130 QString t = app->type(); 188 QPopupMenu *new_menu;
131 QPopupMenu* pmenu = typpop.find(t); 189 if ( ltabs ) {
132 if ( !pmenu ) 190 new_menu = new StartPopupMenu( menu );
133 pmenu = menu; 191 connect( new_menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) );
134 pmenu->insertItem( app->pixmap(), app->name(), app->id() ); 192 int id = menu->insertItem( folder->typePixmap(*tit), folder->typeName(*tit), new_menu, -1, 0 );
135 result=TRUE; 193 tabdict. insert ( id, new_menu );
136 } 194 } else {
195 new_menu = (QPopupMenu*)1;
196 }
197 typpop.insert(*tit, new_menu);
198 }
199 if ( tit == typs. begin ( ))
200 break;
201 }
202 QListIterator<AppLnk> it( folder->children() );
203 bool f=TRUE;
204 for ( ; it.current(); ++it ) {
205 AppLnk *app = it.current();
206 if ( app->type() == "Separator" ) { // No tr
207 if ( lot ) {
208 menu->insertSeparator();
209 }
210 } else {
211 f = FALSE;
212 QString t = app->type();
213 QPopupMenu* pmenu = typpop.find(t);
214 if ( ltabs ) {
215 if ( !pmenu && lot )
216 pmenu = menu;
217 } else {
218 if ( !pmenu )
219 pmenu = menu;
220 else
221 pmenu = 0;
222 }
223 if ( pmenu ) {
224 QString t = app->name();
225 t.replace(QRegExp("&"),"&&"); // escape shortcut character
226 pmenu->insertItem( app->pixmap(), t, app->id() );
227 }
228 result=TRUE;
229 }
230 }
137 } 231 }
138 232
139 if ( result ) 233 if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries
140 connect( menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) ); 234 menu-> removeItem ( sepId );
141 235 sepId = 0;
236 }
237 if ( !menu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later
238 sepId = menu-> insertSeparator ( );
239
142 return result; 240 return result;
143} 241}
144 242
@@ -147,7 +245,7 @@ void StartMenu::launch()
147{ 245{
148 int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height(); 246 int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height();
149 247
150 if ( launchMenu->isVisible() ) 248 if ( launchMenu->isVisible() )
151 launchMenu->hide(); 249 launchMenu->hide();
152 else 250 else
153 launchMenu->popup( QPoint( 1, y ) ); 251 launchMenu->popup( QPoint( 1, y ) );
@@ -162,10 +260,126 @@ const AppLnk* StartMenu::execToLink(const QString& appname)
162void StartPopupMenu::keyPressEvent( QKeyEvent *e ) 260void StartPopupMenu::keyPressEvent( QKeyEvent *e )
163{ 261{
164 if ( e->key() == Key_F33 || e->key() == Key_Space ) { 262 if ( e->key() == Key_F33 || e->key() == Key_Space ) {
165 // "OK" button, little hacky 263 // "OK" button, little hacky
166 QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0); 264 QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0);
167 QPopupMenu::keyPressEvent( &ke ); 265 QPopupMenu::keyPressEvent( &ke );
168 } else { 266 } else {
169 QPopupMenu::keyPressEvent( e ); 267 QPopupMenu::keyPressEvent( e );
170 } 268 }
171} 269}
270
271static int compareAppletPositions(const void *a, const void *b)
272{
273 const MenuApplet* aa = *(const MenuApplet**)a;
274 const MenuApplet* ab = *(const MenuApplet**)b;
275 int d = ab->iface->position() - aa->iface->position();
276 if ( d ) return d;
277 return QString::compare(ab->library->library(),aa->library->library());
278}
279
280void StartMenu::clearApplets()
281{
282 launchMenu-> hide();
283
284 for ( QIntDictIterator<MenuApplet> it ( applets ); it. current ( ); ++it ) {
285 MenuApplet *applet = it. current ( );
286 if ( launchMenu ) {
287 launchMenu-> removeItem ( applet-> id );
288 delete applet-> popup;
289 }
290
291 applet-> iface-> release();
292 applet-> library-> unload();
293 delete applet-> library;
294 }
295 applets.clear();
296}
297
298
299
300void StartMenu::loadApplets()
301{
302 Config cfg( "StartMenu" );
303 cfg.setGroup( "Applets" );
304
305 // SafeMode causes too much problems, so we disable it for now --
306 // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02
307
308 bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE);
309 if ( safe && !safety_tid )
310 return;
311 cfg.writeEntry("SafeMode",TRUE);
312 cfg.write();
313 QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
314
315 QString path = QPEApplication::qpeDir() + "/plugins/applets";
316 QDir dir( path, "lib*.so" );
317 QStringList list = dir.entryList();
318 QStringList::Iterator it;
319 int napplets=0;
320 MenuApplet* *xapplets = new MenuApplet*[list.count()];
321 for ( it = list.begin(); it != list.end(); ++it ) {
322 if ( exclude.find( *it ) != exclude.end() )
323 continue;
324 MenuAppletInterface *iface = 0;
325 QLibrary *lib = new QLibrary( path + "/" + *it );
326 if (( lib->queryInterface( IID_MenuApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {
327 MenuApplet *applet = new MenuApplet;
328 xapplets[napplets++] = applet;
329 applet->library = lib;
330 applet->iface = iface;
331 } else {
332 exclude += *it;
333 delete lib;
334 }
335 }
336 cfg.writeEntry( "ExcludeApplets", exclude, ',' );
337 qsort(xapplets,napplets,sizeof(applets[0]),compareAppletPositions);
338
339 if ( sepId )
340 launchMenu-> removeItem ( sepId );
341 sepId = ( launchMenu-> count ( )) ? launchMenu-> insertSeparator ( ) : 0;
342
343 while (napplets--) {
344 MenuApplet *applet = xapplets[napplets];
345 QString lang = getenv( "LANG" );
346 QTranslator * trans = new QTranslator(qApp);
347 QString type = (*it).left( (*it).find(".") );
348 QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
349 if ( trans->load( tfn ))
350 qApp->installTranslator( trans );
351 else
352 delete trans;
353
354 applet-> popup = applet-> iface-> popup ( this );
355
356 if ( applet-> popup )
357 applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup );
358 else
359 applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) );
360 applets.insert ( applet-> id, new MenuApplet(*applet));
361 }
362 delete xapplets;
363
364 if ( sepId && ( launchMenu-> idAt ( launchMenu-> count ( ) - 1 ) == sepId )) { // no applets
365 launchMenu-> removeItem ( sepId );
366 sepId = 0;
367 }
368 if ( !launchMenu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later
369 sepId = launchMenu-> insertSeparator ( );
370
371 if ( !safety_tid )
372 safety_tid = startTimer(2000); // TT has 5000, but this is a PITA for a developer ;) (sandman)
373}
374
375void StartMenu::timerEvent(QTimerEvent* e)
376{
377 if ( e->timerId() == safety_tid ) {
378 Config cfg( "StartMenu" );
379 cfg.setGroup( "Applets" );
380 cfg.writeEntry( "SafeMode", FALSE );
381 killTimer(safety_tid);
382 safety_tid = 0;
383 }
384}
385
diff --git a/core/launcher/startmenu.h b/core/launcher/startmenu.h
index a02f39e..0a91bb8 100644
--- a/core/launcher/startmenu.h
+++ b/core/launcher/startmenu.h
@@ -1,7 +1,7 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
@@ -23,9 +23,11 @@
23 23
24#include <qstring.h> 24#include <qstring.h>
25#include <qlist.h> 25#include <qlist.h>
26#include <qintdict.h>
26#include <qlabel.h> 27#include <qlabel.h>
27#include <qpopupmenu.h> 28#include <qpopupmenu.h>
28 29
30#include <qpe/menuappletinterface.h>
29 31
30class AppLnkSet; 32class AppLnkSet;
31class AppLnk; 33class AppLnk;
@@ -38,6 +40,19 @@ protected:
38 void keyPressEvent( QKeyEvent *e ); 40 void keyPressEvent( QKeyEvent *e );
39}; 41};
40 42
43class QLibrary;
44
45struct MenuApplet
46{
47#ifndef QT_NO_COMPONENT
48 QLibrary *library;
49#endif
50 MenuAppletInterface *iface;
51 int id;
52 QPopupMenu *popup;
53};
54
55
41class StartMenu : public QLabel { 56class StartMenu : public QLabel {
42 Q_OBJECT 57 Q_OBJECT
43public: 58public:
@@ -53,15 +68,20 @@ public slots:
53 void launch( ); 68 void launch( );
54 void loadOptions( ); 69 void loadOptions( );
55 void createMenu( ); 70 void createMenu( );
71 void reloadApps( );
72 void reloadApplets( );
56 73
57protected slots: 74protected slots:
58 void itemSelected( int id ); 75 void itemSelected( int id );
59 76
60protected: 77protected:
61 virtual void mousePressEvent( QMouseEvent * ); 78 virtual void mousePressEvent( QMouseEvent * );
79 virtual void timerEvent ( QTimerEvent * );
62 80
63private: 81private:
64 bool loadMenu( AppLnkSet *folder, QPopupMenu *menu ); 82 bool loadMenu( AppLnkSet *folder, QPopupMenu *menu );
83 void loadApplets( );
84 void clearApplets( );
65 85
66private: 86private:
67 bool useWidePopupMenu; 87 bool useWidePopupMenu;
@@ -71,6 +91,13 @@ private:
71 QString startButtonPixmap; 91 QString startButtonPixmap;
72 92
73 AppLnkSet *apps; 93 AppLnkSet *apps;
94
95 QIntDict<MenuApplet> applets;
96 QIntDict<QPopupMenu> tabdict;
97
98// QValueList<MenuApplet> appletList;
99 int safety_tid;
100 int sepId;
74}; 101};
75 102
76#endif // __START_MENU_H__ 103#endif // __START_MENU_H__
diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp
index 697971d..406c662 100644
--- a/core/launcher/systray.cpp
+++ b/core/launcher/systray.cpp
@@ -102,7 +102,7 @@ void SysTray::addApplets()
102 continue; 102 continue;
103 TaskbarAppletInterface *iface = 0; 103 TaskbarAppletInterface *iface = 0;
104 QLibrary *lib = new QLibrary( path + "/" + *it ); 104 QLibrary *lib = new QLibrary( path + "/" + *it );
105 if ( lib->queryInterface( IID_TaskbarApplet, (QUnknownInterface**)&iface ) == QS_OK ) { 105 if (( lib->queryInterface( IID_TaskbarApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {
106 TaskbarApplet *applet = new TaskbarApplet; 106 TaskbarApplet *applet = new TaskbarApplet;
107 applets[napplets++] = applet; 107 applets[napplets++] = applet;
108 applet->library = lib; 108 applet->library = lib;
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
@@ -191,11 +191,15 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
191 191
192void TaskBar::setStatusMessage( const QString &text ) 192void 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
201void TaskBar::clearStatusBar() 205void TaskBar::clearStatusBar()
@@ -212,7 +216,7 @@ void TaskBar::startWait()
212 waitTimer->start( 10 * 1000, true ); 216 waitTimer->start( 10 * 1000, true );
213} 217}
214 218
215void TaskBar::stopWait(const QString& app) 219void TaskBar::stopWait(const QString& /*app*/)
216{ 220{
217 waitTimer->stop(); 221 waitTimer->stop();
218 //mru->addTask(sm->execToLink(app)); 222 //mru->addTask(sm->execToLink(app));
@@ -273,9 +277,12 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
273 inputMethods->showInputMethod(); 277 inputMethods->showInputMethod();
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();
281 } 288 }