[video] Rename setting 'Play default video version' to 'Select default video version' and move it from Player->Videos to Media->Videos.

4 files changed, 12 insertions, 12 deletions

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index bb3f6157e7..fe7d42af8f 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -23874,16 +23874,16 @@ msgctxt "#40023"
 msgid "Choose {0:s}"
 msgstr ""
 
-#. Play default video version setting
+#. Select default video version setting
 #: system/settings/settings.xml
 msgctxt "#40200"
-msgid "Play default video version"
+msgid "Select default video version"
 msgstr ""
 
-#. Help for play default video version setting
+#. Help for select default video version setting
 #: system/settings/settings.xml
 msgctxt "#40201"
-msgid "Select player action for video with multiple versions.[CR][Enabled] Automatically play the default video version without prompting.[CR][Disabled] Always display a dialogue to select the preferred video version."
+msgid "Defines how to handle selection of videos with multiple versions.[CR][Enabled] Automatically select the default video version without prompting.[CR][Disabled] Display a dialogue to select a version of the video."
 msgstr ""
 
 #. Ignore different video versions settting
@@ -23919,7 +23919,7 @@ msgstr ""
 #. Help for show video versions as folder settting
 #: system/settings/settings.xml
 msgctxt "#40207"
-msgid "When enabled, video with multiple versions will be shown as folder in library, this folder can then be opened to display the individual video versions. When disabled, a video version dialog will be opened for the video."
+msgid "When enabled, a video with multiple versions will be shown as a folder in the video library. This folder can then be opened to display the individual video versions. When disabled, the configured select action will be applied."
 msgstr ""
 
 # Video versions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 826f1ea708..6330fafad4 100755
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -21,11 +21,6 @@
             <hidevalue>false</hidevalue>
           </control>
         </setting>
-        <setting id="videoplayer.playdefaultversion" type="boolean" label="40200" help="40201">
-          <level>0</level>
-          <default>false</default>
-          <control type="toggle" />
-        </setting>
         <setting id="videoplayer.seeksteps" type="list[integer]" label="13556" help="37042">
           <level>1</level>
           <default>-600,-300,-180,-60,-30,-10,10,30,60,180,300,600</default>
@@ -1030,6 +1025,11 @@
           </constraints>
           <control type="list" format="string" />
         </setting>
+        <setting id="myvideos.selectdefaultversion" type="boolean" label="40200" help="40201">
+          <level>0</level>
+          <default>false</default>
+          <control type="toggle" />
+        </setting>
         <setting id="myvideos.playaction" type="integer" label="22076" help="36204">
           <level>0</level>
           <default>1</default> <!-- PLAY_ACTION_PLAY_OR_RESUME -->
diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h
index 3ba4b08cde..8a62a03b4d 100644
--- a/xbmc/settings/Settings.h
+++ b/xbmc/settings/Settings.h
@@ -101,7 +101,6 @@ public:
   static constexpr auto SETTING_VIDEOLIBRARY_IGNOREVIDEOEXTRAS = "videolibrary.ignorevideoextras";
   static constexpr auto SETTING_VIDEOLIBRARY_SHOWVIDEOVERSIONSASFOLDER =
       "videolibrary.showvideoversionsasfolder";
-  static constexpr auto SETTING_VIDEOPLAYER_PLAYDEFAULTVERSION = "videoplayer.playdefaultversion";
   static constexpr auto SETTING_LOCALE_AUDIOLANGUAGE = "locale.audiolanguage";
   static constexpr auto SETTING_VIDEOPLAYER_PREFERDEFAULTFLAG = "videoplayer.preferdefaultflag";
   static constexpr auto SETTING_VIDEOPLAYER_AUTOPLAYNEXTITEM = "videoplayer.autoplaynextitem";
@@ -137,6 +136,7 @@ public:
   static constexpr auto SETTING_VIDEOPLAYER_SUPPORTMVC = "videoplayer.supportmvc";
   static constexpr auto SETTING_VIDEOPLAYER_CONVERTDOVI = "videoplayer.convertdovi";
   static constexpr auto SETTING_MYVIDEOS_SELECTACTION = "myvideos.selectaction";
+  static constexpr auto SETTING_MYVIDEOS_SELECTDEFAULTVERSION = "myvideos.selectdefaultversion";
   static constexpr auto SETTING_MYVIDEOS_PLAYACTION = "myvideos.playaction";
   static constexpr auto SETTING_MYVIDEOS_USETAGS = "myvideos.usetags";
   static constexpr auto SETTING_MYVIDEOS_EXTRACTFLAGS = "myvideos.extractflags";
diff --git a/xbmc/video/guilib/VideoActionProcessorHelper.cpp b/xbmc/video/guilib/VideoActionProcessorHelper.cpp
index 10f7d3f936..405f7a298f 100644
--- a/xbmc/video/guilib/VideoActionProcessorHelper.cpp
+++ b/xbmc/video/guilib/VideoActionProcessorHelper.cpp
@@ -120,7 +120,7 @@ std::shared_ptr<CFileItem> CVideoActionProcessorHelper::ChooseVideoVersion()
     if (!m_videoVersion)
     {
       // select the default video version
-      if (settings->GetBool(CSettings::SETTING_VIDEOPLAYER_PLAYDEFAULTVERSION))
+      if (settings->GetBool(CSettings::SETTING_MYVIDEOS_SELECTDEFAULTVERSION))
       {
         CVideoDatabase db;
         if (!db.Open())