summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-09-22 23:21:25 (UTC)
committer llornkcor <llornkcor>2002-09-22 23:21:25 (UTC)
commit4f142e98ee63e88fa0df61161b93228ee719d551 (patch) (side-by-side diff)
treed311813aa272ecd2a4f340a124d4e610f8601995
parent452a124385fbc8162e03ee6cc9020ebeb2133a7f (diff)
downloadopie-4f142e98ee63e88fa0df61161b93228ee719d551.zip
opie-4f142e98ee63e88fa0df61161b93228ee719d551.tar.gz
opie-4f142e98ee63e88fa0df61161b93228ee719d551.tar.bz2
fix typo in loadOptions()
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/startmenu.cpp50
1 files changed, 25 insertions, 25 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 5506c55..b008a30 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -72,100 +72,100 @@ void StartMenu::loadOptions()
Config config("StartMenu");
config.setGroup( "StartMenu" );
QString tmpBoolString1 = config.readEntry( "UseWidePopupMenu", "FALSE" );
useWidePopupMenu = ( tmpBoolString1 == "TRUE" ) ? TRUE : FALSE;
QString tmpBoolString2 = config.readEntry( "StartButtonIsFlat", "TRUE" );
startButtonIsFlat = ( tmpBoolString2 == "TRUE" ) ? TRUE : FALSE;
// QString tmpBoolString3 = config.readEntry( "UseMRUList", "TRUE" );
popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "launcher/sidebar" );
startButtonPixmap = config.readEntry( "StartButtonPixmap", "go" );
#else
// Basically just #include the .qpe_menu.conf file settings
useWidePopupMenu = FALSE;
- popupMenuSidePixmap = "lauchner/sidebar";
+ popupMenuSidePixmap = "launcher/sidebar";
startButtonIsFlat = TRUE;
startButtonPixmap = "launcher/start_button";
#endif
}
void StartMenu::createMenu()
{
if ( useWidePopupMenu )
- launchMenu = new PopupWithLaunchSideThing( this, &popupMenuSidePixmap );
+ launchMenu = new PopupWithLaunchSideThing( this, &popupMenuSidePixmap );
else
launchMenu = new StartPopupMenu( this );
loadMenu( apps, launchMenu );
}
void StartMenu::itemSelected( int id )
{
const AppLnk *app = apps->find( id );
if ( app )
- app->execute();
+ app->execute();
}
bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
{
bool result = FALSE;
QStringList typs = folder->types();
QDict<QPopupMenu> typpop;
for (QStringList::Iterator tit=typs.begin(); tit!=typs.end(); ++tit) {
- if ( !(*tit).isEmpty() ) {
- QPopupMenu *new_menu = new StartPopupMenu( menu );
- typpop.insert(*tit, new_menu);
- connect( new_menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) );
- menu->insertItem( folder->typePixmap(*tit), folder->typeName(*tit), new_menu );
- }
+ if ( !(*tit).isEmpty() ) {
+ QPopupMenu *new_menu = new StartPopupMenu( menu );
+ typpop.insert(*tit, new_menu);
+ connect( new_menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) );
+ menu->insertItem( folder->typePixmap(*tit), folder->typeName(*tit), new_menu );
+ }
}
QListIterator<AppLnk> it( folder->children() );
for ( ; it.current(); ++it ) {
- AppLnk *app = it.current();
- if ( app->type() == "Separator" ) {
- menu->insertSeparator();
- } else {
- QString t = app->type();
- QPopupMenu* pmenu = typpop.find(t);
- if ( !pmenu )
- pmenu = menu;
- pmenu->insertItem( app->pixmap(), app->name(), app->id() );
- result=TRUE;
- }
+ AppLnk *app = it.current();
+ if ( app->type() == "Separator" ) {
+ menu->insertSeparator();
+ } else {
+ QString t = app->type();
+ QPopupMenu* pmenu = typpop.find(t);
+ if ( !pmenu )
+ pmenu = menu;
+ pmenu->insertItem( app->pixmap(), app->name(), app->id() );
+ result=TRUE;
+ }
}
if ( result )
- connect( menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) );
+ connect( menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) );
return result;
}
void StartMenu::launch()
{
int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height();
if ( launchMenu->isVisible() )
launchMenu->hide();
else
launchMenu->popup( QPoint( 1, y ) );
}
const AppLnk* StartMenu::execToLink(const QString& appname)
{
const AppLnk* a = apps->findExec( appname );
return a;
}
void StartPopupMenu::keyPressEvent( QKeyEvent *e )
{
if ( e->key() == Key_F33 || e->key() == Key_Space ) {
- // "OK" button, little hacky
- QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0);
- QPopupMenu::keyPressEvent( &ke );
+ // "OK" button, little hacky
+ QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0);
+ QPopupMenu::keyPressEvent( &ke );
} else {
- QPopupMenu::keyPressEvent( e );
+ QPopupMenu::keyPressEvent( e );
}
}