[video][guilib][input] Remove WINDOW_DIALOG_VIDEO_VERSION_SELECT.

7 files changed, 20 insertions, 107 deletions

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 8f4a7785a8..d48ae45c72 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -23878,11 +23878,7 @@ msgctxt "#40022"
 msgid "Manage {0:s}"
 msgstr ""
 
-#. Choose video version dialog title
-#: xbmc/video/dialogs/GUIDialogVideoVersion.cpp
-msgctxt "#40023"
-msgid "Choose {0:s}"
-msgstr ""
+#empty string with id 40023
 
 #. Select default video version setting
 #: system/settings/settings.xml
diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp
index a4af4ee49d..1ed598d8eb 100644
--- a/xbmc/guilib/GUIWindowManager.cpp
+++ b/xbmc/guilib/GUIWindowManager.cpp
@@ -292,8 +292,7 @@ void CGUIWindowManager::CreateWindows()
   Add(new CGUIDialogMusicInfo);
   Add(new CGUIDialogOK);
   Add(new CGUIDialogVideoInfo);
-  Add(new CGUIDialogVideoVersion(WINDOW_DIALOG_VIDEO_VERSION));
-  Add(new CGUIDialogVideoVersion(WINDOW_DIALOG_VIDEO_VERSION_SELECT));
+  Add(new CGUIDialogVideoVersion);
   Add(new CGUIDialogSelect(WINDOW_DIALOG_SELECT_VIDEO_VERSION));
   Add(new CGUIDialogSelect(WINDOW_DIALOG_SELECT_VIDEO_EXTRA));
 
@@ -340,7 +339,6 @@ bool CGUIWindowManager::DestroyWindows()
     DestroyWindow(WINDOW_DIALOG_SELECT_VIDEO_EXTRA);
     DestroyWindow(WINDOW_DIALOG_SELECT_VIDEO_VERSION);
     DestroyWindow(WINDOW_DIALOG_VIDEO_VERSION);
-    DestroyWindow(WINDOW_DIALOG_VIDEO_VERSION_SELECT);
     DestroyWindow(WINDOW_VIDEO_PLAYLIST);
     DestroyWindow(WINDOW_VIDEO_NAV);
     DestroyWindow(WINDOW_FILES);
diff --git a/xbmc/guilib/WindowIDs.dox b/xbmc/guilib/WindowIDs.dox
index ad1d00399e..23e31f3440 100644
--- a/xbmc/guilib/WindowIDs.dox
+++ b/xbmc/guilib/WindowIDs.dox
@@ -134,7 +134,6 @@ This page shows the window names, the window definition, the window ID and the s
 | Visualisation           | WINDOW_VISUALISATION                 | 12006     | MusicVisualisation.xml              |                                    |
 | Slideshow               | WINDOW_SLIDESHOW                     | 12007     | SlideShow.xml                       |                                    |
 | DialogColorPicker       | WINDOW_DIALOG_COLOR_PICKER           | 12008     | DialogColorPicker.xml               |                                    |
-| VideoVersionPlay        | WINDOW_DIALOG_VIDEO_VERSION_PLAY     | 12009     | DialogVideoVersion.xml              | @skinning_v21 **New window** VideoVersionPlay |
 | SelectVideoVersion      | WINDOW_DIALOG_SELECT_VIDEO_VERSION   | 12015     | DialogSelect.xml                    | @skinning_v21 **New window** SelectVideoVersion |
 | SelectVideoExtra        | WINDOW_DIALOG_SELECT_VIDEO_EXTRA     | 12016     | DialogSelect.xml                    | @skinning_v21 **New window** SelectVideoExtra |
 | Weather                 | WINDOW_WEATHER                       | 12600     | MyWeather.xml                       |                                    |
diff --git a/xbmc/guilib/WindowIDs.h b/xbmc/guilib/WindowIDs.h
index c4ecc52572..71bb6213b2 100644
--- a/xbmc/guilib/WindowIDs.h
+++ b/xbmc/guilib/WindowIDs.h
@@ -169,7 +169,6 @@
 #define WINDOW_VISUALISATION              12006
 #define WINDOW_SLIDESHOW                  12007
 #define WINDOW_DIALOG_COLOR_PICKER 12008
