diff options
author | heiko tietze <tietze.heiko@gmail.com> | 2018-05-25 11:45:29 +0200 |
---|---|---|
committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-06-07 07:51:52 +0200 |
commit | 90088d43a20cff2623c2f01949955099f9b92845 (patch) | |
tree | 3d7f3fd0984cf2394eced521ef7c42150dc9c948 /vcl/source/app/IconThemeSelector.cxx | |
parent | 251cb2a7b8b6c1f3fa6335911f0df38b23765da2 (diff) |
tdf#116916 - Icon themes missing on LibreOffice Vanilla from macOS appstore
Update of blacklist for $WITH_THEMES
Fallback to Tango for ancient/unknown DE, Colibre only on Windows
MPL vs. non-MPL on macOS
Change-Id: Ibea9e9429a79911d632b54fa4aa9649003830aa3
Reviewed-on: https://gerrit.libreoffice.org/55295
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/54794
Diffstat (limited to 'vcl/source/app/IconThemeSelector.cxx')
-rw-r--r-- | vcl/source/app/IconThemeSelector.cxx | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index 20b64f4da6ac..c9da2d6895c3 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -11,12 +11,13 @@ #include <vcl/IconThemeScanner.hxx> #include <vcl/IconThemeInfo.hxx> +#include <config_mpl.h> #include <algorithm> namespace vcl { -/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID("colibre"); +/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID("tango"); namespace { @@ -51,20 +52,31 @@ IconThemeSelector::IconThemeSelector() IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment) { OUString r; +#ifdef _WIN32 + r = "colibre"; + (void)desktopEnvironment; +#else if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") || - desktopEnvironment.equalsIgnoreAsciiCase("kde5") || - desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) { + desktopEnvironment.equalsIgnoreAsciiCase("kde5") ) { r = "breeze"; - } - else + } else + if ( desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) { +#if MPL_HAVE_SUBSET + r = "tango"; +#else + r = "breeze"; +#endif + } else if ( desktopEnvironment.equalsIgnoreAsciiCase("gnome") || desktopEnvironment.equalsIgnoreAsciiCase("mate") || desktopEnvironment.equalsIgnoreAsciiCase("unity") ) { r = "elementary"; + } else + { + r = FALLBACK_ICON_THEME_ID; } - else { - r = FALLBACK_ICON_THEME_ID; //effective also on Windows - } +#endif + return r; } |