[education/rkward] /: Add breeze icons as fallback

[Thomas Friedrichsmeier]

Git commit af98c374746d6e38f4541fb3471371c8c615cbed by Thomas Friedrichsmeier.
Committed on 15/06/2024 at 11:09.
Pushed by tfry into branch 'master'.

Add breeze icons as fallback

M  +1    -1    CMakeLists.txt
M  +2    -0    ChangeLog
M  +1    -1    rkward/misc/CMakeLists.txt
M  +2    -0    rkward/misc/rkstandardicons.cpp

https://invent.kde.org/education/rkward/-/commit/af98c374746d6e38f4541fb3471371c8c615cbed

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1052671e..3b9833164 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE(ECMMarkNonGuiExecutable)
 INCLUDE(FeatureSummary)
 
 FIND_PACKAGE(Qt6 6.6 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network Qml PrintSupport WebEngineWidgets Core5Compat DBus) # TODO: remove compat
-FIND_PACKAGE(KF6 6.0.0 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor WidgetsAddons Parts Config Notifications WindowSystem Archive OPTIONAL_COMPONENTS Crash)
+FIND_PACKAGE(KF6 6.0.0 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor WidgetsAddons Parts Config Notifications WindowSystem Archive BreezeIcons OPTIONAL_COMPONENTS Crash)
 FIND_PACKAGE(Gettext REQUIRED)
 
 IF(FORCE_PRETTY_MAKEFILE)
diff --git a/ChangeLog b/ChangeLog
index 4e65eb34b..57c8ccd2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+- Fixed: Add breeze icons as a fallback on systems that use a different icon theme (fixes missing icons)
+- Added: Setup dialog includes setting to select a different R installation
 - Added: Command line option "--setup" to force (re-)initialization as if a new version of RKWard had been installed
 - Fixed: R functions loadhistory(), savehistory(), and timestamp() broken
 - Changed: R shared library is now loaded, dynamically, rather than linked at compile time.
diff --git a/rkward/misc/CMakeLists.txt b/rkward/misc/CMakeLists.txt
index a3913c188..e87d6b6d3 100644
--- a/rkward/misc/CMakeLists.txt
+++ b/rkward/misc/CMakeLists.txt
@@ -37,4 +37,4 @@ SET(misc_STAT_SRCS
    )
 
 ADD_LIBRARY(misc STATIC ${misc_STAT_SRCS})
-TARGET_LINK_LIBRARIES(misc Qt6::Widgets KF6::WidgetsAddons KF6::KIOWidgets Qt6::Xml Qt6::DBus KF6::ConfigCore KF6::Parts KF6::WindowSystem KF6::TextEditor KF6::Archive KF6::I18n)
+TARGET_LINK_LIBRARIES(misc Qt6::Widgets KF6::WidgetsAddons KF6::KIOWidgets Qt6::Xml Qt6::DBus KF6::ConfigCore KF6::Parts KF6::WindowSystem KF6::TextEditor KF6::Archive KF6::I18n KF6::BreezeIcons)
diff --git a/rkward/misc/rkstandardicons.cpp b/rkward/misc/rkstandardicons.cpp
index a63fd3d23..5037a5a71 100644
--- a/rkward/misc/rkstandardicons.cpp
+++ b/rkward/misc/rkstandardicons.cpp
@@ -8,6 +8,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 #include "rkstandardicons.h"
 
 #include <QFileInfo>
+#include <BreezeIcons>
 
 #include "../core/robject.h"
 #include "../core/robjectlist.h"
@@ -23,6 +24,7 @@ void RKStandardIcons::initIcons () {
 	RK_TRACE (APP);
 
 	RK_ASSERT (!instance);	// init only once
+	BreezeIcons::initIcons(); // install as fallback theme. Too many issues with missing icons, otherwise
 	instance = new RKStandardIcons ();
 	instance->doInitIcons ();
 }