[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [networkmanagement] /: Try (again) to fix WPA2 config dialog.
From: Lamarque V. Souza <lamarque () kde ! org>
Date: 2011-12-13 0:14:50
Message-ID: 20111213001450.89FA3A60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 747cbddcc729facf24f45656154a42599c6b4103 by Lamarque V. Souza.
Committed on 13/12/2011 at 01:12.
Pushed by lvsouza into branch 'master'.
Try (again) to fix WPA2 config dialog.
BUG: 288831
M +2 -0 libs/ui/security/eapmethod.h
M +11 -0 libs/ui/security/eapmethodleap.cpp
M +2 -0 libs/ui/security/eapmethodleap.h
M +11 -0 libs/ui/security/eapmethodsimple.cpp
M +3 -0 libs/ui/security/eapmethodsimple.h
M +19 -5 libs/ui/security/eapmethodstack.cpp
M +2 -0 libs/ui/security/eapmethodstack.h
M +12 -0 libs/ui/security/peapwidget.cpp
M +2 -0 libs/ui/security/peapwidget.h
M +10 -0 libs/ui/security/securitydynamicwep.cpp
M +2 -0 libs/ui/security/securitydynamicwep.h
M +11 -0 libs/ui/security/tlswidget.cpp
M +2 -0 libs/ui/security/tlswidget.h
M +12 -0 libs/ui/security/ttlswidget.cpp
M +2 -0 libs/ui/security/ttlswidget.h
M +10 -0 libs/ui/security/wpaeapwidget.cpp
M +2 -0 libs/ui/security/wpaeapwidget.h
M +1 -1 plasma_nm_version.h
http://commits.kde.org/networkmanagement/747cbddcc729facf24f45656154a42599c6b4103
diff --git a/libs/ui/security/eapmethod.h b/libs/ui/security/eapmethod.h
index 4e2790a..e7669c8 100644
--- a/libs/ui/security/eapmethod.h
+++ b/libs/ui/security/eapmethod.h
@@ -46,6 +46,8 @@ public:
virtual void writeConfig() = 0;
virtual void readSecrets() = 0;
virtual void setShowPasswords(bool b = true) = 0;
+ virtual void syncWidgetData(const QPair<QString, QString> &widgetData) = 0;
+ virtual QPair<QString, QString> widgetData() = 0;
protected:
EapMethod(EapMethodPrivate &dd, Knm::Connection * connection, QWidget * parent = 0);
EapMethodPrivate * d_ptr;
diff --git a/libs/ui/security/eapmethodleap.cpp b/libs/ui/security/eapmethodleap.cpp
index 0ffb9c4..3677dc2 100644
--- a/libs/ui/security/eapmethodleap.cpp
+++ b/libs/ui/security/eapmethodleap.cpp
@@ -105,4 +105,15 @@ void EapMethodLeap::passwordStorageChanged(int type)
}
}
+void EapMethodLeap::syncWidgetData(const QPair<QString, QString> &widgetData)
+{
+ leUsername->setText(widgetData.first);
+ lePassword->setText(widgetData.second);
+}
+
+QPair<QString, QString> EapMethodLeap::widgetData()
+{
+ return QPair<QString, QString>(leUsername->text(), lePassword->text());
+}
+
// vim: sw=4 sts=4 et tw=100
diff --git a/libs/ui/security/eapmethodleap.h b/libs/ui/security/eapmethodleap.h
index 6dd971c..238f52b 100644
--- a/libs/ui/security/eapmethodleap.h
+++ b/libs/ui/security/eapmethodleap.h
@@ -36,6 +36,8 @@ public:
void readConfig();
void writeConfig();
void readSecrets();
+ void syncWidgetData(const QPair<QString, QString> &widgetData);
+ QPair<QString, QString> widgetData();
public Q_SLOTS:
void setShowPasswords(bool b = true);
private Q_SLOTS:
diff --git a/libs/ui/security/eapmethodsimple.cpp b/libs/ui/security/eapmethodsimple.cpp
index 2ff7296..b3a5750 100644
--- a/libs/ui/security/eapmethodsimple.cpp
+++ b/libs/ui/security/eapmethodsimple.cpp
@@ -119,4 +119,15 @@ void EapMethodSimple::readSecrets()
}
}
+void EapMethodSimple::syncWidgetData(const QPair<QString, QString> &widgetData)
+{
+ leUserName->setText(widgetData.first);
+ lePassword->setText(widgetData.second);
+}
+
+QPair<QString, QString> EapMethodSimple::widgetData()
+{
+ return QPair<QString, QString>(leUserName->text(), lePassword->text());
+}
+
// vim: sw=4 sts=4 et tw=100
diff --git a/libs/ui/security/eapmethodsimple.h b/libs/ui/security/eapmethodsimple.h
index 352a7cb..88ea2f5 100644
--- a/libs/ui/security/eapmethodsimple.h
+++ b/libs/ui/security/eapmethodsimple.h
@@ -37,6 +37,9 @@ public:
void writeConfig();
void readSecrets();
void setShowPasswords(bool on = true);
+ void syncWidgetData(const QPair<QString, QString> &widgetData);
+ QPair<QString, QString> widgetData();
+
private Q_SLOTS:
void passwordStorageChanged(int);
private:
diff --git a/libs/ui/security/eapmethodstack.cpp b/libs/ui/security/eapmethodstack.cpp
index 14a15ae..3034246 100644
--- a/libs/ui/security/eapmethodstack.cpp
+++ b/libs/ui/security/eapmethodstack.cpp
@@ -79,15 +79,14 @@ void EapMethodStack::setCurrentEapMethod(int key)
/* Triggered when the user changes the EAP method using the cboEapMethod combo box. */
void EapMethodStack::setCurrentEapMethodInternal(int index)
{
- // Save old eap method's data into this connection's settings.
- qobject_cast<EapMethod *>(eapMethods->currentWidget())->writeConfig();
+ // Get old eap method's data.
+ QPair<QString, QString> pair = qobject_cast<EapMethod *>(eapMethods->currentWidget())->widgetData();
// Change to the chosen epa method.
eapMethods->setCurrentIndex(index);
- // Load this connection's setting into the chosen epa method.
- qobject_cast<EapMethod *>(eapMethods->widget(index))->readConfig();
- qobject_cast<EapMethod *>(eapMethods->widget(index))->readSecrets();
+ // Load data into the chosen epa method.
+ qobject_cast<EapMethod *>(eapMethods->widget(index))->syncWidgetData(pair);
}
EapMethod * EapMethodStack::currentEapMethod() const
@@ -131,4 +130,19 @@ void EapMethodStack::setShowPasswords(bool on)
}
}
+void EapMethodStack::syncWidgetData(const QPair<QString, QString> &widgetData)
+{
+ if (eapMethods->count()) {
+ qobject_cast<EapMethod *>(eapMethods->currentWidget())->syncWidgetData(widgetData);
+ }
+}
+
+QPair<QString, QString> EapMethodStack::widgetData()
+{
+ if (eapMethods->count()) {
+ return qobject_cast<EapMethod *>(eapMethods->currentWidget())->widgetData();
+ }
+ return QPair<QString, QString>();
+}
+
// vim: sw=4 sts=4 et tw=100
diff --git a/libs/ui/security/eapmethodstack.h b/libs/ui/security/eapmethodstack.h
index b888913..67d48df 100644
--- a/libs/ui/security/eapmethodstack.h
+++ b/libs/ui/security/eapmethodstack.h
@@ -55,6 +55,8 @@ public:
virtual void writeConfig();
virtual void readSecrets();
void setShowPasswords(bool on);
+ void syncWidgetData(const QPair<QString, QString> &widgetData);
+ QPair<QString, QString> widgetData();
private Q_SLOTS:
void setCurrentEapMethodInternal(int);
protected:
diff --git a/libs/ui/security/peapwidget.cpp b/libs/ui/security/peapwidget.cpp
index 491b9ea..b28a1b4 100644
--- a/libs/ui/security/peapwidget.cpp
+++ b/libs/ui/security/peapwidget.cpp
@@ -203,4 +203,16 @@ void PeapWidget::showServersEditor()
}
}
+void PeapWidget::syncWidgetData(const QPair<QString, QString> &widgetData)
+{
+ Q_D(PeapWidget);
+ d->innerAuth->syncWidgetData(widgetData);
+}
+
+QPair<QString, QString> PeapWidget::widgetData()
+{
+ Q_D(PeapWidget);
+ return d->innerAuth->widgetData();
+}
+
// vim: sw=4 sts=4 et tw=100
diff --git a/libs/ui/security/peapwidget.h b/libs/ui/security/peapwidget.h
index f54c0b9..377070d 100644
--- a/libs/ui/security/peapwidget.h
+++ b/libs/ui/security/peapwidget.h
@@ -40,6 +40,8 @@ public:
void readConfig();
void writeConfig();
void readSecrets();
+ void syncWidgetData(const QPair<QString, QString> &widgetData);
+ QPair<QString, QString> widgetData();
private Q_SLOTS:
void showAltSubjectMatchesEditor();
void showServersEditor();
diff --git a/libs/ui/security/securitydynamicwep.cpp b/libs/ui/security/securitydynamicwep.cpp
index 2280895..a91bc2c 100644
--- a/libs/ui/security/securitydynamicwep.cpp
+++ b/libs/ui/security/securitydynamicwep.cpp
@@ -57,4 +57,14 @@ void SecurityDynamicWep::writeConfig()
d->settingSecurity->setGroup(group);
}
+void SecurityDynamicWep::syncWidgetData(const QPair<QString, QString> &widgetData)
+{
+ Q_UNUSED(widgetData);
+}
+
+QPair<QString, QString> SecurityDynamicWep::widgetData()
+{
+ return QPair<QString, QString>();
+}
+
// vim: sw=4 sts=4 et tw=100
diff --git a/libs/ui/security/securitydynamicwep.h b/libs/ui/security/securitydynamicwep.h
index f0eb4e9..d8a6731 100644
--- a/libs/ui/security/securitydynamicwep.h
+++ b/libs/ui/security/securitydynamicwep.h
@@ -31,6 +31,8 @@ public:
explicit SecurityDynamicWep(Knm::Connection* connection, QWidget * parent = 0);
virtual ~SecurityDynamicWep();
void writeConfig();
+ void syncWidgetData(const QPair<QString, QString> &widgetData);
+ QPair<QString, QString> widgetData();
};
#endif // SECURITYDYNAMICWEP_H
diff --git a/libs/ui/security/tlswidget.cpp b/libs/ui/security/tlswidget.cpp
index d66b957..c2321af 100644
--- a/libs/ui/security/tlswidget.cpp
+++ b/libs/ui/security/tlswidget.cpp
@@ -304,4 +304,15 @@ void TlsWidget::showServersEditor()
}
}
+void TlsWidget::syncWidgetData(const QPair<QString, QString> &widgetData)
+{
+ kurPrivateKey->setUrl(widgetData.first);
+ lePrivateKeyPassword->setText(widgetData.second);
+}
+
+QPair<QString, QString> TlsWidget::widgetData()
+{
+ return QPair<QString, QString>(kurPrivateKey->text(), lePrivateKeyPassword->text());
+}
+
// vim: sw=4 sts=4 et tw=100
diff --git a/libs/ui/security/tlswidget.h b/libs/ui/security/tlswidget.h
index 640ab1a..50bd058 100644
--- a/libs/ui/security/tlswidget.h
+++ b/libs/ui/security/tlswidget.h
@@ -48,6 +48,8 @@ public:
void readConfig();
void writeConfig();
void readSecrets();
+ void syncWidgetData(const QPair<QString, QString> &widgetData);
+ QPair<QString, QString> widgetData();
public Q_SLOTS:
void setShowPasswords(bool b = true);
private Q_SLOTS:
diff --git a/libs/ui/security/ttlswidget.cpp b/libs/ui/security/ttlswidget.cpp
index 085f7e5..0ce137b 100644
--- a/libs/ui/security/ttlswidget.cpp
+++ b/libs/ui/security/ttlswidget.cpp
@@ -199,4 +199,16 @@ void TtlsWidget::showServersEditor()
}
}
+void TtlsWidget::syncWidgetData(const QPair<QString, QString> &widgetData)
+{
+ Q_D(TtlsWidget);
+ d->innerAuth->syncWidgetData(widgetData);
+}
+
+QPair<QString, QString> TtlsWidget::widgetData()
+{
+ Q_D(TtlsWidget);
+ return d->innerAuth->widgetData();
+}
+
// vim: sw=4 sts=4 et tw=100
diff --git a/libs/ui/security/ttlswidget.h b/libs/ui/security/ttlswidget.h
index 2a2a267..eb5c84f 100644
--- a/libs/ui/security/ttlswidget.h
+++ b/libs/ui/security/ttlswidget.h
@@ -40,6 +40,8 @@ public:
void readConfig();
void writeConfig();
void readSecrets();
+ void syncWidgetData(const QPair<QString, QString> &widgetData);
+ QPair<QString, QString> widgetData();
private Q_SLOTS:
void showAltSubjectMatchesEditor();
void showServersEditor();
diff --git a/libs/ui/security/wpaeapwidget.cpp b/libs/ui/security/wpaeapwidget.cpp
index 3032675..7142aaa 100644
--- a/libs/ui/security/wpaeapwidget.cpp
+++ b/libs/ui/security/wpaeapwidget.cpp
@@ -31,4 +31,14 @@ WpaEapWidget::~WpaEapWidget()
}
+void WpaEapWidget::syncWidgetData(const QPair<QString, QString> &widgetData)
+{
+ Q_UNUSED(widgetData);
+}
+
+QPair<QString, QString> WpaEapWidget::widgetData()
+{
+ return QPair<QString, QString>();
+}
+
// vim: sw=4 sts=4 et tw=100
diff --git a/libs/ui/security/wpaeapwidget.h b/libs/ui/security/wpaeapwidget.h
index 7b97700..5cf38e1 100644
--- a/libs/ui/security/wpaeapwidget.h
+++ b/libs/ui/security/wpaeapwidget.h
@@ -29,6 +29,8 @@ Q_OBJECT
public:
explicit WpaEapWidget(Knm::Connection* connection, QWidget * parent = 0);
virtual ~WpaEapWidget();
+ void syncWidgetData(const QPair<QString, QString> &widgetData);
+ QPair<QString, QString> widgetData();
};
#endif // WPAEAPWIDGET_H
diff --git a/plasma_nm_version.h b/plasma_nm_version.h
index dff948d..85faf40 100644
--- a/plasma_nm_version.h
+++ b/plasma_nm_version.h
@@ -1,4 +1,4 @@
#ifndef PLASMA_NM_VERSION_H
#define PLASMA_NM_VERSION_H
-static const char * plasmaNmVersion = "0.9.1_rc1 (master 20111210)";
+static const char * plasmaNmVersion = "0.9.1_rc1 (master 20111212)";
#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic