/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-2015 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#ifndef _NETWORKSSETTINGSPAGE_H_
-#define _NETWORKSSETTINGSPAGE_H_
+#ifndef NETWORKSSETTINGSPAGE_H
+#define NETWORKSSETTINGSPAGE_H
#include <QIcon>
+#include "network.h"
#include "settingspage.h"
+#include "clientidentity.h"
+
#include "ui_networkssettingspage.h"
-#include "ui_networkeditdlgnew.h"
-#include "ui_servereditdlgnew.h"
+#include "ui_networkadddlg.h"
+#include "ui_networkeditdlg.h"
+#include "ui_servereditdlg.h"
#include "ui_saveidentitiesdlg.h"
-#include "network.h"
-#include "types.h"
-
-class NetworksSettingsPage : public SettingsPage {
- Q_OBJECT
+class NetworksSettingsPage : public SettingsPage
+{
+ Q_OBJECT
- public:
+public:
NetworksSettingsPage(QWidget *parent = 0);
+ virtual inline bool needsCoreConnection() const { return true; }
+
bool aboutToSave();
- public slots:
+public slots:
void save();
void load();
- private slots:
+private slots:
void widgetHasChanged();
void setWidgetStates();
void coreConnectionStateChanged(bool);
+ void networkConnectionStateChanged(Network::ConnectionState state);
+ void networkConnectionError(const QString &msg);
- void displayNetwork(NetworkId, bool dontsave = false);
+ void displayNetwork(NetworkId);
+ void setItemState(NetworkId, QListWidgetItem *item = 0);
void clientNetworkAdded(NetworkId);
void clientNetworkRemoved(NetworkId);
void clientIdentityRemoved(IdentityId);
void clientIdentityUpdated();
+#ifdef HAVE_SSL
+ void sslUpdated();
+#endif
+
void on_networkList_itemSelectionChanged();
void on_addNetwork_clicked();
void on_deleteNetwork_clicked();
void on_renameNetwork_clicked();
+ void on_editIdentities_clicked();
+
+ // void on_connectNow_clicked();
void on_serverList_itemSelectionChanged();
void on_addServer_clicked();
void on_upServer_clicked();
void on_downServer_clicked();
- private:
+private:
Ui::NetworksSettingsPage ui;
NetworkId currentId;
QHash<NetworkId, NetworkInfo> networkInfos;
+ bool _ignoreWidgetChanges;
+#ifdef HAVE_SSL
+ CertIdentity *_cid;
+#endif
- QIcon connectedIcon, disconnectedIcon;
+ QIcon connectedIcon, connectingIcon, disconnectedIcon;
void reset();
bool testHasChanged();
QListWidgetItem *insertNetwork(const NetworkInfo &info);
QListWidgetItem *networkItem(NetworkId) const;
void saveToNetworkInfo(NetworkInfo &);
+ IdentityId defaultIdentity() const;
};
-class NetworkEditDlgNew : public QDialog {
- Q_OBJECT
- public:
- NetworkEditDlgNew(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
+class NetworkAddDlg : public QDialog
+{
+ Q_OBJECT
+
+public:
+ NetworkAddDlg(const QStringList &existing = QStringList(), QWidget *parent = 0);
+
+ NetworkInfo networkInfo() const;
+
+private slots:
+ void setButtonStates();
+
+private:
+ Ui::NetworkAddDlg ui;
+
+ QStringList existing;
+};
+
+
+class NetworkEditDlg : public QDialog
+{
+ Q_OBJECT
+
+public:
+ NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
QString networkName() const;
- private slots:
+private slots:
void on_networkEdit_textChanged(const QString &);
- private:
- Ui::NetworkEditDlgNew ui;
+private:
+ Ui::NetworkEditDlg ui;
QStringList existing;
};
+class ServerEditDlg : public QDialog
+{
+ Q_OBJECT
-class ServerEditDlgNew : public QDialog {
- Q_OBJECT
-
- public:
- ServerEditDlgNew(const QVariantMap &serverData = QVariantMap(), QWidget *parent = 0);
+public:
+ ServerEditDlg(const Network::Server &server = Network::Server(), QWidget *parent = 0);
- QVariantMap serverData() const;
+ Network::Server serverData() const;
- private slots:
+private slots:
void on_host_textChanged();
- private:
- Ui::ServerEditDlgNew ui;
+private:
+ Ui::ServerEditDlg ui;
};
-class SaveNetworksDlg : public QDialog {
- Q_OBJECT
+class SaveNetworksDlg : public QDialog
+{
+ Q_OBJECT
- public:
+public:
SaveNetworksDlg(const QList<NetworkInfo> &toCreate, const QList<NetworkInfo> &toUpdate, const QList<NetworkId> &toRemove, QWidget *parent = 0);
- private:
+private slots:
+ void clientEvent();
+
+private:
Ui::SaveIdentitiesDlg ui;
+
+ int numevents, rcvevents;
};
+
#endif