video: move "Stack" toggle to settings

xbmc · Aug 2, 2013 · 8848f57 · 8848f57
1 parent 5bf2a98
commit 8848f57
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml
@@ -143,12 +143,6 @@
 					<include>ButtonCommonValues</include>
 					<label>137</label>
 				</control>
-				<control type="radiobutton" id="7">
-					<description>Stack Toggle</description>
-					<textwidth>170</textwidth>
-					<include>ButtonCommonValues</include>
-					<label>346</label>
-				</control>
 				<control type="radiobutton" id="17">
 					<description>Flatten</description>
 					<textwidth>170</textwidth>

diff --git a/language/English/strings.po b/language/English/strings.po
@@ -9976,7 +9976,10 @@ msgctxt "#20434"
 msgid "Sets"
 msgstr ""
 
-#empty string with id 20435
+#: system/settings/settings.xml
+msgctxt "#20435"
+msgid "Combine split video items"
+msgstr ""
 
 msgctxt "#20436"
 msgid "Export actor thumbs?"
@@ -12967,7 +12970,7 @@ msgstr ""
 
 #: system/settings/settings.xml
 msgctxt "#36182"
-msgid "No info available yet."
+msgid "Enables direct playback of videos that are in folders, without having to open those folders first, as well as displaying multi-part video files as single items in non-library views."
 msgstr ""
 
 #: system/settings/settings.xml

diff --git a/system/settings/settings.xml b/system/settings/settings.xml
@@ -598,8 +598,8 @@
           <level>4</level>
           <default>100024</default> <!-- WINDOW_VIDEO_FILES -->
         </setting>
-        <setting id="myvideos.stackvideos" type="boolean" label="0" help="36182">
-          <level>4</level>
+        <setting id="myvideos.stackvideos" type="boolean" label="20435" help="36182">
+          <level>1</level>
           <default>false</default>
         </setting>
         <setting id="myvideos.flatten" type="boolean" label="0" help="36183">

diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -92,7 +92,6 @@ using namespace PVR;
 #define CONTROL_LABELFILES        12
 
 #define CONTROL_PLAY_DVD           6
-#define CONTROL_STACK              7
 #define CONTROL_BTNSCAN            8
 
 #define PROPERTY_GROUP_BY           "group.by"
@@ -156,21 +155,15 @@ bool CGUIWindowVideoBase::OnMessage(CGUIMessage& message)
   case GUI_MSG_CLICKED:
     {
       int iControl = message.GetSenderId();
-      if (iControl == CONTROL_STACK)
-      {
-        CSettings::Get().ToggleBool("myvideos.stackvideos");
-        CSettings::Get().Save();
-        UpdateButtons();
-        Update( m_vecItems->GetPath() );
-      }
 #if defined(HAS_DVD_DRIVE)
-      else if (iControl == CONTROL_PLAY_DVD)
+      if (iControl == CONTROL_PLAY_DVD)
       {
         // play movie...
         MEDIA_DETECT::CAutorun::PlayDiscAskResume(g_mediaManager.TranslateDevicePath(""));
       }
+      else
 #endif
-      else if (iControl == CONTROL_BTNTYPE)
+      if (iControl == CONTROL_BTNTYPE)
       {
         CGUIMessage msg(GUI_MSG_ITEM_SELECTED, GetID(), CONTROL_BTNTYPE);
         g_windowManager.SendMessage(msg);
@@ -271,10 +264,6 @@ void CGUIWindowVideoBase::UpdateButtons()
   CONTROL_SELECT_ITEM(CONTROL_BTNTYPE, nWindow);
 
   CONTROL_ENABLE(CONTROL_BTNSCAN);
-
-  SET_CONTROL_LABEL(CONTROL_STACK, 14000);  // Stack
-  SET_CONTROL_SELECTED(GetID(), CONTROL_STACK, CSettings::Get().GetBool("myvideos.stackvideos"));
-  CONTROL_ENABLE_ON_CONDITION(CONTROL_STACK, m_stackingAvailable);
 
   CGUIMediaWindow::UpdateButtons();
 }