7 files changed, 55 insertions, 22 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 59f2aea..fbcce7c 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -342,24 +342,34 @@ void DesktopApplication::sendHeldAction ( )
 
 
 
-void DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keycode*/, bool press, bool autoRepeat )
+bool DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keycode*/, bool press, bool autoRepeat )
         {       
         if ( db ) {
                 if ( !press && !autoRepeat && m_button_timer-> isActive ( )) {
                         m_button_timer-> stop ( );
-                        if ( !db-> pressedAction ( ). channel ( ). isEmpty ( )) {
-                                db-> pressedAction ( ). send ( );
+                        
+                        if (!db-> pressedAction ( ). channel ( ) .isEmpty())
+                        {
+                                if ( db-> pressedAction ( ). channel ( )!="ignore") {
+                                        db-> pressedAction ( ). send ( );
+                                }
+                                else return false;
                         }
                 }
                 else if ( press && !autoRepeat ) {
                         m_button_timer-> stop ( );
+                        if (!db-> pressedAction ( ). channel ( ) .isEmpty())
+                        {
                         
-                        if ( !db-> heldAction ( ). channel ( ). isEmpty ( )) {
-                                m_last_button = db;
-                                m_button_timer-> start ( ODevice::inst ( )-> buttonHoldTime ( ), true );
+                                if ( db-> heldAction ( ). channel ( )!="ignore") {
+                                        m_last_button = db;
+                                        m_button_timer-> start ( ODevice::inst ( )-> buttonHoldTime ( ), true );
+                                }
+                                else return false;
                         }
                 }
         }
+        return true;
 }
 
 bool DesktopApplication::eventFilter ( QObject *o, QEvent *e )
@@ -370,8 +380,7 @@ bool DesktopApplication::eventFilter ( QObject *o, QEvent *e )
                 const ODeviceButton *db = ODevice::inst ( )-> buttonForKeycode ( ke-> key ( ));
         
                 if ( db ) {
-                        checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( ));
-                        return true;
+                        return checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( ));
                 }
         }
         return QPEApplication::eventFilter ( o, e );
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index db0173e..4024c38 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -83,7 +83,7 @@ protected slots:
 
 protected:
         virtual bool eventFilter ( QObject *o, QEvent *e );
-        void checkButtonAction ( const Opie::ODeviceButton *db, int keycode, bool press, bool autoRepeat );
+        bool checkButtonAction ( const Opie::ODeviceButton *db, int keycode, bool press, bool autoRepeat );
         
 private:
         static DesktopApplication *me ( );
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index eabb779..942d5e4 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -208,7 +208,6 @@ void ButtonSettings::keyTimeout ( )
 
 void ButtonSettings::edit ( buttoninfo *bi, bool hold )
 {
-                qDebug ( "remap %s for %s", hold ? "hold" : "press", bi-> m_button-> userText ( ). latin1 ( )); 
         
         if ( m_lock )
                 return;
@@ -218,7 +217,7 @@ void ButtonSettings::edit ( buttoninfo *bi, bool hold )
 
                 d-> showMaximized ( );
         if ( d-> exec ( ) == QDialog::Accepted ) {
-                qDebug ( " -> %s %s", d-> message ( ). channel ( ). data ( ), d-> message ( ). message ( ). data ( ));
+
         
                 if ( hold ) {
                         bi-> m_hmsg = d-> message ( );
diff --git a/core/settings/button/buttonutils.cpp b/core/settings/button/buttonutils.cpp
index 91d2af3..27a2f38 100644
--- a/core/settings/button/buttonutils.cpp
+++ b/core/settings/button/buttonutils.cpp
@@ -65,7 +65,8 @@ qCopInfo ButtonUtils::messageToInfo ( const OQCopMessage &c )
         QCString ch = c. channel ( );
         QCString f  = c. message ( ); 
 
-        if ( ch. isNull ( ))
+        
+        if ( ch == "ignore" )
                 return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Ignored</nobr>" ));
         
         for ( const predef_qcop *p = predef; p-> m_text; p++ ) {
diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp
index a251bd4..b6ee60b 100644
--- a/core/settings/button/remapdlg.cpp
+++ b/core/settings/button/remapdlg.cpp
@@ -59,7 +59,18 @@ RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, c
         m_map_none   = new NoSortItem ( w_list, 0, tr( "No mapping" ));
         m_map_preset = new NoSortItem ( w_list, 1, tr( "Default" ), m_msg_preset. channel ( ), m_msg_preset. message ( ));
         ((NoSortItem *) m_map_preset )-> setDefault ( true );
-        m_map_custom = new NoSortItem ( w_list, 2, tr( "Custom" ), m_msg. channel ( ), m_msg. message ( ));
+        
+        if (m_msg. channel ( ) == "ignore")
+        {
+                m_map_custom = new NoSortItem ( w_list, 2, tr( "Custom" ), m_msg_preset. channel ( ), m_msg_preset. message ( ));
+                
+                m_current = m_map_none;
+        }
+        else
+        {
+                m_map_custom = new NoSortItem ( w_list, 2, tr( "Custom" ), m_msg. channel ( ), m_msg. message ( ));
+                m_current = m_map_custom;
+        }
         
                 QListViewItem *it = new NoSortItem ( w_list, 3, tr( "Actions" ));
         ButtonUtils::inst ( )-> insertActions ( it );
@@ -67,7 +78,6 @@ RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, c
         
                 m_map_show = new NoSortItem ( w_list, 4, tr( "Show" ));
         
-        m_current = m_map_custom;
         w_list-> setCurrentItem ( m_current );
         
         QTimer::singleShot ( 0, this, SLOT( delayedInit ( )));
@@ -97,10 +107,18 @@ void RemapDlg::itemChanged ( QListViewItem *it )
         m_current = it;
 
         if ( it == m_map_none )
-                m_msg = m = OQCopMessage ( 0, 0 );
+        {
+                m_msg = m = OQCopMessage ( "ignore", 0 );
+                qDebug ("***ignoring");
+        }
         else if ( it == m_map_preset )
+        {
                 m_msg = m = m_msg_preset;
-        else if ( it && !it-> childCount ( )) {
+                qDebug ("***Preset");
+        }
+        else if ( it && !it-> childCount ( )) 
+        {
+                qDebug ("***Custom: %s %s ",it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( ));
                 enabled = ( it == m_map_custom );
                 m_msg = m = OQCopMessage ( it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( ));
         }
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 9e97c56..d5e3c5c 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -280,7 +280,6 @@ void ODevice::init ( )
                         b. setPixmap ( Resource::loadPixmap ( ib-> pix ));
                         b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction ));
                         b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction ));
-                                        
                         d-> m_buttons. append ( b );
                 }
         }
