Integrated new IdleDetector.

author: Remko Tronçon <git@el-tramo.be> 2009-11-24 20:03:09 (GMT)
committer: Remko Tronçon <git@el-tramo.be> 2009-11-24 20:03:09 (GMT)
commit: 48fc9e9fb0abd42d47a95042837a026730f20f34 (patch)
tree: 3390dbf200fcde18c2b1c6877c29a143e80671fd /Swift/QtUI
parent: 3b7e581ad1d57170d9809e27437ee3c468c5702f (diff)
download: swift-48fc9e9fb0abd42d47a95042837a026730f20f34.zip
swift-48fc9e9fb0abd42d47a95042837a026730f20f34.tar.bz2
5 files changed, 1 insertions, 71 deletions
diff --git a/Swift/QtUI/QtIdleDetector.cpp b/Swift/QtUI/QtIdleDetector.cpp
deleted file mode 100644
index 783cc14..0000000
--- a/Swift/QtUI/QtIdleDetector.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "QtIdleDetector.h"
-
-#include <QCursor>
-
-namespace Swift {
-
-QtIdleDetector::QtIdleDetector() {
-	signalled_ = false;
-	lastMoveTime_ = QDateTime::currentDateTime();
-	lastPosition_ = QCursor::pos();
-	connect(&timer_, SIGNAL(timeout()), this, SLOT(handleTimerTick()));
-	timer_.start(1000);
-}
-
-QtIdleDetector::~QtIdleDetector() {
-}
-
-void QtIdleDetector::forceNotIdle() {
-
-}
-
-void QtIdleDetector::handleTimerTick() {
-	QPoint position = QCursor::pos();
-	QDateTime now = QDateTime::currentDateTime();
-	if (position != lastPosition_) {
-		if (signalled_) {
-			onInputNotIdle();
-		}
-		lastPosition_ = position;
-		lastMoveTime_ = now;
-		signalled_ = false;
-	} else if (!signalled_ && now > lastMoveTime_.addSecs(600) && position == lastPosition_) {
-		signalled_ = true;
-		onInputIdle();
-	}
-}
-
-}
diff --git a/Swift/QtUI/QtIdleDetector.h b/Swift/QtUI/QtIdleDetector.h
deleted file mode 100644
index 444fb15..0000000
--- a/Swift/QtUI/QtIdleDetector.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "Swift/Controllers/IdleDetector.h"
-
-#include <QObject>
-#include <QPoint>
-#include <QTimer>
-#include <QDateTime>
-
-namespace Swift {
-class QtIdleDetector : public QObject, public IdleDetector {
-	Q_OBJECT
-	public:
-		QtIdleDetector();
-		virtual ~QtIdleDetector();
-		virtual void forceNotIdle();
-	private slots:
-		void handleTimerTick();
-	private:
-		QPoint lastPosition_;
-		QDateTime lastMoveTime_;
-		QTimer timer_;
-		bool signalled_;
-};
-}
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 0def66f..2aaa27e 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -1,66 +1,62 @@
 #include "QtSwift.h"
 
 #include "QtLoginWindowFactory.h"
 #include "QtChatWindowFactory.h"
 #include "QtLoginWindow.h"
 #include "QtChatTabs.h"
 #include "QtMainWindowFactory.h"
 #include "Roster/QtTreeWidgetFactory.h"
 #include "QtSystemTray.h"
 #include "QtSoundPlayer.h"
