summaryrefslogtreecommitdiff
authorsandman <sandman>2002-10-06 22:32:36 (UTC)
committer sandman <sandman>2002-10-06 22:32:36 (UTC)
commit814a6d0506a0296874949d2f220cf816830f1c80 (patch) (side-by-side diff)
tree592b601293d8671b1f159db92ac463c9347d2a4b
parent8deb3ccbd188faf17aeb94afe108134ae72c4254 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/opie-taskbar.control2
-rw-r--r--core/launcher/startmenu.cpp4
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 @@
-Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so*
+Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so*
Priority: required
Section: opie/system
Maintainer: Project Opie <opie@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION.1
Depends: qt-embedded (>=$QTE_VERSION)
Description: Launcher for Opie
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
@@ -263,27 +263,27 @@ void StartPopupMenu::keyPressEvent( QKeyEvent *e )
// "OK" button, little hacky
QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0);
QPopupMenu::keyPressEvent( &ke );
} else {
QPopupMenu::keyPressEvent( e );
}
}
static int compareAppletPositions(const void *a, const void *b)
{
const MenuApplet* aa = *(const MenuApplet**)a;
const MenuApplet* ab = *(const MenuApplet**)b;
- int d = ab->iface->position() - aa->iface->position();
+ int d = aa->iface->position() - ab->iface->position();
if ( d ) return d;
- return QString::compare(ab->library->library(),aa->library->library());
+ return QString::compare(aa->library->library(),ab->library->library());
}
void StartMenu::clearApplets()
{
launchMenu-> hide();
for ( QIntDictIterator<MenuApplet> it ( applets ); it. current ( ); ++it ) {
MenuApplet *applet = it. current ( );
if ( launchMenu ) {
launchMenu-> removeItem ( applet-> id );
delete applet-> popup;
}