Ticket #2239: mythcontrols-20060824.diff

mythcontrols/mythcontrols/action.h

@@ -26 +26 @@
 
 #include <qstring.h>
 #include <qstringlist.h>
+#include <mythtv/mythkeysequence.h>
 
 /**
  * @class Action

mythcontrols/mythcontrols/mythcontrols.cpp

@@ -389 +389 @@
     if (key.left(6) == "remote") {
         key = KeyToDisplay(key);
     } else {
-        key = QString(QKeySequence(e->key()));
-        if (key.isEmpty()) return false;
-        QString modifiers = "";
-        if (e->state()&Qt::ShiftButton) modifiers+="Shift+";
-        if (e->state()&Qt::ControlButton) modifiers+="Ctrl+";
-        if (e->state()&Qt::AltButton) modifiers+="Alt+";
-        if (e->state()&Qt::MetaButton) modifiers+="Meta+";
-        key = modifiers + key;
+#ifdef USE_LIRC
+        if (key.left( 2 ) != "ir")
+        {
+#endif // USE_LIRC
+            key = QString(QKeySequence(e->key()));
+            if (key.isEmpty()) return false;
+            QString modifiers = "";
+            if (e->state()&Qt::ShiftButton) modifiers+="Shift+";
+            if (e->state()&Qt::ControlButton) modifiers+="Ctrl+";
+            if (e->state()&Qt::AltButton) modifiers+="Alt+";
+            if (e->state()&Qt::MetaButton) modifiers+="Meta+";
+            key = modifiers + key;
+#ifdef USE_LIRC
+        }
+#endif // USE_LIRC
     }
 
     UIListBtnTypeItem *b;
@@ -926 +933 @@
         QString key = *it;
 
         QString keydesc = "3 ";
-        if (key.left(6) == "remote")
+        if ((key.left(6) == "remote") || (key.left(2) == "ir"))
         {
             keydesc = "0 ";
         }

mythcontrols/mythcontrols/mythcontrols.h

@@ -26 +26 @@
 
 #include <mythtv/mythdialogs.h>
 #include <mythtv/uilistbtntype.h>
+#include <mythtv/mythkeysequence.h>
 
 #include "keybindings.h"
 

mythcontrols/mythcontrols/action.cpp

@@ -35 +35 @@
 Action::Action(const QString & description, const QString & keys)
 {
     this->description() = description;
-    this->keys() = QStringList::split(", ", QString(QKeySequence(keys)));
+    this->keys() = QStringList::split(", ", QString(MythKeySequence(keys)));
 }
 
 

mythcontrols/mythcontrols/keygrabber.cpp

@@ -29 +29 @@
 #include "keygrabber.h"
 
 #include <mythtv/mythcontext.h>
+#include <mythtv/mythkeysequence.h>
 
 
 KeyGrabPopupBox::KeyGrabPopupBox(MythMainWindow *window)
@@ -58 +59 @@
     /* get the base name of the qkeysequence */
     QString key_name = QString(QKeySequence(e->key()));
 
+    if ((e->text().length( ) > 6) && (e->text().left(6) == "remote"))
+    {
+        captured_key_event = e->text( );
+        key_label->setText(tr("Add button '[%1]'?").arg(e->text().mid(6)));
+        ok_button->setFocus();
+    }
+    else
     /* if we really have a key, then process it */
     if (!key_name.isEmpty() && !key_name.isNull())
     {
@@ -70 +78 @@
         if (e->state()&Qt::MetaButton) modifiers+="Meta+";
         key_name = modifiers + key_name;
     }
-
+    else
     /* keys without a name are no good to us */
     if (key_name.isEmpty())
     {