diff --git a/app/app.pri b/app/app.pri index 1df830d57236abb020582016cba96777b7619e37..7e03a9c0fa9cc860f9a31358cc220eead6766d19 100644 --- a/app/app.pri +++ b/app/app.pri @@ -33,6 +33,7 @@ unix:!ios:!android { $${PWD}/src/desktopthemes/kdetheme.h \ $${PWD}/src/desktopthemes/gnometheme.h \ $${PWD}/src/desktopthemes/xfcetheme.h \ + $${PWD}/src/desktopthemes/cinnamontheme.h \ $${PWD}/src/desktopthemes/matetheme.h SOURCES += \ @@ -40,5 +41,6 @@ unix:!ios:!android { $${PWD}/src/desktopthemes/kdetheme.cpp \ $${PWD}/src/desktopthemes/gnometheme.cpp \ $${PWD}/src/desktopthemes/xfcetheme.cpp \ + $${PWD}/src/desktopthemes/cinnamontheme.cpp \ $${PWD}/src/desktopthemes/matetheme.cpp } diff --git a/app/src/desktopthemes/cinnamontheme.cpp b/app/src/desktopthemes/cinnamontheme.cpp new file mode 100644 index 0000000000000000000000000000000000000000..1558a21711d1d165ff135669fb94c281ef985bd9 --- /dev/null +++ b/app/src/desktopthemes/cinnamontheme.cpp @@ -0,0 +1,41 @@ +#include "cinnamontheme.h" + +#include <QStringList> +#include <QDir> +#include <QProcess> + +CinnamonTheme::CinnamonTheme(const QString &path, QObject *parent) + : QObject(parent), path_(path) +{ + themeName_ = QDir(path_).dirName(); +} + +bool CinnamonTheme::applyAsWallpaper() const +{ + return setConfig("org.cinnamon.desktop.background", "picture-uri", "file://" + path_); +} + +bool CinnamonTheme::applyAsIcon() const +{ + return setConfig("org.cinnamon.desktop.interface", "icon-theme", themeName_); +} + +bool CinnamonTheme::applyAsCursor() const +{ + return setConfig("org.cinnamon.desktop.interface", "cursor-theme", themeName_); +} + +bool CinnamonTheme::applyAsGtk3Theme() const +{ + return setConfig("org.cinnamon.desktop.interface", "gtk-theme", themeName_); +} + +bool CinnamonTheme::applyAsCinnamonTheme() const +{ + return setConfig("org.cinnamon.theme", "name", themeName_); +} + +bool CinnamonTheme::setConfig(const QString &schema, const QString &key, const QString &value) const +{ + return QProcess::startDetached("gsettings", QStringList() << "set" << schema << key << value); +} diff --git a/app/src/desktopthemes/cinnamontheme.h b/app/src/desktopthemes/cinnamontheme.h new file mode 100644 index 0000000000000000000000000000000000000000..9aaaec565c6c5379fa5e408b466050ea45614db3 --- /dev/null +++ b/app/src/desktopthemes/cinnamontheme.h @@ -0,0 +1,23 @@ +#pragma once + +#include <QObject> + +class CinnamonTheme : public QObject +{ + Q_OBJECT + +public: + explicit CinnamonTheme(const QString &path, QObject *parent = nullptr); + + bool applyAsWallpaper() const; + bool applyAsIcon() const; + bool applyAsCursor() const; + bool applyAsGtk3Theme() const; + bool applyAsCinnamonTheme() const; + +private: + bool setConfig(const QString &schema, const QString &key, const QString &value) const; + + QString path_; + QString themeName_; +}; diff --git a/app/src/handlers/desktopthemehandler.cpp b/app/src/handlers/desktopthemehandler.cpp index ea978dcdb476c1fdae2d0fcefeb54f61eaf99608..948b01a7233b5c6f8d50a3640c0a6c2be6569771 100644 --- a/app/src/handlers/desktopthemehandler.cpp +++ b/app/src/handlers/desktopthemehandler.cpp @@ -8,6 +8,7 @@ #include "desktopthemes/kdetheme.h" #include "desktopthemes/gnometheme.h" #include "desktopthemes/xfcetheme.h" +#include "desktopthemes/cinnamontheme.h" #include "desktopthemes/matetheme.h" #endif @@ -39,6 +40,9 @@ QString DesktopThemeHandler::desktopEnvironment() const else if (currentDesktop.contains("xfce")) { desktop = "xfce"; } + else if (currentDesktop.contains("cinnamon")) { + desktop = "cinnamon"; + } else if (currentDesktop.contains("mate")) { desktop = "mate"; } @@ -73,6 +77,13 @@ bool DesktopThemeHandler::isApplicableType(const QString &installType) const << "gtk2_themes" << "xfwm4_themes"; } + else if (desktop == "cinnamon") { + applicableTypes << "wallpapers" + << "icons" + << "cursors" + << "gtk3_themes" + << "cinnamon_themes"; + } else if (desktop == "mate") { applicableTypes << "wallpapers" << "icons" @@ -144,6 +155,24 @@ bool DesktopThemeHandler::applyTheme(const QString &path, const QString &install return xfceTheme.applyAsXfwm4Theme(); } } + else if (desktop == "cinnamon") { + CinnamonTheme cinnamonTheme(path); + if (installType == "wallpapers") { + return cinnamonTheme.applyAsWallpaper(); + } + else if (installType == "icons") { + return cinnamonTheme.applyAsIcon(); + } + else if (installType == "cursors") { + return cinnamonTheme.applyAsCursor(); + } + else if (installType == "gtk3_themes") { + return cinnamonTheme.applyAsGtk3Theme(); + } + else if (installType == "gnome_shell_themes") { + return cinnamonTheme.applyAsCinnamonTheme(); + } + } else if (desktop == "mate") { MateTheme mateTheme(path); if (installType == "wallpapers") {