Git commit 2429a37568a61ef900ce5de3ff6ea9079eaa86f8 by Will Stephenson. Committed on 23/05/2013 at 17:10. Pushed by wstephens into branch 'refactor-8021x'. Import ui classes for polymorphic eap methods M +6 -0 lib/editor/CMakeLists.txt A +116 -0 lib/editor/ui/eapmethodleap.ui A +214 -0 lib/editor/ui/eapmethodpeap.ui A +89 -0 lib/editor/ui/eapmethodsimple.ui A +74 -0 lib/editor/ui/eapmethodstack.ui A +260 -0 lib/editor/ui/eapmethodtls.ui A +172 -0 lib/editor/ui/eapmethodttls.ui http://commits.kde.org/plasma-nm/2429a37568a61ef900ce5de3ff6ea9079eaa86f8 diff --git a/lib/editor/CMakeLists.txt b/lib/editor/CMakeLists.txt index b806dc9..beba0c8 100644 --- a/lib/editor/CMakeLists.txt +++ b/lib/editor/CMakeLists.txt @@ -50,6 +50,12 @@ kde4_add_ui_files(plasmanm_libeditor_SRCS ui/bridge.ui ui/connectiondetaileditor.ui ui/connectionwidget.ui + ui/eapmethodleap.ui + ui/eapmethodpeap.ui + ui/eapmethodsimple.ui + ui/eapmethodstack.ui + ui/eapmethodtls.ui + ui/eapmethodttls.ui ) = kde4_add_library(plasmanm-editor SHARED ${plasmanm_libeditor_SRCS}) diff --git a/lib/editor/ui/eapmethodleap.ui b/lib/editor/ui/eapmethodleap.ui new file mode 100644 index 0000000..681b002 --- /dev/null +++ b/lib/editor/ui/eapmethodleap.ui @@ -0,0 +1,116 @@ + + + EapMethodLeap + + + + 0 + 0 + 269 + 111 + + + + + 0 + + + + + + + &Username: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + leUsername + + + + + + + Username on this network + + + + + + + &Password: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + lePassword + + + + + + + + + Password on this network + + + true + + + + + + + + Store + + + + + Always Ask + + + + + Not Required + + + + + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + KComboBox + QComboBox +
kcombobox.h
+
+ + KLineEdit + QLineEdit +
klineedit.h
+
+
+ + +
diff --git a/lib/editor/ui/eapmethodpeap.ui b/lib/editor/ui/eapmethodpeap.ui new file mode 100644 index 0000000..1700a21 --- /dev/null +++ b/lib/editor/ui/eapmethodpeap.ui @@ -0,0 +1,214 @@ + + + EapMethodPeap + + + + 0 + 0 + 400 + 351 + + + + + + + + + &Anonymous Identity: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + leAnonIdentity + + + + + + + + + + CA Certi&ficate: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + kurCaCert + + + + + + + + + + Use Syste&m CA Certs + + + + + + + PEAP &Version: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + cboPeapVersion + + + + + + + + Automatic= + + + + + Version 0 + + + + + Version 1 + + + + + + + + Subject Match: + + + + + + + Only connect to servers whose certificate subject matches = this. For the syntax see the wpa_supplicant documentation. + + + + + + + Alternative Subject Matches: + + + + + + + + + Only connect to servers whose certificate contains at le= ast one of the entries. For the syntax see the wpa_supplicant documentation= . Use ',' to separate entries. + + + + + + + ... + + + + + + + + + Connect to these Servers: + + + + + + + + + Only connect to these servers. Use ',' to separate entri= es. + + + + + + + ... + + + + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + KComboBox + QComboBox +
kcombobox.h
+
+ + KLineEdit + QLineEdit +
klineedit.h
+
+ + KPushButton + QPushButton +
kpushbutton.h
+
+ + KUrlRequester + QFrame +
kurlrequester.h
+
+
+ + leAnonIdentity + kurCaCert + cboPeapVersion + + + + + chkUseSystemCaCerts + toggled(bool) + kurCaCert + setDisabled(bool) + + + 222 + 83 + + + 221 + 54 + + + + +
diff --git a/lib/editor/ui/eapmethodsimple.ui b/lib/editor/ui/eapmethodsimp= le.ui new file mode 100644 index 0000000..a592995 --- /dev/null +++ b/lib/editor/ui/eapmethodsimple.ui @@ -0,0 +1,89 @@ + + + EapMethodSimple + + + + 0 + 0 + 376 + 59 + + + + + + + &Username: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + leUserName + + + + + + + + + + &Password: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + lePassword + + + + + + + + + true + + + + + + + + Store + + + + + Always Ask + + + + + Not Required + + + + + + + + + + + KComboBox + QComboBox +
kcombobox.h
+
+ + KLineEdit + QLineEdit +
klineedit.h
+
+
+ + +
diff --git a/lib/editor/ui/eapmethodstack.ui b/lib/editor/ui/eapmethodstack= .ui new file mode 100644 index 0000000..3452ac4 --- /dev/null +++ b/lib/editor/ui/eapmethodstack.ui @@ -0,0 +1,74 @@ + + + EapMethodStack + + + + 0 + 0 + 222 + 42 + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + &Authentication: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + cboEapMethod + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + KComboBox + QComboBox +
kcombobox.h
+
+
+ + +
diff --git a/lib/editor/ui/eapmethodtls.ui b/lib/editor/ui/eapmethodtls.ui new file mode 100644 index 0000000..fea2563 --- /dev/null +++ b/lib/editor/ui/eapmethodtls.ui @@ -0,0 +1,260 @@ + + + EapMethodTls + + + + 0 + 0 + 388 + 434 + + + + + + + + + &Identity: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + leIdentity + + + + + + + + + + &User Certificate: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + kurClientCert + + + + + + + If your private key file is in PKCS12 format select it her= e and in the 'Private Key' field below. + + + + + + + CA Certi&ficate: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + kurCaCert + + + + + + + + + + Use Syste&m CA Certs + + + + + + + Private &Key: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + kurPrivateKey + + + + + + + If your private key file is in PKCS12 format select it her= e and in the 'User Certificate' field above. + + + + + + + Private Key Pass&word: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + lePrivateKeyPassword + + + + + + + + + true + + + + + + + + Store + + + + + Always Ask + + + + + Not Required + + + + + + + + + + Subject Match: + + + + + + + Only connect to servers whose certificate's subject matche= s this. For the syntax see the wpa_supplicant documentation. + + + + + + + Alternative Subject Matches: + + + + + + + + + Only connect to servers whose certificate's alternative = subject contains at least one of the entries. For the syntax see the wpa_su= pplicant documentation. Use ',' to separate entries. + + + + + + + ... + + + + + + + + + Connect to these Servers: + + + + + + + + + Only connect to these servers. Use ',' to separate entri= es. + + + + + + + ... + + + + + + + + + + + Qt::Vertical + + + + 20 + 1 + + + + + + + + + KComboBox + QComboBox +
kcombobox.h
+
+ + KLineEdit + QLineEdit +
klineedit.h
+
+ + KPushButton + QPushButton +
kpushbutton.h
+
+ + KUrlRequester + QFrame +
kurlrequester.h
+
+
+ + + + chkUseSystemCaCerts + toggled(bool) + kurCaCert + setDisabled(bool) + + + 221 + 110 + + + 224 + 84 + + + + +
diff --git a/lib/editor/ui/eapmethodttls.ui b/lib/editor/ui/eapmethodttls.ui new file mode 100644 index 0000000..2a202a7 --- /dev/null +++ b/lib/editor/ui/eapmethodttls.ui @@ -0,0 +1,172 @@ + + + EapMethodTtls + + + + 0 + 0 + 400 + 337 + + + + + + + + + &Anonymous Identity: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + leAnonIdentity + + + + + + + + + + CA Certi&ficate: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + kurCaCert + + + + + + + + + + Use Syste&m CA Certs + + + + + + + Subject Match: + + + + + + + Only connect to servers whose certificate's subject matche= s this. For the syntax see the wpa_supplicant documentation. + + + + + + + Alternative Subject Matches: + + + + + + + + + Only connect to servers whose certificate's alternative = subject contains at least one of the entries. For the syntax see the wpa_su= pplicant documentation. Use ',' to separate entries. + + + + + + + ... + + + + + + + + + Connect to these Servers: + + + + + + + + + Only connect to these servers. Use ',' to separate entri= es. + + + + + + + ... + + + + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + KLineEdit + QLineEdit +
klineedit.h
+
+ + KPushButton + QPushButton +
kpushbutton.h
+
+ + KUrlRequester + QFrame +
kurlrequester.h
+
+
+ + + + chkUseSystemCaCerts + toggled(bool) + kurCaCert + setDisabled(bool) + + + 220 + 74 + + + 224 + 59 + + + + +