projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing build on non-mac systems. ooopsi.
[quassel.git]
/
src
/
qtui
/
settingspages
/
identitiessettingspage.h
diff --git
a/src/qtui/settingspages/identitiessettingspage.h
b/src/qtui/settingspages/identitiessettingspage.h
index
b4ebadf
..
277cee8
100644
(file)
--- a/
src/qtui/settingspages/identitiessettingspage.h
+++ b/
src/qtui/settingspages/identitiessettingspage.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * 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,122
+18,113
@@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef
_IDENTITIESSETTINGSPAGE_H_
-#define
_IDENTITIESSETTINGSPAGE_H_
+#ifndef
IDENTITIESSETTINGSPAGE_H
+#define
IDENTITIESSETTINGSPAGE_H
-#include "identity.h"
+#include "
client
identity.h"
#include "settingspage.h"
#include "settingspage.h"
+#include "identityeditwidget.h"
+
#include "ui_identitiessettingspage.h"
#include "ui_createidentitydlg.h"
#include "ui_saveidentitiesdlg.h"
#include "ui_identitiessettingspage.h"
#include "ui_createidentitydlg.h"
#include "ui_saveidentitiesdlg.h"
-#include "ui_nickeditdlgnew.h"
class QAbstractItemModel;
class IdentitiesSettingsPage : public SettingsPage {
Q_OBJECT
class QAbstractItemModel;
class IdentitiesSettingsPage : public SettingsPage {
Q_OBJECT
- public:
- IdentitiesSettingsPage(QWidget *parent = 0);
-
- bool aboutToSave();
-
- public slots:
- void save();
- void load();
-
- private slots:
- void coreConnectionStateChanged(bool);
- void clientIdentityCreated(IdentityId);
- void clientIdentityUpdated();
- void clientIdentityRemoved(IdentityId);
+public:
+ IdentitiesSettingsPage(QWidget *parent = 0);
- void on_identityList_currentIndexChanged(int index);
+ virtual inline bool needsCoreConnection() const { return true; }
- void on_addIdentity_clicked();
- void on_deleteIdentity_clicked();
- void on_renameIdentity_clicked();
+ bool aboutToSave();
- void on_addNick_clicked();
- void on_deleteNick_clicked();
- void on_renameNick_clicked();
- void on_nickUp_clicked();
- void on_nickDown_clicked();
+public slots:
+ void save();
+ void load();
- void widgetHasChanged();
- void setWidgetStates();
+private slots:
+ void coreConnectionStateChanged(bool);
+ void clientIdentityCreated(IdentityId);
+ void clientIdentityUpdated();
+ void clientIdentityRemoved(IdentityId);
- private:
- Ui::IdentitiesSettingsPage ui;
+ void on_identityList_currentIndexChanged(int index);
- QHash<IdentityId, Identity *> identities;
- IdentityId currentId;
+ void on_addIdentity_clicked();
+ void on_deleteIdentity_clicked();
+ void on_renameIdentity_clicked();
- QList<IdentityId> changedIdentities; // for setting the widget changed state
- QList<IdentityId> deletedIdentities;
+#ifdef HAVE_SSL
+ void continueUnsecured();
+#endif
+ void widgetHasChanged();
+ void setWidgetStates();
- void insertIdentity(Identity *identity);
- void removeIdentity(Identity *identity);
- void renameIdentity(IdentityId id, const QString &newName);
- void displayIdentity(Identity *, bool dontsave = false);
- void saveToIdentity(Identity *);
+private:
+ Ui::IdentitiesSettingsPage ui;
-
bool testHasChanged()
;
-
}
;
+
QHash<IdentityId, CertIdentity *> identities
;
+
IdentityId currentId
;
-class CreateIdentityDlg : public QDialog {
- Q
_OBJECT
+ QList<IdentityId> changedIdentities; // for setting the widget changed state
+ Q
List<IdentityId> deletedIdentities;
- public:
- CreateIdentityDlg(QAbstractItemModel *model, QWidget *parent = 0);
+ bool _editSsl;
- QString identityName() const;
- IdentityId duplicateId() const;
+ void insertIdentity(CertIdentity *identity);
+ void removeIdentity(Identity *identity);
+ void renameIdentity(IdentityId id, const QString &newName);
- private slots:
- void on_identityName_textChanged(const QString &text);
+#ifdef HAVE_SSL
+ QSslKey keyByFilename(const QString &filename);
+ void showKeyState(const QSslKey &key);
+ QSslCertificate certByFilename(const QString &filename);
+ void showCertState(const QSslCertificate &cert);
+#endif
- private:
- Ui::CreateIdentityDlg ui;
+ bool testHasChanged();
};
};
-class SaveIdentitiesDlg : public QDialog {
+// ==============================
+// Various Dialogs
+// ==============================
+class CreateIdentityDlg : public QDialog {
Q_OBJECT
Q_OBJECT
-
public:
-
SaveIdentitiesDlg(const QList<Identity *> &toCreate, const QList<Identity *> &toUpdate, const QList<IdentityId> &toRemove
, QWidget *parent = 0);
+public:
+
CreateIdentityDlg(QAbstractItemModel *model
, QWidget *parent = 0);
- private slots:
-
void clientEvent()
;
+ QString identityName() const;
+
IdentityId duplicateId() const
;
-
private
:
-
Ui::SaveIdentitiesDlg ui
;
+
private slots
:
+
void on_identityName_textChanged(const QString &text)
;
- //QList<Identity *> toCreate, toUpdate;
- //QList<IdentityId> toRemove;
+private:
+ Ui::CreateIdentityDlg ui;
+};
- int numevents, rcvevents;
-};
-class
NickEditDlgNew
: public QDialog {
+class
SaveIdentitiesDlg
: public QDialog {
Q_OBJECT
Q_OBJECT
-
public:
-
NickEditDlgNew(const QString &oldnick, const QStringList &existing = QStringList()
, QWidget *parent = 0);
+public:
+
SaveIdentitiesDlg(const QList<CertIdentity *> &toCreate, const QList<CertIdentity *> &toUpdate, const QList<IdentityId> &toRemove
, QWidget *parent = 0);
- QString nick() const;
+private slots:
+ void clientEvent();
-
private slots
:
-
void on_nickEdit_textChanged(const QString &)
;
+
private
:
+
Ui::SaveIdentitiesDlg ui
;
- private:
-
Ui::NickEditDlgNew ui
;
+ int numevents, rcvevents;
+
}
;
- QString oldNick;
- QStringList existing;
-};
#endif
#endif