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

diff --git a/src/qtui/settingspages/identitiessettingspage.h b/src/qtui/settingspages/identitiessettingspage.h
index 9b750e27..277cee87 100644
--- a/src/qtui/settingspages/identitiessettingspage.h
+++ b/src/qtui/settingspages/identitiessettingspage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,10 +24,11 @@
 #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;
 
@@ -37,6 +38,8 @@ class IdentitiesSettingsPage : public SettingsPage {
 public:
   IdentitiesSettingsPage(QWidget *parent = 0);
 
+  virtual inline bool needsCoreConnection() const { return true; }
+
   bool aboutToSave();
 
 public slots:
@@ -55,15 +58,9 @@ private slots:
   void on_deleteIdentity_clicked();
   void on_renameIdentity_clicked();
 
-  void on_addNick_clicked();
-  void on_deleteNick_clicked();
-  void on_renameNick_clicked();
-  void on_nickUp_clicked();
-  void on_nickDown_clicked();
-
-  void on_continueUnsecured_clicked();
-  void on_clearOrLoadKeyButton_clicked();
-  void on_clearOrLoadCertButton_clicked();
+#ifdef HAVE_SSL
+  void continueUnsecured();
+#endif
   void widgetHasChanged();
   void setWidgetStates();
 
@@ -81,15 +78,20 @@ private:
   void insertIdentity(CertIdentity *identity);
   void removeIdentity(Identity *identity);
   void renameIdentity(IdentityId id, const QString &newName);
-  void displayIdentity(CertIdentity *, bool dontsave = false);
-  void saveToIdentity(CertIdentity *);
 
+#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();
 };
 
+// ==============================
+//  Various Dialogs
+// ==============================
 class CreateIdentityDlg : public QDialog {
   Q_OBJECT
 
@@ -106,6 +108,8 @@ private:
   Ui::CreateIdentityDlg ui;
 };
 
+
+
 class SaveIdentitiesDlg : public QDialog {
   Q_OBJECT
 
@@ -121,23 +125,6 @@ private:
   int numevents, rcvevents;
 };
 
-class NickEditDlg : public QDialog {
-  Q_OBJECT
 
-public:
-  NickEditDlg(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = 0);
-
-  QString nick() const;
-
-private slots:
-  void on_nickEdit_textChanged(const QString &);
-
-private:
-  Ui::NickEditDlg ui;
-
-  QString oldNick;
-  QStringList existing;
-
-};
 
 #endif