author | sandman <sandman> | 2002-10-06 22:32:36 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-06 22:32:36 (UTC) |
commit | 814a6d0506a0296874949d2f220cf816830f1c80 (patch) (unidiff) | |
tree | 592b601293d8671b1f159db92ac463c9347d2a4b | |
parent | 8deb3ccbd188faf17aeb94afe108134ae72c4254 (diff) | |
download | opie-814a6d0506a0296874949d2f220cf816830f1c80.zip opie-814a6d0506a0296874949d2f220cf816830f1c80.tar.gz opie-814a6d0506a0296874949d2f220cf816830f1c80.tar.bz2 |
- reversed the sort order of menu applet positions
- added logout applet to the base opie-taskbar ipk
-rw-r--r-- | core/launcher/opie-taskbar.control | 2 | ||||
-rw-r--r-- | core/launcher/startmenu.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control index 8b88ec6..13e5715 100644 --- a/core/launcher/opie-taskbar.control +++ b/core/launcher/opie-taskbar.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* | 1 | Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* |
2 | Priority: required | 2 | Priority: required |
3 | Section: opie/system | 3 | Section: opie/system |
4 | Maintainer: Project Opie <opie@handhelds.org> | 4 | Maintainer: Project Opie <opie@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION.1 | 6 | Version: $QPE_VERSION-$SUB_VERSION.1 |
7 | Depends: qt-embedded (>=$QTE_VERSION) | 7 | Depends: qt-embedded (>=$QTE_VERSION) |
8 | Description: Launcher for Opie | 8 | Description: Launcher for Opie |
9 | The "finder" or "explorer", or whatever you want to call it. | 9 | The "finder" or "explorer", or whatever you want to call it. |
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp index 647d0f2..917f4c1 100644 --- a/core/launcher/startmenu.cpp +++ b/core/launcher/startmenu.cpp | |||
@@ -227,99 +227,99 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu ) | |||
227 | } | 227 | } |
228 | result=TRUE; | 228 | result=TRUE; |
229 | } | 229 | } |
230 | } | 230 | } |
231 | } | 231 | } |
232 | 232 | ||
233 | if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries | 233 | if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries |
234 | menu-> removeItem ( sepId ); | 234 | menu-> removeItem ( sepId ); |
235 | sepId = 0; | 235 | sepId = 0; |
236 | } | 236 | } |
237 | if ( !menu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later | 237 | if ( !menu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later |
238 | sepId = menu-> insertSeparator ( ); | 238 | sepId = menu-> insertSeparator ( ); |
239 | 239 | ||
240 | return result; | 240 | return result; |
241 | } | 241 | } |
242 | 242 | ||
243 | 243 | ||
244 | void StartMenu::launch() | 244 | void StartMenu::launch() |
245 | { | 245 | { |
246 | int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height(); | 246 | int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height(); |
247 | 247 | ||
248 | if ( launchMenu->isVisible() ) | 248 | if ( launchMenu->isVisible() ) |
249 | launchMenu->hide(); | 249 | launchMenu->hide(); |
250 | else | 250 | else |
251 | launchMenu->popup( QPoint( 1, y ) ); | 251 | launchMenu->popup( QPoint( 1, y ) ); |
252 | } | 252 | } |
253 | 253 | ||
254 | const AppLnk* StartMenu::execToLink(const QString& appname) | 254 | const AppLnk* StartMenu::execToLink(const QString& appname) |
255 | { | 255 | { |
256 | const AppLnk* a = apps->findExec( appname ); | 256 | const AppLnk* a = apps->findExec( appname ); |
257 | return a; | 257 | return a; |
258 | } | 258 | } |
259 | 259 | ||
260 | void StartPopupMenu::keyPressEvent( QKeyEvent *e ) | 260 | void StartPopupMenu::keyPressEvent( QKeyEvent *e ) |
261 | { | 261 | { |
262 | if ( e->key() == Key_F33 || e->key() == Key_Space ) { | 262 | if ( e->key() == Key_F33 || e->key() == Key_Space ) { |
263 | // "OK" button, little hacky | 263 | // "OK" button, little hacky |
264 | QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0); | 264 | QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0); |
265 | QPopupMenu::keyPressEvent( &ke ); | 265 | QPopupMenu::keyPressEvent( &ke ); |
266 | } else { | 266 | } else { |
267 | QPopupMenu::keyPressEvent( e ); | 267 | QPopupMenu::keyPressEvent( e ); |
268 | } | 268 | } |
269 | } | 269 | } |
270 | 270 | ||
271 | static int compareAppletPositions(const void *a, const void *b) | 271 | static int compareAppletPositions(const void *a, const void *b) |
272 | { | 272 | { |
273 | const MenuApplet* aa = *(const MenuApplet**)a; | 273 | const MenuApplet* aa = *(const MenuApplet**)a; |
274 | const MenuApplet* ab = *(const MenuApplet**)b; | 274 | const MenuApplet* ab = *(const MenuApplet**)b; |
275 | int d = ab->iface->position() - aa->iface->position(); | 275 | int d = aa->iface->position() - ab->iface->position(); |
276 | if ( d ) return d; | 276 | if ( d ) return d; |
277 | return QString::compare(ab->library->library(),aa->library->library()); | 277 | return QString::compare(aa->library->library(),ab->library->library()); |
278 | } | 278 | } |
279 | 279 | ||
280 | void StartMenu::clearApplets() | 280 | void StartMenu::clearApplets() |
281 | { | 281 | { |
282 | launchMenu-> hide(); | 282 | launchMenu-> hide(); |
283 | 283 | ||
284 | for ( QIntDictIterator<MenuApplet> it ( applets ); it. current ( ); ++it ) { | 284 | for ( QIntDictIterator<MenuApplet> it ( applets ); it. current ( ); ++it ) { |
285 | MenuApplet *applet = it. current ( ); | 285 | MenuApplet *applet = it. current ( ); |
286 | if ( launchMenu ) { | 286 | if ( launchMenu ) { |
287 | launchMenu-> removeItem ( applet-> id ); | 287 | launchMenu-> removeItem ( applet-> id ); |
288 | delete applet-> popup; | 288 | delete applet-> popup; |
289 | } | 289 | } |
290 | 290 | ||
291 | applet-> iface-> release(); | 291 | applet-> iface-> release(); |
292 | applet-> library-> unload(); | 292 | applet-> library-> unload(); |
293 | delete applet-> library; | 293 | delete applet-> library; |
294 | } | 294 | } |
295 | applets.clear(); | 295 | applets.clear(); |
296 | } | 296 | } |
297 | 297 | ||
298 | 298 | ||
299 | 299 | ||
300 | void StartMenu::loadApplets() | 300 | void StartMenu::loadApplets() |
301 | { | 301 | { |
302 | Config cfg( "StartMenu" ); | 302 | Config cfg( "StartMenu" ); |
303 | cfg.setGroup( "Applets" ); | 303 | cfg.setGroup( "Applets" ); |
304 | 304 | ||
305 | // SafeMode causes too much problems, so we disable it for now -- | 305 | // SafeMode causes too much problems, so we disable it for now -- |
306 | // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02 | 306 | // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02 |
307 | 307 | ||
308 | bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE); | 308 | bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE); |
309 | if ( safe && !safety_tid ) | 309 | if ( safe && !safety_tid ) |
310 | return; | 310 | return; |
311 | cfg.writeEntry("SafeMode",TRUE); | 311 | cfg.writeEntry("SafeMode",TRUE); |
312 | cfg.write(); | 312 | cfg.write(); |
313 | QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' ); | 313 | QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' ); |
314 | 314 | ||
315 | QString path = QPEApplication::qpeDir() + "/plugins/applets"; | 315 | QString path = QPEApplication::qpeDir() + "/plugins/applets"; |
316 | QDir dir( path, "lib*.so" ); | 316 | QDir dir( path, "lib*.so" ); |
317 | QStringList list = dir.entryList(); | 317 | QStringList list = dir.entryList(); |
318 | QStringList::Iterator it; | 318 | QStringList::Iterator it; |
319 | int napplets=0; | 319 | int napplets=0; |
320 | MenuApplet* *xapplets = new MenuApplet*[list.count()]; | 320 | MenuApplet* *xapplets = new MenuApplet*[list.count()]; |
321 | for ( it = list.begin(); it != list.end(); ++it ) { | 321 | for ( it = list.begin(); it != list.end(); ++it ) { |
322 | if ( exclude.find( *it ) != exclude.end() ) | 322 | if ( exclude.find( *it ) != exclude.end() ) |
323 | continue; | 323 | continue; |
324 | MenuAppletInterface *iface = 0; | 324 | MenuAppletInterface *iface = 0; |
325 | QLibrary *lib = new QLibrary( path + "/" + *it ); | 325 | QLibrary *lib = new QLibrary( path + "/" + *it ); |