summaryrefslogtreecommitdiff
authormark <mark>2002-02-04 21:55:05 (UTC)
committer mark <mark>2002-02-04 21:55:05 (UTC)
commit2ef9eaee77c655dbe366fdaadb2b6cf6cff85eb4 (patch) (unidiff)
tree301b1e045abcb6ad5977d135beb69954e984e248
parentad32a5ffb9fcc666977c93fc074741fdfe22e5c4 (diff)
downloadopie-2ef9eaee77c655dbe366fdaadb2b6cf6cff85eb4.zip
opie-2ef9eaee77c655dbe366fdaadb2b6cf6cff85eb4.tar.gz
opie-2ef9eaee77c655dbe366fdaadb2b6cf6cff85eb4.tar.bz2
Q logo to O on start button
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/startmenu.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 54bdfcc..007b483 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -36,99 +36,99 @@
36 36
37// #define USE_CONFIG_FILE 37// #define USE_CONFIG_FILE
38 38
39 39
40StartMenu::StartMenu(QWidget *parent) : QLabel( parent ) 40StartMenu::StartMenu(QWidget *parent) : QLabel( parent )
41{ 41{
42 loadOptions(); 42 loadOptions();
43 43
44 setPixmap( Resource::loadPixmap( startButtonPixmap ) ); 44 setPixmap( Resource::loadPixmap( startButtonPixmap ) );
45 setFocusPolicy( NoFocus ); 45 setFocusPolicy( NoFocus );
46 //setFlat( startButtonIsFlat ); 46 //setFlat( startButtonIsFlat );
47 47
48 apps = new AppLnkSet( QPEApplication::qpeDir() + "apps" ); 48 apps = new AppLnkSet( QPEApplication::qpeDir() + "apps" );
49 49
50 createMenu(); 50 createMenu();
51} 51}
52 52
53 53
54void StartMenu::mousePressEvent( QMouseEvent * ) 54void StartMenu::mousePressEvent( QMouseEvent * )
55{ 55{
56 launch(); 56 launch();
57 if (desktopInfo) 57 if (desktopInfo)
58 desktopInfo->menuClicked(); 58 desktopInfo->menuClicked();
59} 59}
60 60
61 61
62StartMenu::~StartMenu() 62StartMenu::~StartMenu()
63{ 63{
64 delete apps; 64 delete apps;
65} 65}
66 66
67 67
68void StartMenu::loadOptions() 68void 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", "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 = "sidebar"; 84 popupMenuSidePixmap = "go";
85 startButtonIsFlat = TRUE; 85 startButtonIsFlat = TRUE;
86 startButtonPixmap = "go"; 86 startButtonPixmap = "start_button";
87#endif 87#endif
88} 88}
89 89
90 90
91void StartMenu::createMenu() 91void 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 );
97 97
98 loadMenu( apps, launchMenu ); 98 loadMenu( apps, launchMenu );
99 99
100} 100}
101 101
102void StartMenu::itemSelected( int id ) 102void StartMenu::itemSelected( int id )
103{ 103{
104 const AppLnk *app = apps->find( id ); 104 const AppLnk *app = apps->find( id );
105 if ( app ) 105 if ( app )
106 app->execute(); 106 app->execute();
107} 107}
108 108
109bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu ) 109bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
110{ 110{
111 bool result = FALSE; 111 bool result = FALSE;
112 112
113 QStringList typs = folder->types(); 113 QStringList typs = folder->types();
114 QDict<QPopupMenu> typpop; 114 QDict<QPopupMenu> typpop;
115 for (QStringList::Iterator tit=typs.begin(); tit!=typs.end(); ++tit) { 115 for (QStringList::Iterator tit=typs.begin(); tit!=typs.end(); ++tit) {
116 if ( !(*tit).isEmpty() ) { 116 if ( !(*tit).isEmpty() ) {
117 QPopupMenu *new_menu = new StartPopupMenu( menu ); 117 QPopupMenu *new_menu = new StartPopupMenu( menu );
118 typpop.insert(*tit, new_menu); 118 typpop.insert(*tit, new_menu);
119 connect( new_menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) ); 119 connect( new_menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) );
120 menu->insertItem( folder->typePixmap(*tit), *tit, new_menu ); 120 menu->insertItem( folder->typePixmap(*tit), *tit, new_menu );
121 } 121 }
122 } 122 }
123 123
124 QListIterator<AppLnk> it( folder->children() ); 124 QListIterator<AppLnk> it( folder->children() );
125 for ( ; it.current(); ++it ) { 125 for ( ; it.current(); ++it ) {
126 AppLnk *app = it.current(); 126 AppLnk *app = it.current();
127 if ( app->type() == "Separator" ) { 127 if ( app->type() == "Separator" ) {
128 menu->insertSeparator(); 128 menu->insertSeparator();
129 } else { 129 } else {
130 QString t = app->type(); 130 QString t = app->type();
131 QPopupMenu* pmenu = typpop.find(t); 131 QPopupMenu* pmenu = typpop.find(t);
132 if ( !pmenu ) 132 if ( !pmenu )
133 pmenu = menu; 133 pmenu = menu;
134 pmenu->insertItem( app->pixmap(), app->name(), app->id() ); 134 pmenu->insertItem( app->pixmap(), app->name(), app->id() );