summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-05-15 17:18:38 (UTC)
committer harlekin <harlekin>2002-05-15 17:18:38 (UTC)
commitf67dd09ba006b52a25ec1a0a828f6a72b70291e0 (patch) (side-by-side diff)
treee82fdc38c6dc32bf1f5a4d28a5a64b7101e254f5
parent443c88975417cb4dc080392abd07be7723c38c62 (diff)
downloadopie-f67dd09ba006b52a25ec1a0a828f6a72b70291e0.zip
opie-f67dd09ba006b52a25ec1a0a828f6a72b70291e0.tar.gz
opie-f67dd09ba006b52a25ec1a0a828f6a72b70291e0.tar.bz2
sidebar is back for testing
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/startmenu.cpp6
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
@@ -55,54 +55,54 @@ void StartMenu::mousePressEvent( QMouseEvent * )
{
launch();
if (desktopInfo)
desktopInfo->menuClicked();
}
StartMenu::~StartMenu()
{
delete apps;
}
void StartMenu::loadOptions()
{
#ifdef USE_CONFIG_FILE
// Read configuration file
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", "sidebar" );
+ popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "launcher/sidebar" );
startButtonPixmap = config.readEntry( "StartButtonPixmap", "go" );
#else
// Basically just #include the .qpe_menu.conf file settings
useWidePopupMenu = FALSE;
- popupMenuSidePixmap = "go";
+ popupMenuSidePixmap = "lauchner/sidebar";
startButtonIsFlat = TRUE;
startButtonPixmap = "launcher/start_button";
#endif
}
void StartMenu::createMenu()
{
if ( useWidePopupMenu )
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();
}
@@ -126,46 +126,46 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
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)) );
return result;
}
void StartMenu::launch()
{
int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height();
- if ( launchMenu->isVisible() )
+ 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 );
} else {
QPopupMenu::keyPressEvent( e );
}
}