summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/application.cpp2
-rw-r--r--src/rekonq.kcfg3
-rw-r--r--src/settings/test/test_settings.cpp8
-rw-r--r--src/settings/test/test_settings.qrc10
4 files changed, 15 insertions, 8 deletions
diff --git a/src/application.cpp b/src/application.cpp
index 228b3d38..aba1fc69 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -51,7 +51,7 @@ Application::Application(int &argc, char *argv[]) : SingleApplication(argc, argv
}
// setWindowIcon(KIcon("rekonq"));
- if (const auto iconTheme = m_settings->value("IconTheme"); iconTheme.isValid()) {
+ if (const auto iconTheme = m_settings->value("Appearance/IconTheme"); iconTheme.isValid()) {
spdlog::info("Set icon theme {}", qUtf8Printable(iconTheme.toString()));
QIcon::setThemeName(iconTheme.toString());
}
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 0de9cd44..0b23782e 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -49,6 +49,9 @@
<!-- Fonts Settings -->
<group name="Appearance">
+ <entry name="Icon Theme" key="IconTheme" type="String">
+ <default>tabler</default>
+ </entry>
<entry name="Standard Font Family" key="standardFontFamily" type="Font">
<default code="true">getFont(QFont::AnyStyle)</default>
</entry>
diff --git a/src/settings/test/test_settings.cpp b/src/settings/test/test_settings.cpp
index babbcdb6..24bbf349 100644
--- a/src/settings/test/test_settings.cpp
+++ b/src/settings/test/test_settings.cpp
@@ -76,14 +76,16 @@ TEST(settings, Settings)
TEST(settings, SettingsDialog)
{
+ constexpr unsigned n_settings = 36; // there are 36 settings in total
MockSettings mockSettings;
// There are 4 groups in total, but General should not be calling beginGroup/endGroup
// beginGroup/endGroup are called twice: during the ctor and when accepted
EXPECT_CALL(mockSettings, beginGroup).Times(3 * 4);
EXPECT_CALL(mockSettings, endGroup).Times(3 * 4);
- // There are 35 settings in total, one of which is hidden and won't be set by the dialog
- EXPECT_CALL(mockSettings, value).Times(35 * 2).WillRepeatedly(ReturnArg<1>());
- EXPECT_CALL(mockSettings, setValue(_, _)).Times(33 + 34);
+ EXPECT_CALL(mockSettings, value).Times(n_settings * 2).WillRepeatedly(ReturnArg<1>());
+ // 1 setting is hidden and won't be set by the dialog
+ // save and reset will both call setValue on all non-hidden settings
+ EXPECT_CALL(mockSettings, setValue(_, _)).Times(n_settings * 2 - 3);
EXPECT_CALL(mockSettings, setValue(QStringEq("homepage"), QVariantEq("about:blank")));
// change setting
diff --git a/src/settings/test/test_settings.qrc b/src/settings/test/test_settings.qrc
index deaf088f..16e74fef 100644
--- a/src/settings/test/test_settings.qrc
+++ b/src/settings/test/test_settings.qrc
@@ -1,5 +1,7 @@
-<!DOCTYPE RCC><RCC version="1.0">
- <qresource>
- <file>rekonqrc</file>
- </qresource>
+<?xml version='1.0' encoding='utf-8' standalone='yes'?>
+<!DOCTYPE RCC>
+<RCC version="1.0">
+ <qresource prefix="/">
+ <file alias="rekonqrc">rekonqrc</file>
+ </qresource>
</RCC>