From abc298ca71c25ae57081aad60ba5ef0abec3a445 Mon Sep 17 00:00:00 2001 From: mad-max Date: Fri, 27 Feb 2015 10:21:32 +0100 Subject: [PATCH 1/2] moved HideAllItems Tag from AdvancedSettings to GUI --- language/English/strings.po | 12 ++++++++++++ system/settings/settings.xml | 10 ++++++++++ .../MusicDatabaseDirectory/DirectoryNode.cpp | 3 ++- .../VideoDatabaseDirectory/DirectoryNode.cpp | 3 ++- xbmc/settings/AdvancedSettings.cpp | 4 ---- xbmc/settings/AdvancedSettings.h | 2 -- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po index 54de069e6b765..8446f59dab052 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -16254,3 +16254,15 @@ msgstr "" msgctxt "#38010" msgid "GPU accelerated" msgstr "" + +#. Setting #38011 "Videos -> Library -> Hide All Items entry" +#: system/settings/settings.xml +msgctxt "#38011" +msgid "Hide "All Items" entry" +msgstr "" + +#. Description of setting "Videos -> Library -> Hide All Items entry" +#: system/settings/settings.xml +msgctxt "#38012" +msgid "Hide "All Items" entry in directory (for example All Albums or All Seasons)" +msgstr "" \ No newline at end of file diff --git a/system/settings/settings.xml b/system/settings/settings.xml index ecd2e9010f9ba..865aa597a84d2 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -350,6 +350,11 @@ false + + 2 + false + + 0 false @@ -1555,6 +1560,11 @@ + + 2 + false + + 2 diff --git a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp index 87eb1f3af4ebd..401806dcdb460 100644 --- a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp +++ b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp @@ -46,6 +46,7 @@ #include "utils/StringUtils.h" #include "guilib/LocalizeStrings.h" #include "music/MusicDbUrl.h" +#include "settings/settings.h" using namespace std; using namespace XFILE::MUSICDATABASEDIRECTORY; @@ -293,7 +294,7 @@ void CDirectoryNode::AddQueuingFolder(CFileItemList& items) const return; // always hide "all" items - if (g_advancedSettings.m_bMusicLibraryHideAllItems) + if (CSettings::Get().GetBool("musiclibrary.hideallitems")) return; // no need for "all" item when only one item diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp index afcd11bfce821..295967269f1d4 100644 --- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp +++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp @@ -44,6 +44,7 @@ #include "guilib/LocalizeStrings.h" #include "utils/Variant.h" #include "video/VideoDatabase.h" +#include "settings/settings.h" using namespace std; using namespace XFILE::VIDEODATABASEDIRECTORY; @@ -284,7 +285,7 @@ void CDirectoryNode::AddQueuingFolder(CFileItemList& items) const CFileItemPtr pItem; // always hide "all" items - if (g_advancedSettings.m_bVideoLibraryHideAllItems) + if (CSettings::Get().GetBool("videolibrary.hideallitems")) return; // no need for "all" item when only one item diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index eb39cecca0d23..3c33e6c75cdec 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -266,7 +266,6 @@ void CAdvancedSettings::Initialize() m_musicThumbs = "folder.jpg|Folder.jpg|folder.JPG|Folder.JPG|cover.jpg|Cover.jpg|cover.jpeg|thumb.jpg|Thumb.jpg|thumb.JPG|Thumb.JPG"; m_fanartImages = "fanart.jpg|fanart.png"; - m_bMusicLibraryHideAllItems = false; m_bMusicLibraryAllItemsOnBottom = false; m_bMusicLibraryAlbumsSortByArtistThenYear = false; m_bMusicLibraryCleanOnUpdate = false; @@ -277,7 +276,6 @@ void CAdvancedSettings::Initialize() m_musicItemSeparator = " / "; m_videoItemSeparator = " / "; - m_bVideoLibraryHideAllItems = false; m_bVideoLibraryAllItemsOnBottom = false; m_iVideoLibraryRecentlyAddedItems = 25; m_bVideoLibraryHideEmptySeries = false; @@ -744,7 +742,6 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) pElement = pRootElement->FirstChildElement("musiclibrary"); if (pElement) { - XMLUtils::GetBoolean(pElement, "hideallitems", m_bMusicLibraryHideAllItems); XMLUtils::GetInt(pElement, "recentlyaddeditems", m_iMusicLibraryRecentlyAddedItems, 1, INT_MAX); XMLUtils::GetBoolean(pElement, "prioritiseapetags", m_prioritiseAPEv2tags); XMLUtils::GetBoolean(pElement, "allitemsonbottom", m_bMusicLibraryAllItemsOnBottom); @@ -758,7 +755,6 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) pElement = pRootElement->FirstChildElement("videolibrary"); if (pElement) { - XMLUtils::GetBoolean(pElement, "hideallitems", m_bVideoLibraryHideAllItems); XMLUtils::GetBoolean(pElement, "allitemsonbottom", m_bVideoLibraryAllItemsOnBottom); XMLUtils::GetInt(pElement, "recentlyaddeditems", m_iVideoLibraryRecentlyAddedItems, 1, INT_MAX); XMLUtils::GetBoolean(pElement, "hideemptyseries", m_bVideoLibraryHideEmptySeries); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h index ae56be0e044dd..89cdefa3b7eb0 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -261,7 +261,6 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler std::string m_musicThumbs; std::string m_fanartImages; - bool m_bMusicLibraryHideAllItems; int m_iMusicLibraryRecentlyAddedItems; bool m_bMusicLibraryAllItemsOnBottom; bool m_bMusicLibraryAlbumsSortByArtistThenYear; @@ -273,7 +272,6 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler std::string m_videoItemSeparator; std::vector m_musicTagsFromFileFilters; - bool m_bVideoLibraryHideAllItems; bool m_bVideoLibraryAllItemsOnBottom; int m_iVideoLibraryRecentlyAddedItems; bool m_bVideoLibraryHideEmptySeries; From 5990efe473e572a2118245f0f70ef3d5713800dd Mon Sep 17 00:00:00 2001 From: mad-max Date: Tue, 3 Mar 2015 08:10:07 +0100 Subject: [PATCH 2/2] damn you case-sensitivity --- xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp | 2 +- xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp index 401806dcdb460..7824a3f9d513d 100644 --- a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp +++ b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp @@ -46,7 +46,7 @@ #include "utils/StringUtils.h" #include "guilib/LocalizeStrings.h" #include "music/MusicDbUrl.h" -#include "settings/settings.h" +#include "settings/Settings.h" using namespace std; using namespace XFILE::MUSICDATABASEDIRECTORY; diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp index 295967269f1d4..0ac3de4f6da6c 100644 --- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp +++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp @@ -44,7 +44,7 @@ #include "guilib/LocalizeStrings.h" #include "utils/Variant.h" #include "video/VideoDatabase.h" -#include "settings/settings.h" +#include "settings/Settings.h" using namespace std; using namespace XFILE::VIDEODATABASEDIRECTORY;