author | sandman <sandman> | 2002-12-23 00:07:32 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-23 00:07:32 (UTC) |
commit | 6f82a7bad0746d37ff1545717be3fe67e2eed17c (patch) (side-by-side diff) | |
tree | eaf5e6b6d7e7fcc648d25ae7021d1785b80122f2 /core/launcher/desktop.h | |
parent | c513f413c7d901cc9945714c8e7eb47292f63306 (diff) | |
download | opie-6f82a7bad0746d37ff1545717be3fe67e2eed17c.zip opie-6f82a7bad0746d37ff1545717be3fe67e2eed17c.tar.gz opie-6f82a7bad0746d37ff1545717be3fe67e2eed17c.tar.bz2 |
- ported the device button handling to the new ODevice based framework
- removed the key re-grabbing in runningsappbar (not necessary anymore)
- added a few new QCops to make all "special" launcher functions available
via qcop
- added the devicebuttons to the opie-taskbar ipk
-rw-r--r-- | core/launcher/desktop.h | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h index 1f8daa0..6cb7ab2 100644 --- a/core/launcher/desktop.h +++ b/core/launcher/desktop.h @@ -25,6 +25,7 @@ #include "shutdownimpl.h" #include <qpe/qpeapplication.h> +#include <opie/odevicebutton.h> #include <qwidget.h> #include <qdatetime.h> @@ -48,13 +49,12 @@ public: static void switchLCD ( bool on ); // only for togglePower in Desktop + static void soundAlarm(); // only because QCop soundAlarm() is defined in QPE/TaskBar + signals: void menu(); void home(); - void datebook(); - void contacts(); void launch(); - void email(); void backlight(); void power(); void symbol(); @@ -72,13 +72,22 @@ protected: void restart(); public slots: - virtual void desktopMessage ( const QCString &msg, const QByteArray &data ); virtual void systemMessage ( const QCString &msg, const QByteArray &data ); + virtual void launcherMessage ( const QCString &msg, const QByteArray &data ); + void rereadVolumes(); protected slots: void shutdown( ShutdownImpl::Type ); void apmTimeout(); - void sendCard(); + void sendHeldAction ( ); + +protected: + virtual bool eventFilter ( QObject *o, QEvent *e ); + void checkButtonAction ( const Opie::ODeviceButton *db, int keycode, bool press, bool autoRepeat ); + +private: + static DesktopApplication *me ( ); + private: void reloadPowerWarnSettings(); DesktopPowerAlerter *pa; @@ -90,6 +99,13 @@ private: int m_powerVeryLow; int m_powerCritical; int m_currentPowerLevel; + + const Opie::ODeviceButton *m_last_button; + QTimer *m_button_timer; + + bool m_keyclick_sound : 1; + bool m_screentap_sound : 1; + bool m_alarm_sound : 1; }; @@ -105,16 +121,7 @@ public: void show(); void checkMemory(); - void keyClick(); - void screenClick(); - static void soundAlarm(); - public slots: - void raiseDatebook(); - void raiseContacts(); - void raiseMenu(); - void raiseLauncher(); - void raiseEmail(); void execAutoStart(); void togglePower(); void toggleLight(); @@ -122,9 +129,6 @@ public slots: void toggleCapsLockState(); void toggleSymbolInput(); void terminateServers(); - void rereadVolumes(); - - void home ( ); protected: void executeOrModify( const QString& appLnkFile ); @@ -144,7 +148,6 @@ private: PackageSlave *packageSlave; QDateTime suspendTime; - bool keyclick, touchclick, alarmsound; }; |