summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/startmenu.cpp2
-rw-r--r--pics/launcher/start_button.png (renamed from pics/start_button.png)bin780 -> 780 bytes
-rw-r--r--pics/start_button.xpm26
3 files changed, 1 insertions, 27 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 007b483..237a2de 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -62,49 +62,49 @@ void StartMenu::mousePressEvent( QMouseEvent * )
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 = "go"; 84 popupMenuSidePixmap = "go";
85 startButtonIsFlat = TRUE; 85 startButtonIsFlat = TRUE;
86 startButtonPixmap = "start_button"; 86 startButtonPixmap = "launcher/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{
diff --git a/pics/start_button.png b/pics/launcher/start_button.png
index c84c00b..c84c00b 100644
--- a/pics/start_button.png
+++ b/pics/launcher/start_button.png
Binary files differ
diff --git a/pics/start_button.xpm b/pics/start_button.xpm
deleted file mode 100644
index 6eba2a5..0000000
--- a/pics/start_button.xpm
+++ b/dev/null
@@ -1,26 +0,0 @@
1/* XPM */
2static char * start_button_xpm[] = {
3"50 16 7 1",
4 " c None",
5 ".c #707070",
6 "+c #FFFFFF",
7 "@c #000000",
8 "#c #008200",
9 "$c #C0C0C0",
10 "%c #B7B500",
11".++++++++++++++++++++++++++++++++++++++++++++++++@",
12"+##############$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
13"+####@@@@@@####$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
14"+###@@@@@@@@###$$$@@@@$$$$@$$$$$$$$$$$$$$$$$$@$$$@",
15"+##@@#####@@@##$$@@$$@@$$@@$$$$$$$$$$$$$$$$$@@$$$@",
16"+#@@#######@@@#$$@@$$$$$@@@@@$$@@@@$$$@@$@@@@@@@$@",
17"+#@#########@@#$$@@@$$$$$@@$$$@@$$@@$$@@$@@$@@$$$@",
18"+#@###@%@###@@#$$$@@@@$$$@@$$$$$$$@@$$@@@$$$@@$$$@",
19"+#@###%%%###@@#$$$$$@@@$$@@$$$$@@@@@$$@@$$$$@@$$$@",
20"+#@###@%@###@@#$$$$$$@@$$@@$$$@@$$@@$$@@$$$$@@$$$@",
21"+#@#########@@#$$@@$$@@$$@@$$$@@$$@@$$@@$$$$@@$$$@",
22"+#@@########@@#$$$@@@@$$$$@@@$$@@@$@@$@@$$$$$@@@$@",
23"+##@@######@@@#$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
24"+###@@####@@@##$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
25"+####@@@@@@@###$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
26"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};