Core now remembers the channels you've joined if a disconnect happens, so you'll...

[quassel.git] / src / common / network.h

diff --git a/src/common/network.h b/src/common/network.h
index 6358bae..c67fea8 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -49,6 +49,7 @@ class Network : public SyncableObject {
   Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName STORED false)
   Q_PROPERTY(QString currentServer READ currentServer WRITE setCurrentServer STORED false)
   Q_PROPERTY(QString myNick READ myNick WRITE setMyNick STORED false)
+  Q_PROPERTY(QByteArray codecForServer READ codecForServer WRITE setCodecForServer STORED false)
   Q_PROPERTY(QByteArray codecForEncoding READ codecForEncoding WRITE setCodecForEncoding STORED false)
   Q_PROPERTY(QByteArray codecForDecoding READ codecForDecoding WRITE setCodecForDecoding STORED false)
   Q_PROPERTY(IdentityId identityId READ identity WRITE setIdentity STORED false)
@@ -62,11 +63,12 @@ class Network : public SyncableObject {
   Q_PROPERTY(QString autoIdentifyPassword READ autoIdentifyPassword WRITE setAutoIdentifyPassword STORED false)
   Q_PROPERTY(bool useAutoReconnect READ useAutoReconnect WRITE setUseAutoReconnect STORED false)
   Q_PROPERTY(quint32 autoReconnectInterval READ autoReconnectInterval WRITE setAutoReconnectInterval STORED false)
-  Q_PROPERTY(qint16 autoReconnectRetries READ autoReconnectRetries WRITE setAutoReconnectRetries STORED false)
+  Q_PROPERTY(quint16 autoReconnectRetries READ autoReconnectRetries WRITE setAutoReconnectRetries STORED false)
+  Q_PROPERTY(bool unlimitedReconnectRetries READ unlimitedReconnectRetries WRITE setUnlimitedReconnectRetries STORED false)
   Q_PROPERTY(bool rejoinChannels READ rejoinChannels WRITE setRejoinChannels STORED false)
 
 public:
-  enum ConnectionState { Disconnected, Connecting, Initializing, Initialized, Disconnecting };
+  enum ConnectionState { Disconnected, Connecting, Initializing, Initialized, Reconnecting, Disconnecting };
 
   Network(const NetworkId &networkid, QObject *parent = 0);
   ~Network();
@@ -104,7 +106,8 @@ public:
   QString autoIdentifyPassword() const;
   bool useAutoReconnect() const;
   quint32 autoReconnectInterval() const;
-  qint16 autoReconnectRetries() const;  // -1 => unlimited
+  quint16 autoReconnectRetries() const;
+  bool unlimitedReconnectRetries() const;
   bool rejoinChannels() const;
 
   NetworkInfo networkInfo() const;
@@ -130,16 +133,24 @@ public:
   QList<IrcChannel *> ircChannels() const;
   quint32 ircChannelCount() const;
 
+  inline QHash<QString, QString> persistentChannels() const { return _persistentChannels; }
+
+  QByteArray codecForServer() const;
   QByteArray codecForEncoding() const;
   QByteArray codecForDecoding() const;
+  void setCodecForServer(QTextCodec *codec);
   void setCodecForEncoding(QTextCodec *codec);
   void setCodecForDecoding(QTextCodec *codec);
 
   QString decodeString(const QByteArray &text) const;
-  QByteArray encodeString(const QString string) const;
+  QByteArray encodeString(const QString &string) const;
+  QString decodeServerString(const QByteArray &text) const;
+  QByteArray encodeServerString(const QString &string) const;
 
+  static QByteArray defaultCodecForServer();
   static QByteArray defaultCodecForEncoding();
   static QByteArray defaultCodecForDecoding();
+  static void setDefaultCodecForServer(const QByteArray &name);
   static void setDefaultCodecForEncoding(const QByteArray &name);
   static void setDefaultCodecForDecoding(const QByteArray &name);
 
@@ -160,9 +171,11 @@ public slots:
   void setAutoIdentifyPassword(const QString &);
   void setUseAutoReconnect(bool);
   void setAutoReconnectInterval(quint32);
-  void setAutoReconnectRetries(qint16);
+  void setAutoReconnectRetries(quint16);
+  void setUnlimitedReconnectRetries(bool);
   void setRejoinChannels(bool);
 
+  void setCodecForServer(const QByteArray &codecName);
   void setCodecForEncoding(const QByteArray &codecName);
   void setCodecForDecoding(const QByteArray &codecName);
 
@@ -172,18 +185,24 @@ public slots:
   inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); }
   void removeIrcUser(const QString &nick);
   void removeIrcChannel(const QString &channel);
