diff options
| author | heiko tietze <tietze.heiko@gmail.com> | 2018-04-18 12:22:07 +0200 |
|---|---|---|
| committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-05-05 10:19:26 +0200 |
| commit | 60413c9800c27f53c1108015b50754b065bc98c6 (patch) | |
| tree | a0f5a128c529c786c8200ce546a3730997549988 /vcl | |
| parent | f6fb5a17da883e89cae6f7a960266fc87ccc9f6b (diff) | |
Replace Galaxy icon theme by Colibre
Galaxy goes into an extension, fallback updated
Change-Id: I4b6998035857f01368b39d4f16b2639d8a665065
Reviewed-on: https://gerrit.libreoffice.org/53092
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/IconThemeInfo.cxx | 15 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 8 |
3 files changed, 9 insertions, 16 deletions
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx index c4c2e647e5eb..6057e37a9236 100644 --- a/vcl/source/app/IconThemeInfo.cxx +++ b/vcl/source/app/IconThemeInfo.cxx @@ -66,15 +66,12 @@ IconThemeInfo::IconThemeInfo(const OUString& urlToFile) /*static*/ Size IconThemeInfo::SizeByThemeName(const OUString& themeName) { - if (themeName == "crystal") { - return Size( 22, 22 ); - } - else if (themeName == "galaxy") { - return Size( 26, 26 ); - } - else { - return Size( 24, 24 ); - } + if (themeName == "galaxy") { //kept for compiler because of unused parameter 'themeName' + return Size( 26, 26 ); + } + else { + return Size( 24, 24 ); + } } /*static*/ bool diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 3c5d150df79c..92904ec759d6 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -3010,7 +3010,7 @@ StyleSettings::DetermineIconTheme() const if (sTheme.isEmpty()) { if (utl::ConfigManager::IsFuzzing()) - sTheme = "galaxy"; + sTheme = "colibre"; else { // read from the configuration, or fallback to what the desktop wants diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index ba1f22155d27..274c4e60f8d2 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -300,18 +300,14 @@ OUString ImplImageTree::fallbackStyle(const OUString& rsStyle) { OUString sResult; - if (rsStyle == "galaxy") + if (rsStyle == "colibre" || rsStyle == "helpimg") sResult = ""; - else if (rsStyle == "industrial" || rsStyle == "tango" || rsStyle == "breeze") - sResult = "galaxy"; else if (rsStyle == "sifr" || rsStyle == "breeze_dark") sResult = "breeze"; else if (rsStyle == "sifr_dark" ) sResult = "breeze_dark"; - else if (rsStyle == "helpimg") - sResult = ""; else - sResult = "tango"; + sResult = "colibre"; return sResult; } |