Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-07-11 11:37:43 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-07-11 11:37:43 (GMT) |
| commit | 127355ccda505bbfcfa93d1f1304e6027c55516c (patch) | |
| tree | 6236bcc102cdffd7cf88d639ef4daeae618dfd64 /Swift/QtUI | |
| parent | 1a88be2c3755de25464e403049a95ddd7fca327c (diff) | |
| download | swift-contrib-127355ccda505bbfcfa93d1f1304e6027c55516c.zip swift-contrib-127355ccda505bbfcfa93d1f1304e6027c55516c.tar.bz2 | |
Make IdleDetector a parameter of MainController.
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 3 | ||||
| -rw-r--r-- | Swift/QtUI/QtSwift.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 1d820b1..398150e 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -74,19 +74,19 @@ po::options_description QtSwift::getOptionsDescription() { ("latency-debug", "Use latency debugging (unsupported)") ("multi-account", po::value<int>()->default_value(1), "Number of accounts to open windows for (unsupported)") ("start-minimized", "Don't show the login/roster window at startup") ("eagle-mode", "Settings more suitable for military/secure deployments") ; return result; } -QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMainThreadCaller_), autoUpdater_(NULL) { +QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMainThreadCaller_), autoUpdater_(NULL), idleDetector_(&idleQuerier_, networkFactories_->getTimerFactory(), 1000) { if (options.count("netbook-mode")) { splitter_ = new QSplitter(); } else { splitter_ = NULL; } QCoreApplication::setApplicationName(SWIFT_APPLICATION_NAME); QCoreApplication::setOrganizationName(SWIFT_ORGANIZATION_NAME); QCoreApplication::setOrganizationDomain(SWIFT_ORGANIZATION_DOMAIN); QCoreApplication::setApplicationVersion(buildVersion); @@ -159,18 +159,19 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa uiFactory, settings_, systemTrays_[i], soundPlayer_, storagesFactory_, certificateStorageFactory_, dock_, notifier_, uriHandler_, + &idleDetector_, options.count("latency-debug") > 0, eagleMode); mainControllers_.push_back(mainController); } // PlatformAutoUpdaterFactory autoUpdaterFactory; // if (autoUpdaterFactory.isSupported()) { // autoUpdater_ = autoUpdaterFactory.createAutoUpdater(SWIFT_APPCAST_URL); diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h index 4bf5c97..7f33475 100644 --- a/Swift/QtUI/QtSwift.h +++ b/Swift/QtUI/QtSwift.h @@ -15,18 +15,20 @@ #include "Swiften/Base/Platform.h" #include "Swiften/EventLoop/Qt/QtEventLoop.h" #include "QtSettingsProvider.h" #if defined(SWIFTEN_PLATFORM_MACOSX) #include "SwifTools/Application/CocoaApplication.h" #endif #if defined(SWIFTEN_PLATFORM_WINDOWS) #include "WindowsNotifier.h" #endif +#include "SwifTools/Idle/PlatformIdleQuerier.h" +#include "SwifTools/Idle/ActualIdleDetector.h" namespace po = boost::program_options; class QSplitter; namespace Swift { class QtUIFactory; class CertificateStorageFactory; class Dock; @@ -65,14 +67,16 @@ namespace Swift { QtSoundPlayer* soundPlayer_; Dock* dock_; URIHandler* uriHandler_; QtChatTabs* tabs_; ApplicationPathProvider* applicationPathProvider_; StoragesFactory* storagesFactory_; CertificateStorageFactory* certificateStorageFactory_; AutoUpdater* autoUpdater_; Notifier* notifier_; + PlatformIdleQuerier idleQuerier_; + ActualIdleDetector idleDetector_; #if defined(SWIFTEN_PLATFORM_MACOSX) CocoaApplication cocoaApplication_; #endif }; } |