-  
+
+  void addPersistentChannel(const QString &channel, const QString &key = QString());
+  void removePersistentChannel(const QString &channel);
+  void setPersistentChannelKey(const QString &channel, const QString &key);
+
   //init geters
   QVariantMap initSupports() const;
   QVariantList initServerList() const;
   QStringList initIrcUsers() const;
   QStringList initIrcChannels() const;
+  QStringList initPersistentChannels() const;
   
   //init seters
   void initSetSupports(const QVariantMap &supports);
   void initSetServerList(const QVariantList &serverList);
   void initSetIrcUsers(const QStringList &hostmasks);
-  void initSetChannels(const QStringList &channels);
+  void initSetIrcChannels(const QStringList &channels);
+  void initSetPersistentChannels(const QStringList &channels);
   
   IrcUser *updateNickFromMask(const QString &mask);
 
@@ -223,9 +242,11 @@ signals:
   void autoIdentifyPasswordSet(const QString &);
   void useAutoReconnectSet(bool);
   void autoReconnectIntervalSet(quint32);
-  void autoReconnectRetriesSet(qint16);
+  void autoReconnectRetriesSet(quint16);
+  void unlimitedReconnectRetriesSet(bool);
   void rejoinChannelsSet(bool);
 
+  void codecForServerSet(const QByteArray &codecName);
   void codecForEncodingSet(const QByteArray &codecName);
   void codecForDecodingSet(const QByteArray &codecName);
 
@@ -240,6 +261,10 @@ signals:
   void ircUserRemoved(const QString &nick);
   void ircChannelRemoved(const QString &channel);
 
+  void persistentChannelAdded(const QString &channel, const QString &key);
+  void persistentChannelRemoved(const QString &channel);
+  void persistentChannelKeySet(const QString &channel, const QString &key);
+
   // needed for client sync progress
   void ircUserRemoved(QObject *);
   void ircChannelRemoved(QObject *);
@@ -251,6 +276,8 @@ signals:
   void disconnectRequested(NetworkId id = 0) const;
 
 private:
+  QPointer<SignalProxy> _proxy;
+
   NetworkId _networkId;
   IdentityId _identity;
 
@@ -266,6 +293,7 @@ private:
   QHash<QString, IrcUser *> _ircUsers;  // stores all known nicks for the server
   QHash<QString, IrcChannel *> _ircChannels; // stores all known channels
   QHash<QString, QString> _supports;  // stores results from RPL_ISUPPORT
+  QHash<QString, QString> _persistentChannels;  // stores persistent channels and their passwords, if any
 
   QVariantList _serverList;
   bool _useRandomServer;
@@ -277,15 +305,17 @@ private:
 
   bool _useAutoReconnect;
   quint32 _autoReconnectInterval;
-  qint16 _autoReconnectRetries;
+  quint16 _autoReconnectRetries;
+  bool _unlimitedReconnectRetries;
   bool _rejoinChannels;
 
-  QPointer<SignalProxy> _proxy;
   void determinePrefixes();
 
+  QTextCodec *_codecForServer;
   QTextCodec *_codecForEncoding;
   QTextCodec *_codecForDecoding;
 
+  static QTextCodec *_defaultCodecForServer;
   static QTextCodec *_defaultCodecForEncoding;
   static QTextCodec *_defaultCodecForDecoding;
 };
@@ -296,7 +326,8 @@ struct NetworkInfo {
   QString networkName;
   IdentityId identity;
 
-  bool useCustomEncodings;
+  bool useCustomEncodings; // not used!
+  QByteArray codecForServer;
   QByteArray codecForEncoding;
   QByteArray codecForDecoding;
 
@@ -312,7 +343,8 @@ struct NetworkInfo {
 
   bool useAutoReconnect;
   quint32 autoReconnectInterval;
-  qint16 autoReconnectRetries;  // -1 => Unlimited
+  quint16 autoReconnectRetries;
+  bool unlimitedReconnectRetries;
   bool rejoinChannels;
 
   bool operator==(const NetworkInfo &other) const;
@@ -321,6 +353,7 @@ struct NetworkInfo {
 
 QDataStream &operator<<(QDataStream &out, const NetworkInfo &info);
 QDataStream &operator>>(QDataStream &in, NetworkInfo &info);
+QDebug operator<<(QDebug dbg, const NetworkInfo &i);
 
 Q_DECLARE_METATYPE(NetworkInfo);