|
 |
4ea8a1b |
From ffceb48dd576ababe346c9548b12ca18f31d3293 Mon Sep 17 00:00:00 2001
|
|
|
4ea8a1b |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
4ea8a1b |
Date: Fri, 10 Mar 2023 11:41:45 +0000
|
|
|
4ea8a1b |
Subject: [PATCH] default to sifr for gnome light mode
|
|
|
4ea8a1b |
|
|
|
4ea8a1b |
https://pagure.io/fedora-workstation/issue/361
|
|
|
4ea8a1b |
|
|
|
4ea8a1b |
"Fedora Workstation currently uses the rather outdated-looking
|
|
|
4ea8a1b |
Elementary icon theme for LibreOffice, instead of the Sifr icon theme
|
|
|
4ea8a1b |
which was designed to fit in with GNOME's icons. The Sifr theme saw a
|
|
|
4ea8a1b |
nice update with LibreOffice 7.5, the version being shipped in Fedora
|
|
|
4ea8a1b |
Linux 38, which makes the icons fit better with the current GNOME design
|
|
|
4ea8a1b |
language."
|
|
|
4ea8a1b |
|
|
|
4ea8a1b |
Change-Id: Ic37bbe8e7ad754ab070ead06dc0b006c6ccf3adb
|
|
|
4ea8a1b |
---
|
|
|
4ea8a1b |
vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 4 ++--
|
|
|
4ea8a1b |
vcl/source/app/IconThemeSelector.cxx | 2 +-
|
|
|
4ea8a1b |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
4ea8a1b |
|
|
|
4ea8a1b |
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
|
|
|
4ea8a1b |
index 72ee344b1437..8d1aea0c3889 100644
|
|
|
4ea8a1b |
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
|
|
|
4ea8a1b |
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
|
|
|
4ea8a1b |
@@ -85,7 +85,7 @@ IconThemeSelectorTest::ElementaryIsReturnedForGnomeDesktop()
|
|
|
4ea8a1b |
std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
|
|
|
4ea8a1b |
vcl::IconThemeSelector s;
|
|
|
4ea8a1b |
OUString r = s.SelectIconThemeForDesktopEnvironment(themes, "gnome");
|
|
|
4ea8a1b |
- CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is returned for gnome desktop", OUString("elementary"), r);
|
|
|
4ea8a1b |
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("'sifr' theme is returned for gnome desktop", OUString("sifr"), r);
|
|
|
4ea8a1b |
}
|
|
|
4ea8a1b |
|
|
|
4ea8a1b |
void
|
|
|
4ea8a1b |
@@ -96,7 +96,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByPreferredTheme()
|
|
|
4ea8a1b |
s.SetPreferredIconTheme(preferred, false);
|
|
|
4ea8a1b |
std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
|
|
|
4ea8a1b |
OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, "gnome");
|
|
|
4ea8a1b |
- CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is overridden by breeze", preferred, selected);
|
|
|
4ea8a1b |
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("'sifr' theme is overridden by breeze", preferred, selected);
|
|
|
4ea8a1b |
}
|
|
|
4ea8a1b |
|
|
|
4ea8a1b |
void
|
|
|
4ea8a1b |
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
|
|
|
4ea8a1b |
index 6b8dfc0f42c7..ee30e577f3f5 100644
|
|
|
4ea8a1b |
--- a/vcl/source/app/IconThemeSelector.cxx
|
|
|
4ea8a1b |
+++ b/vcl/source/app/IconThemeSelector.cxx
|
|
|
4ea8a1b |
@@ -86,7 +86,7 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
|
|
|
4ea8a1b |
desktopEnvironment.equalsIgnoreAsciiCase("mate") ||
|
|
|
4ea8a1b |
desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
|
|
|
4ea8a1b |
if (!bPreferDarkIconTheme)
|
|
|
4ea8a1b |
- r = "elementary";
|
|
|
4ea8a1b |
+ r = "sifr";
|
|
|
4ea8a1b |
else
|
|
|
4ea8a1b |
r = "sifr_dark";
|
|
|
4ea8a1b |
} else
|
|
|
4ea8a1b |
--
|
|
|
4ea8a1b |
2.40.1
|
|
|
4ea8a1b |
|