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)
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, Reconnecting, Disconnecting };
+
Network(const NetworkId &networkid, QObject *parent = 0);
- //virtual ~Network();
+ ~Network();
NetworkId networkId() const;
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);
IdentityId identity() const;
QStringList nicks() const;
QStringList channels() const;
- QList<QVariantMap> serverList() 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 &);
QString prefixes();
QString prefixModes();
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;
+ 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);
public slots:
void setNetworkName(const QString &networkName);
void setCurrentServer(const QString ¤tServer);
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 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);
void removeSupport(const QString ¶m);
inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); }
- void removeIrcUser(QString nick);
-
+ 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);
// 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 removeIrcChannel(IrcChannel *ircChannel);
+ void removeChansAndUsers();
void ircUserInitDone();
void ircChannelInitDone();
signals:
+ void aboutToBeDestroyed();
void networkNameSet(const QString &networkName);
void currentServerSet(const QString ¤tServer);
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 codecForEncodingSet(const QString &codecName);
- void codecForDecodingSet(const QString &codecName);
+ void serverListSet(QVariantList serverList);
+ 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(quint16);
+ 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 ¶m, const QString &value);
void supportRemoved(const QString ¶m);
void ircChannelAdded(IrcChannel *);
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 ircUserInitDone(IrcUser *);
void ircChannelInitDone(IrcChannel *);
- void connectRequested(NetworkId = 0);
+ void connectRequested(NetworkId id = 0) const;
+ void disconnectRequested(NetworkId id = 0) const;
private:
+ QPointer<SignalProxy> _proxy;
+
NetworkId _networkId;
IdentityId _identity;
QString _networkName;
QString _currentServer;
bool _connected;
+ ConnectionState _connectionState;
QString _prefixes;
QString _prefixModes;
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;
+ QStringList _perform;
+
+ bool _useAutoIdentify;
+ QString _autoIdentifyService;
+ QString _autoIdentifyPassword;
+
+ bool _useAutoReconnect;
+ quint32 _autoReconnectInterval;
+ quint16 _autoReconnectRetries;
+ bool _unlimitedReconnectRetries;
+ bool _rejoinChannels;
- QList<QVariantMap> _serverList;
- //QVariantMap networkSettings;
- //QVariantMap identity;
-
- 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).
+struct NetworkInfo {
+ NetworkId networkId;
+ QString networkName;
+ IdentityId identity;
+
+ bool useCustomEncodings; // not used!
+ QByteArray codecForServer;
+ 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;
+ quint16 autoReconnectRetries;
+ bool unlimitedReconnectRetries;
+ 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);
+QDebug operator<<(QDebug dbg, const NetworkInfo &i);
+
+Q_DECLARE_METATYPE(NetworkInfo);
+
#endif
projects / quassel.git / blobdiff