-#define WINDOW_DIALOG_VIDEO_VERSION_SELECT 12009
 
 //! @todo Numbers given here must match the ids given in strings.po for a translatable string for
 //! the window. 12009 to 12014 are already taken for something else in strings.po (accidentally).
diff --git a/xbmc/input/WindowTranslator.cpp b/xbmc/input/WindowTranslator.cpp
index b178f95efa..4df391020e 100644
--- a/xbmc/input/WindowTranslator.cpp
+++ b/xbmc/input/WindowTranslator.cpp
@@ -120,7 +120,6 @@ const CWindowTranslator::WindowMapByName CWindowTranslator::WindowMappingByName
     {"okdialog", WINDOW_DIALOG_OK},
     {"movieinformation", WINDOW_DIALOG_VIDEO_INFO},
     {"videoversion", WINDOW_DIALOG_VIDEO_VERSION},
-    {"videoversionselect", WINDOW_DIALOG_VIDEO_VERSION_SELECT},
     {"selectvideoversion", WINDOW_DIALOG_SELECT_VIDEO_VERSION},
     {"selectvideoextra", WINDOW_DIALOG_SELECT_VIDEO_EXTRA},
     {"textviewer", WINDOW_DIALOG_TEXT_VIEWER},
diff --git a/xbmc/video/dialogs/GUIDialogVideoVersion.cpp b/xbmc/video/dialogs/GUIDialogVideoVersion.cpp
index 800d4ff311..e9c0f7f781 100644
--- a/xbmc/video/dialogs/GUIDialogVideoVersion.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoVersion.cpp
@@ -45,7 +45,6 @@
 #include <algorithm>
 #include <string>
 
-static constexpr unsigned int CONTROL_LABEL_MODE = 1;
 static constexpr unsigned int CONTROL_LABEL_TITLE = 2;
 static constexpr unsigned int CONTROL_IMAGE_THUMB = 3;
 
@@ -60,8 +59,8 @@ static constexpr unsigned int CONTROL_BUTTON_CHOOSE_ART = 27;
 static constexpr unsigned int CONTROL_LIST_PRIMARY_VERSION = 50;
 static constexpr unsigned int CONTROL_LIST_EXTRAS_VERSION = 51;
 
-CGUIDialogVideoVersion::CGUIDialogVideoVersion(int id)
-  : CGUIDialog(id, "DialogVideoVersion.xml"),
+CGUIDialogVideoVersion::CGUIDialogVideoVersion()
+  : CGUIDialog(WINDOW_DIALOG_VIDEO_VERSION, "DialogVideoVersion.xml"),
     m_videoItem(std::make_shared<CFileItem>()),
     m_primaryVideoVersionList(std::make_unique<CFileItemList>()),
     m_extrasVideoVersionList(std::make_unique<CFileItemList>()),
@@ -74,20 +73,10 @@ CGUIDialogVideoVersion::CGUIDialogVideoVersion(int id)
     CLog::Log(LOGERROR, "{}: Failed to open database", __FUNCTION__);
 }
 
-CGUIDialogVideoVersion::~CGUIDialogVideoVersion()
-{
-}
-
 bool CGUIDialogVideoVersion::OnMessage(CGUIMessage& message)
 {
   switch (message.GetMessage())
   {
-    case GUI_MSG_WINDOW_INIT:
-    {
-      m_cancelled = false;
-      break;
-    }
-
     case GUI_MSG_WINDOW_DEINIT:
     {
       ClearVideoVersionList();
@@ -119,15 +108,12 @@ bool CGUIDialogVideoVersion::OnMessage(CGUIMessage& message)
           }
           else
           {
-            CONTROL_ENABLE_ON_CONDITION(CONTROL_BUTTON_REMOVE, m_mode == Mode::MANAGE);
-            CONTROL_ENABLE_ON_CONDITION(CONTROL_BUTTON_RENAME, m_mode == Mode::MANAGE);
-            CONTROL_ENABLE_ON_CONDITION(CONTROL_BUTTON_SET_DEFAULT, m_mode == Mode::MANAGE);
+            CONTROL_ENABLE(CONTROL_BUTTON_REMOVE);
+            CONTROL_ENABLE(CONTROL_BUTTON_RENAME);
+            CONTROL_ENABLE(CONTROL_BUTTON_SET_DEFAULT);
           }
 
-          if (m_mode == Mode::MANAGE)
-            SET_CONTROL_FOCUS(CONTROL_BUTTON_PLAY, 0);
-          else
-            CloseAll();
+          SET_CONTROL_FOCUS(CONTROL_BUTTON_PLAY, 0);
         }
       }
       else if (control == CONTROL_LIST_EXTRAS_VERSION)
