Merge pull request #7879 from mkortstiege/nuke-dialog-gamepad

[dialog] use DialogOK as basis for the gamepad dialog
xbmc · Sep 1, 2015 · 8890ef7 · 8890ef7
2 parents e894fb2 + df96ec3
commit 8890ef7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 54 deletions.
diff --git a/addons/skin.confluence/720p/DialogGamepad.xml b/addons/skin.confluence/720p/DialogGamepad.xml
diff --git a/xbmc/dialogs/GUIDialogGamepad.cpp b/xbmc/dialogs/GUIDialogGamepad.cpp
@@ -31,7 +31,7 @@
 #include <utility>
 
 CGUIDialogGamepad::CGUIDialogGamepad(void)
-    : CGUIDialogBoxBase(WINDOW_DIALOG_GAMEPAD, "DialogGamepad.xml")
+    : CGUIDialogBoxBase(WINDOW_DIALOG_GAMEPAD, "DialogOK.xml")
 {
   m_bCanceled = false;
   m_iRetries = 0;
@@ -43,6 +43,14 @@ CGUIDialogGamepad::CGUIDialogGamepad(void)
 CGUIDialogGamepad::~CGUIDialogGamepad(void)
 {}
 
+void CGUIDialogGamepad::OnInitWindow()
+{
+  // hide ok button from DialogOK
+  SET_CONTROL_HIDDEN(10);
+
+  CGUIDialogBoxBase::OnInitWindow();
+}
+
 bool CGUIDialogGamepad::OnAction(const CAction &action)
 {
   if ((action.GetButtonCode() >= KEY_BUTTON_A &&

diff --git a/xbmc/dialogs/GUIDialogGamepad.h b/xbmc/dialogs/GUIDialogGamepad.h
@@ -41,6 +41,7 @@ class CGUIDialogGamepad :
   static bool ShowAndVerifyInput(std::string& strPassword, const std::string& dlgHeading, const std::string& dlgLine0, const std::string& dlgLine1, const std::string& dlgLine2, bool bGetUserInput, bool bHideInputChars);
 protected:
   virtual bool OnAction(const CAction &action);
+  virtual void OnInitWindow();
   bool m_bCanceled;
   char m_cHideInputChar;
 };