Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-05 15:14:08 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-05 15:24:54 (GMT) |
| commit | 6cdd48b30526761f5c6365496e30580ed3bd8a82 (patch) | |
| tree | 790a96ee6a70054165264171a31ead5e8e598baf /Swift | |
| parent | cd3017c8730ce66539d539890d72434cf644ab80 (diff) | |
| download | swift-6cdd48b30526761f5c6365496e30580ed3bd8a82.zip swift-6cdd48b30526761f5c6365496e30580ed3bd8a82.tar.bz2 | |
Added FreeDesktopNotifier.
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/FreeDesktopNotifier.cpp | 52 | ||||
| -rw-r--r-- | Swift/QtUI/FreeDesktopNotifier.h | 21 | ||||
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 4 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 3 |
4 files changed, 80 insertions, 0 deletions
diff --git a/Swift/QtUI/FreeDesktopNotifier.cpp b/Swift/QtUI/FreeDesktopNotifier.cpp new file mode 100644 index 0000000..2560882 --- /dev/null +++ b/Swift/QtUI/FreeDesktopNotifier.cpp @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +//#pragma GCC diagnostic ignored "-Wredundant-decls" + +#include "Swift/QtUI/FreeDesktopNotifier.h" + +#include <QMap> +#include <QString> +#include <QStringList> +#include <QtDBus/QtDBus> +#include <algorithm> + +#include "QtSwiftUtil.h" + +namespace Swift { + +FreeDesktopNotifier::FreeDesktopNotifier(const String& name) : applicationName(name) { +} + +void FreeDesktopNotifier::doShowMessage(Type type, const String& subject, const String& description, const boost::filesystem::path& picture, boost::function<void()>) { + QDBusConnection bus = QDBusConnection::sessionBus(); + if (!bus.isConnected()) { + return; + } + std::vector<Notifier::Type> defaultTypes = getDefaultTypes(); + if (std::find(defaultTypes.begin(), defaultTypes.end(), type) == defaultTypes.end()) { + return; + } + + int timeout = (type == IncomingMessage || type == SystemMessage) ? DEFAULT_MESSAGE_NOTIFICATION_TIMEOUT_SECONDS : DEFAULT_STATUS_NOTIFICATION_TIMEOUT_SECONDS; + + QDBusMessage msg = QDBusMessage::createMethodCall("org.freedesktop.Notifications", "/org/freedesktop/Notifications", "", "Notify"); + + QStringList actions; + QMap<QString, QVariant> hints; + msg << P2QSTRING(applicationName); + msg << quint32(0); // ID of previous notification to replace + msg << picture.string().c_str(); // Icon to display + msg << P2QSTRING(subject); // Summary / Header of the message to display + msg << P2QSTRING(description); // Body of the message to display + msg << actions; // Actions from which the user may choose + msg << hints; // Hints to the server displaying the message + msg << qint32(timeout*1000); // Timeout in milliseconds + + bus.call(msg); +} + +} diff --git a/Swift/QtUI/FreeDesktopNotifier.h b/Swift/QtUI/FreeDesktopNotifier.h new file mode 100644 index 0000000..087e9e3 --- /dev/null +++ b/Swift/QtUI/FreeDesktopNotifier.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include "SwifTools/Notifier/Notifier.h" + +namespace Swift { + class FreeDesktopNotifier : public Notifier { + public: + FreeDesktopNotifier(const String& name); + + virtual void doShowMessage(Type type, const String& subject, const String& description, const boost::filesystem::path& picture, boost::function<void()> callback); + + private: + String applicationName; + }; +} diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 13543af..26d1664 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -41,6 +41,8 @@ #elif defined(HAVE_SNARL) #include "QtWin32NotifierWindow.h" #include "SwifTools/Notifier/SnarlNotifier.h" +#elif defined(SWIFTEN_PLATFORM_LINUX) +#include "FreeDesktopNotifier.h" #else #include "SwifTools/Notifier/NullNotifier.h" #endif @@ -103,6 +105,8 @@ QtSwift::QtSwift(po::variables_map options) : autoUpdater_(NULL) { #elif defined(HAVE_SNARL) notifierWindow_ = new QtWin32NotifierWindow(); notifier_ = new SnarlNotifier(SWIFT_APPLICATION_NAME, notifierWindow_, applicationPathProvider_->getResourcePath("/images/logo-icon-32.png")); +#elif defined(SWIFTEN_PLATFORM_LINUX) + notifier_ = new FreeDesktopNotifier(SWIFT_APPLICATION_NAME); #else notifier_ = new NullNotifier(); #endif diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index a3631e5..3d4fc9f 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -125,6 +125,9 @@ if env["PLATFORM"] == "win32" : myenv.RES("../resources/Windows/Swift.rc") sources += ["../resources/Windows/Swift.res"] +if env["PLATFORM"] == "posix" : + sources += ["FreeDesktopNotifier.cpp"] + if env["PLATFORM"] == "darwin" or env["PLATFORM"] == "win32" : swiftProgram = myenv.Program("Swift", sources) else : |