Ticket #5309: keypad_mainmenu.diff

libs/libmythui/myththemedmenu.cpp

@@ -2079 +2079 @@
 
             lastbutton = NULL;
         }
+        else if (action == "1" || action == "2" || action == "3" ||
+                 action == "4" || action == "5" || action == "6" || 
+                 action == "7" || action == "8" || action == "9" || 
+                 action == "0")
+        {
+            /*
+             * Select a menu item by number
+             * More suitable for remote keypad :
+             * 1 2 3
+             * 4 5 6
+             * 7 8 9
+             *   0
+             * than keyboard :
+             * 7 8 9
+             * 4 5 6
+             * 1 2 3
+             * 0
+             */
+            int pos = action.toInt()-1;
+            if (pos==-1) pos=9;
+            int row=0;
+            while (row < (int)buttonRows.size() 
+                && pos >= buttonRows[row].numitems)
+            {
+                pos -= buttonRows[row].numitems;
+                row++;
+            }
+            if (row < (int)buttonRows.size() && pos < buttonRows[row].numitems)
+            {
+                lastbutton = buttonRows[row].buttons[pos];
+                activebutton = NULL;
+                QStringList::Iterator it = lastbutton->action.begin();
+                for (; it != lastbutton->action.end(); it++)
+                {
+                    if (handleAction(*it))
+                        break;
+                }
+            }
+        }
         else if (action == "ESCAPE")
         {
             QString action = "UPMENU";

libs/libmythui/mythlistbutton.cpp

@@ -767 +767 @@
                 emit itemClicked(item);
             }
         }
+        else if (action == "1" || action == "2" || action == "3" ||
+                 action == "4" || action == "5" || action == "6" || 
+                 action == "7" || action == "8" || action == "9" || 
+                 action == "0")
+        {
+            int pos = action.toInt()-1;
+            if (pos==-1) pos=9;
+            MythListButtonItem *item = GetItemAt(pos);
+            if (item)
+            {
+                emit itemSelected(item);
+                emit itemClicked(item);
+            }
+        }
+
         else
             handled = false;
     }