-rw-r--r-- | libopie/odevice.cpp | 59 |
1 files changed, 50 insertions, 9 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 2873407..01932c9 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -245,51 +245,92 @@ struct z_button z_buttons_c700 [] = { | |||
245 | "addressbook", "beamBusinessCard()" }, | 245 | "addressbook", "beamBusinessCard()" }, |
246 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), | 246 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), |
247 | "devicebuttons/z_home", | 247 | "devicebuttons/z_home", |
248 | "QPE/Launcher", "home()", | 248 | "QPE/Launcher", "home()", |
249 | "buttonsettings", "raise()" }, | 249 | "buttonsettings", "raise()" }, |
250 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), | 250 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), |
251 | "devicebuttons/z_menu", | 251 | "devicebuttons/z_menu", |
252 | "QPE/TaskBar", "toggleMenu()", | 252 | "QPE/TaskBar", "toggleMenu()", |
253 | "QPE/TaskBar", "toggleStartMenu()" }, | 253 | "QPE/TaskBar", "toggleStartMenu()" }, |
254 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Display Rotate"), | 254 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Display Rotate"), |
255 | "", | 255 | "", |
256 | "QPE/Rotation", "flip()", | 256 | "QPE/Rotation", "flip()", |
257 | "QPE/Rotation", "flip()" }, | 257 | "QPE/Rotation", "flip()" }, |
258 | }; | 258 | }; |
259 | 259 | ||
260 | struct s_button { | 260 | struct s_button { |
261 | uint model; | 261 | uint model; |
262 | Qt::Key code; | 262 | Qt::Key code; |
263 | char *utext; | 263 | char *utext; |
264 | char *pix; | 264 | char *pix; |
265 | char *fpressedservice; | 265 | char *fpressedservice; |
266 | char *fpressedaction; | 266 | char *fpressedaction; |
267 | char *fheldservice; | 267 | char *fheldservice; |
268 | char *fheldaction; | 268 | char *fheldaction; |
269 | } simpad_buttons [] = { | 269 | } simpad_buttons [] = { |
270 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 270 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
271 | Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), | 271 | Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"), |
272 | "devicebuttons/simpad_menu", | 272 | "devicebuttons/simpad_lower_up", |
273 | "QPE/TaskBar", "toggleMenu()", | 273 | "datebook", "nextView()", |
274 | "QPE/TaskBar", "toggleStartMenu()" }, | 274 | "today", "raise()" }, |
275 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 275 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
276 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), | 276 | Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"), |
277 | "devicebuttons/ipaq_home", | 277 | "devicebuttons/simpad_lower_down", |
278 | "QPE/Launcher", "home()", | 278 | "addressbook", "raise()", |
279 | "buttonsettings", "raise()" }, | 279 | "addressbook", "beamBusinessCard()" }, |
280 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | ||
281 | Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Lower+Right"), | ||
282 | "devicebuttons/simpad_lower_right", | ||
283 | "QPE/TaskBar", "toggleMenu()", | ||
284 | "QPE/TaskBar", "toggleStartMenu()" }, | ||
285 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | ||
286 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"), | ||
287 | "devicebuttons/simpad_lower_upper", | ||
288 | "QPE/Launcher", "home()", | ||
289 | "buttonsettings", "raise()" }, | ||
290 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | ||
291 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Lower+Left"), | ||
292 | "devicebuttons/simpad_lower_left", | ||
293 | "mail", "raise()", | ||
294 | "mail", "newMail()" }, | ||
295 | |||
296 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | ||
297 | Qt::Key_F5, QT_TRANSLATE_NOOP("Button", "Upper+Up"), | ||
298 | "devicebuttons/simpad_upper_up", | ||
299 | "datebook", "nextView()", | ||
300 | "today", "raise()" }, | ||
301 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | ||
302 | Qt::Key_F6, QT_TRANSLATE_NOOP("Button", "Upper+Down"), | ||
303 | "devicebuttons/simpad_upper_down", | ||
304 | "addressbook", "raise()", | ||
305 | "addressbook", "beamBusinessCard()" }, | ||
306 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | ||
307 | Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Upper+Right"), | ||
308 | "devicebuttons/simpad_upper_right", | ||
309 | "QPE/TaskBar", "toggleMenu()", | ||
310 | "QPE/TaskBar", "toggleStartMenu()" }, | ||
311 | /*{ Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | ||
312 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"), | ||
313 | "devicebuttons/simpad_lower_upper", | ||
314 | "QPE/Launcher", "home()", | ||
315 | "buttonsettings", "raise()" },*/ | ||
316 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | ||
317 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Upper+Left"), | ||
318 | "devicebuttons/simpad_upper_left", | ||
319 | "mail", "raise()", | ||
320 | "mail", "newMail()" }, | ||
280 | }; | 321 | }; |
281 | 322 | ||
282 | static QCString makeChannel ( const char *str ) | 323 | static QCString makeChannel ( const char *str ) |
283 | { | 324 | { |
284 | if ( str && !::strchr ( str, '/' )) | 325 | if ( str && !::strchr ( str, '/' )) |
285 | return QCString ( "QPE/Application/" ) + str; | 326 | return QCString ( "QPE/Application/" ) + str; |
286 | else | 327 | else |
287 | return str; | 328 | return str; |
288 | } | 329 | } |
289 | 330 | ||
290 | static inline bool isQWS() | 331 | static inline bool isQWS() |
291 | { | 332 | { |
292 | return qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; | 333 | return qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; |
293 | } | 334 | } |
294 | 335 | ||
295 | ODevice *ODevice::inst ( ) | 336 | ODevice *ODevice::inst ( ) |