From 5cc59d6e777d595538a2113b4bb50e6ac31839fd Mon Sep 17 00:00:00 2001 From: chrisparker126 Date: Tue, 27 Apr 2010 12:18:44 +0000 Subject: [PATCH] added idle status and connection to messenger window git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2795 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MainWindow.cpp | 3 +++ retroshare-gui/src/gui/MainWindow.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 058524b09..039b7b3bd 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -266,6 +266,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) /* Creates a tray icon with a context menu and adds it to the system's * notification area. */ createTrayIcon(); + idle = new Idle(); + idle->start(); + QTimer *timer = new QTimer(this); timer->connect(timer, SIGNAL(timeout()), this, SLOT(updateStatus())); timer->start(1000); diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h index 84a37f5e0..b73fab2bc 100644 --- a/retroshare-gui/src/gui/MainWindow.h +++ b/retroshare-gui/src/gui/MainWindow.h @@ -45,6 +45,7 @@ #include "ui_MainWindow.h" #include "gui/common/rwindow.h" +#include "idle/idle.h" class PeerStatus; class NATStatus; @@ -90,6 +91,8 @@ public: MessagesDialog *messagesDialog; SharedFilesDialog *sharedfilesDialog; MessengerWindow *messengerWindow; + Idle *idle; + #ifdef UNFINISHED ApplicationWindow *applicationWindow; #endif