diff options
| author | alcoheca <alcoheca@svn> | 2010-03-08 12:03:24 +0000 |
|---|---|---|
| committer | alcoheca <alcoheca@svn> | 2010-03-08 12:03:24 +0000 |
| commit | e57d38a1d6d4f7f65bbd8a9724d12982e16233f2 (patch) | |
| tree | d3d3fb29af3922f50c8c363ca732b7e4a543cb7d | |
| parent | dd1eceef5d45e6197d876f68b218fa227407d4f0 (diff) | |
added: kaitoast popup on set content with scraper disabled
changed: addons should preserve state when cloning
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28467 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rw-r--r-- | language/English/strings.xml | 1 | ||||
| -rw-r--r-- | xbmc/GUIDialogContentSettings.cpp | 7 | ||||
| -rw-r--r-- | xbmc/utils/Addon.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/language/English/strings.xml b/language/English/strings.xml index dd04fa9948..7d3537e4da 100644 --- a/language/English/strings.xml +++ b/language/English/strings.xml @@ -2115,6 +2115,7 @@ <string id="24020">Configure Add-on</string> <string id="24021">Disable Add-on</string> <string id="24022">Enable Add-on</string> + <string id="24023">Add-on disabled</string> <string id="24027">Weather service</string> <string id="24028">Weather.com (standard)</string> <string id="24030">This Add-on can not be configured</string> diff --git a/xbmc/GUIDialogContentSettings.cpp b/xbmc/GUIDialogContentSettings.cpp index 4a6e4348ca..78db494bc2 100644 --- a/xbmc/GUIDialogContentSettings.cpp +++ b/xbmc/GUIDialogContentSettings.cpp @@ -25,6 +25,7 @@ #include "GUISettings.h" #include "GUIWindowManager.h" #include "utils/IAddon.h" +#include "Application.h" #include "FileItem.h" #include "VideoDatabase.h" #include "VideoInfoScanner.h" @@ -115,7 +116,7 @@ void CGUIDialogContentSettings::SetupPage() { FillListControl(); SET_CONTROL_VISIBLE(CONTROL_SCRAPER_LIST); - if (m_scraper) + if (m_scraper && !m_scraper->Disabled()) { m_bShowScanSettings = true; if (m_scraper->Supports(m_content) && m_scraper->HasSettings()) @@ -373,7 +374,11 @@ bool CGUIDialogContentSettings::Show(ADDON::ScraperPtr& scraper, VIDEO::SScanSet dialog->m_content = scraper->Content(); dialog->m_origContent = dialog->m_content; dialog->m_scraper = scraper; + // toast selected but disabled scrapers + if (scraper->Disabled()) + g_application.m_guiDialogKaiToast.QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(24023), scraper->Name(), 2000, true); } + dialog->m_bRunScan = bRunScan; dialog->m_bScanRecursive = (settings.recurse > 0 && !settings.parent_name) || (settings.recurse > 1 && settings.parent_name); dialog->m_bUseDirNames = settings.parent_name; diff --git a/xbmc/utils/Addon.cpp b/xbmc/utils/Addon.cpp index d65e107fcb..8b67cfe067 100644 --- a/xbmc/utils/Addon.cpp +++ b/xbmc/utils/Addon.cpp @@ -222,7 +222,7 @@ CAddon::CAddon(const CAddon &rhs, const AddonPtr &parent) BuildProfilePath(); CUtil::AddFileToFolder(Profile(), "settings.xml", m_userSettingsPath); m_strLibName = rhs.LibName(); - m_disabled = false; + m_disabled = rhs.Disabled(); } AddonPtr CAddon::Clone(const AddonPtr &self) const |