-rw-r--r-- | core/launcher/startmenu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp index 237a2de..15707b4 100644 --- a/core/launcher/startmenu.cpp +++ b/core/launcher/startmenu.cpp | |||
@@ -67,30 +67,30 @@ StartMenu::~StartMenu() | |||
67 | 67 | ||
68 | void StartMenu::loadOptions() | 68 | void StartMenu::loadOptions() |
69 | { | 69 | { |
70 | #ifdef USE_CONFIG_FILE | 70 | #ifdef USE_CONFIG_FILE |
71 | // Read configuration file | 71 | // Read configuration file |
72 | Config config("StartMenu"); | 72 | Config config("StartMenu"); |
73 | config.setGroup( "StartMenu" ); | 73 | config.setGroup( "StartMenu" ); |
74 | QString tmpBoolString1 = config.readEntry( "UseWidePopupMenu", "FALSE" ); | 74 | QString tmpBoolString1 = config.readEntry( "UseWidePopupMenu", "FALSE" ); |
75 | useWidePopupMenu = ( tmpBoolString1 == "TRUE" ) ? TRUE : FALSE; | 75 | useWidePopupMenu = ( tmpBoolString1 == "TRUE" ) ? TRUE : FALSE; |
76 | QString tmpBoolString2 = config.readEntry( "StartButtonIsFlat", "TRUE" ); | 76 | QString tmpBoolString2 = config.readEntry( "StartButtonIsFlat", "TRUE" ); |
77 | startButtonIsFlat = ( tmpBoolString2 == "TRUE" ) ? TRUE : FALSE; | 77 | startButtonIsFlat = ( tmpBoolString2 == "TRUE" ) ? TRUE : FALSE; |
78 | QString tmpBoolString3 = config.readEntry( "UseMRUList", "TRUE" ); | 78 | QString tmpBoolString3 = config.readEntry( "UseMRUList", "TRUE" ); |
79 | popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "sidebar" ); | 79 | popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "launcher/sidebar" ); |
80 | startButtonPixmap = config.readEntry( "StartButtonPixmap", "go" ); | 80 | startButtonPixmap = config.readEntry( "StartButtonPixmap", "go" ); |
81 | #else | 81 | #else |
82 | // Basically just #include the .qpe_menu.conf file settings | 82 | // Basically just #include the .qpe_menu.conf file settings |
83 | useWidePopupMenu = FALSE; | 83 | useWidePopupMenu = FALSE; |
84 | popupMenuSidePixmap = "go"; | 84 | popupMenuSidePixmap = "lauchner/sidebar"; |
85 | startButtonIsFlat = TRUE; | 85 | startButtonIsFlat = TRUE; |
86 | startButtonPixmap = "launcher/start_button"; | 86 | startButtonPixmap = "launcher/start_button"; |
87 | #endif | 87 | #endif |
88 | } | 88 | } |
89 | 89 | ||
90 | 90 | ||
91 | void StartMenu::createMenu() | 91 | void StartMenu::createMenu() |
92 | { | 92 | { |
93 | if ( useWidePopupMenu ) | 93 | if ( useWidePopupMenu ) |
94 | launchMenu = new PopupWithLaunchSideThing( this, &popupMenuSidePixmap ); | 94 | launchMenu = new PopupWithLaunchSideThing( this, &popupMenuSidePixmap ); |
95 | else | 95 | else |
96 | launchMenu = new StartPopupMenu( this ); | 96 | launchMenu = new StartPopupMenu( this ); |
@@ -138,25 +138,25 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu ) | |||
138 | 138 | ||
139 | if ( result ) | 139 | if ( result ) |
140 | connect( menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) ); | 140 | connect( menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) ); |
141 | 141 | ||
142 | return result; | 142 | return result; |
143 | } | 143 | } |
144 | 144 | ||
145 | 145 | ||
146 | void StartMenu::launch() | 146 | void StartMenu::launch() |
147 | { | 147 | { |
148 | int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height(); | 148 | int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height(); |
149 | 149 | ||
150 | if ( launchMenu->isVisible() ) | 150 | if ( launchMenu->isVisible() ) |
151 | launchMenu->hide(); | 151 | launchMenu->hide(); |
152 | else | 152 | else |
153 | launchMenu->popup( QPoint( 1, y ) ); | 153 | launchMenu->popup( QPoint( 1, y ) ); |
154 | } | 154 | } |
155 | 155 | ||
156 | const AppLnk* StartMenu::execToLink(const QString& appname) | 156 | const AppLnk* StartMenu::execToLink(const QString& appname) |
157 | { | 157 | { |
158 | const AppLnk* a = apps->findExec( appname ); | 158 | const AppLnk* a = apps->findExec( appname ); |
159 | return a; | 159 | return a; |
160 | } | 160 | } |
161 | 161 | ||
162 | void StartPopupMenu::keyPressEvent( QKeyEvent *e ) | 162 | void StartPopupMenu::keyPressEvent( QKeyEvent *e ) |