summaryrefslogtreecommitdiff
authorsandman <sandman>2003-03-21 21:12:14 (UTC)
committer sandman <sandman>2003-03-21 21:12:14 (UTC)
commitd11cf5483fbfa87a7be65891df2625def351f3a4 (patch) (unidiff)
tree53ec1a4fefcd7a2fc37bd64a0bae3ce378c5ef7d
parent633fbff7e3d85a5fc16bd3ed3283723c44acb2aa (diff)
downloadopie-d11cf5483fbfa87a7be65891df2625def351f3a4.zip
opie-d11cf5483fbfa87a7be65891df2625def351f3a4.tar.gz
opie-d11cf5483fbfa87a7be65891df2625def351f3a4.tar.bz2
fix for bug #647:
Programs are sorted by their internal name and not by the translated name (in the O-Menu)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/startmenu.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 2871233..28c8b97 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -214,25 +214,33 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
214 if ( ltabs ) { 214 if ( ltabs ) {
215 if ( !pmenu && lot ) 215 if ( !pmenu && lot )
216 pmenu = menu; 216 pmenu = menu;
217 } else { 217 } else {
218 if ( !pmenu ) 218 if ( !pmenu )
219 pmenu = menu; 219 pmenu = menu;
220 else 220 else
221 pmenu = 0; 221 pmenu = 0;
222 } 222 }
223 if ( pmenu ) { 223 if ( pmenu ) {
224 QString t = app->name(); 224 QString t = app->name();
225 t.replace(QRegExp("&"),"&&"); // escape shortcut character 225 t.replace(QRegExp("&"),"&&"); // escape shortcut character
226 pmenu->insertItem( app->pixmap(), t, app->id() ); 226
227 int index = -1;
228
229 for ( index = 0; index < pmenu-> count ( ); index++ ) {
230 if ( pmenu-> text ( pmenu-> idAt ( index )). compare ( t ) > 0 )
231 break;
232 }
233
234 pmenu->insertItem( app->pixmap(), t, app->id(), index );
227 } 235 }
228 result=TRUE; 236 result=TRUE;
229 } 237 }
230 } 238 }
231 } 239 }
232 240
233 if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries 241 if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries
234 menu-> removeItem ( sepId ); 242 menu-> removeItem ( sepId );
235 sepId = 0; 243 sepId = 0;
236 } 244 }
237 if ( !menu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later 245 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 ( ); 246 sepId = menu-> insertSeparator ( );