X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentitiessettingspage.h;h=3674c345ac88541246108e1270b0b4ff2f5711cd;hp=9b750e277be240ff896af0ed49982be66d18f0dd;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=ac21cc48d22f0cf58a98b74754fa94564a8e3f45

diff --git a/src/qtui/settingspages/identitiessettingspage.h b/src/qtui/settingspages/identitiessettingspage.h
index 9b750e27..3674c345 100644
--- a/src/qtui/settingspages/identitiessettingspage.h
+++ b/src/qtui/settingspages/identitiessettingspage.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -15,129 +15,114 @@
  *   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 IDENTITIESSETTINGSPAGE_H
-#define IDENTITIESSETTINGSPAGE_H
+#pragma once
 
 #include "clientidentity.h"
 #include "settingspage.h"
 
+#include "identityeditwidget.h"
+
 #include "ui_identitiessettingspage.h"
 #include "ui_createidentitydlg.h"
 #include "ui_saveidentitiesdlg.h"
-#include "ui_nickeditdlg.h"
 
 class QAbstractItemModel;
 
-class IdentitiesSettingsPage : public SettingsPage {
-  Q_OBJECT
+class IdentitiesSettingsPage : public SettingsPage
+{
+    Q_OBJECT
 
 public:
-  IdentitiesSettingsPage(QWidget *parent = 0);
+    IdentitiesSettingsPage(QWidget *parent = nullptr);
+
+    inline bool needsCoreConnection() const override { return true; }
 
-  bool aboutToSave();
+    bool aboutToSave() override;
 
 public slots:
-  void save();
-  void load();
+    void save() final override;
+    void load() final override;
 
 private slots:
-  void coreConnectionStateChanged(bool);
-  void clientIdentityCreated(IdentityId);
-  void clientIdentityUpdated();
-  void clientIdentityRemoved(IdentityId);
-
-  void on_identityList_currentIndexChanged(int index);
+    void coreConnectionStateChanged(bool);
+    void clientIdentityCreated(IdentityId);
+    void clientIdentityUpdated();
+    void clientIdentityRemoved(IdentityId);
 
-  void on_addIdentity_clicked();
-  void on_deleteIdentity_clicked();
-  void on_renameIdentity_clicked();
+    void on_identityList_currentIndexChanged(int index);
 
-  void on_addNick_clicked();
-  void on_deleteNick_clicked();
-  void on_renameNick_clicked();
-  void on_nickUp_clicked();
-  void on_nickDown_clicked();
+    void on_addIdentity_clicked();
+    void on_deleteIdentity_clicked();
+    void on_renameIdentity_clicked();
 
-  void on_continueUnsecured_clicked();
-  void on_clearOrLoadKeyButton_clicked();
-  void on_clearOrLoadCertButton_clicked();
-  void widgetHasChanged();
-  void setWidgetStates();
+#ifdef HAVE_SSL
+    void continueUnsecured();
+#endif
+    void widgetHasChanged();
+    void setWidgetStates();
 
 private:
-  Ui::IdentitiesSettingsPage ui;
+    Ui::IdentitiesSettingsPage ui;
 
-  QHash<IdentityId, CertIdentity *> identities;
-  IdentityId currentId;
+    QHash<IdentityId, CertIdentity *> identities;
+    IdentityId currentId;
 
-  QList<IdentityId> changedIdentities;  // for setting the widget changed state
-  QList<IdentityId> deletedIdentities;
+    QList<IdentityId> changedIdentities; // for setting the widget changed state
+    QList<IdentityId> deletedIdentities;
 
-  bool _editSsl;
+    bool _editSsl;
 
-  void insertIdentity(CertIdentity *identity);
-  void removeIdentity(Identity *identity);
-  void renameIdentity(IdentityId id, const QString &newName);
-  void displayIdentity(CertIdentity *, bool dontsave = false);
-  void saveToIdentity(CertIdentity *);
+    void insertIdentity(CertIdentity *identity);
+    void removeIdentity(Identity *identity);
+    void renameIdentity(IdentityId id, const QString &newName);
 
-  void showKeyState(const QSslKey &key);
-  void showCertState(const QSslCertificate &cert);
+#ifdef HAVE_SSL
+    QSslKey keyByFilename(const QString &filename);
+    void showKeyState(const QSslKey &key);
+    QSslCertificate certByFilename(const QString &filename);
+    void showCertState(const QSslCertificate &cert);
+#endif
 
-  bool testHasChanged();
+    bool testHasChanged();
 };
 
-class CreateIdentityDlg : public QDialog {
-  Q_OBJECT
+
+// ==============================
+//  Various Dialogs
+// ==============================
+class CreateIdentityDlg : public QDialog
+{
+    Q_OBJECT
 
 public:
-  CreateIdentityDlg(QAbstractItemModel *model, QWidget *parent = 0);
+    CreateIdentityDlg(QAbstractItemModel *model, QWidget *parent = nullptr);
 
-  QString identityName() const;
-  IdentityId duplicateId() const;
+    QString identityName() const;
+    IdentityId duplicateId() const;
 
 private slots:
-  void on_identityName_textChanged(const QString &text);
+    void on_identityName_textChanged(const QString &text);
 
 private:
-  Ui::CreateIdentityDlg ui;
+    Ui::CreateIdentityDlg ui;
 };
 
-class SaveIdentitiesDlg : public QDialog {
-  Q_OBJECT
-
-public:
-  SaveIdentitiesDlg(const QList<CertIdentity *> &toCreate, const QList<CertIdentity *> &toUpdate, const QList<IdentityId> &toRemove, QWidget *parent = 0);
-
-private slots:
-  void clientEvent();
-
-private:
-  Ui::SaveIdentitiesDlg ui;
-
-  int numevents, rcvevents;
-};
 
-class NickEditDlg : public QDialog {
-  Q_OBJECT
+class SaveIdentitiesDlg : public QDialog
+{
+    Q_OBJECT
 
 public:
-  NickEditDlg(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = 0);
-
-  QString nick() const;
+    SaveIdentitiesDlg(const QList<CertIdentity *> &toCreate, const QList<CertIdentity *> &toUpdate, const QList<IdentityId> &toRemove, QWidget *parent = nullptr);
 
 private slots:
-  void on_nickEdit_textChanged(const QString &);
+    void clientEvent();
 
 private:
-  Ui::NickEditDlg ui;
-
-  QString oldNick;
-  QStringList existing;
+    Ui::SaveIdentitiesDlg ui;
 
+    int numevents, rcvevents;
 };
-
-#endif