summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp28
1 files changed, 3 insertions, 25 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 4258d60..013f804 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -366,34 +366,12 @@ struct s_button {
366 "devicebuttons/simpad_upper_lower", 366 "devicebuttons/simpad_upper_lower",
367 "QPE/Launcher", "home()", 367 "QPE/Launcher", "home()",
368 "buttonsettings", "raise()" }, 368 "buttonsettings", "raise()" },
369 */ 369 */
370}; 370};
371 371
372struct r_button {
373 uint model;
374 Qt::Key code;
375 char *utext;
376 char *pix;
377 char *fpressedservice;
378 char *fpressedaction;
379 char *fheldservice;
380 char *fheldaction;
381} ramses_buttons [] = {
382 { Model_Ramses_MNCI,
383 Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
384 "devicebuttons/z_menu",
385 "QPE/TaskBar", "toggleMenu()",
386 "QPE/TaskBar", "toggleStartMenu()" },
387 { Model_Ramses_MNCI,
388 Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
389 "devicebuttons/ipaq_home",
390 "QPE/Launcher", "home()",
391 "buttonsettings", "raise()" },
392};
393
394class Yopy : public ODevice { 372class Yopy : public ODevice {
395protected: 373protected:
396 virtual void init ( ); 374 virtual void init ( );
397 virtual void initButtons ( ); 375 virtual void initButtons ( );
398 376
399public: 377public:
@@ -449,18 +427,18 @@ ODevice *ODevice::inst ( )
449 if ( QFile::exists ( "/proc/hal/model" )) 427 if ( QFile::exists ( "/proc/hal/model" ))
450 dev = new iPAQ ( ); 428 dev = new iPAQ ( );
451 else if ( Zaurus::isZaurus() ) 429 else if ( Zaurus::isZaurus() )
452 dev = new Zaurus ( ); 430 dev = new Zaurus ( );
453 else if ( QFile::exists ( "/proc/ucb1x00" ) && QFile::exists ( "/proc/cs3" )) 431 else if ( QFile::exists ( "/proc/ucb1x00" ) && QFile::exists ( "/proc/cs3" ))
454 dev = new SIMpad ( ); 432 dev = new SIMpad ( );
455 else if ( QFile::exists ( "/proc/sys/board/name" ))
456 dev = new Ramses ( );
457 else if ( Yopy::isYopy() ) 433 else if ( Yopy::isYopy() )
458 dev = new Yopy ( ); 434 dev = new Yopy ( );
459 else if ( Jornada::isJornada() ) 435 else if ( Jornada::isJornada() )
460 dev = new Jornada ( ); 436 dev = new Jornada ( );
437 else if ( QFile::exists ( "/proc/sys/board/sys_name" ))
438 dev = new Ramses ( );
461 else 439 else
462 dev = new ODevice ( ); 440 dev = new ODevice ( );
463 dev-> init ( ); 441 dev-> init ( );
464 } 442 }
465 return dev; 443 return dev;
466} 444}
@@ -2525,13 +2503,13 @@ void Ramses::init()
2525 2503
2526 QFile f("/proc/sys/board/ramses"); 2504 QFile f("/proc/sys/board/ramses");
2527 2505
2528 d->m_modelstr = "Ramses"; 2506 d->m_modelstr = "Ramses";
2529 d->m_model = Model_Ramses_MNCI; 2507 d->m_model = Model_Ramses_MNCI;
2530 2508
2531 d->m_rotation = Rot0; 2509 d->m_rotation = Rot90;
2532 d->m_holdtime = 1000; 2510 d->m_holdtime = 1000;
2533 2511
2534 f.setName("/etc/oz_version"); 2512 f.setName("/etc/oz_version");
2535 2513
2536 if (f.open(IO_ReadOnly)) { 2514 if (f.open(IO_ReadOnly)) {
2537 d->m_systemstr = "OpenEmbedded/Ramses"; 2515 d->m_systemstr = "OpenEmbedded/Ramses";