-#include "QtIdleDetector.h"
-
 #include <boost/bind.hpp>
 #include <QSplitter>
 
 #include "Swiften/Application/Application.h"
 #include "Swiften/Application/Platform/PlatformApplication.h"
 #include "Swiften/Base/String.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/Client/Client.h"
 #include "Swift/Controllers/ChatController.h"
 #include "Swift/Controllers/MainController.h"
 #include "Swift/QtUI/BuildVersion.h"
 
 namespace Swift{
 
 QtSwift::QtSwift(bool netbookMode) {
 	if (netbookMode) {
 		splitter_ = new QSplitter();
 	} else {
 		splitter_ = NULL;
 	}
 	QCoreApplication::setApplicationName("Swift");
 	QCoreApplication::setOrganizationName("Swift");
 	QCoreApplication::setOrganizationDomain("swift.im");
 	QCoreApplication::setApplicationVersion(buildVersion);
 	settings_ = new QtSettingsProvider();
 	application_ = new PlatformApplication("Swift");
 	treeWidgetFactory_ = new QtTreeWidgetFactory(); 
 	systemTray_ = new QtSystemTray();
 	loginWindowFactory_ = new QtLoginWindowFactory(splitter_, systemTray_, settings_);
 	chatWindowFactory_ = new QtChatWindowFactory(treeWidgetFactory_, splitter_, settings_);
 	rosterWindowFactory_ = new QtMainWindowFactory(treeWidgetFactory_);
 	soundPlayer_ = new QtSoundPlayer();
-	idleDetector_ = new QtIdleDetector();
 	if (splitter_) {
 		splitter_->show();
 	}
-	mainController_ = new MainController(chatWindowFactory_, rosterWindowFactory_, loginWindowFactory_, treeWidgetFactory_, settings_, application_, systemTray_, soundPlayer_, idleDetector_);
+	mainController_ = new MainController(chatWindowFactory_, rosterWindowFactory_, loginWindowFactory_, treeWidgetFactory_, settings_, application_, systemTray_, soundPlayer_);
 }
 
 QtSwift::~QtSwift() {
 	delete chatWindowFactory_;
 	delete rosterWindowFactory_;
 	delete loginWindowFactory_;
 	delete treeWidgetFactory_;
 	delete mainController_;
 	delete settings_;
 	delete application_;
 	delete systemTray_;
 	delete splitter_;
 	delete soundPlayer_;
-	delete idleDetector_;
 }
 
 }
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h
index 60ff5a7..263dc05 100644
--- a/Swift/QtUI/QtSwift.h
+++ b/Swift/QtUI/QtSwift.h
@@ -1,45 +1,43 @@
 #ifndef SWIFT_QtSwift_H
 #define SWIFT_QtSwift_H
 
 #include "Swiften/Base/String.h"
 #include "Swiften/EventLoop/Qt/QtEventLoop.h"
 #include "QtLoginWindowFactory.h"
 #include "QtMainWindowFactory.h"
 #include "QtChatWindowFactory.h"
 #include "QtSettingsProvider.h"
