diff --git a/apps/cmstapp/code/provisioning/prov_ed.cpp b/apps/cmstapp/code/provisioning/prov_ed.cpp index 1373b767..387fac6f 100644 --- a/apps/cmstapp/code/provisioning/prov_ed.cpp +++ b/apps/cmstapp/code/provisioning/prov_ed.cpp @@ -69,6 +69,9 @@ ProvisioningEditor::ProvisioningEditor(QWidget* parent) : QDialog(parent) group_template = new QActionGroup(this); group_template->addAction(ui.actionTemplateEduroamLong); group_template->addAction(ui.actionTemplateEduroamShort); + group_template->addAction(ui.actionTemplateeap_peap); + group_template->addAction(ui.actionTemplateeap_tls); + group_template->addAction(ui.actionTemplateeap_ttls); group_freeform = new QActionGroup(this); group_freeform->addAction(ui.actionGlobal); @@ -162,6 +165,10 @@ ProvisioningEditor::ProvisioningEditor(QWidget* parent) : QDialog(parent) menu_template = new QMenu(tr("Templates"), this);menu_template->addAction(ui.actionTemplateEduroamShort); menu_template->addAction(ui.actionTemplateEduroamLong); menu_template->addAction(ui.actionTemplateEduroamShort); + menu_template->addSeparator(); + menu_template->addAction(ui.actionTemplateeap_peap); + menu_template->addAction(ui.actionTemplateeap_tls); + menu_template->addAction(ui.actionTemplateeap_ttls); // add menus to UI menubar->addMenu(menu_global); @@ -427,14 +434,18 @@ void ProvisioningEditor::templateTriggered(QAction* act) // get the source string depending on the action if (act == ui.actionTemplateEduroamLong) source = ":/text/text/eduroam_long.txt"; else if (act == ui.actionTemplateEduroamShort) source = ":/text/text/eduroam_short.txt"; - + else if (act == ui.actionTemplateeap_peap) source = ":/text/text/eap-peap.txt"; + else if (act == ui.actionTemplateeap_tls) source = ":/text/text/eap-tls.txt"; + else if (act == ui.actionTemplateeap_ttls) source = ":/text/text/eap-ttls.txt"; + else return; + // get the text QFile file(source); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { QByteArray ba = file.readAll(); - // seed the textedit with the template - this->seedTextEdit(QString(ba)); + // append the template to the textedit + ui.plainTextEdit_main->appendPlainText(QString(ba) ); } // if @@ -592,8 +603,7 @@ void ProvisioningEditor::processFileList(const QStringList& sl_conf) // // Slot to seed the QTextEdit window with data read from file. Connected to -// fileReadCompleted signal in root helper. Also called directly from -// the templateTriggered slot. +// fileReadCompleted signal in root helper. void ProvisioningEditor::seedTextEdit(const QString& data) { // clear the text edit and seed it with the read data diff --git a/apps/cmstapp/code/provisioning/ui/provisioning_editor.ui b/apps/cmstapp/code/provisioning/ui/provisioning_editor.ui index b12e7bd8..ced33447 100644 --- a/apps/cmstapp/code/provisioning/ui/provisioning_editor.ui +++ b/apps/cmstapp/code/provisioning/ui/provisioning_editor.ui @@ -370,6 +370,30 @@ IPv6.Privacy + + + EAP-PEAP + + + EAP-PEAP + + + + + EAP-TLS + + + EAP-TLS + + + + + EAP-TTLS + + + EAP-TTLS + + diff --git a/apps/resource.h b/apps/resource.h index e05c3daf..589146d0 100755 --- a/apps/resource.h +++ b/apps/resource.h @@ -35,9 +35,9 @@ DEALINGS IN THE SOFTWARE. ///////////////////////////////// Program Values /////////////////////// // // Program Info (may be visible, but don't mark for tranalation) -#define VERSION "2016.03.30-1" +#define VERSION "2016.04.03-1" -#define RELEASE_DATE "26 January 2016" +#define RELEASE_DATE "3 April 2016" #define COPYRIGHT_DATE "2013-2016" // Program Values: diff --git a/cmst.qrc b/cmst.qrc index a3c35e3b..03f93cdf 100644 --- a/cmst.qrc +++ b/cmst.qrc @@ -1,5 +1,8 @@ + text/eap-peap.txt + text/eap-tls.txt + text/eap-ttls.txt text/changelog.txt text/icon_def.txt text/eduroam_long.txt diff --git a/text/changelog.txt b/text/changelog.txt index 658c0230..af9c5716 100644 --- a/text/changelog.txt +++ b/text/changelog.txt @@ -1,6 +1,6 @@
Connman System Tray (CMST)
Change Log
 -In Progress +2016.04.03
  • Removed unnecessary calls to managerReacan from servicePropertyChanged slot.
  • Added nicknames for display to wired and hidden wifi connections.
    • @@ -10,6 +10,7 @@
  • Added ability to tether a technology.
  • Can reposition tabs in the main dialog.
  • Revise move before/after to only be active for and show services which can actually be moved.
    • +
  • Added three templates (EAP) to provisioning editor.
2016.01.26
    diff --git a/text/eap-peap.txt b/text/eap-peap.txt new file mode 100644 index 00000000..d24e6a62 --- /dev/null +++ b/text/eap-peap.txt @@ -0,0 +1,8 @@ +[service_peap] +Type = wifi_OR_ethernet +Name = peap_ssid +EAP = peap +CACertFile = /path/to/ca.pem +Phase2 = MSCHAPV2 +Identity = yourusername + diff --git a/text/eap-tls.txt b/text/eap-tls.txt new file mode 100644 index 00000000..2d314f6d --- /dev/null +++ b/text/eap-tls.txt @@ -0,0 +1,9 @@ +[service_tls] +Type = wifi_OR_ethernet +Name = tls_ssid +EAP = tls +CACertFile = /path/to/ca.pem +ClientCertFile = /path/to/client.pem +PrivateKeyFile = /path/to/client.fsid.pem +PrivateKeyPassphraseType = fsid +Identity = yourusername diff --git a/text/eap-ttls.txt b/text/eap-ttls.txt new file mode 100644 index 00000000..f7d129f1 --- /dev/null +++ b/text/eap-ttls.txt @@ -0,0 +1,7 @@ +[service_ttls] +Type = wifi_OR_ethernet +Name = ttls_ssid +EAP = ttls +CACertFile = /path/to/ca.pem +Phase2 = MSCHAPV2 +Identity = yourusername diff --git a/text/eduroam_long.txt b/text/eduroam_long.txt index 9d129a7a..1fe55a34 100644 --- a/text/eduroam_long.txt +++ b/text/eduroam_long.txt @@ -1,5 +1,5 @@ [service_eduroam] -Type=wifi +Type=wifi_OR_ethernet Name=eduroam EAP=peap CACertFile=/etc/ssl/certs/ca-certificates.crt diff --git a/text/eduroam_short.txt b/text/eduroam_short.txt index 768b7b40..2b5a0fd6 100644 --- a/text/eduroam_short.txt +++ b/text/eduroam_short.txt @@ -1,5 +1,5 @@ [service_eduroam] -Type = wifi +Type = wifi_OR_ethernet Name = eduroam EAP = peap Phase2 = MSCHAPV2