@@ -516,23 +515,29 @@ void ODevice::reloadButtonMapping ( )
                         hm  = cfg. readEntry ( "HeldActionMessage" ). latin1 ( );
                         // hdata = decodeBase64 ( buttonFile. readEntry ( "HeldActionArgs" ));
                 }
-                
+                                
                 b. setPressedAction ( OQCopMessage ( pch, pm, pdata ));
+                
                 b. setHeldAction ( OQCopMessage ( hch, hm, hdata ));
         }
 }
 
 void ODevice::remapPressedAction ( int button, const OQCopMessage &action )
 {
+        QString mb_chan;
+        
         if ( button >= (int) d-> m_buttons. count ( ))
                 return;
+        
                 
         ODeviceButton &b = d-> m_buttons [button];
-    b. setPressedAction ( action );
+        b. setPressedAction ( action );
+
+        mb_chan=b. pressedAction ( ). channel ( );
 
         Config buttonFile ( "ButtonSettings" );
         buttonFile. setGroup ( "Button" + QString::number ( button ));
-        buttonFile. writeEntry ( "PressedActionChannel", (const char*) b. pressedAction ( ). channel ( ));
+        buttonFile. writeEntry ( "PressedActionChannel", (const char*) mb_chan);
         buttonFile. writeEntry ( "PressedActionMessage", (const char*) b. pressedAction ( ). message ( ));
 
         //buttonFile. writeEntry ( "PressedActionArgs", encodeBase64 ( b. pressedAction ( ). data ( )));
@@ -546,7 +551,7 @@ void ODevice::remapHeldAction ( int button, const OQCopMessage &action )
                 return;
                 
         ODeviceButton &b = d-> m_buttons [button];
-    b. setHeldAction ( action );
+            b. setHeldAction ( action );
 
         Config buttonFile ( "ButtonSettings" );
         buttonFile. setGroup ( "Button" + QString::number ( button ));
diff --git a/libopie/odevicebutton.cpp b/libopie/odevicebutton.cpp
index 2270343..4b22358 100644
--- a/libopie/odevicebutton.cpp
+++ b/libopie/odevicebutton.cpp
@@ -70,7 +70,7 @@ void OQCopMessage::init ( const QCString &ch, const QCString &m, const QByteArra
 
 bool OQCopMessage::send ( )
 {
-        if ( d-> m_channel. isEmpty ( ) || d-> m_message. isEmpty ( ))
+        if ( d-> m_channel. isEmpty ( ) || d-> m_message. isEmpty ( ) )
                 return false;
 
         QCopEnvelope e ( d-> m_channel, d-> m_message );
@@ -218,6 +218,7 @@ void ODeviceButton::setFactoryPresetPressedAction(const OQCopMessage& action)
     m_FactoryPresetPressedAction = action;
 }
 
+
 void ODeviceButton::setPressedAction(const OQCopMessage& action)
 {
     m_PressedAction = action;