-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 @@ | |||
25 | #include "shutdownimpl.h" | 25 | #include "shutdownimpl.h" |
26 | 26 | ||
27 | #include <qpe/qpeapplication.h> | 27 | #include <qpe/qpeapplication.h> |
28 | #include <opie/odevicebutton.h> | ||
28 | 29 | ||
29 | #include <qwidget.h> | 30 | #include <qwidget.h> |
30 | #include <qdatetime.h> | 31 | #include <qdatetime.h> |
@@ -48,13 +49,12 @@ public: | |||
48 | 49 | ||
49 | static void switchLCD ( bool on ); // only for togglePower in Desktop | 50 | static void switchLCD ( bool on ); // only for togglePower in Desktop |
50 | 51 | ||
52 | static void soundAlarm(); // only because QCop soundAlarm() is defined in QPE/TaskBar | ||
53 | |||
51 | signals: | 54 | signals: |
52 | void menu(); | 55 | void menu(); |
53 | void home(); | 56 | void home(); |
54 | void datebook(); | ||
55 | void contacts(); | ||
56 | void launch(); | 57 | void launch(); |
57 | void email(); | ||
58 | void backlight(); | 58 | void backlight(); |
59 | void power(); | 59 | void power(); |
60 | void symbol(); | 60 | void symbol(); |
@@ -72,13 +72,22 @@ protected: | |||
72 | void restart(); | 72 | void restart(); |
73 | 73 | ||
74 | public slots: | 74 | public slots: |
75 | virtual void desktopMessage ( const QCString &msg, const QByteArray &data ); | ||
76 | virtual void systemMessage ( const QCString &msg, const QByteArray &data ); | 75 | virtual void systemMessage ( const QCString &msg, const QByteArray &data ); |
76 | virtual void launcherMessage ( const QCString &msg, const QByteArray &data ); | ||
77 | void rereadVolumes(); | ||
77 | 78 | ||
78 | protected slots: | 79 | protected slots: |
79 | void shutdown( ShutdownImpl::Type ); | 80 | void shutdown( ShutdownImpl::Type ); |
80 | void apmTimeout(); | 81 | void apmTimeout(); |
81 | void sendCard(); | 82 | void sendHeldAction ( ); |
83 | |||
84 | protected: | ||
85 | virtual bool eventFilter ( QObject *o, QEvent *e ); | ||
86 | void checkButtonAction ( const Opie::ODeviceButton *db, int keycode, bool press, bool autoRepeat ); | ||
87 | |||
88 | private: | ||
89 | static DesktopApplication *me ( ); | ||
90 | |||
82 | private: | 91 | private: |
83 | void reloadPowerWarnSettings(); | 92 | void reloadPowerWarnSettings(); |
84 | DesktopPowerAlerter *pa; | 93 | DesktopPowerAlerter *pa; |
@@ -90,6 +99,13 @@ private: | |||
90 | int m_powerVeryLow; | 99 | int m_powerVeryLow; |
91 | int m_powerCritical; | 100 | int m_powerCritical; |
92 | int m_currentPowerLevel; | 101 | int m_currentPowerLevel; |
102 | |||
103 | const Opie::ODeviceButton *m_last_button; | ||
104 | QTimer *m_button_timer; | ||
105 | |||
106 | bool m_keyclick_sound : 1; | ||
107 | bool m_screentap_sound : 1; | ||
108 | bool m_alarm_sound : 1; | ||
93 | }; | 109 | }; |
94 | 110 | ||
95 | 111 | ||
@@ -105,16 +121,7 @@ public: | |||
105 | void show(); | 121 | void show(); |
106 | void checkMemory(); | 122 | void checkMemory(); |
107 | 123 | ||
108 | void keyClick(); | ||
109 | void screenClick(); | ||
110 | static void soundAlarm(); | ||
111 | |||
112 | public slots: | 124 | public slots: |
113 | void raiseDatebook(); | ||
114 | void raiseContacts(); | ||
115 | void raiseMenu(); | ||
116 | void raiseLauncher(); | ||
117 | void raiseEmail(); | ||
118 | void execAutoStart(); | 125 | void execAutoStart(); |
119 | void togglePower(); | 126 | void togglePower(); |
120 | void toggleLight(); | 127 | void toggleLight(); |
@@ -122,9 +129,6 @@ public slots: | |||
122 | void toggleCapsLockState(); | 129 | void toggleCapsLockState(); |
123 | void toggleSymbolInput(); | 130 | void toggleSymbolInput(); |
124 | void terminateServers(); | 131 | void terminateServers(); |
125 | void rereadVolumes(); | ||
126 | |||
127 | void home ( ); | ||
128 | 132 | ||
129 | protected: | 133 | protected: |
130 | void executeOrModify( const QString& appLnkFile ); | 134 | void executeOrModify( const QString& appLnkFile ); |
@@ -144,7 +148,6 @@ private: | |||
144 | PackageSlave *packageSlave; | 148 | PackageSlave *packageSlave; |
145 | 149 | ||
146 | QDateTime suspendTime; | 150 | QDateTime suspendTime; |
147 | bool keyclick, touchclick, alarmsound; | ||
148 | }; | 151 | }; |
149 | 152 | ||
150 | 153 | ||