summaryrefslogtreecommitdiff
path: root/core/launcher/startmenu.cpp
Unidiff
Diffstat (limited to 'core/launcher/startmenu.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/startmenu.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 39e07c8..2871233 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -21,3 +21,3 @@
21#define INCLUDE_MENUITEM_DEF 21#define INCLUDE_MENUITEM_DEF
22 22
23#include "startmenu.h" 23#include "startmenu.h"
@@ -58,3 +58,3 @@ StartMenu::StartMenu(QWidget *parent) : QLabel( parent )
58 sepId = 0; 58 sepId = 0;
59 59
60 reloadApps ( ); 60 reloadApps ( );
@@ -90,3 +90,3 @@ void StartMenu::loadOptions()
90 popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "launcher/sidebar" ); 90 popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "launcher/sidebar" );
91 startButtonPixmap = config.readEntry( "StartButtonPixmap", "launcher/start_button" ); 91 startButtonPixmap = config.readEntry( "StartButtonPixmap", "go" );
92#else 92#else
@@ -96,3 +96,3 @@ void StartMenu::loadOptions()
96 startButtonIsFlat = TRUE; 96 startButtonIsFlat = TRUE;
97 startButtonPixmap = "launcher/start_button"; // No tr 97 startButtonPixmap = "go"; // No tr
98#endif 98#endif
@@ -111,3 +111,3 @@ void StartMenu::createMenu()
111 loadApplets ( ); 111 loadApplets ( );
112 112
113 connect( launchMenu, SIGNAL(activated(int)), SLOT(itemSelected(int)) ); 113 connect( launchMenu, SIGNAL(activated(int)), SLOT(itemSelected(int)) );
@@ -131,3 +131,3 @@ void StartMenu::reloadApps()
131 launchMenu-> hide ( ); 131 launchMenu-> hide ( );
132 132
133 for ( QIntDictIterator<QPopupMenu> it ( tabdict ); it. current ( ); ++it ) { 133 for ( QIntDictIterator<QPopupMenu> it ( tabdict ); it. current ( ); ++it ) {
@@ -160,6 +160,6 @@ void StartMenu::itemSelected( int id )
160 MenuApplet *applet = applets. find ( id ); 160 MenuApplet *applet = applets. find ( id );
161 161
162 if ( applet ) 162 if ( applet )
163 applet-> iface-> activated ( ); 163 applet-> iface-> activated ( );
164 } 164 }
165} 165}
@@ -175,5 +175,5 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
175 bool lot = cfg.readBoolEntry("LauncherOther",TRUE); 175 bool lot = cfg.readBoolEntry("LauncherOther",TRUE);
176 176
177 tabdict. clear ( ); 177 tabdict. clear ( );
178 178
179 if ( sepId ) 179 if ( sepId )
@@ -232,3 +232,3 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
232 232
233 if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries 233 if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries
234 menu-> removeItem ( sepId ); 234 menu-> removeItem ( sepId );
@@ -238,3 +238,3 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
238 sepId = menu-> insertSeparator ( ); 238 sepId = menu-> insertSeparator ( );
239 239
240 return result; 240 return result;
@@ -254,3 +254,3 @@ void StartMenu::launch ( )
254 active-> close ( ); 254 active-> close ( );
255 255
256 launchMenu-> popup ( QPoint ( 1, y )); 256 launchMenu-> popup ( QPoint ( 1, y ));
@@ -295,3 +295,3 @@ void StartMenu::clearApplets()
295 } 295 }
296 296
297 applet-> iface-> release(); 297 applet-> iface-> release();
@@ -309,6 +309,6 @@ void StartMenu::loadApplets()
309 cfg.setGroup( "Applets" ); 309 cfg.setGroup( "Applets" );
310 310
311 // SafeMode causes too much problems, so we disable it for now -- 311 // SafeMode causes too much problems, so we disable it for now --
312 // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02 312 // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02
313 313
314 bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE); 314 bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE);
@@ -337,3 +337,3 @@ void StartMenu::loadApplets()
337 applet->iface = iface; 337 applet->iface = iface;
338 338
339 QTranslator *trans = new QTranslator(qApp); 339 QTranslator *trans = new QTranslator(qApp);
@@ -344,3 +344,3 @@ void StartMenu::loadApplets()
344 else 344 else
345 delete trans; 345 delete trans;
346 } else { 346 } else {
@@ -356,11 +356,11 @@ void StartMenu::loadApplets()
356 sepId = ( launchMenu-> count ( )) ? launchMenu-> insertSeparator ( ) : 0; 356 sepId = ( launchMenu-> count ( )) ? launchMenu-> insertSeparator ( ) : 0;
357 357
358 while (napplets--) { 358 while (napplets--) {
359 MenuApplet *applet = xapplets[napplets]; 359 MenuApplet *applet = xapplets[napplets];
360 360
361 applet-> popup = applet-> iface-> popup ( this ); 361 applet-> popup = applet-> iface-> popup ( this );
362 362
363 if ( applet-> popup ) 363 if ( applet-> popup )
364 applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup ); 364 applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup );
365 else 365 else
366 applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) ); 366 applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) );
@@ -369,3 +369,3 @@ void StartMenu::loadApplets()
369 delete [] xapplets; 369 delete [] xapplets;
370 370
371 if ( sepId && ( launchMenu-> idAt ( launchMenu-> count ( ) - 1 ) == sepId )) { // no applets 371 if ( sepId && ( launchMenu-> idAt ( launchMenu-> count ( ) - 1 ) == sepId )) { // no applets
@@ -376,3 +376,3 @@ void StartMenu::loadApplets()
376 sepId = launchMenu-> insertSeparator ( ); 376 sepId = launchMenu-> insertSeparator ( );
377 377
378 if ( !safety_tid ) 378 if ( !safety_tid )