[VideoVersion] Added VideoVersionPlay dialog

addons/resource.language.en_gb/resources/strings.po

@@ -23790,21 +23790,25 @@ msgctxt "#40009"
 msgid "Found a different version of {0:s} \"{1:s}\" ({2:s}). Would you like to convert it into an additional version of the original?"
 msgstr ""
 
+#. "video version" string in singular format
 #: xbmc/media/MediaType.cpp
 msgctxt "#40010"
 msgid "video version"
 msgstr ""
 
+#. "video version" string in plural format
 #: xbmc/media/MediaType.cpp
 msgctxt "#40011"
 msgid "video versions"
 msgstr ""
 
+#. "video version" string in singular capital format
 #: xbmc/media/MediaType.cpp
 msgctxt "#40012"
 msgid "Video version"
 msgstr ""
 
+#. "video version" string in plural capital format
 #: xbmc/media/MediaType.cpp
 msgctxt "#40013"
 msgid "Video versions"
@@ -23920,186 +23924,223 @@ msgstr ""
 
 # Video versions
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40400"
 msgid "Standard Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40401"
 msgid "Extended Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40402"
 msgid "Unrated Version"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40403"
 msgid "Uncut Version"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40404"
 msgid "Remastered Version"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40405"
 msgid "4K"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40406"
 msgid "Theatrical Cut"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40407"
 msgid "Director's Cut"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40408"
 msgid "Special Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40409"
 msgid "Limited Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40410"
 msgid "Complete Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40411"
 msgid "The Final Cut"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40412"
 msgid "Super Duper Cut"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40413"
 msgid "Collector's Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40414"
 msgid "Ultimate Collector's Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40415"
 msgid "Criterion Collection Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40416"
 msgid "Fan Edit"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40417"
 msgid "Black and White Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40418"
 msgid "BluRay"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40419"
 msgid "WEB-DL"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40420"
 msgid "3D"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40421"
 msgid "8K"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40422"
 msgid "IMAX"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40423"
 msgid "UHD"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40424"
 msgid "FHD"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40425"
 msgid "HD"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40426"
 msgid "SD"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40427"
 msgid "DVD"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40428"
 msgid "VHS"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40429"
 msgid "VCD"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40430"
 msgid "REMUX"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40431"
 msgid "10th Anniversary Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40432"
 msgid "20th Anniversary Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40433"
 msgid "25th Anniversary Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40434"
 msgid "30th Anniversary Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40435"
 msgid "40th Anniversary Edition"
 msgstr ""
 
+#. Name of a video version, like "Director's Cut"
 #: xbmc/video/VideoDatabase.cpp
 msgctxt "#40436"
 msgid "50th Anniversary Edition"

xbmc/guilib/GUIWindowManager.cpp

@@ -292,7 +292,8 @@ void CGUIWindowManager::CreateWindows()
   Add(new CGUIDialogMusicInfo);
   Add(new CGUIDialogOK);
   Add(new CGUIDialogVideoInfo);
-  Add(new CGUIDialogVideoVersion);
+  Add(new CGUIDialogVideoVersion(WINDOW_DIALOG_VIDEO_VERSION));
+  Add(new CGUIDialogVideoVersion(WINDOW_DIALOG_VIDEO_VERSION_PLAY));
   Add(new CGUIDialogTextViewer);
   Add(new CGUIWindowFullScreen);
   Add(new CGUIWindowVisualisation);
@@ -334,6 +335,7 @@ bool CGUIWindowManager::DestroyWindows()
     DestroyWindow(WINDOW_DIALOG_MUSIC_INFO);
     DestroyWindow(WINDOW_DIALOG_VIDEO_INFO);
     DestroyWindow(WINDOW_DIALOG_VIDEO_VERSION);
+    DestroyWindow(WINDOW_DIALOG_VIDEO_VERSION_PLAY);
     DestroyWindow(WINDOW_VIDEO_PLAYLIST);
     DestroyWindow(WINDOW_VIDEO_NAV);
     DestroyWindow(WINDOW_FILES);

xbmc/guilib/WindowIDs.dox

@@ -134,6 +134,7 @@ 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 |
 | Weather                 | WINDOW_WEATHER                       | 12600     | MyWeather.xml                       |                                    |
 | Screensaver             | WINDOW_SCREENSAVER                   | 12900     | none                                |                                    |
 | VideoOSD                | WINDOW_DIALOG_VIDEO_OSD              | 12901     | VideoOSD.xml                        |                                    |

xbmc/guilib/WindowIDs.h

@@ -169,6 +169,7 @@
 #define WINDOW_VISUALISATION              12006
 #define WINDOW_SLIDESHOW                  12007
 #define WINDOW_DIALOG_COLOR_PICKER 12008
+#define WINDOW_DIALOG_VIDEO_VERSION_PLAY 12009
 #define WINDOW_WEATHER                    12600
 #define WINDOW_SCREENSAVER                12900
 #define WINDOW_DIALOG_VIDEO_OSD           12901

xbmc/input/WindowTranslator.cpp

@@ -120,6 +120,7 @@ const CWindowTranslator::WindowMapByName CWindowTranslator::WindowMappingByName
     {"okdialog", WINDOW_DIALOG_OK},
     {"movieinformation", WINDOW_DIALOG_VIDEO_INFO},
     {"videoversion", WINDOW_DIALOG_VIDEO_VERSION},
+    {"videoversionplay", WINDOW_DIALOG_VIDEO_VERSION_PLAY},
     {"textviewer", WINDOW_DIALOG_TEXT_VIEWER},
     {"fullscreenvideo", WINDOW_FULLSCREEN_VIDEO},
     {"dialogcolorpicker", WINDOW_DIALOG_COLOR_PICKER},

xbmc/video/dialogs/GUIDialogVideoVersion.cpp

@@ -68,8 +68,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()
-  : CGUIDialog(WINDOW_DIALOG_VIDEO_VERSION, "DialogVideoVersion.xml"),
+CGUIDialogVideoVersion::CGUIDialogVideoVersion(int id)
+  : CGUIDialog(id, "DialogVideoVersion.xml"),
     m_videoItem(std::make_shared<CFileItem>()),
     m_primaryVideoVersionList(std::make_unique<CFileItemList>()),
     m_extrasVideoVersionList(std::make_unique<CFileItemList>()),
@@ -663,7 +663,7 @@ void CGUIDialogVideoVersion::PlayVideoVersion(const std::shared_ptr<CFileItem>&
   // prompt to play selected video version
   CGUIDialogVideoVersion* dialog =
       CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogVideoVersion>(
-          WINDOW_DIALOG_VIDEO_VERSION);
+          WINDOW_DIALOG_VIDEO_VERSION_PLAY);
   if (!dialog)
     return;
 

xbmc/video/dialogs/GUIDialogVideoVersion.h

@@ -22,7 +22,7 @@ class CVideoDatabase;
 class CGUIDialogVideoVersion : public CGUIDialog
 {
 public:
-  CGUIDialogVideoVersion(void);
+  CGUIDialogVideoVersion(int id);
   ~CGUIDialogVideoVersion(void) override;
   bool OnMessage(CGUIMessage& message) override;
   void SetVideoItem(const std::shared_ptr<CFileItem>& item, bool playMode);