summaryrefslogtreecommitdiff
authorsandman <sandman>2003-03-21 21:12:14 (UTC)
committer sandman <sandman>2003-03-21 21:12:14 (UTC)
commitd11cf5483fbfa87a7be65891df2625def351f3a4 (patch) (side-by-side diff)
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
@@ -202,49 +202,57 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
QListIterator<AppLnk> it( folder->children() );
bool f=TRUE;
for ( ; it.current(); ++it ) {
AppLnk *app = it.current();
if ( app->type() == "Separator" ) { // No tr
if ( lot ) {
menu->insertSeparator();
}
} else {
f = FALSE;
QString t = app->type();
QPopupMenu* pmenu = typpop.find(t);
if ( ltabs ) {
if ( !pmenu && lot )
pmenu = menu;
} else {
if ( !pmenu )
pmenu = menu;
else
pmenu = 0;
}
if ( pmenu ) {
QString t = app->name();
t.replace(QRegExp("&"),"&&"); // escape shortcut character
- pmenu->insertItem( app->pixmap(), t, app->id() );
+
+ int index = -1;
+
+ for ( index = 0; index < pmenu-> count ( ); index++ ) {
+ if ( pmenu-> text ( pmenu-> idAt ( index )). compare ( t ) > 0 )
+ break;
+ }
+
+ pmenu->insertItem( app->pixmap(), t, app->id(), index );
}
result=TRUE;
}
}
}
if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries
menu-> removeItem ( sepId );
sepId = 0;
}
if ( !menu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later
sepId = menu-> insertSeparator ( );
return result;
}
void StartMenu::launch ( )
{
int y = mapToGlobal ( QPoint ( )). y ( ) - launchMenu-> sizeHint ( ). height ( );
if ( launchMenu-> isVisible ( )) {
launchMenu-> hide ( );
}