with the old dialogs.
src/qtui/settingspages/identitiessettingspage.cpp
src/qtui/settingspages/identitiessettingspage.h
src/qtui/settingspages/identitiessettingspage.ui
+src/qtui/settingspages/networkeditdlg.ui
src/qtui/settingspages/networkeditdlgnew.ui
src/qtui/settingspages/networkssettingspage.cpp
src/qtui/settingspages/networkssettingspage.h
src/qtui/settingspages/networkssettingspage.ui
+src/qtui/settingspages/nickeditdlg.ui
src/qtui/settingspages/nickeditdlgnew.ui
src/qtui/settingspages/saveidentitiesdlg.ui
+src/qtui/settingspages/servereditdlg.ui
src/qtui/settingspages/servereditdlgnew.ui
src/qtui/settingspages/settingspages.pri
src/qtui/topicwidget.cpp
void IdentitiesSettingsPage::on_addNick_clicked() {
QStringList existing;
for(int i = 0; i < ui.nicknameList->count(); i++) existing << ui.nicknameList->item(i)->text();
- NickEditDlgNew dlg(QString(), existing, this);
+ NickEditDlg dlg(QString(), existing, this);
if(dlg.exec() == QDialog::Accepted) {
ui.nicknameList->addItem(dlg.nick());
ui.nicknameList->setCurrentRow(ui.nicknameList->count()-1);
QString old = ui.nicknameList->selectedItems()[0]->text();
QStringList existing;
for(int i = 0; i < ui.nicknameList->count(); i++) existing << ui.nicknameList->item(i)->text();
- NickEditDlgNew dlg(old, existing, this);
+ NickEditDlg dlg(old, existing, this);
if(dlg.exec() == QDialog::Accepted) {
ui.nicknameList->selectedItems()[0]->setText(dlg.nick());
}
/*************************************************************************************************/
-NickEditDlgNew::NickEditDlgNew(const QString &old, const QStringList &exist, QWidget *parent)
+NickEditDlg::NickEditDlg(const QString &old, const QStringList &exist, QWidget *parent)
: QDialog(parent), oldNick(old), existing(exist) {
ui.setupUi(this);
} else ui.nickEdit->setText(old);
}
-QString NickEditDlgNew::nick() const {
+QString NickEditDlg::nick() const {
return ui.nickEdit->text();
}
-void NickEditDlgNew::on_nickEdit_textChanged(const QString &text) {
+void NickEditDlg::on_nickEdit_textChanged(const QString &text) {
ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text));
}
#include "ui_identitiessettingspage.h"
#include "ui_createidentitydlg.h"
#include "ui_saveidentitiesdlg.h"
-#include "ui_nickeditdlgnew.h"
+#include "ui_nickeditdlg.h"
class QAbstractItemModel;
};
-class NickEditDlgNew : public QDialog {
+class NickEditDlg : public QDialog {
Q_OBJECT
public:
- NickEditDlgNew(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = 0);
+ NickEditDlg(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = 0);
QString nick() const;
void on_nickEdit_textChanged(const QString &);
private:
- Ui::NickEditDlgNew ui;
+ Ui::NickEditDlg ui;
QString oldNick;
QStringList existing;
<ui version="4.0" >
- <class>NetworkEditDlgNew</class>
- <widget class="QDialog" name="NetworkEditDlgNew" >
+ <class>NetworkEditDlg</class>
+ <widget class="QDialog" name="NetworkEditDlg" >
<property name="geometry" >
<rect>
<x>0</x>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>NetworkEditDlgNew</receiver>
+ <receiver>NetworkEditDlg</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>NetworkEditDlgNew</receiver>
+ <receiver>NetworkEditDlg</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
void NetworksSettingsPage::on_addNetwork_clicked() {
QStringList existing;
for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text();
- NetworkEditDlgNew dlg(QString(), existing, this);
+ NetworkEditDlg dlg(QString(), existing, this);
if(dlg.exec() == QDialog::Accepted) {
NetworkId id;
for(id = 1; id <= networkInfos.count(); id++) {
QString old = ui.networkList->selectedItems()[0]->text();
QStringList existing;
for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text();
- NetworkEditDlgNew dlg(old, existing, this);
+ NetworkEditDlg dlg(old, existing, this);
if(dlg.exec() == QDialog::Accepted) {
ui.networkList->selectedItems()[0]->setText(dlg.networkName());
NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
void NetworksSettingsPage::on_addServer_clicked() {
if(currentId == 0) return;
- ServerEditDlgNew dlg(QVariantMap(), this);
+ ServerEditDlg dlg(QVariantMap(), this);
if(dlg.exec() == QDialog::Accepted) {
networkInfos[currentId].serverList.append(dlg.serverData());
displayNetwork(currentId);
void NetworksSettingsPage::on_editServer_clicked() {
if(currentId == 0) return;
int cur = ui.serverList->currentRow();
- ServerEditDlgNew dlg(networkInfos[currentId].serverList[cur], this);
+ ServerEditDlg dlg(networkInfos[currentId].serverList[cur], this);
if(dlg.exec() == QDialog::Accepted) {
networkInfos[currentId].serverList[cur] = dlg.serverData();
displayNetwork(currentId);
* NetworkEditDlg
*************************************************************************/
-NetworkEditDlgNew::NetworkEditDlgNew(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) {
+NetworkEditDlg::NetworkEditDlg(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) {
ui.setupUi(this);
if(old.isEmpty()) {
} else ui.networkEdit->setText(old);
}
-QString NetworkEditDlgNew::networkName() const {
+QString NetworkEditDlg::networkName() const {
return ui.networkEdit->text();
}
-void NetworkEditDlgNew::on_networkEdit_textChanged(const QString &text) {
+void NetworkEditDlg::on_networkEdit_textChanged(const QString &text) {
ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text));
}
* ServerEditDlg
*************************************************************************/
-ServerEditDlgNew::ServerEditDlgNew(const QVariant &_serverData, QWidget *parent) : QDialog(parent) {
+ServerEditDlg::ServerEditDlg(const QVariant &_serverData, QWidget *parent) : QDialog(parent) {
ui.setupUi(this);
QVariantMap serverData = _serverData.toMap();
if(serverData.count()) {
on_host_textChanged();
}
-QVariant ServerEditDlgNew::serverData() const {
+QVariant ServerEditDlg::serverData() const {
QVariantMap _serverData;
_serverData["Host"] = ui.host->text();
_serverData["Port"] = ui.port->value();
return _serverData;
}
-void ServerEditDlgNew::on_host_textChanged() {
+void ServerEditDlg::on_host_textChanged() {
ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().isEmpty());
}
#include "settingspage.h"
#include "ui_networkssettingspage.h"
-#include "ui_networkeditdlgnew.h"
-#include "ui_servereditdlgnew.h"
+#include "ui_networkeditdlg.h"
+#include "ui_servereditdlg.h"
#include "ui_saveidentitiesdlg.h"
#include "network.h"
void saveToNetworkInfo(NetworkInfo &);
};
-class NetworkEditDlgNew : public QDialog {
+class NetworkEditDlg : public QDialog {
Q_OBJECT
public:
- NetworkEditDlgNew(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
+ NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
QString networkName() const;
void on_networkEdit_textChanged(const QString &);
private:
- Ui::NetworkEditDlgNew ui;
+ Ui::NetworkEditDlg ui;
QStringList existing;
};
-class ServerEditDlgNew : public QDialog {
+class ServerEditDlg : public QDialog {
Q_OBJECT
public:
- ServerEditDlgNew(const QVariant &serverData = QVariant(), QWidget *parent = 0);
+ ServerEditDlg(const QVariant &serverData = QVariant(), QWidget *parent = 0);
QVariant serverData() const;
void on_host_textChanged();
private:
- Ui::ServerEditDlgNew ui;
+ Ui::ServerEditDlg ui;
};
<ui version="4.0" >
- <class>NickEditDlgNew</class>
- <widget class="QDialog" name="NickEditDlgNew" >
+ <class>NickEditDlg</class>
+ <widget class="QDialog" name="NickEditDlg" >
<property name="geometry" >
<rect>
<x>0</x>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>NickEditDlgNew</receiver>
+ <receiver>NickEditDlg</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>NickEditDlgNew</receiver>
+ <receiver>NickEditDlg</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<ui version="4.0" >
- <class>ServerEditDlgNew</class>
- <widget class="QDialog" name="ServerEditDlgNew" >
+ <class>ServerEditDlg</class>
+ <widget class="QDialog" name="ServerEditDlg" >
<property name="geometry" >
<rect>
<x>0</x>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>ServerEditDlgNew</receiver>
+ <receiver>ServerEditDlg</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>ServerEditDlgNew</receiver>
+ <receiver>ServerEditDlg</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
# Specify additional files (e.g. for subdialogs) here!
SP_SRCS =
SP_HDRS =
-SP_FRMS = createidentitydlg.ui saveidentitiesdlg.ui networkeditdlgnew.ui nickeditdlgnew.ui servereditdlgnew.ui
+SP_FRMS = createidentitydlg.ui saveidentitiesdlg.ui networkeditdlg.ui nickeditdlg.ui servereditdlg.ui