File sync_settings.diff of Package plasma5-desktop

Overview Repositories Revisions Requests Users Attributes Meta

File sync_settings.diff of Package plasma5-desktop (Revision c8594f3767bf7eaf158fd749b38eb12c)

Currently displaying revision c8594f3767bf7eaf158fd749b38eb12c , Show latest

diff --git a/kcms/icons/CMakeLists.txt b/kcms/icons/CMakeLists.txt
index 16a269f..69fff4d 100644
--- a/kcms/icons/CMakeLists.txt
+++ b/kcms/icons/CMakeLists.txt
@@ -18,9 +18,14 @@ target_link_libraries(kcm_icons
     KF5::Archive
     KF5::NewStuff
     KF5::KIOWidgets
+    KF5::KDELibs4Support
     ${X11_LIBRARIES}
 )
 
+if(X11_FOUND)
+    target_link_libraries(kcm_icons Qt5::X11Extras)
+endif()
+
 install(TARGETS kcm_icons  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 ########### install files ###############
diff --git a/kcms/icons/icons.cpp b/kcms/icons/icons.cpp
index 89f3450..9b55f5f 100644
--- a/kcms/icons/icons.cpp
+++ b/kcms/icons/icons.cpp
@@ -38,6 +38,8 @@
 #include <KSharedConfig>
 #include <KConfigGroup>
 
+#include <kdelibs4migration.h>
+
 Q_DECLARE_LOGGING_CATEGORY(KCM_ICONS)
 
 
@@ -332,6 +334,38 @@ void KIconConfig::preview()
     preview(2);
 }
 
+void KIconConfig::exportToKDE4()
+{
+    //TODO: killing the kde4 icon cache: possible? (kde4migration doesn't let access the cache folder)
+    Kdelibs4Migration migration;
+    QString configFilePath = migration.saveLocation("config") + "kdeglobals";
+
+    if (configFilePath.isEmpty()) {
+        return;
+    }
+
+    KSharedConfigPtr kglobalcfg = KSharedConfig::openConfig( "kdeglobals" );
+    KConfig kde4config(configFilePath);
+
+    KConfigGroup iconsGroup(kglobalcfg, "Icons");
+    KConfigGroup kde4IconGroup(&kde4config, "Icons");
+    QString iconTheme = iconsGroup.readEntry("Theme", QString());
+    if (!iconTheme.isEmpty()) {
+        kde4IconGroup.writeEntry("Theme", iconTheme);
+    }
+    kde4IconGroup.sync();
+
+    //Synchronize icon effects
+    QStringList iconGroups;
+    iconGroups << "DesktopIcons" << "DialogIcons" << "MainToolbarIcons" << "PanelIcons" << "SmallIcons" << "ToolbarIcons";
+
+    for (QString grp : iconGroups) {
+        KConfigGroup cg(kglobalcfg, grp);
+        KConfigGroup cg2(&kde4config, grp);
+        cg.copyTo(&cg2);
+    }
+}
+
 void KIconConfig::load()
 {
     read();
@@ -386,6 +420,8 @@ void KIconConfig::save()
 
     mpConfig->sync();
 
+    exportToKDE4();
+
     emit changed(false);
 
     // Emit KIPC change message.
diff --git a/kcms/icons/icons.h b/kcms/icons/icons.h
index 96d1a80..29a4527 100644
--- a/kcms/icons/icons.h
+++ b/kcms/icons/icons.h
@@ -81,6 +81,8 @@ private:
     void read();
     void apply();
 
+    void exportToKDE4();
+
 
     bool mbChanged[6], mbAnimated[6];
     int mSizes[6];

Places

File sync_settings.diff of Package plasma5-desktop (Revision c8594f3767bf7eaf158fd749b38eb12c)

Places