From 60413c9800c27f53c1108015b50754b065bc98c6 Mon Sep 17 00:00:00 2001 From: heiko tietze Date: Wed, 18 Apr 2018 12:22:07 +0200 Subject: 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 Tested-by: Jenkins Reviewed-by: Heiko Tietze --- vcl/source/app/IconThemeInfo.cxx | 15 ++++++--------- vcl/source/app/settings.cxx | 2 +- vcl/source/image/ImplImageTree.cxx | 8 ++------ 3 files changed, 9 insertions(+), 16 deletions(-) (limited to 'vcl') 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; } -- cgit on value='distro/collabora/co-24.04.4'>distro/collabora/co-24.04.4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/dtrans
AgeCommit message (Expand)Author
2018-11-16Fix typosAndrea Gelmini
2018-11-05Win: implement Clipboard Format Listener instead of obsolete ViewerMike Kaganski
2018-11-05tdf#109085: don't assume MtaOleReq window is still valid at shutdownMike Kaganski
2018-11-02fix signatures of deleted copy/assign operatorsNoel Grandin
2018-10-28tdf#119235 svx,sd: fix drag&drop from ColorBarMichael Stahl
2018-10-12Remove unnecessary mutexStephan Bergmann
2018-10-12Remove undefined member function declarationsStephan Bergmann
2018-10-11tdf#120158: Base CMimeContentType on INetMIME::scanContentTypeStephan Bergmann
2018-10-11Drop duplicate WINVER and _WIN32_WINNT definesJan-Marek Glogowski
2018-10-10Properly check HRESULTMike Kaganski
2018-09-24loplugin:external (clang-cl)Stephan Bergmann
2018-09-10tdf#42949 Fix IWYU warnings in include/cppuhelper/*Gabor Kelemen
2018-09-07Fix some std::unique_ptr array allocsJan-Marek Glogowski
2018-09-07Cppcheck: release the handle that CreateThread returnsMike Kaganski
2018-07-29loplugin:stringloop in variousNoel Grandin
2018-06-05tdf#42949 remove unused compheler includes ..Jochen Nitschke