Skip to content

Commit 4db7c2b

Browse files
andrew-bibbandrew-bibb
committed
added 3 templates to provisioning editor
1 parent da2d79c commit 4db7c2b

File tree

10 files changed

+72
-10
lines changed

10 files changed

+72
-10
lines changed

‎apps/cmstapp/code/provisioning/prov_ed.cpp‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ ProvisioningEditor::ProvisioningEditor(QWidget* parent) : QDialog(parent)
6969
group_template = new QActionGroup(this);
7070
group_template->addAction(ui.actionTemplateEduroamLong);
7171
group_template->addAction(ui.actionTemplateEduroamShort);
72+
group_template->addAction(ui.actionTemplateeap_peap);
73+
group_template->addAction(ui.actionTemplateeap_tls);
74+
group_template->addAction(ui.actionTemplateeap_ttls);
7275

7376
group_freeform = new QActionGroup(this);
7477
group_freeform->addAction(ui.actionGlobal);
@@ -162,6 +165,10 @@ ProvisioningEditor::ProvisioningEditor(QWidget* parent) : QDialog(parent)
162165
menu_template = new QMenu(tr("Templates"), this);menu_template->addAction(ui.actionTemplateEduroamShort);
163166
menu_template->addAction(ui.actionTemplateEduroamLong);
164167
menu_template->addAction(ui.actionTemplateEduroamShort);
168+
menu_template->addSeparator();
169+
menu_template->addAction(ui.actionTemplateeap_peap);
170+
menu_template->addAction(ui.actionTemplateeap_tls);
171+
menu_template->addAction(ui.actionTemplateeap_ttls);
165172

166173
// add menus to UI
167174
menubar->addMenu(menu_global);
@@ -427,14 +434,18 @@ void ProvisioningEditor::templateTriggered(QAction* act)
427434
// get the source string depending on the action
428435
if (act == ui.actionTemplateEduroamLong) source = ":/text/text/eduroam_long.txt";
429436
else if (act == ui.actionTemplateEduroamShort) source = ":/text/text/eduroam_short.txt";
430-
437+
else if (act == ui.actionTemplateeap_peap) source = ":/text/text/eap-peap.txt";
438+
else if (act == ui.actionTemplateeap_tls) source = ":/text/text/eap-tls.txt";
439+
else if (act == ui.actionTemplateeap_ttls) source = ":/text/text/eap-ttls.txt";
440+
else return;
441+
431442
// get the text
432443
QFile file(source);
433444
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
434445
QByteArray ba = file.readAll();
435446

436-
// seed the textedit with the template
437-
this->seedTextEdit(QString(ba));
447+
// append the template to the textedit
448+
ui.plainTextEdit_main->appendPlainText(QString(ba) );
438449
} // if
439450

440451

@@ -592,8 +603,7 @@ void ProvisioningEditor::processFileList(const QStringList& sl_conf)
592603

593604
//
594605
// Slot to seed the QTextEdit window with data read from file. Connected to
595-
// fileReadCompleted signal in root helper. Also called directly from
596-
// the templateTriggered slot.
606+
// fileReadCompleted signal in root helper.
597607
void ProvisioningEditor::seedTextEdit(const QString& data)
598608
{
599609
// clear the text edit and seed it with the read data

‎apps/cmstapp/code/provisioning/ui/provisioning_editor.ui‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,30 @@
370370
<string>IPv6.Privacy</string>
371371
</property>
372372
</action>
373+
<action name="actionTemplateeap_peap">
374+
<property name="text">
375+
<string>EAP-PEAP</string>
376+
</property>
377+
<property name="toolTip">
378+
<string>EAP-PEAP</string>
379+
</property>
380+
</action>
381+
<action name="actionTemplateeap_tls">
382+
<property name="text">
383+
<string>EAP-TLS</string>
384+
</property>
385+
<property name="toolTip">
386+
<string>EAP-TLS</string>
387+
</property>
388+
</action>
389+
<action name="actionTemplateeap_ttls">
390+
<property name="text">
391+
<string>EAP-TTLS</string>
392+
</property>
393+
<property name="toolTip">
394+
<string>EAP-TTLS</string>
395+
</property>
396+
</action>
373397
</widget>
374398
<resources/>
375399
<connections>

‎apps/resource.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ DEALINGS IN THE SOFTWARE.
3535
///////////////////////////////// Program Values ///////////////////////
3636
//
3737
// Program Info (may be visible, but don't mark for tranalation)
38-
#define VERSION "2016.03.30-1"
38+
#define VERSION "2016.04.03-1"
3939

40-
#define RELEASE_DATE "26 January 2016"
40+
#define RELEASE_DATE "3 April 2016"
4141
#define COPYRIGHT_DATE "2013-2016"
4242

4343
// Program Values:

‎cmst.qrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<RCC>
22
<qresource prefix="text">
3+
<file>text/eap-peap.txt</file>
4+
<file>text/eap-tls.txt</file>
5+
<file>text/eap-ttls.txt</file>
36
<file>text/changelog.txt</file>
47
<file>text/icon_def.txt</file>
58
<file>text/eduroam_long.txt</file>

‎text/changelog.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<b><center>Connman System Tray (CMST)</center></b>
22
<b><center>Change Log</center></b>
3-
<b>In Progress</b>
3+
<b>2016.04.03</b>
44
<ul>
55
<li>Removed unnecessary calls to managerReacan from servicePropertyChanged slot.<li>
66
<li>Added nicknames for display to wired and hidden wifi connections.</li>
@@ -10,6 +10,7 @@
1010
<li>Added ability to tether a technology.</li>
1111
<li>Can reposition tabs in the main dialog.</li>
1212
<li>Revise move before/after to only be active for and show services which can actually be moved.</li>
13+
<li>Added three templates (EAP) to provisioning editor.</li>
1314
</ul>
1415
<b>2016.01.26</b>
1516
<ul>

‎text/eap-peap.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[service_peap]
2+
Type = wifi_OR_ethernet
3+
Name = peap_ssid
4+
EAP = peap
5+
CACertFile = /path/to/ca.pem
6+
Phase2 = MSCHAPV2
7+
Identity = yourusername
8+

‎text/eap-tls.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[service_tls]
2+
Type = wifi_OR_ethernet
3+
Name = tls_ssid
4+
EAP = tls
5+
CACertFile = /path/to/ca.pem
6+
ClientCertFile = /path/to/client.pem
7+
PrivateKeyFile = /path/to/client.fsid.pem
8+
PrivateKeyPassphraseType = fsid
9+
Identity = yourusername

‎text/eap-ttls.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[service_ttls]
2+
Type = wifi_OR_ethernet
3+
Name = ttls_ssid
4+
EAP = ttls
5+
CACertFile = /path/to/ca.pem
6+
Phase2 = MSCHAPV2
7+
Identity = yourusername

‎text/eduroam_long.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[service_eduroam]
2-
Type=wifi
2+
Type=wifi_OR_ethernet
33
Name=eduroam
44
EAP=peap
55
CACertFile=/etc/ssl/certs/ca-certificates.crt

‎text/eduroam_short.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[service_eduroam]
2-
Type = wifi
2+
Type = wifi_OR_ethernet
33
Name = eduroam
44
EAP = peap
55
Phase2 = MSCHAPV2

0 commit comments

Comments
 (0)