-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index e57cdef..39b37cd 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -624,52 +624,53 @@ uint ODevice::buttonHoldTime() const | |||
624 | return d->m_holdtime; | 624 | return d->m_holdtime; |
625 | } | 625 | } |
626 | 626 | ||
627 | /** | 627 | /** |
628 | * This method return a ODeviceButton for a key code | 628 | * This method return a ODeviceButton for a key code |
629 | * or 0 if no special hardware button is available for the device | 629 | * or 0 if no special hardware button is available for the device |
630 | * | 630 | * |
631 | * @return The devicebutton or 0l | 631 | * @return The devicebutton or 0l |
632 | * @see ODeviceButton | 632 | * @see ODeviceButton |
633 | */ | 633 | */ |
634 | const ODeviceButton *ODevice::buttonForKeycode ( ushort code ) | 634 | const ODeviceButton *ODevice::buttonForKeycode ( ushort code ) |
635 | { | 635 | { |
636 | initButtons(); | 636 | initButtons(); |
637 | 637 | ||
638 | for ( QValueListConstIterator<ODeviceButton> it = d->m_buttons->begin(); it != d->m_buttons->end(); ++it ) { | 638 | for ( QValueListConstIterator<ODeviceButton> it = d->m_buttons->begin(); it != d->m_buttons->end(); ++it ) { |
639 | if ( (*it). keycode() == code ) | 639 | if ( (*it). keycode() == code ) |
640 | return &(*it); | 640 | return &(*it); |
641 | } | 641 | } |
642 | return 0; | 642 | return 0; |
643 | } | 643 | } |
644 | 644 | ||
645 | void ODevice::reloadButtonMapping() | 645 | void ODevice::reloadButtonMapping() |
646 | { | 646 | { |
647 | if(!d->m_buttons) | 647 | if(!d->m_buttons) |
648 | initButtons(); | 648 | initButtons(); |
649 | 649 | ||
650 | if(!d->m_initializedButtonQcop) { | 650 | if(!d->m_initializedButtonQcop) { |
651 | connect(qApp,SIGNAL(systemMessageSignal(const QCString&,const QByteArray&)), | 651 | QCopChannel *chan = new QCopChannel("QPE/System", this, "ODevice button channel"); |
652 | connect(chan,SIGNAL(received(const QCString&,const QByteArray&)), | ||
652 | this,SLOT(systemMessage(const QCString&,const QByteArray&))); | 653 | this,SLOT(systemMessage(const QCString&,const QByteArray&))); |
653 | d->m_initializedButtonQcop = true; | 654 | d->m_initializedButtonQcop = true; |
654 | } | 655 | } |
655 | 656 | ||
656 | Config cfg ( "ButtonSettings" ); | 657 | Config cfg ( "ButtonSettings" ); |
657 | 658 | ||
658 | for ( uint i = 0; i < d->m_buttons->count(); i++ ) { | 659 | for ( uint i = 0; i < d->m_buttons->count(); i++ ) { |
659 | ODeviceButton &b = ( *d->m_buttons ) [i]; | 660 | ODeviceButton &b = ( *d->m_buttons ) [i]; |
660 | QString group = "Button" + QString::number ( i ); | 661 | QString group = "Button" + QString::number ( i ); |
661 | 662 | ||
662 | QCString pch, hch; | 663 | QCString pch, hch; |
663 | QCString pm, hm; | 664 | QCString pm, hm; |
664 | QByteArray pdata, hdata; | 665 | QByteArray pdata, hdata; |
665 | 666 | ||
666 | if ( cfg. hasGroup ( group )) { | 667 | if ( cfg. hasGroup ( group )) { |
667 | cfg. setGroup ( group ); | 668 | cfg. setGroup ( group ); |
668 | pch = cfg. readEntry ( "PressedActionChannel" ). latin1(); | 669 | pch = cfg. readEntry ( "PressedActionChannel" ). latin1(); |
669 | pm = cfg. readEntry ( "PressedActionMessage" ). latin1(); | 670 | pm = cfg. readEntry ( "PressedActionMessage" ). latin1(); |
670 | // pdata = decodeBase64 ( buttonFile. readEntry ( "PressedActionArgs" )); | 671 | // pdata = decodeBase64 ( buttonFile. readEntry ( "PressedActionArgs" )); |
671 | 672 | ||
672 | hch = cfg. readEntry ( "HeldActionChannel" ). latin1(); | 673 | hch = cfg. readEntry ( "HeldActionChannel" ). latin1(); |
673 | hm = cfg. readEntry ( "HeldActionMessage" ). latin1(); | 674 | hm = cfg. readEntry ( "HeldActionMessage" ). latin1(); |
674 | // hdata = decodeBase64 ( buttonFile. readEntry ( "HeldActionArgs" )); | 675 | // hdata = decodeBase64 ( buttonFile. readEntry ( "HeldActionArgs" )); |
675 | } | 676 | } |