make settings dialogs use the same xml

xbmc · Mar 3, 2016 · b89eab7 · b89eab7
1 parent 6d20fcb
commit b89eab7
Show file tree

Hide file tree

Showing 18 changed files with 453 additions and 285 deletions.
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
@@ -4679,6 +4679,7 @@ msgstr ""
 #: xbmc/addons/GUIDialogAddonSettings.cpp
 #: xbmc/guilib/WindowIDs.h
 #: addons/skin.estuary/1080i/AddonBrowser.xml
+#: xbmc/settings/dialogs/GUIDialogContentSettings.cpp
 msgctxt "#10004"
 msgid "Settings"
 msgstr ""
@@ -11487,7 +11488,10 @@ msgctxt "#20321"
 msgid "Scanning albums using %s"
 msgstr ""
 
-#empty string with id 20322
+#: xbmc/settings/dialogs/GUIDialogContentSettings.cpp
+msgctxt "#20322"
+msgid "Content scanning options"
+msgstr ""
 
 #: xbmc/video/windows/GUIWindowVideoNav.cpp
 msgctxt "#20323"

diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -3755,7 +3755,7 @@ std::string CGUIInfoManager::GetImage(int info, int contextWindow, std::string *
   {
     std::string thumb = CProfilesManager::GetInstance().GetCurrentProfile().getThumb();
     if (thumb.empty())
-      thumb = "unknown-user.png";
+      thumb = "DefaultUser.png";
     return thumb;
   }
   else if (info == MUSICPLAYER_COVER)

diff --git a/xbmc/dialogs/GUIDialogMediaFilter.cpp b/xbmc/dialogs/GUIDialogMediaFilter.cpp
@@ -40,9 +40,9 @@
 
 #define CONTROL_HEADING             2
 
-#define CONTROL_CLEAR_BUTTON       27
 #define CONTROL_OKAY_BUTTON        28
 #define CONTROL_CANCEL_BUTTON      29
+#define CONTROL_CLEAR_BUTTON       30
 
 #define CHECK_ALL                  -1
 #define CHECK_NO                    0
@@ -122,7 +122,7 @@ static const CGUIDialogMediaFilter::Filter filterList[] = {
 #define NUM_FILTERS sizeof(filterList) / sizeof(CGUIDialogMediaFilter::Filter)
 
 CGUIDialogMediaFilter::CGUIDialogMediaFilter()
-  : CGUIDialogSettingsManualBase(WINDOW_DIALOG_MEDIA_FILTER, "DialogMediaFilter.xml"),
+  : CGUIDialogSettingsManualBase(WINDOW_DIALOG_MEDIA_FILTER, "DialogSettings.xml"),
     m_dbUrl(NULL),
     m_filter(NULL)
 { }
@@ -362,6 +362,9 @@ void CGUIDialogMediaFilter::SetupView()
 
   // set the heading
   SET_CONTROL_LABEL(CONTROL_HEADING, StringUtils::Format(g_localizeStrings.Get(1275).c_str(), g_localizeStrings.Get(localizedMediaId).c_str()));
+
+  SET_CONTROL_LABEL(CONTROL_OKAY_BUTTON, 186);
+  SET_CONTROL_LABEL(CONTROL_CLEAR_BUTTON, 192);
 }
 
 void CGUIDialogMediaFilter::InitializeSettings()