Extended NetworkInfo again to prepare for even more sophisticated encoding stuff.

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

diff --git a/src/common/network.h b/src/common/network.h
index b9a2236..6c2ff40 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -49,12 +49,23 @@ 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)
   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)
+  Q_PROPERTY(bool useRandomServer READ useRandomServer WRITE setUseRandomServer STORED false)
+  Q_PROPERTY(QStringList perform READ perform WRITE setPerform STORED false)
+  Q_PROPERTY(bool useAutoIdentify READ useAutoIdentify WRITE setUseAutoIdentify STORED false)
+  Q_PROPERTY(QString autoIdentifyService READ autoIdentifyService WRITE setAutoIdentifyService STORED false)
+  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(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 };
@@ -88,6 +99,16 @@ public:
   QStringList nicks() const;
   QStringList channels() const;
   QVariantList serverList() const;
+  bool useRandomServer() const;
+  QStringList perform() const;
+  bool useAutoIdentify() const;
+  QString autoIdentifyService() const;
+  QString autoIdentifyPassword() const;
+  bool useAutoReconnect() const;
+  quint32 autoReconnectInterval() const;
+  quint16 autoReconnectRetries() const;
+  bool unlimitedReconnectRetries() const;
+  bool rejoinChannels() const;
 
   NetworkInfo networkInfo() const;
   void setNetworkInfo(const NetworkInfo &);
@@ -112,14 +133,23 @@ public:
   QList<IrcChannel *> ircChannels() const;
   quint32 ircChannelCount() const;
 
+  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;
 
+  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);
+
 public slots:
   void setNetworkName(const QString &networkName);
   void setCurrentServer(const QString &currentServer);
@@ -130,7 +160,18 @@ public slots:
   void setIdentity(IdentityId);
 
   void setServerList(const QVariantList &serverList);
-
+  void setUseRandomServer(bool);
+  void setPerform(const QStringList &);
+  void setUseAutoIdentify(bool);
+  void setAutoIdentifyService(const QString &);
+  void setAutoIdentifyPassword(const QString &);
+  void setUseAutoReconnect(bool);
+  void setAutoReconnectInterval(quint32);
+  void setAutoReconnectRetries(quint16);
+  void setUnlimitedReconnectRetries(bool);
+  void setRejoinChannels(bool);
+
+  void setCodecForServer(const QByteArray &codecName);
   void setCodecForEncoding(const QByteArray &codecName);
   void setCodecForDecoding(const QByteArray &codecName);
 
@@ -184,9 +225,20 @@ signals:
   void identitySet(IdentityId);
 
   void serverListSet(QVariantList serverList);
-
-  void codecForEncodingSet(const QString &codecName);
-  void codecForDecodingSet(const QString &codecName);
+  void useRandomServerSet(bool);
+  void performSet(const QStringList &);
+  void useAutoIdentifySet(bool);
+  void autoIdentifyServiceSet(const QString &);
+  void autoIdentifyPasswordSet(const QString &);
+  void useAutoReconnectSet(bool);
+  void autoReconnectIntervalSet(quint32);
+  void autoReconnectRetriesSet(qint16);
+  void unlimitedReconnectRetriesSet(bool);
+  void rejoinChannelsSet(bool);
+
+  void codecForServerSet(const QByteArray &codecName);
+  void codecForEncodingSet(const QByteArray &codecName);
+  void codecForDecodingSet(const QByteArray &codecName);
 
   void supportAdded(const QString &param, const QString &value);
   void supportRemoved(const QString &param);
@@ -227,15 +279,29 @@ private:
   QHash<QString, QString> _supports;  // stores results from RPL_ISUPPORT
 
   QVariantList _serverList;
+  bool _useRandomServer;
   QStringList _perform;
-  //QVariantMap networkSettings;
+
+  bool _useAutoIdentify;
+  QString _autoIdentifyService;
+  QString _autoIdentifyPassword;
+
+  bool _useAutoReconnect;
+  quint32 _autoReconnectInterval;
+  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;
 };
 
 //! Stores all editable information about a network (as opposed to runtime state).
@@ -244,7 +310,8 @@ struct NetworkInfo {
   QString networkName;
   IdentityId identity;
 
-  bool useCustomEncodings;
+  bool useCustomEncodings; // not used!
+  QByteArray codecForServer;
   QByteArray codecForEncoding;
   QByteArray codecForDecoding;
 
@@ -260,7 +327,8 @@ struct NetworkInfo {
 
   bool useAutoReconnect;
   quint32 autoReconnectInterval;
-  qint16 autoReconnectRetries;  // -1 => Unlimited
+  quint16 autoReconnectRetries;
+  bool unlimitedReconnectRetries;
   bool rejoinChannels;
 
   bool operator==(const NetworkInfo &other) const;