From 7b3b06bd5731c6ed4624f1fe0e8d45b412c366e5 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 7 Jun 2020 13:00:50 +0200 Subject: [PATCH] Make KDE integration optional --- Makefile | 4 +++- app/SysTray-X/SysTray-X.pro | 19 +++++++++++++++++-- app/SysTray-X/preferencesdialog.cpp | 6 ++++++ app/SysTray-X/systrayx.cpp | 6 +++--- app/SysTray-X/systrayxstatusnotifier.cpp | 2 +- app/SysTray-X/systrayxstatusnotifier.h | 2 +- dist/deb/gnome/debian.rules | 2 +- dist/rpm/gnome/systray-x-gnome.spec | 2 +- 8 files changed, 33 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f3b8322..3ce0ffc 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,8 @@ else endif endif +#OPTIONS = "DEFINES += NO_KDE_INTEGRATION" + .PHONY: clean \ systray-x-xpi \ systray-x-app @@ -56,7 +58,7 @@ systray-x-app: rm -f SysTray-X ;\ mkdir -p app/build ;\ cd app/build ;\ - $(QMAKE) $(EXT_VERSION) ../SysTray-X/SysTray-X.pro ;\ + $(QMAKE) $(EXT_VERSION) $(OPTIONS) ../SysTray-X/SysTray-X.pro ;\ make ;\ cd ../.. ;\ cp app/build/SysTray-X . diff --git a/app/SysTray-X/SysTray-X.pro b/app/SysTray-X/SysTray-X.pro index c3c72ac..26445ae 100644 --- a/app/SysTray-X/SysTray-X.pro +++ b/app/SysTray-X/SysTray-X.pro @@ -4,13 +4,28 @@ # #------------------------------------------------- -QT += core gui +#DEFINES += NO_KDE_INTEGRATION + + +!contains(DEFINES,NO_KDE_INTEGRATION) { + DEFINES += KDE_INTEGRATION +} + +# +# Set the Qt modules +# +QT += core gui unix:!macx: { -QT += dbus KNotifications + contains(DEFINES,KDE_INTEGRATION) { + QT += dbus KNotifications + } } greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +# +# Define the target +# TARGET = SysTray-X TEMPLATE = app diff --git a/app/SysTray-X/preferencesdialog.cpp b/app/SysTray-X/preferencesdialog.cpp index 43fbdb1..f5ba68c 100644 --- a/app/SysTray-X/preferencesdialog.cpp +++ b/app/SysTray-X/preferencesdialog.cpp @@ -44,6 +44,12 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi m_ui->hideDefaultIconCheckBox->hide(); +#endif + +#if defined( Q_OS_UNIX ) && defined( NO_KDE_INTEGRATION ) + + m_ui->hideDefaultIconCheckBox->hide(); + #endif /* diff --git a/app/SysTray-X/systrayx.cpp b/app/SysTray-X/systrayx.cpp index d8f6717..017f6ad 100644 --- a/app/SysTray-X/systrayx.cpp +++ b/app/SysTray-X/systrayx.cpp @@ -324,7 +324,7 @@ void SysTrayX::hideTrayIcon() } -#ifdef Q_OS_UNIX +#if defined( Q_OS_UNIX ) && defined( KDE_INTEGRATION ) /* * Show / create tray icon @@ -438,7 +438,7 @@ void SysTrayX::slotSelectIconObjectPref() void SysTrayX::slotSelectIconObject( bool state ) { -#ifdef Q_OS_UNIX +#if defined( Q_OS_UNIX ) && defined( KDE_INTEGRATION ) if( state ) { @@ -574,7 +574,7 @@ void SysTrayX::slotVersion( QString version ) QSystemTrayIcon::Warning ); } -#ifdef Q_OS_UNIX +#if defined( Q_OS_UNIX ) && defined( KDE_INTEGRATION ) if( m_kde_tray_icon ) { diff --git a/app/SysTray-X/systrayxstatusnotifier.cpp b/app/SysTray-X/systrayxstatusnotifier.cpp index 96447af..c24eb0a 100644 --- a/app/SysTray-X/systrayxstatusnotifier.cpp +++ b/app/SysTray-X/systrayxstatusnotifier.cpp @@ -1,6 +1,6 @@ #include "systrayxstatusnotifier.h" -#ifdef Q_OS_UNIX +#if defined( Q_OS_UNIX ) && defined( KDE_INTEGRATION ) /* * Local includes diff --git a/app/SysTray-X/systrayxstatusnotifier.h b/app/SysTray-X/systrayxstatusnotifier.h index 4855473..4f1beb5 100644 --- a/app/SysTray-X/systrayxstatusnotifier.h +++ b/app/SysTray-X/systrayxstatusnotifier.h @@ -1,5 +1,5 @@ #include -#ifdef Q_OS_UNIX +#if defined( Q_OS_UNIX ) && defined( KDE_INTEGRATION ) #ifndef SYSTRAYXSTATUSNOTIFIER_H #define SYSTRAYXSTATUSNOTIFIER_H diff --git a/dist/deb/gnome/debian.rules b/dist/deb/gnome/debian.rules index 4e79392..456db1c 100644 --- a/dist/deb/gnome/debian.rules +++ b/dist/deb/gnome/debian.rules @@ -34,7 +34,7 @@ build-stamp: # Add here commands to compile the package. sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|/usr/bin/SysTray-X|' > SysTray_X.json - make EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$(VERSION_MAJOR)\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$(VERSION_MINOR)\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$(VERSION_PATCH)\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$(BUILD_NUMBER)\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$(GIT_HASH)\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$(GIT_BRANCH)\\\\\\\\\\\\\\\"" + make OPTIONS="DEFINES += NO_KDE_INTEGRATION" EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$(VERSION_MAJOR)\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$(VERSION_MINOR)\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$(VERSION_PATCH)\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$(BUILD_NUMBER)\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$(GIT_HASH)\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$(GIT_BRANCH)\\\\\\\\\\\\\\\"" # --- end custom part for compiling diff --git a/dist/rpm/gnome/systray-x-gnome.spec b/dist/rpm/gnome/systray-x-gnome.spec index 491c594..feda8fe 100644 --- a/dist/rpm/gnome/systray-x-gnome.spec +++ b/dist/rpm/gnome/systray-x-gnome.spec @@ -68,7 +68,7 @@ export BUILD_NUMBER=`cat %{S:1} | grep BUILD_NUMBER | sed -e "s/BUILD_NUMBER=\(. export GIT_HASH=`cat %{S:1} | grep GIT_HASH | sed -e "s/GIT_HASH=\(.*\)/\1/"` export GIT_BRANCH=`cat %{S:1} | grep GIT_BRANCH | sed -e "s/GIT_BRANCH=\(.*\)/\1/"` -make %{?_smp_mflags} EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$VERSION_MAJOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$VERSION_MINOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$VERSION_PATCH\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$BUILD_NUMBER\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$GIT_HASH\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$GIT_BRANCH\\\\\\\\\\\\\\\"" +make %{?_smp_mflags} OPTIONS="DEFINES += NO_KDE_INTEGRATION" EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$VERSION_MAJOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$VERSION_MINOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$VERSION_PATCH\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$BUILD_NUMBER\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$GIT_HASH\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$GIT_BRANCH\\\\\\\\\\\\\\\"" sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|%{_bindir}/SysTray-X|' > SysTray_X.json