projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better height for nick combobox and style button
[quassel.git]
/
src
/
qtui
/
settingspages
/
identitiessettingspage.h
diff --git
a/src/qtui/settingspages/identitiessettingspage.h
b/src/qtui/settingspages/identitiessettingspage.h
index
37c5ec2
..
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 *
@@
-24,15
+24,11
@@
#include "clientidentity.h"
#include "settingspage.h"
#include "clientidentity.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_nickeditdlg.h"
-
-#ifdef HAVE_SSL
-#include <QSslCertificate>
-#include <QSslKey>
-#endif
class QAbstractItemModel;
class QAbstractItemModel;
@@
-42,17
+38,14
@@
class IdentitiesSettingsPage : public SettingsPage {
public:
IdentitiesSettingsPage(QWidget *parent = 0);
public:
IdentitiesSettingsPage(QWidget *parent = 0);
+ virtual inline bool needsCoreConnection() const { return true; }
+
bool aboutToSave();
public slots:
void save();
void load();
bool aboutToSave();
public slots:
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);
@@
-65,25
+58,12
@@
private slots:
void on_deleteIdentity_clicked();
void on_renameIdentity_clicked();
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();
-
#ifdef HAVE_SSL
#ifdef HAVE_SSL
- void on_continueUnsecured_clicked();
- void on_clearOrLoadKeyButton_clicked();
- void on_clearOrLoadCertButton_clicked();
+ void continueUnsecured();
#endif
void widgetHasChanged();
void setWidgetStates();
#endif
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;
@@
-98,8
+78,6
@@
private:
void insertIdentity(CertIdentity *identity);
void removeIdentity(Identity *identity);
void renameIdentity(IdentityId id, const QString &newName);
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);
#ifdef HAVE_SSL
QSslKey keyByFilename(const QString &filename);
@@
-111,6
+89,9
@@
private:
bool testHasChanged();
};
bool testHasChanged();
};
+// ==============================
+// Various Dialogs
+// ==============================
class CreateIdentityDlg : public QDialog {
Q_OBJECT
class CreateIdentityDlg : public QDialog {
Q_OBJECT
@@
-127,6
+108,8
@@
private:
Ui::CreateIdentityDlg ui;
};
Ui::CreateIdentityDlg ui;
};
+
+
class SaveIdentitiesDlg : public QDialog {
Q_OBJECT
class SaveIdentitiesDlg : public QDialog {
Q_OBJECT
@@
-142,23
+125,6
@@
private:
int numevents, rcvevents;
};
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
#endif