projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes #413 - Icons in Nicklist
[quassel.git]
/
src
/
qtui
/
settingspages
/
identitiessettingspage.h
diff --git
a/src/qtui/settingspages/identitiessettingspage.h
b/src/qtui/settingspages/identitiessettingspage.h
index
9b750e2
..
7c97916
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 *
@@
-29,6
+29,11
@@
#include "ui_saveidentitiesdlg.h"
#include "ui_nickeditdlg.h"
#include "ui_saveidentitiesdlg.h"
#include "ui_nickeditdlg.h"
+#ifdef HAVE_SSL
+#include <QSslCertificate>
+#include <QSslKey>
+#endif
+
class QAbstractItemModel;
class IdentitiesSettingsPage : public SettingsPage {
class QAbstractItemModel;
class IdentitiesSettingsPage : public SettingsPage {
@@
-43,6
+48,11
@@
public slots:
void save();
void load();
void save();
void load();
+#ifdef HAVE_SSL
+protected:
+ virtual bool eventFilter(QObject *watched, QEvent *event);
+#endif
+
private slots:
void coreConnectionStateChanged(bool);
void clientIdentityCreated(IdentityId);
private slots:
void coreConnectionStateChanged(bool);
void clientIdentityCreated(IdentityId);
@@
-61,12
+71,19
@@
private slots:
void on_nickUp_clicked();
void on_nickDown_clicked();
void on_nickUp_clicked();
void on_nickDown_clicked();
+#ifdef HAVE_SSL
void on_continueUnsecured_clicked();
void on_clearOrLoadKeyButton_clicked();
void on_clearOrLoadCertButton_clicked();
void on_continueUnsecured_clicked();
void on_clearOrLoadKeyButton_clicked();
void on_clearOrLoadCertButton_clicked();
+#endif
void widgetHasChanged();
void setWidgetStates();
void widgetHasChanged();
void setWidgetStates();
+#ifdef HAVE_SSL
+ void sslDragEnterEvent(QDragEnterEvent *event);
+ void sslDropEvent(QDropEvent *event, bool isCert);
+#endif
+
private:
Ui::IdentitiesSettingsPage ui;
private:
Ui::IdentitiesSettingsPage ui;
@@
-84,8
+101,12
@@
private:
void displayIdentity(CertIdentity *, bool dontsave = false);
void saveToIdentity(CertIdentity *);
void displayIdentity(CertIdentity *, bool dontsave = false);
void saveToIdentity(CertIdentity *);
+#ifdef HAVE_SSL
+ QSslKey keyByFilename(const QString &filename);
void showKeyState(const QSslKey &key);
void showKeyState(const QSslKey &key);
+ QSslCertificate certByFilename(const QString &filename);
void showCertState(const QSslCertificate &cert);
void showCertState(const QSslCertificate &cert);
+#endif
bool testHasChanged();
};
bool testHasChanged();
};