summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-01-04 23:36:04 (UTC)
committer mickeyl <mickeyl>2004-01-04 23:36:04 (UTC)
commit68f09442c635da109c0f31888d4f42bd14e8de1f (patch) (unidiff)
tree27f7dbdaae1547fc6e8094a97009859e3c480ee2
parent5af215d9cac1c65a9cd56b56cc18e39cfcc06c64 (diff)
downloadopie-68f09442c635da109c0f31888d4f42bd14e8de1f.zip
opie-68f09442c635da109c0f31888d4f42bd14e8de1f.tar.gz
opie-68f09442c635da109c0f31888d4f42bd14e8de1f.tar.bz2
better not define rotation as pressaction _and_ heldaction
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 82a0099..35d6cb4 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -253,99 +253,99 @@ struct z_button {
253 Qt::Key code; 253 Qt::Key code;
254 char *utext; 254 char *utext;
255 char *pix; 255 char *pix;
256 char *fpressedservice; 256 char *fpressedservice;
257 char *fpressedaction; 257 char *fpressedaction;
258 char *fheldservice; 258 char *fheldservice;
259 char *fheldaction; 259 char *fheldaction;
260} z_buttons [] = { 260} z_buttons [] = {
261 { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), 261 { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
262 "devicebuttons/z_calendar", 262 "devicebuttons/z_calendar",
263 "datebook", "nextView()", 263 "datebook", "nextView()",
264 "today", "raise()" }, 264 "today", "raise()" },
265 { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), 265 { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
266 "devicebuttons/z_contact", 266 "devicebuttons/z_contact",
267 "addressbook", "raise()", 267 "addressbook", "raise()",
268 "addressbook", "beamBusinessCard()" }, 268 "addressbook", "beamBusinessCard()" },
269 { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), 269 { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
270 "devicebuttons/z_home", 270 "devicebuttons/z_home",
271 "QPE/Launcher", "home()", 271 "QPE/Launcher", "home()",
272 "buttonsettings", "raise()" }, 272 "buttonsettings", "raise()" },
273 { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), 273 { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
274 "devicebuttons/z_menu", 274 "devicebuttons/z_menu",
275 "QPE/TaskBar", "toggleMenu()", 275 "QPE/TaskBar", "toggleMenu()",
276 "QPE/TaskBar", "toggleStartMenu()" }, 276 "QPE/TaskBar", "toggleStartMenu()" },
277 { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), 277 { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
278 "devicebuttons/z_mail", 278 "devicebuttons/z_mail",
279 "mail", "raise()", 279 "mail", "raise()",
280 "mail", "newMail()" }, 280 "mail", "newMail()" },
281}; 281};
282 282
283struct z_button z_buttons_c700 [] = { 283struct z_button z_buttons_c700 [] = {
284 { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), 284 { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
285 "devicebuttons/z_calendar", 285 "devicebuttons/z_calendar",
286 "datebook", "nextView()", 286 "datebook", "nextView()",
287 "today", "raise()" }, 287 "today", "raise()" },
288 { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), 288 { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
289 "devicebuttons/z_contact", 289 "devicebuttons/z_contact",
290 "addressbook", "raise()", 290 "addressbook", "raise()",
291 "addressbook", "beamBusinessCard()" }, 291 "addressbook", "beamBusinessCard()" },
292 { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), 292 { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
293 "devicebuttons/z_home", 293 "devicebuttons/z_home",
294 "QPE/Launcher", "home()", 294 "QPE/Launcher", "home()",
295 "buttonsettings", "raise()" }, 295 "buttonsettings", "raise()" },
296 { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), 296 { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
297 "devicebuttons/z_menu", 297 "devicebuttons/z_menu",
298 "QPE/TaskBar", "toggleMenu()", 298 "QPE/TaskBar", "toggleMenu()",
299 "QPE/TaskBar", "toggleStartMenu()" }, 299 "QPE/TaskBar", "toggleStartMenu()" },
300 { Qt::Key_F14, QT_TRANSLATE_NOOP("Button", "Display Rotate"), 300 { Qt::Key_F14, QT_TRANSLATE_NOOP("Button", "Display Rotate"),
301 "", 301 "devicebuttons/z_hinge",
302 "QPE/Rotation", "rotateDefault()", 302 "QPE/Rotation", "rotateDefault()",
303 "QPE/Rotation", "rotateDefault()" }, 303 "QPE/Dummy", "doNothing()" },
304}; 304};
305 305
306struct s_button { 306struct s_button {
307 uint model; 307 uint model;
308 Qt::Key code; 308 Qt::Key code;
309 char *utext; 309 char *utext;
310 char *pix; 310 char *pix;
311 char *fpressedservice; 311 char *fpressedservice;
312 char *fpressedaction; 312 char *fpressedaction;
313 char *fheldservice; 313 char *fheldservice;
314 char *fheldaction; 314 char *fheldaction;
315} simpad_buttons [] = { 315} simpad_buttons [] = {
316 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, 316 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
317 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"), 317 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"),
318 "devicebuttons/simpad_lower_up", 318 "devicebuttons/simpad_lower_up",
319 "datebook", "nextView()", 319 "datebook", "nextView()",
320 "today", "raise()" }, 320 "today", "raise()" },
321 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, 321 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
322 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"), 322 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"),
323 "devicebuttons/simpad_lower_down", 323 "devicebuttons/simpad_lower_down",
324 "addressbook", "raise()", 324 "addressbook", "raise()",
325 "addressbook", "beamBusinessCard()" }, 325 "addressbook", "beamBusinessCard()" },
326 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, 326 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
327 Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Lower+Right"), 327 Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Lower+Right"),
328 "devicebuttons/simpad_lower_right", 328 "devicebuttons/simpad_lower_right",
329 "QPE/TaskBar", "toggleMenu()", 329 "QPE/TaskBar", "toggleMenu()",
330 "QPE/TaskBar", "toggleStartMenu()" }, 330 "QPE/TaskBar", "toggleStartMenu()" },
331 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, 331 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
332 Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Lower+Left"), 332 Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Lower+Left"),
333 "devicebuttons/simpad_lower_left", 333 "devicebuttons/simpad_lower_left",
334 "mail", "raise()", 334 "mail", "raise()",
335 "mail", "newMail()" }, 335 "mail", "newMail()" },
336 336
337 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, 337 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
338 Qt::Key_F5, QT_TRANSLATE_NOOP("Button", "Upper+Up"), 338 Qt::Key_F5, QT_TRANSLATE_NOOP("Button", "Upper+Up"),
339 "devicebuttons/simpad_upper_up", 339 "devicebuttons/simpad_upper_up",
340 "QPE/Launcher", "home()", 340 "QPE/Launcher", "home()",
341 "buttonsettings", "raise()" }, 341 "buttonsettings", "raise()" },
342 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, 342 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
343 Qt::Key_F6, QT_TRANSLATE_NOOP("Button", "Upper+Down"), 343 Qt::Key_F6, QT_TRANSLATE_NOOP("Button", "Upper+Down"),
344 "devicebuttons/simpad_upper_down", 344 "devicebuttons/simpad_upper_down",
345 "addressbook", "raise()", 345 "addressbook", "raise()",
346 "addressbook", "beamBusinessCard()" }, 346 "addressbook", "beamBusinessCard()" },
347 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, 347 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
348 Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Upper+Right"), 348 Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Upper+Right"),
349 "devicebuttons/simpad_upper_right", 349 "devicebuttons/simpad_upper_right",
350 "QPE/TaskBar", "toggleMenu()", 350 "QPE/TaskBar", "toggleMenu()",
351 "QPE/TaskBar", "toggleStartMenu()" }, 351 "QPE/TaskBar", "toggleStartMenu()" },