Ticket #2839: combovirtualkeyboardpopup.diff

mythtv/libs/libmyth/mythwidgets.cpp

@@ -16 +16 @@
 #include "virtualkeyboard.h"
 #include "libmythui/mythmainwindow.h"
 
+MythComboBox::~MythComboBox()
+{
+    if (popup)
+        delete popup;
+}
+
+void MythComboBox::Init()
+{
+    popup = NULL;
+    popupPosition = VK_POSBELOWEDIT;
+}
+
 void MythComboBox::keyPressEvent(QKeyEvent *e)
 {
     bool handled = false;
     QStringList actions;
-    if (gContext->GetMainWindow()->TranslateKeyPress("qt", e, actions))
+    if ((!popup || !popup->isShown()) &&
+        (gContext->GetMainWindow()->TranslateKeyPress("qt", e, actions)))
     {
         for (unsigned int i = 0; i < actions.size() && !handled; i++)
         {
@@ -59 +72 @@
             }
             else if (action == "SELECT" && AcceptOnSelect)
                 emit accepted(currentItem());
+            else if (action == "SELECT" && 
+                    (e->text().isNull() ||
+                    (e->key() == Qt::Key_Enter) ||
+                    (e->key() == Qt::Key_Return) ||
+                    (e->key() == Qt::Key_Space)))
+            {
+                if ((allowVirtualKeyboard) &&
+                                    (gContext->GetNumSetting("UseVirtualKeyboard", 1) == 1))
+                {
+                    popup = new VirtualKeyboard(gContext->GetMainWindow(), this);
+                    gContext->GetMainWindow()->detach(popup);
+                    popup->exec();
+                    delete popup;
+                    popup = NULL;
+                }
+                else
+                   handled = true;
+            }
+
             else
                 handled = false;
         }

mythtv/libs/libmyth/virtualkeyboard.cpp

@@ -84 +84 @@
         MythLineEdit *par = (MythLineEdit *)m_parentEdit;
         preferredPos = par->getPopupPosition();
     }
-    else
+    else if (m_parentEdit->inherits("MythRemoteLineEdit"))
     {
         MythRemoteLineEdit *par = (MythRemoteLineEdit *)m_parentEdit;
         preferredPos = par->getPopupPosition();
     }
+    else
+    {
+        MythComboBox *par = (MythComboBox *)m_parentEdit;
+        preferredPos = par->getPopupPosition();
+    }
 
     if (preferredPos == VK_POSBELOWEDIT)
     {

mythtv/libs/libmyth/mythwidgets.h

@@ -42 +42 @@
     Q_OBJECT
   public:
     MythComboBox(bool rw, QWidget* parent=0, const char* name=0):
-        QComboBox(rw, parent, name) { AcceptOnSelect = false; step = 1; };
+        QComboBox(rw, parent, name) { AcceptOnSelect = false; step = 1; 
+            allowVirtualKeyboard = rw; Init(); };
 
+    virtual ~MythComboBox();
+
     void setHelpText(QString help) { helptext = help; }
     void setAcceptOnSelect(bool Accept) { AcceptOnSelect = Accept; }
     void setStep(int _step = 1) { step = _step; }
+    void setAllowVirtualKeyboard(bool allowKbd = true)
+               { allowVirtualKeyboard = allowKbd; }
+    void setPopupPosition(PopupPosition pos) { popupPosition = pos; }
+    PopupPosition getPopupPosition(void) { return popupPosition; }
 
   signals:
     void changeHelpText(QString);
@@ -62 +69 @@
     virtual void keyPressEvent (QKeyEvent *e);
     virtual void focusInEvent(QFocusEvent *e);
     virtual void focusOutEvent(QFocusEvent *e);
+    void Init(void);
 
   private:
+    VirtualKeyboard *popup;
     QString helptext;
     bool AcceptOnSelect;
+    bool allowVirtualKeyboard;
+    PopupPosition popupPosition;
     int step;
 };