| -rw-r--r-- | core/launcher/startmenu.cpp | 48 |
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 @@ #define INCLUDE_MENUITEM_DEF - + #include "startmenu.h" @@ -58,3 +58,3 @@ StartMenu::StartMenu(QWidget *parent) : QLabel( parent ) sepId = 0; - + reloadApps ( ); @@ -90,3 +90,3 @@ void StartMenu::loadOptions() popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "launcher/sidebar" ); - startButtonPixmap = config.readEntry( "StartButtonPixmap", "launcher/start_button" ); + startButtonPixmap = config.readEntry( "StartButtonPixmap", "go" ); #else @@ -96,3 +96,3 @@ void StartMenu::loadOptions() startButtonIsFlat = TRUE; - startButtonPixmap = "launcher/start_button"; // No tr + startButtonPixmap = "go"; // No tr #endif @@ -111,3 +111,3 @@ void StartMenu::createMenu() loadApplets ( ); - + connect( launchMenu, SIGNAL(activated(int)), SLOT(itemSelected(int)) ); @@ -131,3 +131,3 @@ void StartMenu::reloadApps() launchMenu-> hide ( ); - + for ( QIntDictIterator<QPopupMenu> it ( tabdict ); it. current ( ); ++it ) { @@ -160,6 +160,6 @@ void StartMenu::itemSelected( int id ) MenuApplet *applet = applets. find ( id ); - + if ( applet ) applet-> iface-> activated ( ); - } + } } @@ -175,5 +175,5 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu ) bool lot = cfg.readBoolEntry("LauncherOther",TRUE); - + tabdict. clear ( ); - + if ( sepId ) @@ -232,3 +232,3 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu ) - if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries + if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries menu-> removeItem ( sepId ); @@ -238,3 +238,3 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu ) sepId = menu-> insertSeparator ( ); - + return result; @@ -254,3 +254,3 @@ void StartMenu::launch ( ) active-> close ( ); - + launchMenu-> popup ( QPoint ( 1, y )); @@ -295,3 +295,3 @@ void StartMenu::clearApplets() } - + applet-> iface-> release(); @@ -309,6 +309,6 @@ void StartMenu::loadApplets() cfg.setGroup( "Applets" ); - + // SafeMode causes too much problems, so we disable it for now -- // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02 - + bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE); @@ -337,3 +337,3 @@ void StartMenu::loadApplets() applet->iface = iface; - + QTranslator *trans = new QTranslator(qApp); @@ -344,3 +344,3 @@ void StartMenu::loadApplets() else - delete trans; + delete trans; } else { @@ -356,11 +356,11 @@ void StartMenu::loadApplets() sepId = ( launchMenu-> count ( )) ? launchMenu-> insertSeparator ( ) : 0; - + while (napplets--) { MenuApplet *applet = xapplets[napplets]; - + applet-> popup = applet-> iface-> popup ( this ); - + if ( applet-> popup ) applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup ); - else + else applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) ); @@ -369,3 +369,3 @@ void StartMenu::loadApplets() delete [] xapplets; - + if ( sepId && ( launchMenu-> idAt ( launchMenu-> count ( ) - 1 ) == sepId )) { // no applets @@ -376,3 +376,3 @@ void StartMenu::loadApplets() sepId = launchMenu-> insertSeparator ( ); - + if ( !safety_tid ) |