X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=a1d6cda05fc9749eca92a33ebf604c8dd3798fb2;hb=8438c6f685ed43943d36996ada054941a30e3cb3;hp=5342636f737f14f454ea858d1614ac48a1ddb810;hpb=67a80c804797ba432378ad6b81fc82b1aa0d9a1d;p=quassel.git

diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h
index 5342636f..a1d6cda0 100644
--- a/src/client/coreconnection.h
+++ b/src/client/coreconnection.h
@@ -24,6 +24,7 @@
 // TODO: support system application proxy (new in Qt 4.6)
 
 #include "QPointer"
+#include "QTimer"
 
 #ifdef HAVE_SSL
 #  include <QSslSocket>
@@ -31,6 +32,10 @@
 #  include <QTcpSocket>
 #endif
 
+#ifdef HAVE_KDE
+#  include <Solid/Networking>
+#endif
+
 #include "coreaccount.h"
 #include "types.h"
 
@@ -54,11 +59,12 @@ public:
 
   void init();
 
-  inline ConnectionState state() const;
   inline bool isConnected() const;
+  inline ConnectionState state() const;
   inline CoreAccount currentAccount() const;
 
   bool isEncrypted() const;
+  bool isLocalConnection() const;
 
   inline int progressMinimum() const;
   inline int progressMaximum() const;
@@ -72,12 +78,13 @@ public:
 public slots:
   bool connectToCore(AccountId = 0);
   void reconnectToCore();
-  void disconnectFromCore(const QString &errorString = QString());
+  void disconnectFromCore();
 
 signals:
   void stateChanged(CoreConnection::ConnectionState);
   void encrypted(bool isEncrypted = true);
   void synchronized();
+  void lagUpdated(int msecs);
 
   void connectionError(const QString &errorMsg);
   void connectionErrorPopup(const QString &errorMsg);
@@ -90,6 +97,9 @@ signals:
   void progressTextChanged(const QString &);
 
   void startCoreSetup(const QVariantList &);
+  void coreSetupSuccess();
+  void coreSetupFailed(const QString &error);
+
   void startInternalCore();
   void connectToInternalCore(SignalProxy *proxy);
 
@@ -103,6 +113,7 @@ signals:
 
 private slots:
   void connectToCurrentAccount();
+  void disconnectFromCore(const QString &errorString, bool wantReconnect = true);
 
   void socketStateChanged(QAbstractSocket::SocketState);
   void coreSocketError(QAbstractSocket::SocketError);
@@ -120,14 +131,16 @@ private slots:
   void internalSessionStateReceived(const QVariant &packedState);
   void sessionStateReceived(const QVariantMap &state);
 
-  void resetConnection();
+  void resetConnection(bool wantReconnect = false);
   void connectionReady();
-  //void doCoreSetup(const QVariant &setupData);
 
+  void loginToCore(const QString &user, const QString &password, bool remember); // for config wizard
   void loginToCore(const QString &previousError = QString());
   void loginSuccess();
   void loginFailed(const QString &errorMessage);
 
+  void doCoreSetup(const QVariant &setupData);
+
   void updateProgress(int value, int maximum);
   void setProgressText(const QString &text);
   void setProgressValue(int value);
@@ -142,16 +155,28 @@ private slots:
   void sslErrors();
 #endif
 
+  void networkDetectionModeChanged(const QVariant &mode);
+  void pingTimeoutIntervalChanged(const QVariant &interval);
+  void reconnectIntervalChanged(const QVariant &interval);
+  void reconnectTimeout();
+
+#ifdef HAVE_KDE
+  void solidNetworkStatusChanged(Solid::Networking::Status status);
+#endif
+
 private:
   CoreAccountModel *_model;
   CoreAccount _account;
   QVariantMap _coreMsgBuffer;
 
-  QPointer<QIODevice> _socket;
+  QPointer<QAbstractSocket> _socket;
   quint32 _blockSize;
   ConnectionState _state;
 
-  QSet<Network *> _netsToSync;
+  QTimer _reconnectTimer;
+  bool _wantReconnect;
+
+  QSet<QObject *> _netsToSync;
   int _numNetsToSync;
   int _progressMinimum, _progressMaximum, _progressValue;
   QString _progressText;
@@ -159,6 +184,8 @@ private:
   QString _coreInfoString(const QVariantMap &);
 
   inline CoreAccountModel *accountModel() const;
+
+  friend class CoreConfigWizard;
 };
 
 Q_DECLARE_METATYPE(CoreConnection::ConnectionState)