changed: Removed Set/Clear default from context menu in videos - doesn't make sense...

diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
index 2e99152..11b0644 100644 (file)
--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
+++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
@@ -251,7 +251,8 @@ void CGUIDialogContextMenu::GetContextButtons(const CStdString &type, const CFil
         if (plugin->HasSettings())
           buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045); // Plugin Settings
       }
-      buttons.Add(CONTEXT_BUTTON_SET_DEFAULT, 13335); // Set as Default
+      if (type != "video")
+        buttons.Add(CONTEXT_BUTTON_SET_DEFAULT, 13335); // Set as Default
       if (!share->m_ignore && !isAddon)
         buttons.Add(CONTEXT_BUTTON_REMOVE_SOURCE, 522); // Remove Source
 
@@ -628,8 +629,6 @@ void CGUIDialogContextMenu::SetDefault(const CStdString &strType, const CStdStri
     g_settings.m_defaultFileSource = strDefault;
   else if (strType == "music")
     g_settings.m_defaultMusicSource = strDefault;
-  else if (strType == "video")
-    g_settings.m_defaultVideoSource = strDefault;
   else if (strType == "pictures")
     g_settings.m_defaultPictureSource = strDefault;
   g_settings.SaveSources();

diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 92f4ab1..20f3325 100644 (file)
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -209,8 +209,6 @@ CStdString CSettings::GetDefaultSourceFromType(const CStdString &type)
     defaultShare = m_defaultFileSource;
   else if (type == "music")
     defaultShare = m_defaultMusicSource;
-  else if (type == "video")
-    defaultShare = m_defaultVideoSource;
   else if (type == "pictures")
     defaultShare = m_defaultPictureSource;
   return defaultShare;
@@ -633,8 +631,6 @@ bool CSettings::LoadSettings(const CStdString& strSettingsFile)
     GetInteger(pElement, "startwindow", m_iVideoStartWindow, WINDOW_VIDEO_FILES, WINDOW_VIDEO_FILES, WINDOW_VIDEO_NAV);
     XMLUtils::GetBoolean(pElement, "stackvideos", m_videoStacking);
 
-    GetPath(pElement, "defaultlibview", m_defaultVideoLibSource);
-
     // Read the watchmode settings for the various media views
     GetInteger(pElement, "watchmodemovies", m_watchMode["movies"], VIDEO_SHOW_ALL, VIDEO_SHOW_ALL, VIDEO_SHOW_WATCHED);
     GetInteger(pElement, "watchmodetvshows", m_watchMode["tvshows"], VIDEO_SHOW_ALL, VIDEO_SHOW_ALL, VIDEO_SHOW_WATCHED);
@@ -806,8 +802,6 @@ bool CSettings::SaveSettings(const CStdString& strSettingsFile, CGUISettings *lo
 
   XMLUtils::SetBoolean(pNode, "stackvideos", m_videoStacking);
 
-  XMLUtils::SetPath(pNode, "defaultlibview", m_defaultVideoLibSource);
-
   XMLUtils::SetInt(pNode, "watchmodemovies", m_watchMode.find("movies")->second);
   XMLUtils::SetInt(pNode, "watchmodetvshows", m_watchMode.find("tvshows")->second);
   XMLUtils::SetInt(pNode, "watchmodemusicvideos", m_watchMode.find("musicvideos")->second);
@@ -1272,7 +1266,7 @@ bool CSettings::SaveSources()
 
   // ok, now run through and save each sources section
   SetSources(pRoot, "programs", m_programSources, m_defaultProgramSource);
-  SetSources(pRoot, "video", m_videoSources, m_defaultVideoSource);
+  SetSources(pRoot, "video", m_videoSources, "");
   SetSources(pRoot, "music", m_musicSources, m_defaultMusicSource);
   SetSources(pRoot, "pictures", m_pictureSources, m_defaultPictureSource);
   SetSources(pRoot, "files", m_fileSources, m_defaultFileSource);
@@ -1341,11 +1335,12 @@ void CSettings::LoadSources()
   // parse sources
   if (pRootElement)
   {
+    CStdString dummy;
     GetSources(pRootElement, "programs", m_programSources, m_defaultProgramSource);
     GetSources(pRootElement, "pictures", m_pictureSources, m_defaultPictureSource);
     GetSources(pRootElement, "files", m_fileSources, m_defaultFileSource);
     GetSources(pRootElement, "music", m_musicSources, m_defaultMusicSource);
-    GetSources(pRootElement, "video", m_videoSources, m_defaultVideoSource);
+    GetSources(pRootElement, "video", m_videoSources, dummy);
   }
 }
 

diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h
index 023a84b..4e878cc 100644 (file)
--- a/xbmc/settings/Settings.h
+++ b/xbmc/settings/Settings.h
@@ -236,9 +236,7 @@ public:
   CStdString m_defaultMusicSource;
   CStdString m_defaultPictureSource;
   CStdString m_defaultFileSource;
-  CStdString m_defaultVideoSource;
   CStdString m_defaultMusicLibSource;
-  CStdString m_defaultVideoLibSource;
 
   CStdString m_UPnPUUIDServer;
   int        m_UPnPPortServer;

diff --git a/xbmc/video/windows/GUIWindowVideoFiles.cpp b/xbmc/video/windows/GUIWindowVideoFiles.cpp
index 82264d1..60ff24b 100644 (file)
--- a/xbmc/video/windows/GUIWindowVideoFiles.cpp
+++ b/xbmc/video/windows/GUIWindowVideoFiles.cpp
@@ -67,10 +67,6 @@ bool CGUIWindowVideoFiles::OnMessage(CGUIMessage& message)
   {
   case GUI_MSG_WINDOW_INIT:
     {
-      // is this the first time accessing this window?
-      if (m_vecItems->m_strPath == "?" && message.GetStringParam().IsEmpty())
-        message.SetStringParam(g_settings.m_defaultVideoSource);
-
       return CGUIWindowVideoBase::OnMessage(message);
     }
     break;

diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp
index 77aa6aa..c5f977f 100644 (file)
--- a/xbmc/video/windows/GUIWindowVideoNav.cpp
+++ b/xbmc/video/windows/GUIWindowVideoNav.cpp
@@ -76,7 +76,6 @@ using namespace std;
 CGUIWindowVideoNav::CGUIWindowVideoNav(void)
     : CGUIWindowVideoBase(WINDOW_VIDEO_NAV, "MyVideoNav.xml")
 {
-  m_vecItems->m_strPath = "?";
   m_thumbLoader.SetObserver(this);
 }
 
@@ -104,7 +103,7 @@ bool CGUIWindowVideoNav::OnMessage(CGUIMessage& message)
   switch (message.GetMessage())
   {
   case GUI_MSG_WINDOW_RESET:
-    m_vecItems->m_strPath = "?";
+    m_vecItems->m_strPath.clear();
     break;
   case GUI_MSG_WINDOW_DEINIT:
     if (m_thumbLoader.IsLoading())
@@ -115,10 +114,6 @@ bool CGUIWindowVideoNav::OnMessage(CGUIMessage& message)
       /* We don't want to show Autosourced items (ie removable pendrives, memorycards) in Library mode */
       m_rootDir.AllowNonLocalSources(false);
 
-      // is this the first time the window is opened?
-      if (m_vecItems->m_strPath == "?" && message.GetStringParam().IsEmpty())
-        message.SetStringParam(g_settings.m_defaultVideoLibSource);
-
       SetProperty("flattened", g_settings.m_bMyVideoNavFlatten);
       
       if (!CGUIWindowVideoBase::OnMessage(message))
@@ -996,21 +991,6 @@ void CGUIWindowVideoNav::GetContextButtons(int itemNumber, CContextButtons &butt
           buttons.Add(CONTEXT_BUTTON_UPDATE_LIBRARY, 653);
       }
 
-      //Set default and/or clear default
-      NODE_TYPE nodetype = CVideoDatabaseDirectory::GetDirectoryType(item->m_strPath);
-      if (!item->IsParentFolder() && !m_vecItems->m_strPath.Equals("special://videoplaylists/") &&
-        (nodetype == NODE_TYPE_ROOT             ||
-         nodetype == NODE_TYPE_OVERVIEW         ||
-         nodetype == NODE_TYPE_TVSHOWS_OVERVIEW ||
-         nodetype == NODE_TYPE_MOVIES_OVERVIEW  ||
-         nodetype == NODE_TYPE_MUSICVIDEOS_OVERVIEW))
-      {
-        if (!item->m_strPath.Equals(g_settings.m_defaultVideoLibSource))
-          buttons.Add(CONTEXT_BUTTON_SET_DEFAULT, 13335); // set default
-        if (strcmp(g_settings.m_defaultVideoLibSource, ""))
-          buttons.Add(CONTEXT_BUTTON_CLEAR_DEFAULT, 13403); // clear default
-      }
-
       if (!m_vecItems->IsVideoDb() && !m_vecItems->IsVirtualDirectoryRoot())
       { // non-video db items, file operations are allowed
         if (!item->IsReadOnly())
@@ -1056,16 +1036,6 @@ bool CGUIWindowVideoNav::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
   }
   switch (button)
   {
-  case CONTEXT_BUTTON_SET_DEFAULT:
-    g_settings.m_defaultVideoLibSource = GetQuickpathName(item->m_strPath);
-    g_settings.Save();
-    return true;
-
-  case CONTEXT_BUTTON_CLEAR_DEFAULT:
-    g_settings.m_defaultVideoLibSource.Empty();
-    g_settings.Save();
-    return true;
-
   case CONTEXT_BUTTON_EDIT:
     UpdateVideoTitle(item.get());
     CUtil::DeleteVideoDatabaseDirectoryCache();