projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor the markerline into a proper QGraphicsWidget
[quassel.git]
/
src
/
qtui
/
settingspages
/
networkssettingspage.h
diff --git
a/src/qtui/settingspages/networkssettingspage.h
b/src/qtui/settingspages/networkssettingspage.h
index
0c10a57
..
db209a7
100644
(file)
--- a/
src/qtui/settingspages/networkssettingspage.h
+++ b/
src/qtui/settingspages/networkssettingspage.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8 by the Quassel IRC Team
*
+ * Copyright (C) 2005-0
9 by the Quassel Project
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-18,112
+18,135
@@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef
_NETWORKSSETTINGSPAGE_H_
-#define
_NETWORKSSETTINGSPAGE_H_
+#ifndef
NETWORKSSETTINGSPAGE_H
+#define
NETWORKSSETTINGSPAGE_H
-#include <Q
Icon
>
+#include <Q
Pixmap
>
+#include "network.h"
#include "settingspage.h"
#include "settingspage.h"
+
#include "ui_networkssettingspage.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 "ui_saveidentitiesdlg.h"
-#include "network.h"
-#include "types.h"
-
class NetworksSettingsPage : public SettingsPage {
Q_OBJECT
class NetworksSettingsPage : public SettingsPage {
Q_OBJECT
-
public:
-
NetworksSettingsPage(QWidget *parent = 0);
+public:
+ NetworksSettingsPage(QWidget *parent = 0);
- bool aboutToSave();
+ virtual inline bool needsCoreConnection() const { return true; }
- public slots:
- void save();
- void load();
+ bool aboutToSave();
- private slots:
- void widgetHasChanged();
- void setWidgetStates();
- void coreConnectionStateChanged(bool);
- void networkConnectionStateChanged(Network::ConnectionState state);
- void networkConnectionError(const QString &msg);
+public slots:
+ void save();
+ void load();
- void displayNetwork(NetworkId);
- void setItemState(NetworkId, QListWidgetItem *item = 0);
+private slots:
+ void widgetHasChanged();
+ void setWidgetStates();
+ void coreConnectionStateChanged(bool);
+ void networkConnectionStateChanged(Network::ConnectionState state);
+ void networkConnectionError(const QString &msg);
- void clientNetworkAdded(NetworkId);
- void clientNetworkRemoved(NetworkId);
- void clientNetworkUpdated();
+ void displayNetwork(NetworkId);
+ void setItemState(NetworkId, QListWidgetItem *item = 0);
-
void clientIdentityAdded(Identity
Id);
-
void clientIdentityRemoved(Identity
Id);
-
void clientIdentity
Updated();
+
void clientNetworkAdded(Network
Id);
+
void clientNetworkRemoved(Network
Id);
+
void clientNetwork
Updated();
- void on_networkList_itemSelectionChanged();
- void on_addNetwork_clicked();
- void on_deleteNetwork_clicked();
- void on_renameNetwork_clicked();
+ void clientIdentityAdded(IdentityId);
+ void clientIdentityRemoved(IdentityId);
+ void clientIdentityUpdated();
- void on_connectNow_clicked();
+ void on_networkList_itemSelectionChanged();
+ void on_addNetwork_clicked();
+ void on_deleteNetwork_clicked();
+ void on_renameNetwork_clicked();
+ void on_editIdentities_clicked();
- void on_serverList_itemSelectionChanged();
- void on_addServer_clicked();
- void on_deleteServer_clicked();
- void on_editServer_clicked();
- void on_upServer_clicked();
- void on_downServer_clicked();
+ // void on_connectNow_clicked();
- private:
- Ui::NetworksSettingsPage ui;
+ void on_serverList_itemSelectionChanged();
+ void on_addServer_clicked();
+ void on_deleteServer_clicked();
+ void on_editServer_clicked();
+ void on_upServer_clicked();
+ void on_downServer_clicked();
+
+private:
+ Ui::NetworksSettingsPage ui;
- NetworkId currentId;
- QHash<NetworkId, NetworkInfo> networkInfos;
+ NetworkId currentId;
+ QHash<NetworkId, NetworkInfo> networkInfos;
+ bool _ignoreWidgetChanges;
-
QIcon
connectedIcon, connectingIcon, disconnectedIcon;
+
QPixmap
connectedIcon, connectingIcon, disconnectedIcon;
- void reset();
- bool testHasChanged();
- QListWidgetItem *insertNetwork(NetworkId);
- QListWidgetItem *insertNetwork(const NetworkInfo &info);
- QListWidgetItem *networkItem(NetworkId) const;
- void saveToNetworkInfo(NetworkInfo &);
+ void reset();
+ bool testHasChanged();
+ QListWidgetItem *insertNetwork(NetworkId);
+ QListWidgetItem *insertNetwork(const NetworkInfo &info);
+ QListWidgetItem *networkItem(NetworkId) const;
+ void saveToNetworkInfo(NetworkInfo &);
+ IdentityId defaultIdentity() const;
};
};
-class NetworkEditDlgNew : public QDialog {
+
+class NetworkAddDlg : public QDialog {
Q_OBJECT
public:
Q_OBJECT
public:
- Network
EditDlgNew(const QString &old,
const QStringList &existing = QStringList(), QWidget *parent = 0);
+ Network
AddDlg(
const QStringList &existing = QStringList(), QWidget *parent = 0);
-
QString networkName
() const;
+
NetworkInfo networkInfo
() const;
private slots:
private slots:
- void
on_networkEdit_textChanged(const QString &
);
+ void
setButtonStates(
);
private:
private:
- Ui::Network
EditDlgNew
ui;
+ Ui::Network
AddDlg
ui;
QStringList existing;
};
QStringList existing;
};
-
-class ServerEditDlgNew : public QDialog {
+class NetworkEditDlg : public QDialog {
Q_OBJECT
public:
Q_OBJECT
public:
-
ServerEditDlgNew(const QVariant &serverData = QVarian
t(), QWidget *parent = 0);
+
NetworkEditDlg(const QString &old, const QStringList &existing = QStringLis
t(), QWidget *parent = 0);
- Q
Variant serverData
() const;
+ Q
String networkName
() const;
private slots:
private slots:
- void on_
host_textChanged(
);
+ void on_
networkEdit_textChanged(const QString &
);
private:
private:
- Ui::ServerEditDlgNew ui;
+ Ui::NetworkEditDlg ui;
+
+ QStringList existing;
+};
+
+
+class ServerEditDlg : public QDialog {
+ Q_OBJECT
+
+public:
+ ServerEditDlg(const Network::Server &server = Network::Server(), QWidget *parent = 0);
+
+ Network::Server serverData() const;
+
+private slots:
+ void on_host_textChanged();
+
+private:
+ Ui::ServerEditDlg ui;
};
};