Skip to content

Commit 7a11dd0

Browse files
committed
[video] Cleanup remains of video versions/extras select dialog
1 parent 4c3c11b commit 7a11dd0

File tree

4 files changed

+2
-20
lines changed

4 files changed

+2
-20
lines changed

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24521,19 +24521,7 @@ msgctxt "#40040"
2452124521
msgid "Are you sure to remove the extra \"{0:s}\"?"
2452224522
msgstr ""
2452324523

24524-
#empty strings with id 40041 to 40199
24525-
24526-
#. Select default video version setting
24527-
#: system/settings/settings.xml
24528-
msgctxt "#40200"
24529-
msgid "Select default video version"
24530-
msgstr ""
24531-
24532-
#. Help for select default video version setting
24533-
#: system/settings/settings.xml
24534-
msgctxt "#40201"
24535-
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."
24536-
msgstr ""
24524+
#empty strings with id 40041 to 40201
2453724525

2453824526
#. Ignore different video versions settting
2453924527
#: system/settings/settings.xml

addons/skin.estuary/xml/DialogSelect.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<include>Animation_DialogPopupOpenClose</include>
55
<depth>DepthOSD</depth>
66
<controls>
7-
<include condition="![Window.IsActive(dialogselectvideo) | Window.IsActive(dialogselectaudio) | Window.IsActive(dialogselectsubtitle) | Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra) | Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DefaultDialogSelectLayout</include>
7+
<include condition="![Window.IsActive(dialogselectvideo) | Window.IsActive(dialogselectaudio) | Window.IsActive(dialogselectsubtitle) | Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DefaultDialogSelectLayout</include>
88
<include condition="Window.IsActive(dialogselectvideo)">VideoDialogSelectVideoLayout</include>
99
<include condition="Window.IsActive(dialogselectaudio)">VideoDialogSelectAudioLayout</include>
1010
<include condition="Window.IsActive(dialogselectsubtitle)">VideoDialogSelectSubtitleLayout</include>

system/settings/settings.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,11 +1123,6 @@
11231123
</constraints>
11241124
<control type="list" format="string" />
11251125
</setting>
1126-
<setting id="myvideos.selectdefaultversion" type="boolean" label="40200" help="40201">
1127-
<level>0</level>
1128-
<default>false</default>
1129-
<control type="toggle" />
1130-
</setting>
11311126
<setting id="myvideos.playaction" type="integer" label="22076" help="36204">
11321127
<level>0</level>
11331128
<default>1</default> <!-- ACTION_PLAY_OR_RESUME -->

xbmc/settings/Settings.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ class CSettings : public CSettingsBase, public CSettingCreator, public CSettingC
139139
static constexpr auto SETTING_VIDEOPLAYER_QUEUETIMESIZE = "videoplayer.queuetimesize";
140140
static constexpr auto SETTING_VIDEOPLAYER_QUEUEDATASIZE = "videoplayer.queuedatasize";
141141
static constexpr auto SETTING_MYVIDEOS_SELECTACTION = "myvideos.selectaction";
142-
static constexpr auto SETTING_MYVIDEOS_SELECTDEFAULTVERSION = "myvideos.selectdefaultversion";
143142
static constexpr auto SETTING_MYVIDEOS_PLAYACTION = "myvideos.playaction";
144143
static constexpr auto SETTING_MYVIDEOS_USETAGS = "myvideos.usetags";
145144
static constexpr auto SETTING_MYVIDEOS_EXTRACTFLAGS = "myvideos.extractflags";

0 commit comments

Comments
 (0)