make 'ok', 'yesno' & 'progress' dialogs use the same xml file

ronie · Jan 18, 2016 · 92fe219 · 92fe219
1 parent 34ae127
commit 92fe219
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 22 deletions.
diff --git a/xbmc/dialogs/GUIDialogBoxBase.cpp b/xbmc/dialogs/GUIDialogBoxBase.cpp
@@ -28,7 +28,6 @@
 #define CONTROL_HEADING 1
 #define CONTROL_LINES_START 2
 #define CONTROL_TEXTBOX     9
-#define CONTROL_CHOICES_START 10
 
 CGUIDialogBoxBase::CGUIDialogBoxBase(int id, const std::string &xmlFile)
     : CGUIDialog(id, xmlFile)
@@ -145,6 +144,11 @@ void CGUIDialogBoxBase::Process(unsigned int currentTime, CDirtyRegionList &dirt
 
 void CGUIDialogBoxBase::OnInitWindow()
 {
+  // hide all controls
+  for (int i = 0; i < DIALOG_MAX_CHOICES; ++i)
+    SET_CONTROL_HIDDEN(CONTROL_CHOICES_START + i);
+  SET_CONTROL_HIDDEN(CONTROL_PROGRESS_BAR);
+
   // set focus to default
   m_lastControlID = m_defaultControl;
 

diff --git a/xbmc/dialogs/GUIDialogBoxBase.h b/xbmc/dialogs/GUIDialogBoxBase.h
@@ -25,8 +25,14 @@
 #include "guilib/GUIDialog.h"
 #include "threads/CriticalSection.h"
 
+#define CONTROL_CHOICES_START  10
+#define CONTROL_NO_BUTTON      CONTROL_CHOICES_START
+#define CONTROL_YES_BUTTON     CONTROL_CHOICES_START + 1
+#define CONTROL_CUSTOM_BUTTON  CONTROL_CHOICES_START + 2
+#define CONTROL_PROGRESS_BAR   20
+
 #define DIALOG_MAX_LINES 3
-#define DIALOG_MAX_CHOICES 2
+#define DIALOG_MAX_CHOICES 3
 
 class CVariant;
 

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, "DialogOK.xml")
+    : CGUIDialogBoxBase(WINDOW_DIALOG_GAMEPAD, "DialogConfirm.xml")
 {
   m_bCanceled = false;
   m_iRetries = 0;
@@ -45,8 +45,6 @@ CGUIDialogGamepad::~CGUIDialogGamepad(void)
 
 void CGUIDialogGamepad::OnInitWindow()
 {
-  // hide ok button from DialogOK
-  SET_CONTROL_HIDDEN(10);
 
   CGUIDialogBoxBase::OnInitWindow();
 }

diff --git a/xbmc/dialogs/GUIDialogOK.cpp b/xbmc/dialogs/GUIDialogOK.cpp
@@ -23,10 +23,8 @@
 #include "guilib/GUIMessage.h"
 #include "utils/Variant.h"
 
-#define ID_BUTTON_OK   10
-
 CGUIDialogOK::CGUIDialogOK(void)
-    : CGUIDialogBoxBase(WINDOW_DIALOG_OK, "DialogOK.xml")
+    : CGUIDialogBoxBase(WINDOW_DIALOG_OK, "DialogConfirm.xml")
 {
 }
 
@@ -38,7 +36,7 @@ bool CGUIDialogOK::OnMessage(CGUIMessage& message)
   if (message.GetMessage() == GUI_MSG_CLICKED)
   {
     int iControl = message.GetSenderId();
-    if (iControl == ID_BUTTON_OK)
+    if (iControl == CONTROL_YES_BUTTON)
     {
       m_bConfirmed = true;
       Close();
@@ -72,9 +70,17 @@ void CGUIDialogOK::ShowAndGetInput(CVariant heading, CVariant line0, CVariant li
   dialog->Open();
 }
 
+void CGUIDialogOK::OnInitWindow()
+{
+  CGUIDialogBoxBase::OnInitWindow();
+
+  SET_CONTROL_VISIBLE(CONTROL_YES_BUTTON);
+  SET_CONTROL_FOCUS(CONTROL_YES_BUTTON, 0);
+}
+
 int CGUIDialogOK::GetDefaultLabelID(int controlId) const
 {
-  if (controlId == ID_BUTTON_OK)
+  if (controlId == CONTROL_YES_BUTTON)
     return 186;
   return CGUIDialogBoxBase::GetDefaultLabelID(controlId);
 }
diff --git a/xbmc/dialogs/GUIDialogOK.h b/xbmc/dialogs/GUIDialogOK.h
@@ -35,5 +35,6 @@ class CGUIDialogOK :
   static void ShowAndGetInput(CVariant heading, CVariant text);
   static void ShowAndGetInput(CVariant heading, CVariant line0, CVariant line1, CVariant line2);
 protected:
+  virtual void OnInitWindow();
   virtual int GetDefaultLabelID(int controlId) const;
 };
diff --git a/xbmc/dialogs/GUIDialogProgress.cpp b/xbmc/dialogs/GUIDialogProgress.cpp
@@ -28,11 +28,8 @@
 #include "utils/log.h"
 #include "utils/Variant.h"
 
-#define CONTROL_CANCEL_BUTTON 10
-#define CONTROL_PROGRESS_BAR 20
-
 CGUIDialogProgress::CGUIDialogProgress(void)
-    : CGUIDialogBoxBase(WINDOW_DIALOG_PROGRESS, "DialogProgress.xml")
+    : CGUIDialogBoxBase(WINDOW_DIALOG_PROGRESS, "DialogConfirm.xml")
 {
   Reset();
 }
@@ -112,7 +109,7 @@ bool CGUIDialogProgress::OnMessage(CGUIMessage& message)
   case GUI_MSG_CLICKED:
     {
       int iControl = message.GetSenderId();
-      if (iControl == CONTROL_CANCEL_BUTTON && m_bCanCancel && !m_bCanceled)
+      if (iControl == CONTROL_NO_BUTTON && m_bCanCancel && !m_bCanceled)
       {
         std::string strHeading = m_strHeading;
         strHeading.append(" : ");
@@ -201,16 +198,25 @@ void CGUIDialogProgress::Process(unsigned int currentTime, CDirtyRegionList &dir
     else
       SET_CONTROL_HIDDEN(CONTROL_PROGRESS_BAR);
     if (showCancel)
-      SET_CONTROL_VISIBLE(CONTROL_CANCEL_BUTTON);
+      SET_CONTROL_VISIBLE(CONTROL_NO_BUTTON);
     else
-      SET_CONTROL_HIDDEN(CONTROL_CANCEL_BUTTON);
+      SET_CONTROL_HIDDEN(CONTROL_NO_BUTTON);
   }
   CGUIDialogBoxBase::Process(currentTime, dirtyregions);
 }
 
+void CGUIDialogProgress::OnInitWindow()
+{
+  CGUIDialogBoxBase::OnInitWindow();
+
+  SET_CONTROL_VISIBLE(CONTROL_NO_BUTTON);
+  SET_CONTROL_VISIBLE(CONTROL_PROGRESS_BAR);
+  SET_CONTROL_FOCUS(CONTROL_NO_BUTTON, 0);
+}
+
 int CGUIDialogProgress::GetDefaultLabelID(int controlId) const
 {
-  if (controlId == CONTROL_CANCEL_BUTTON)
+  if (controlId == CONTROL_NO_BUTTON)
     return 222;
   return CGUIDialogBoxBase::GetDefaultLabelID(controlId);
 }
diff --git a/xbmc/dialogs/GUIDialogProgress.h b/xbmc/dialogs/GUIDialogProgress.h
@@ -49,6 +49,7 @@ class CGUIDialogProgress :
   void SetCanCancel(bool bCanCancel);
 
 protected:
+  virtual void OnInitWindow();
   virtual int GetDefaultLabelID(int controlId) const;
   virtual void Process(unsigned int currentTime, CDirtyRegionList &dirtyregions);
 

diff --git a/xbmc/dialogs/GUIDialogYesNo.cpp b/xbmc/dialogs/GUIDialogYesNo.cpp
@@ -23,11 +23,8 @@
 #include "input/Key.h"
 #include "messaging/helpers/DialogHelper.h"
 
-#define CONTROL_NO_BUTTON 10
-#define CONTROL_YES_BUTTON 11
-
 CGUIDialogYesNo::CGUIDialogYesNo(int overrideId /* = -1 */)
-    : CGUIDialogBoxBase(overrideId == -1 ? WINDOW_DIALOG_YES_NO : overrideId, "DialogYesNo.xml")
+    : CGUIDialogBoxBase(overrideId == -1 ? WINDOW_DIALOG_YES_NO : overrideId, "DialogConfirm.xml")
 {
   m_bConfirmed = false;
   m_bCanceled = false;
@@ -73,6 +70,15 @@ bool CGUIDialogYesNo::OnBack(int actionID)
   return CGUIDialogBoxBase::OnBack(actionID);
 }
 
+void CGUIDialogYesNo::OnInitWindow()
+{
+  CGUIDialogBoxBase::OnInitWindow();
+
+  SET_CONTROL_VISIBLE(CONTROL_YES_BUTTON);
+  SET_CONTROL_VISIBLE(CONTROL_NO_BUTTON);
+  SET_CONTROL_FOCUS(CONTROL_NO_BUTTON, 0);
+}
+
 bool CGUIDialogYesNo::ShowAndGetInput(CVariant heading, CVariant line0, CVariant line1, CVariant line2, bool &bCanceled)
 {
   return ShowAndGetInput(heading, line0, line1, line2, bCanceled, "", "", NO_TIMEOUT);

diff --git a/xbmc/dialogs/GUIDialogYesNo.h b/xbmc/dialogs/GUIDialogYesNo.h
@@ -112,6 +112,7 @@ class CGUIDialogYesNo :
   int ShowAndGetInput(const KODI::MESSAGING::HELPERS::DialogYesNoMessage& options);
 
 protected:
+  virtual void OnInitWindow();
   virtual int GetDefaultLabelID(int controlId) const;
 
   bool m_bCanceled;