Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-09-15 16:40:20 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-09-15 16:41:16 (GMT) |
| commit | c0ea59aed73b5425ad78e6bdb6f8f12e2b44567e (patch) | |
| tree | bc111c071c92911d7e9745c86c8cdfac69cd64e7 /Swift/QtUI | |
| parent | 3c45ed7c3b62609824c0ea50f1ce9c00bbe00849 (diff) | |
| download | swift-c0ea59aed73b5425ad78e6bdb6f8f12e2b44567e.zip swift-c0ea59aed73b5425ad78e6bdb6f8f12e2b44567e.tar.bz2 | |
Added Snarl notification support
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 7 | ||||
| -rw-r--r-- | Swift/QtUI/QtSwift.h | 6 | ||||
| -rw-r--r-- | Swift/QtUI/QtWin32NotifierWindow.h | 29 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 3 |
4 files changed, 45 insertions, 0 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index ee97fc6..0118416 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -38,6 +38,9 @@ #include "SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h" #if defined(HAVE_GROWL) #include "SwifTools/Notifier/GrowlNotifier.h" +#elif defined(HAVE_SNARL) +#include "QtWin32NotifierWindow.h" +#include "SwifTools/Notifier/SnarlNotifier.h" #else #include "SwifTools/Notifier/NullNotifier.h" #endif @@ -97,6 +100,9 @@ QtSwift::QtSwift(po::variables_map options) : autoUpdater_(NULL) { soundPlayer_ = new QtSoundPlayer(applicationPathProvider_); #if defined(HAVE_GROWL) notifier_ = new GrowlNotifier(SWIFT_APPLICATION_NAME); +#elif defined(HAVE_SNARL) + notifierWindow_ = new QtWin32NotifierWindow(); + notifier_ = new SnarlNotifier(SWIFT_APPLICATION_NAME, notifierWindow_); #else notifier_ = new NullNotifier(); #endif @@ -155,6 +161,7 @@ QtSwift::QtSwift(po::variables_map options) : autoUpdater_(NULL) { } QtSwift::~QtSwift() { + delete notifier_; delete autoUpdater_; delete chatWindowFactory_; foreach (QtMainWindowFactory* factory, rosterWindowFactories_) { diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h index abc8c75..092c45e 100644 --- a/Swift/QtUI/QtSwift.h +++ b/Swift/QtUI/QtSwift.h @@ -20,6 +20,9 @@ #if defined(SWIFTEN_PLATFORM_MACOSX) #include "Swiften/Application/CocoaApplication.h" #endif +#if defined(HAVE_SNARL) +#include "SwifTools/Notifier/Win32NotifierWindow.h" +#endif namespace po = boost::program_options; @@ -75,6 +78,9 @@ namespace Swift { #if defined(SWIFTEN_PLATFORM_MACOSX) CocoaApplication cocoaApplication_; #endif +#if defined(HAVE_SNARL) + Win32NotifierWindow* notifierWindow_; +#endif }; } diff --git a/Swift/QtUI/QtWin32NotifierWindow.h b/Swift/QtUI/QtWin32NotifierWindow.h new file mode 100644 index 0000000..b8d9c77 --- /dev/null +++ b/Swift/QtUI/QtWin32NotifierWindow.h @@ -0,0 +1,29 @@ +/* + * 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 <QWidget> + +#include "SwifTools/Notifier/Win32NotifierWindow.h" + +namespace Swift { + class QtWin32NotifierWindow : public QWidget, public Win32NotifierWindow { + public: + QtWin32NotifierWindow(QWidget* parent = NULL) { + setVisible(false); + } + + bool winEvent (MSG* message, long* result ) { + onMessageReceived(message); + return false; + } + + virtual HWND getID() const { + return winId(); + } + }; +} diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 634207c..933133d 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -38,6 +38,9 @@ myenv.MergeFlags(env.get("EXPAT_FLAGS", "")) if myenv.get("HAVE_GROWL", False) : myenv.MergeFlags(myenv["GROWL_FLAGS"]) myenv.Append(CPPDEFINES = ["HAVE_GROWL"]) +if myenv.get("HAVE_SNARL", False) : + myenv.MergeFlags(myenv["SNARL_FLAGS"]) + myenv.Append(CPPDEFINES = ["HAVE_SNARL"]) myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"]) |