X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=d44319ca64773f5e9918d1198e6864790a84b2df;hp=80131fac206f96a6e13a1f9a1ff3e19bd2194fd2;hb=4aca5963302eb2f6dfc41b723df4b362704f1b2b;hpb=6f2f1723f5bb3d26908f6dd297890f6fba43793b

diff --git a/src/common/network.h b/src/common/network.h
index 80131fac..d44319ca 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -37,10 +37,14 @@ class SignalProxy;
 class IrcUser;
 class IrcChannel;
 
+// defined below!
+struct NetworkInfo;
+
 // TODO: ConnectionInfo to propagate and sync the current state of NetworkConnection, encodings etcpp
 
 class Network : public SyncableObject {
   Q_OBJECT
+  Q_ENUMS(ConnectionState Network::ConnectionState)
 
   Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName STORED false)
   Q_PROPERTY(QString currentServer READ currentServer WRITE setCurrentServer STORED false)
@@ -49,10 +53,14 @@ class Network : public SyncableObject {
   Q_PROPERTY(QByteArray codecForDecoding READ codecForDecoding WRITE setCodecForDecoding STORED false)
   Q_PROPERTY(IdentityId identityId READ identity WRITE setIdentity STORED false)
   Q_PROPERTY(bool isConnected READ isConnected WRITE setConnected STORED false)
+  //Q_PROPERTY(Network::ConnectionState connectionState READ connectionState WRITE setConnectionState STORED false)
+  Q_PROPERTY(int connectionState READ connectionState WRITE setConnectionState STORED false)
 
 public:
+  enum ConnectionState { Disconnected, Connecting, Initializing, Initialized, Disconnecting };
+
   Network(const NetworkId &networkid, QObject *parent = 0);
-  //virtual ~Network();
+  ~Network();
 
   NetworkId networkId() const;
 
@@ -65,6 +73,8 @@ public:
   bool isChannelName(const QString &channelname) const;
 
   bool isConnected() const;
+  //Network::ConnectionState connectionState() const;
+  int connectionState() const;
 
   QString prefixToMode(const QString &prefix);
   QString prefixToMode(const QCharRef &prefix);
@@ -77,7 +87,10 @@ public:
   IdentityId identity() const;
   QStringList nicks() const;
   QStringList channels() const;
-  QList<QVariantMap> serverList() const;
+  QVariantList serverList() const;
+
+  NetworkInfo networkInfo() const;
+  void setNetworkInfo(const NetworkInfo &);
 
   QString prefixes();
   QString prefixModes();
@@ -94,8 +107,8 @@ public:
 
   IrcChannel *newIrcChannel(const QString &channelname);
   IrcChannel *newIrcChannel(const QByteArray &channelname);
-  IrcChannel *ircChannel(QString channelname);
-  IrcChannel *ircChannel(const QByteArray &channelname);
+  IrcChannel *ircChannel(QString channelname) const;
+  IrcChannel *ircChannel(const QByteArray &channelname) const;
   QList<IrcChannel *> ircChannels() const;
   quint32 ircChannelCount() const;
 
@@ -111,10 +124,12 @@ public slots:
   void setNetworkName(const QString &networkName);
   void setCurrentServer(const QString &currentServer);
   void setConnected(bool isConnected);
+  //void setConnectionState(Network::ConnectionState state);
+  void setConnectionState(int state);
   void setMyNick(const QString &mynick);
   void setIdentity(IdentityId);
 
-  void setServerList(const QList<QVariantMap> &serverList);
+  void setServerList(const QVariantList &serverList);
 
   void setCodecForEncoding(const QByteArray &codecName);
   void setCodecForDecoding(const QByteArray &codecName);
@@ -143,10 +158,12 @@ public slots:
   // channel lists up to date
   void ircUserNickChanged(QString newnick);
 
-  void requestConnect();
+  void requestConnect() const;
+  void requestDisconnect() const;
+
+  void emitConnectionError(const QString &);
 
 private slots:
-  void ircUserDestroyed();
   void channelDestroyed();
   void removeIrcUser(IrcUser *ircuser);
   void ircUserInitDone();
@@ -156,10 +173,13 @@ signals:
   void networkNameSet(const QString &networkName);
   void currentServerSet(const QString &currentServer);
   void connectedSet(bool isConnected);
+  void connectionStateSet(Network::ConnectionState);
+  void connectionStateSet(int);
+  void connectionError(const QString &errorMsg);
   void myNickSet(const QString &mynick);
   void identitySet(IdentityId);
 
-  void serverListSet(const QList<QVariantMap> &serverList);
+  void serverListSet(QVariantList serverList);
 
   void codecForEncodingSet(const QString &codecName);
   void codecForDecodingSet(const QString &codecName);
@@ -181,7 +201,8 @@ signals:
   void ircUserInitDone(IrcUser *);
   void ircChannelInitDone(IrcChannel *);
 
-  void connectRequested(NetworkId = 0);
+  void connectRequested(NetworkId id = 0) const;
+  void disconnectRequested(NetworkId id = 0) const;
 
 private:
   NetworkId _networkId;
@@ -191,6 +212,7 @@ private:
   QString _networkName;
   QString _currentServer;
   bool _connected;
+  ConnectionState _connectionState;
 
   QString _prefixes;
   QString _prefixModes;
@@ -199,10 +221,10 @@ private:
   QHash<QString, IrcChannel *> _ircChannels; // stores all known channels
   QHash<QString, QString> _supports;  // stores results from RPL_ISUPPORT
 
-  QList<QVariantMap> _serverList;
+  QVariantList _serverList;
+  QStringList _perform;
   //QVariantMap networkSettings;
-  //QVariantMap identity;
-  
+
   QPointer<SignalProxy> _proxy;
   void determinePrefixes();
 
@@ -211,4 +233,38 @@ private:
 
 };
 
+//! Stores all editable information about a network (as opposed to runtime state).
+struct NetworkInfo {
+  NetworkId networkId;
+  QString networkName;
+  IdentityId identity;
+
+  bool useCustomEncodings;
+  QByteArray codecForEncoding;
+  QByteArray codecForDecoding;
+
+  // Server entry: QString "Host", uint "Port", QString "Password", bool "UseSSL"
+  QVariantList serverList;
+  bool useRandomServer;
+
+  QStringList perform;
+
+  bool useAutoIdentify;
+  QString autoIdentifyService;
+  QString autoIdentifyPassword;
+
+  bool useAutoReconnect;
+  quint32 autoReconnectInterval;
+  qint16 autoReconnectRetries;  // -1 => Unlimited
+  bool rejoinChannels;
+
+  bool operator==(const NetworkInfo &other) const;
+  bool operator!=(const NetworkInfo &other) const;
+};
+
+QDataStream &operator<<(QDataStream &out, const NetworkInfo &info);
+QDataStream &operator>>(QDataStream &in, NetworkInfo &info);
+
+Q_DECLARE_METATYPE(NetworkInfo);
+
 #endif