-#include "QtIdleDetector.h"
 
 class QSplitter;
 
 namespace Swift {
 	class Application;
 	class MainController;
 	class QtChatWindowFactory;
 	class QtMainWindowFactory;
 	class QtLoginWindowFactory;
 	class QtTreeWidgetFactory;
 	class QtSystemTray;
 	class QtSoundPlayer;
 	
 	class QtSwift : public QObject {
 		Q_OBJECT
 		public:
 			QtSwift(bool netbookMode);
 			~QtSwift();
 		private:
 			MainController *mainController_;
 			QtTreeWidgetFactory *treeWidgetFactory_;
 			QtChatWindowFactory *chatWindowFactory_;
 			QtMainWindowFactory *rosterWindowFactory_;
 			QtLoginWindowFactory *loginWindowFactory_;
 			QtEventLoop clientMainThreadCaller_;
 			QtSettingsProvider *settings_;
 			QtSystemTray* systemTray_;
 			QSplitter* splitter_;
 			QtSoundPlayer* soundPlayer_;
-			QtIdleDetector* idleDetector_;
 			Application* application_;
 	};
 }
 
 #endif
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index d30f3b9..800a009 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -7,97 +7,96 @@ def generateDefaultTheme(env, target, source) :
 	output.write("<RCC version =\"1.0\">")
 	output.write("<qresource prefix=\"/themes/Default\">")
 	for (path, dirs, files) in os.walk(sourceDir) :
 		for file in files :
 			filePath = os.path.join(path,file)
 			output.write("<file alias=\"%(alias)s\">%(path)s</file>" % { 
 					"alias": filePath[len(sourceDir)+1:],
 					"path": filePath
 				})
 	output.write("</qresource>")
 	output.write("</RCC>")
 
 Import("env")
 
 myenv = env.Clone()
 
 myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"])
 myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
 myenv.MergeFlags(env["SWIFTEN_FLAGS"])
 myenv.MergeFlags(env["CPPUNIT_FLAGS"])
 myenv.MergeFlags(env["LIBIDN_FLAGS"])
 myenv.MergeFlags(env["BOOST_FLAGS"])
 myenv.MergeFlags(env["SQLITE_FLAGS"])
 myenv.MergeFlags(env["ZLIB_FLAGS"])
 myenv.MergeFlags(env["OPENSSL_FLAGS"])
 myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
 myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
 
 myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
 myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])
 myenv.EnableQt4Modules(['QtCore', 'QtGui', 'QtWebKit'], debug = False)
 myenv.Append(CPPPATH = ["/usr/include/phonon"])
 
 myenv.Append(CPPPATH = ["."])
 
 if env["PLATFORM"] == "win32" :
 	#myenv["LINKFLAGS"] = ["/SUBSYSTEM:CONSOLE"]
 	myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"])
 	myenv.Append(LIBS = "qtmain")
 
 myenv.Command("DefaultTheme.qrc", "../resources/themes/Default", Action(generateDefaultTheme, cmdstr = "$GENCOMSTR"))
 
 sources = [
 		"main.cpp",
 		"QtAboutWidget.cpp",
 		"QtAddContactDialog.cpp",
 		"QtChatWindow.cpp",
 		"QtChatWindowFactory.cpp",
-		"QtIdleDetector.cpp",
 		"QtJoinMUCDialog.cpp",
 		"QtLoginWindow.cpp",
 		"QtLoginWindowFactory.cpp",
 		"QtMainWindow.cpp",
 		"QtMainWindowFactory.cpp",
 		"QtSettingsProvider.cpp",
 		"QtStatusWidget.cpp",
 		"QtSwift.cpp",
 		"QtChatView.cpp",
 		"QtChatTabs.cpp",
 		"QtSoundPlayer.cpp",
 		"QtSystemTray.cpp",
 		"QtTabbable.cpp",
 		"QtTextEdit.cpp",
 		"ChatSnippet.cpp",
 		"MessageSnippet.cpp",
 		"SystemMessageSnippet.cpp",
 		"Roster/RosterModel.cpp",
 		"Roster/QtTreeWidget.cpp",
 		"Roster/QtTreeWidgetItem.cpp",
 		"Roster/RosterDelegate.cpp",
 		"EventViewer/EventView.cpp",
 		"EventViewer/EventModel.cpp",
 		"EventViewer/EventDelegate.cpp",
 		"QtRosterHeader.cpp",
 		"qrc_DefaultTheme.cc",
 		"qrc_Swift.cc",
 	]
 
 myenv.BuildVersion("BuildVersion.h", version = ARGUMENTS.get("swift_version", None))
 
 if env["PLATFORM"] == "win32" :
 	myenv.RES("../resources/Windows/Swift.rc")
 	sources += ["../resources/Windows/Swift.res"]
 
 if env["PLATFORM"] == "darwin" or env["PLATFORM"] == "win32" :
 	swiftProgram = myenv.Program("Swift", sources)
 else :
 	swiftProgram = myenv.Program("swift", sources)
 
 myenv.Uic4("QtJoinMUCDialog.ui")
 myenv.Uic4("QtAddContactDialog.ui")
 myenv.Qrc("DefaultTheme.qrc")
 myenv.Qrc("Swift.qrc")
 
 buildVersion = Version.getBuildVersion(ARGUMENTS.get("swift_version", None))
 
 if env["PLATFORM"] == "darwin" :
author	Remko Tronçon <git@el-tramo.be>	2009-11-24 20:03:09 (GMT)
committer	Remko Tronçon <git@el-tramo.be>	2009-11-24 20:03:09 (GMT)
commit	48fc9e9fb0abd42d47a95042837a026730f20f34 (patch)
tree	3390dbf200fcde18c2b1c6877c29a143e80671fd /Swift/QtUI
parent	3b7e581ad1d57170d9809e27437ee3c468c5702f (diff)
download	swift-48fc9e9fb0abd42d47a95042837a026730f20f34.zip swift-48fc9e9fb0abd42d47a95042837a026730f20f34.tar.bz2