@@ -146,13 +132,10 @@ bool CGUIDialogVideoVersion::OnMessage(CGUIMessage& message)
 
           CONTROL_DISABLE(CONTROL_BUTTON_SET_DEFAULT);
 
-          CONTROL_ENABLE_ON_CONDITION(CONTROL_BUTTON_REMOVE, m_mode == Mode::MANAGE);
-          CONTROL_ENABLE_ON_CONDITION(CONTROL_BUTTON_RENAME, m_mode == Mode::MANAGE);
+          CONTROL_ENABLE(CONTROL_BUTTON_REMOVE);
+          CONTROL_ENABLE(CONTROL_BUTTON_RENAME);
 
-          if (m_mode == Mode::MANAGE)
-            SET_CONTROL_FOCUS(CONTROL_BUTTON_PLAY, 0);
-          else
-            CloseAll();
+          SET_CONTROL_FOCUS(CONTROL_BUTTON_PLAY, 0);
         }
       }
       else if (control == CONTROL_BUTTON_PLAY)
@@ -191,17 +174,8 @@ bool CGUIDialogVideoVersion::OnMessage(CGUIMessage& message)
   return CGUIDialog::OnMessage(message);
 }
 
-bool CGUIDialogVideoVersion::OnBack(int actionID)
-{
-  m_cancelled = true;
-  return CGUIDialog::OnBack(actionID);
-}
-
 void CGUIDialogVideoVersion::OnInitWindow()
 {
-  // set working mode
-  SET_CONTROL_LABEL(CONTROL_LABEL_MODE, m_mode == Mode::MANAGE ? "manage" : "choose");
-
   // set window title
   std::string title = m_videoItem->GetVideoInfoTag()->GetTitle();
 
@@ -209,9 +183,7 @@ void CGUIDialogVideoVersion::OnInitWindow()
   if (year != 0)
     title = StringUtils::Format("{} ({})", title, year);
 
-  SET_CONTROL_LABEL(
-      CONTROL_LABEL_TITLE,
-      StringUtils::Format(g_localizeStrings.Get(m_mode == Mode::MANAGE ? 40022 : 40023), title));
+  SET_CONTROL_LABEL(CONTROL_LABEL_TITLE, StringUtils::Format(g_localizeStrings.Get(40022), title));
 
   // bind primary and extras version lists
   CGUIMessage msg1(GUI_MSG_LABEL_BIND, GetID(), CONTROL_LIST_PRIMARY_VERSION, 0, 0,
@@ -226,11 +198,11 @@ void CGUIDialogVideoVersion::OnInitWindow()
   CONTROL_DISABLE(CONTROL_BUTTON_REMOVE);
   CONTROL_DISABLE(CONTROL_BUTTON_SET_DEFAULT);
 
-  CONTROL_ENABLE_ON_CONDITION(CONTROL_BUTTON_ADD_VERSION, m_mode == Mode::MANAGE);
-  CONTROL_ENABLE_ON_CONDITION(CONTROL_BUTTON_ADD_EXTRAS, m_mode == Mode::MANAGE);
-  CONTROL_ENABLE_ON_CONDITION(CONTROL_BUTTON_CHOOSE_ART, m_mode == Mode::MANAGE);
-  CONTROL_ENABLE_ON_CONDITION(CONTROL_BUTTON_RENAME, m_mode == Mode::MANAGE);
-  CONTROL_ENABLE_ON_CONDITION(CONTROL_BUTTON_PLAY, m_mode == Mode::MANAGE);
+  CONTROL_ENABLE(CONTROL_BUTTON_ADD_VERSION);
+  CONTROL_ENABLE(CONTROL_BUTTON_ADD_EXTRAS);
+  CONTROL_ENABLE(CONTROL_BUTTON_CHOOSE_ART);
+  CONTROL_ENABLE(CONTROL_BUTTON_RENAME);
+  CONTROL_ENABLE(CONTROL_BUTTON_PLAY);
 
   CGUIDialog::OnInitWindow();
 }
@@ -651,41 +623,7 @@ void CGUIDialogVideoVersion::ManageVideoVersion(const std::shared_ptr<CFileItem>
   }
 
   dialog->SetVideoItem(item);
-  dialog->SetMode(Mode::MANAGE);
-  dialog->Open();
-}
-
-CGUIDialogVideoVersion::VersionSelectResult CGUIDialogVideoVersion::ChooseVideoVersion(
-    const std::shared_ptr<CFileItem>& item)
-{
-  if (!item->HasVideoInfoTag())
-  {
-    CLog::LogF(LOGWARNING, "Item is not a video. path={}", item->GetPath());
-    return {true, {}};
-  }
-
-  if (!item->HasVideoVersions())
-  {
-    CLog::LogF(LOGWARNING, "Item has no video versions. path={}", item->GetPath());
-    return {true, {}};
-  }
-
-  // prompt to select a video version
-  CGUIDialogVideoVersion* dialog{
-      CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogVideoVersion>(
-          WINDOW_DIALOG_VIDEO_VERSION_SELECT)};
-  if (!dialog)
-  {
-    CLog::LogF(LOGERROR, "Unable to get WINDOW_DIALOG_VIDEO_VERSION_SELECT instance!");
-    return {true, {}};
-  }
-
-  dialog->SetVideoItem(item);
-  dialog->SetMode(Mode::CHOOSE);
   dialog->Open();
-
-  // get the selected video version from dialog if not cancelled
-  return {dialog->m_cancelled, dialog->m_selectedVideoVersion};
 }
 
 int CGUIDialogVideoVersion::ManageVideoVersionContextMenu(const std::shared_ptr<CFileItem>& version)
