-rw-r--r-- | core/launcher/startmenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp index 39e07c8..2871233 100644 --- a/core/launcher/startmenu.cpp +++ b/core/launcher/startmenu.cpp | |||
@@ -67,55 +67,55 @@ void StartMenu::mousePressEvent( QMouseEvent * ) | |||
67 | launch(); | 67 | launch(); |
68 | if (desktopInfo) | 68 | if (desktopInfo) |
69 | desktopInfo->menuClicked(); | 69 | desktopInfo->menuClicked(); |
70 | } | 70 | } |
71 | 71 | ||
72 | 72 | ||
73 | StartMenu::~StartMenu() | 73 | StartMenu::~StartMenu() |
74 | { | 74 | { |
75 | delete apps; | 75 | delete apps; |
76 | } | 76 | } |
77 | 77 | ||
78 | 78 | ||
79 | void StartMenu::loadOptions() | 79 | void StartMenu::loadOptions() |
80 | { | 80 | { |
81 | #ifdef USE_CONFIG_FILE | 81 | #ifdef USE_CONFIG_FILE |
82 | // Read configuration file | 82 | // Read configuration file |
83 | Config config("StartMenu"); | 83 | Config config("StartMenu"); |
84 | config.setGroup( "StartMenu" ); | 84 | config.setGroup( "StartMenu" ); |
85 | QString tmpBoolString1 = config.readEntry( "UseWidePopupMenu", "FALSE" ); | 85 | QString tmpBoolString1 = config.readEntry( "UseWidePopupMenu", "FALSE" ); |
86 | useWidePopupMenu = ( tmpBoolString1 == "TRUE" ) ? TRUE : FALSE; | 86 | useWidePopupMenu = ( tmpBoolString1 == "TRUE" ) ? TRUE : FALSE; |
87 | QString tmpBoolString2 = config.readEntry( "StartButtonIsFlat", "TRUE" ); | 87 | QString tmpBoolString2 = config.readEntry( "StartButtonIsFlat", "TRUE" ); |
88 | startButtonIsFlat = ( tmpBoolString2 == "TRUE" ) ? TRUE : FALSE; | 88 | startButtonIsFlat = ( tmpBoolString2 == "TRUE" ) ? TRUE : FALSE; |
89 | QString tmpBoolString3 = config.readEntry( "UseMRUList", "TRUE" ); | 89 | QString tmpBoolString3 = config.readEntry( "UseMRUList", "TRUE" ); |
90 | popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "launcher/sidebar" ); | 90 | popupMenuSidePixmap = config.readEntry( "PopupMenuSidePixmap", "launcher/sidebar" ); |
91 | startButtonPixmap = config.readEntry( "StartButtonPixmap", "launcher/start_button" ); | 91 | startButtonPixmap = config.readEntry( "StartButtonPixmap", "go" ); |
92 | #else | 92 | #else |
93 | // Basically just #include the .qpe_menu.conf file settings | 93 | // Basically just #include the .qpe_menu.conf file settings |
94 | useWidePopupMenu = FALSE; | 94 | useWidePopupMenu = FALSE; |
95 | popupMenuSidePixmap = "launcher/sidebar"; | 95 | popupMenuSidePixmap = "launcher/sidebar"; |
96 | startButtonIsFlat = TRUE; | 96 | startButtonIsFlat = TRUE; |
97 | startButtonPixmap = "launcher/start_button"; // No tr | 97 | startButtonPixmap = "go"; // No tr |
98 | #endif | 98 | #endif |
99 | } | 99 | } |
100 | 100 | ||
101 | 101 | ||
102 | void StartMenu::createMenu() | 102 | void StartMenu::createMenu() |
103 | { | 103 | { |
104 | delete launchMenu; | 104 | delete launchMenu; |
105 | if ( useWidePopupMenu ) | 105 | if ( useWidePopupMenu ) |
106 | launchMenu = new PopupWithLaunchSideThing( this, &popupMenuSidePixmap ); | 106 | launchMenu = new PopupWithLaunchSideThing( this, &popupMenuSidePixmap ); |
107 | else | 107 | else |
108 | launchMenu = new StartPopupMenu( this ); | 108 | launchMenu = new StartPopupMenu( this ); |
109 | 109 | ||
110 | loadMenu ( apps, launchMenu ); | 110 | loadMenu ( apps, launchMenu ); |
111 | loadApplets ( ); | 111 | loadApplets ( ); |
112 | 112 | ||
113 | connect( launchMenu, SIGNAL(activated(int)), SLOT(itemSelected(int)) ); | 113 | connect( launchMenu, SIGNAL(activated(int)), SLOT(itemSelected(int)) ); |
114 | } | 114 | } |
115 | 115 | ||
116 | void StartMenu::reloadApps() | 116 | void StartMenu::reloadApps() |
117 | { | 117 | { |
118 | Config cfg("StartMenu"); | 118 | Config cfg("StartMenu"); |
119 | cfg.setGroup("Menu"); | 119 | cfg.setGroup("Menu"); |
120 | bool ltabs = cfg.readBoolEntry("LauncherTabs",TRUE); | 120 | bool ltabs = cfg.readBoolEntry("LauncherTabs",TRUE); |
121 | bool lot = cfg.readBoolEntry("LauncherOther",TRUE); | 121 | bool lot = cfg.readBoolEntry("LauncherOther",TRUE); |