@@ -712,7 +650,6 @@ int CGUIDialogVideoVersion::ManageVideoVersionContextMenu(const std::shared_ptr<
       return -1;
 
     dialog->SetVideoItem(std::make_shared<CFileItem>(videoItem));
-    dialog->SetMode(Mode::MANAGE);
     dialog->SetSelectedVideoVersion(version);
 
     switch (static_cast<CONTEXT_BUTTON>(button))
diff --git a/xbmc/video/dialogs/GUIDialogVideoVersion.h b/xbmc/video/dialogs/GUIDialogVideoVersion.h
index b408f3c782..27e38aae79 100644
--- a/xbmc/video/dialogs/GUIDialogVideoVersion.h
+++ b/xbmc/video/dialogs/GUIDialogVideoVersion.h
@@ -22,17 +22,11 @@ class CVideoDatabase;
 class CGUIDialogVideoVersion : public CGUIDialog
 {
 public:
-  CGUIDialogVideoVersion(int id);
-  ~CGUIDialogVideoVersion(void) override;
+  CGUIDialogVideoVersion();
+  ~CGUIDialogVideoVersion() override = default;
+
   bool OnMessage(CGUIMessage& message) override;
-  bool OnBack(int actionID) override;
 
-  enum class Mode
-  {
-    MANAGE,
-    CHOOSE,
-  };
-  void SetMode(Mode mode) { m_mode = mode; }
   void SetVideoItem(const std::shared_ptr<CFileItem>& item);
 
   static std::tuple<int, std::string> NewVideoVersion();
@@ -45,13 +39,6 @@ public:
   static std::string GenerateExtrasVideoVersion(const std::string& extrasPath);
   static int ManageVideoVersionContextMenu(const std::shared_ptr<CFileItem>& version);
 
-  struct VersionSelectResult
-  {
-    bool cancelled{false};
-    std::shared_ptr<CFileItem> selected;
-  };
-  static VersionSelectResult ChooseVideoVersion(const std::shared_ptr<CFileItem>& item);
-
 protected:
   void OnInitWindow() override;
 
@@ -71,8 +58,6 @@ private:
   void CloseAll();
 
   std::shared_ptr<CFileItem> m_videoItem;
-  Mode m_mode{Mode::MANAGE};
-  bool m_cancelled{false};
   CVideoDatabase m_database;
   std::unique_ptr<CFileItemList> m_primaryVideoVersionList;
   std::unique_ptr<CFileItemList> m_extrasVideoVersionList;