diff --git a/apps/cmstapp/code/control_box/ui/controlbox.ui b/apps/cmstapp/code/control_box/ui/controlbox.ui
index 6327504d..ae9b1684 100644
--- a/apps/cmstapp/code/control_box/ui/controlbox.ui
+++ b/apps/cmstapp/code/control_box/ui/controlbox.ui
@@ -6,8 +6,8 @@
0
0
- 689
- 697
+ 749
+ 644
@@ -58,7 +58,7 @@
0
0
- 647
+ 707
466
@@ -484,7 +484,7 @@
0
0
- 647
+ 707
385
@@ -875,7 +875,7 @@
0
0
- 647
+ 707
466
@@ -915,7 +915,7 @@
0
0
- 603
+ 663
156
@@ -974,7 +974,7 @@
0
0
- 603
+ 663
156
@@ -1041,9 +1041,9 @@
0
- -228
- 633
- 738
+ 0
+ 693
+ 740
@@ -1089,25 +1089,173 @@
- -
-
+
-
+
+
+ true
+
- <html><head/><body><p>Preferences for the system tray are in this box.</p></body></html>
+ <html><head/><body><p>If checked the system notification daemon will popup a notify message when a significant connman related event is received.</p><p>Notifications can be handled by the System Tray Icon, or by a Notify daemon if one is installed. Both can not be active at the same time.</p></body></html>
- System Tray
+ Notifications
-
+
+
-
+
+
+
+ 1
+ 0
+
+
+
+ Server Status
+
+
+ true
+
+
+
-
-
+
+
+ true
+
+
+ Notification Daemon
+
+
+
+
+
+
+ -
+
+
+ <html><head/><body><p>Preferences for the interface are in this box.</p></body></html>
+
+
+ Interface
+
+
+
-
+
+
+ true
+
- <html><head/><body><p>If checked an icon will not be displayed in the system tray. </p></body></html>
+ <html><head/><body><p>Normally counters are cumulative and will retain the connect time and the TX and RX counts between boots. </p><p>When this box is checked the counters will reset to zero every time CMST is started, and if CMST is running everytime a Connman service is started. </p></body></html>
- Hide Tray Icon
+ Reset Counters
+
+
+
+ -
+
+
+ <html><head/><body><p>When checked additional controls for advanced users are displayed.</p></body></html>
+
+
+ Advanced Controls
+
+
+ false
+
+
+
+ -
+
+
+ true
+
+
+ <html><head/><body><p>If checked the Start Up Options in the right hand pane will be enabled. Start up options set in this pane will be read and used next time the program starts. Start up options are also available as command line switches and an option provided on the command line will take precedence over an option set in the right hand pane. The options in this pane are provided as a convienence to avoid the necessity of editing a systemd service or other start up file. </p><p>Settings are stored in<span style=" font-family:'Courier New,courier';">: ~</span><span style=" font-family:'Courier New,courier'; font-weight:600;">/.config/cmst/cmst.conf </span><span style=" font-family:'Courier New,courier';"><br/>This is a standard ini type text file.</span></p></body></html>
+
+
+ Enable Start Options from GUI (right hand pane)
+
+
+ true
+ -
+
+
+ <html><head/><body><p>If checked the state of the GUI will be restored from settings saved on disk. Settings include the geometry and position of the dialog and the current tab. </p><p>These settings will be used at next boot to restore the user interface to the way it was at shutdown.</p><p>The settings file is: ~<span style=" font-weight:600;">/.config/cmst/cmst.conf </span><br/>This is a standard ini type text file.</p></body></html>
+
+
+ Retain State
+
+
+
+ -
+
+
+ <html><head/><body><p>If checked the display of tooltips will be enabled for the interface widgets.</p><p>Tooltips are the small popups that appear when you hover the mouse pointer over an area of the interface. </p></body></html>
+
+
+ Enable ToolTips (Interface)
+
+
+
+ -
+
+
-
+
+
+
+ 1
+ 0
+
+
+
+ <html><head/><body><p>Color in #RGB format to colorize the internal icons with.</p></body></html>
+
+
+ true
+
+
+
+ -
+
+
+ <html><head/><body><p>Open the color selection dialog. </p></body></html>
+
+
+ ...
+
+
+ Qt::UpArrow
+
+
+
+ -
+
+
+ <html><head/><body><p>Internal icons can be colorized. You may select a color using the button to the left, or you may type in the #RGB color yourself.</p><p>If you type the entry it must have leading # sign. Example: #22aa44 </p></body></html>
+
+
+ Colorize
+
+
+
+
+
+
+
+
+ -
+
+
+ <html><head/><body><p>Preferences for the system tray are in this box.</p></body></html>
+
+
+ System Tray
+
+
-
@@ -1121,6 +1269,16 @@
+ -
+
+
+ <html><head/><body><p>If checked an icon will not be displayed in the system tray. </p></body></html>
+
+
+ Hide Tray Icon
+
+
+
-
@@ -1137,86 +1295,71 @@
- -
+
-
true
- <html><head/><body><p>These entries control various options for CMST at program start. </p><p>All of these options are available from the command line, and if a command line option is provided it will take precedence over these settings.</p></body></html>
+ <html><head/><body><p>These entries control various options for CMST at program start. Changing or setting these will only take effect at the next program start. </p><p>All of these options are available from the command line, and if a command line option is provided it will take precedence over these settings.</p></body></html>
- Start Options
+ Start Up Options
-
-
-
+
-
+
false
- <html><head/><body><p>Specify the frequency in seconds between counter updates (default is 10 seconds). </p></body></html>
+ <html><head/><body><p>Specify the background color as a hex number in the format: RRGGBB.</p></body></html>
QAbstractSpinBox::PlusMinus
-
- 5
+
+ true
- 86400
-
-
- 10
+ 16777215
-
- 10
+
+ 16
- -
-
+
-
+
+
+ false
+
- <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">-d</span><span style=" font-family:'Courier New,courier';"> or </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--disable-tray-icon</span></pre></body></html>
-<html><head/><body><p>Disable the system tray icon.</p><p>May be needed for system trays not compliant with the Freedesktop.org system tray specification.</p></body></html>
+ <html><head/><body><p>Icon theme to use. For this theme to be used it must be installed on your system. If the theme is not installed, or if you spell the name wrong CMST will fall back to using its internal icon set.</p><p>If this box is blank CMST will try and use the system wide icon theme (if one is defined).</p></body></html>
-
- Disable Tray Icon
+
+ true
- -
-
-
- false
-
-
- <html><head/><body><p>Disabled because currently Connman will accept this option but will do nothing with it.</p></body></html>
-
+
-
+
- <html><head/><body><p>Specify the amount of data in KB that must be transmitted before the counters update (default is 1024 KB).</p><p>Connman will accept this entry, but according to a comment in the Connman code the actual feature still needs to be implemented and the selection is therefore disabled.</p></body></html>
+ <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">Command Line Option: </span><span style=" font-family:'monospace'; font-weight:600;">-c</span><span style=" font-family:'monospace';"> or </span><span style=" font-family:'monospace'; font-weight:600;">--enable-counters</span></pre><p>Enable Connman RX and TX counters. Counters are experimental in Connman and enabling them will write a large amount of data to the system logs.</p><p>Counters are turned off by default, and is a change from the way it was originally. Up to and including version 2017.09.19 counters were enabled by default. All versions subsequent to that counters are disabled by default.</p></body></html>
- Counter Update KB
+ Enable Counters
- -
-
-
- false
-
+
-
+
- <html><head/><body><p>Specify the wait time in seconds before starting the system tray icon (default is 0 seconds).</p></body></html>
-
-
- QAbstractSpinBox::PlusMinus
-
-
- 1
+ <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">-d</span><span style=" font-family:'Courier New,courier';"> or </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--disable-tray-icon</span></pre></body></html>
+<html><head/><body><p>Disable the system tray icon.</p><p>May be needed for system trays not compliant with the Freedesktop.org system tray specification.</p></body></html>
-
- 60
+
+ Disable Tray Icon
@@ -1259,16 +1402,17 @@
- -
-
+
-
+
- <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">-i</span><span style=" font-family:'Courier New,courier';"> or </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--icon-theme</span></pre><p>Use an icon theme from your system. You may specify the theme in the box at the right, or if the box is left blank CMST will try and use the system wide icon theme (if one is defined).</p></body></html>
+ <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--fake-transparency</span></pre></body></html>
+<html><head/><body><p>Used to work around a QT bug where system tray icons display with white or black backgrounds instead of being transparent.</p><p>You can specify the icon background color here. Format is a hex number in the form RRGGBB. If the spedified color matches the tray background we've effectively created fake transparency. </p></body></html>
- Use Icon Theme
+ Fake Transparency
@@ -1283,230 +1427,80 @@
- -
-
-
- <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">Command Line Option: </span><span style=" font-family:'monospace'; font-weight:600;">-c</span><span style=" font-family:'monospace';"> or </span><span style=" font-family:'monospace'; font-weight:600;">--enable-counters</span></pre><p>Enable Connman RX and TX counters. Counters are experimental in Connman and enabling them will write a large amount of data to the system logs.</p><p>Counters are turned off by default, and is a change from the way it was originally. Up to and including version 2017.09.19 counters were enabled by default. All versions subsequent to that counters are disabled by default.</p></body></html>
-
-
- Enable Counters
-
-
-
- -
-
-
-
-
-
- <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--counter-update-rate</span></pre></body></html>
-<html><head/><body><p>Specify the frequency in seconds between counter updates (default is 10 seconds). </p></body></html>
-
-
- Counter Update Rate
-
-
-
- -
-
+
-
+
- <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--fake-transparency</span></pre></body></html>
-<html><head/><body><p>Used to work around a QT bug where system tray icons display with white or black backgrounds instead of being transparent.</p><p>You can specify the icon background color here. Format is a hex number in the form RRGGBB. If the spedified color matches the tray background we've effectively created fake transparency. </p></body></html>
+ <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">-i</span><span style=" font-family:'Courier New,courier';"> or </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--icon-theme</span></pre><p>Use an icon theme from your system. You may specify the theme in the box at the right, or if the box is left blank CMST will try and use the system wide icon theme (if one is defined).</p></body></html>
- Fake Transparency
+ Use Icon Theme
- -
-
+
-
+
false
- <html><head/><body><p>Specify the background color as a hex number in the format: RRGGBB.</p></body></html>
+ <html><head/><body><p>Specify the frequency in seconds between counter updates (default is 10 seconds). </p></body></html>
QAbstractSpinBox::PlusMinus
-
- true
+
+ 5
- 16777215
+ 86400
-
- 16
+
+ 10
+
+
+ 10
- -
-
+
-
+
false
+
+ <html><head/><body><p>Disabled because currently Connman will accept this option but will do nothing with it.</p></body></html>
+
- <html><head/><body><p>Icon theme to use. For this theme to be used it must be installed on your system. If the theme is not installed, or if you spell the name wrong CMST will fall back to using its internal icon set.</p><p>If this box is blank CMST will try and use the system wide icon theme (if one is defined).</p></body></html>
+ <html><head/><body><p>Specify the amount of data in KB that must be transmitted before the counters update (default is 1024 KB).</p><p>Connman will accept this entry, but according to a comment in the Connman code the actual feature still needs to be implemented and the selection is therefore disabled.</p></body></html>
-
- true
+
+ Counter Update KB
+
+
+
+ -
+
+
+ <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">-M</span><span style=" font-family:'Courier New,courier';"> or </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--disable-minimized</span></pre><p>Disable the minimize button. Use when you want to have the window manager have sole control of minimizing the interface.</p></body></html>
+
+
+ Disable Minimized
- -
-
+
-
+
- <html><head/><body><p>Programs or processes to execute after various events occur.</p><p>If the program or process requires command line arguments provide them here just as if you were typing at a command line. Example:</p><p><span style=" font-weight:600;">/path/to/program arg1 arg2 arg3</span></p><p>Two events are checked. <span style=" font-weight:600;">Before Connecting</span> events are called after the Connect button is pressed in either the Wireless or VPN tabs. The program or process in the Execute box will only be executed prior to making a connection for the service shown in the Service box. It will not be called when connecting to any other service.</p><p>The program or process in the <span style=" font-weight:600;">After Connecting</span> box will be called after Connman enters the ready or online state.</p><p><br/></p></body></html>
+ <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">-n</span><span style=" font-family:'Courier New,courier';"> or </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--disable-vpn</span></pre><p>Disable VPN. This will hide the VPN tab and will also skip trying to make a connection to connman-vpn. The later is useful if your Connman was built with the --disable-vpn feature.</p></body></html>
-
- External Programs
+
+ Disable VPN
-
-
-
-
-
- <html><head/><body><p>This area is to specify a program or process to run after a wifi or vpn service button is pressed, but before the connect method is sent to ConnMan. This is mainly used to modify a .cmst.config file which seems useful to modify certain short lived entries for openConnect vpn connections.</p><p>The program or process in the <span style=" font-weight:600;">Execute</span> box will only be executed prior to making a connection for the single service shown in the <span style=" font-weight:600;">Service</span> box. It will not be called when connecting to any other service. If a .cmst.config file is to be modified a check must in the <span style=" font-weight:600;">Modify Service File</span> box and the path and name of the file to be modified must be provided.</p><p>To modify a .cmst.config file CMST will read stdout of the program or process being called. Program output should be individual lines in KEY=VALUE format. If KEY exists in the .cmst.config file it will be replaced by the new VALUE. If KEY does not exist it will be appended. </p></body></html>
-
-
- Before Connecting
-
-
-
-
-
-
-
- 1
- 0
-
-
-
-
- -
-
-
- <html><head/><body><p>Enter the program or process to be executed before Connman initiates a connection to the service listed in the box above. If left blank no program or process will be executed.</p></body></html>
-
-
- Execute:
-
-
- lineEdit_beforeconnect
-
-
-
- -
-
-
-
- 1
- 0
-
-
-
-
- -
-
-
- Specify the service you are connecting to where you want a program or process to execute prior to initiating the connection.
-
-
- Service:
-
-
- comboBox_beforeconnectserviceslist
-
-
-
- -
-
-
-
-
-
- <html><head/><body><p>If checked the configuration file shown below will be modified by whatever output the program provides.</p></body></html>
-
-
- Modify Service File
-
-
-
- -
-
-
-
-
-
- Service configuration file to be modified by the program.
-
-
- FIle:
-
-
- comboBox_beforeconnectservicefile
-
-
-
- -
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Enter the program or process to be executed after Connman enters the <span style=" font-weight:600;">Ready</span> or <span style=" font-weight:600;">Online</span> state. If left blank no program or process will be executed.</p></body></html>
-
-
- After Connecting
-
-
- lineEdit_afterconnect
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
@@ -1561,186 +1555,196 @@ p, li { white-space: pre-wrap; }
- -
-
-
- <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">-n</span><span style=" font-family:'Courier New,courier';"> or </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--disable-vpn</span></pre><p>Disable VPN. This will hide the VPN tab and will also skip trying to make a connection to connman-vpn. The later is useful if your Connman was built with the --disable-vpn feature.</p></body></html>
-
-
- Disable VPN
-
-
-
- -
-
-
- <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">-M</span><span style=" font-family:'Courier New,courier';"> or </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--disable-minimized</span></pre><p>Disable the minimize button. Use when you want to have the window manager have sole control of minimizing the interface.</p></body></html>
-
-
- Disable Minimized
-
-
-
-
-
-
- -
-
-
- true
-
-
- <html><head/><body><p>If checked the system notification daemon will popup a notify message when a significant connman related event is received.</p><p>Notifications can be handled by the System Tray Icon, or by a Notify daemon if one is installed. Both can not be active at the same time.</p></body></html>
-
-
- Notifications
-
-
-
-
-
-
-
- 1
- 0
-
-
-
- Server Status
-
-
- true
-
-
-
- -
-
-
- true
-
-
- Notification Daemon
-
-
-
-
-
-
- -
-
-
- <html><head/><body><p>Preferences for the interface are in this box.</p></body></html>
-
-
- Interface
-
-
-
-
-
+
-
+
- true
-
-
- <html><head/><body><p>Normally counters are cumulative and will retain the connect time and the TX and RX counts between boots. </p><p>When this box is checked the counters will reset to zero every time CMST is started, and if CMST is running everytime a Connman service is started. </p></body></html>
-
-
- Reset Counters
-
-
-
- -
-
-
- <html><head/><body><p>When checked additional controls for advanced users are displayed.</p></body></html>
-
-
- Advanced Controls
-
-
false
-
-
- -
-
-
- true
-
- <html><head/><body><p>If checked the Start Options set here will be read and used next time the program starts. </p><p>Settings are stored in<span style=" font-family:'Courier New,courier';">: ~</span><span style=" font-family:'Courier New,courier'; font-weight:600;">/.config/cmst/cmst.conf </span><span style=" font-family:'Courier New,courier';"><br/>This is a standard ini type text file.</span></p></body></html>
-
-
- Use Start Options
+ <html><head/><body><p>Specify the wait time in seconds before starting the system tray icon (default is 0 seconds).</p></body></html>
-
- true
+
+ QAbstractSpinBox::PlusMinus
-
-
- -
-
-
- <html><head/><body><p>If checked the state of the GUI will be restored from settings saved on disk. Settings include the geometry and position of the dialog and the current tab. </p><p>These settings will be used at next boot to restore the user interface to the way it was at shutdown.</p><p>The settings file is: ~<span style=" font-weight:600;">/.config/cmst/cmst.conf </span><br/>This is a standard ini type text file.</p></body></html>
+
+ 1
-
- Retain State
+
+ 60
- -
-
+
-
+
+
+
+
- <html><head/><body><p>If checked the display of tooltips will be enabled for the interface widgets.</p><p>Tooltips are the small popups that appear when you hover the mouse pointer over an area of the interface. </p></body></html>
+ <html><head/><body><pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Command Line Option: </span><span style=" font-family:'Courier New,courier'; font-weight:600;">--counter-update-rate</span></pre></body></html>
+<html><head/><body><p>Specify the frequency in seconds between counter updates (default is 10 seconds). </p></body></html>
- Enable ToolTips (Interface)
+ Counter Update Rate
- -
-
-
-
-
-
-
- 1
- 0
-
-
+
+
+
+ -
+
+
-
+
+
+ <html><head/><body><p>Programs or processes to execute after various events occur.</p><p>If the program or process requires command line arguments provide them here just as if you were typing at a command line. Example:</p><p><span style=" font-weight:600;">/path/to/program arg1 arg2 arg3</span></p><p>Two events are checked. <span style=" font-weight:600;">Before Connecting</span> events are called after the Connect button is pressed in either the Wireless or VPN tabs. The program or process in the Execute box will only be executed prior to making a connection for the service shown in the Service box. It will not be called when connecting to any other service.</p><p>The program or process in the <span style=" font-weight:600;">After Connecting</span> box will be called after Connman enters the ready or online state.</p><p><br/></p></body></html>
+
+
+ External Programs
+
+
+
-
+
- <html><head/><body><p>Color in #RGB format to colorize the internal icons with.</p></body></html>
+ <html><head/><body><p>This area is to specify a program or process to run after a wifi or vpn service button is pressed, but before the connect method is sent to ConnMan. This is mainly used to modify a .cmst.config file which seems useful to modify certain short lived entries for openConnect vpn connections.</p><p>The program or process in the <span style=" font-weight:600;">Execute</span> box will only be executed prior to making a connection for the single service shown in the <span style=" font-weight:600;">Service</span> box. It will not be called when connecting to any other service. If a .cmst.config file is to be modified a check must in the <span style=" font-weight:600;">Modify Service File</span> box and the path and name of the file to be modified must be provided.</p><p>To modify a .cmst.config file CMST will read stdout of the program or process being called. Program output should be individual lines in KEY=VALUE format. If KEY exists in the .cmst.config file it will be replaced by the new VALUE. If KEY does not exist it will be appended. </p></body></html>
-
- true
+
+ Before Connecting
+
+
-
+
+
+
+ 1
+ 0
+
+
+
+
+ -
+
+
+ <html><head/><body><p>Enter the program or process to be executed before Connman initiates a connection to the service listed in the box above. If left blank no program or process will be executed.</p></body></html>
+
+
+ Execute:
+
+
+ lineEdit_beforeconnect
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+
+ -
+
+
+ Specify the service you are connecting to where you want a program or process to execute prior to initiating the connection.
+
+
+ Service:
+
+
+ comboBox_beforeconnectserviceslist
+
+
+
+ -
+
+
-
+
+
+ <html><head/><body><p>If checked the configuration file shown below will be modified by whatever output the program provides.</p></body></html>
+
+
+ Modify Service File
+
+
+
+ -
+
+
-
+
+
+ Service configuration file to be modified by the program.
+
+
+ FIle:
+
+
+ comboBox_beforeconnectservicefile
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
- -
-
+
-
+
- <html><head/><body><p>Open the color selection dialog. </p></body></html>
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Enter the program or process to be executed after Connman enters the <span style=" font-weight:600;">Ready</span> or <span style=" font-weight:600;">Online</span> state. If left blank no program or process will be executed.</p></body></html>
- ...
+ After Connecting
-
- Qt::UpArrow
+
+ lineEdit_afterconnect
- -
-
-
- <html><head/><body><p>Internal icons can be colorized. You may select a color using the button to the left, or you may type in the #RGB color yourself.</p><p>If you type the entry it must have leading # sign. Example: #22aa44 </p></body></html>
-
-
- Colorize
+
-
+
+
+ true
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
-
-
-
+
+
+
@@ -1842,7 +1846,7 @@ p, li { white-space: pre-wrap; }
0
0
- 537
+ 597
466
@@ -2007,22 +2011,6 @@ p, li { white-space: pre-wrap; }
-
- checkBox_advanced
- clicked(bool)
- groupBox_process
- setVisible(bool)
-
-
- 103
- -59
-
-
- 610
- 444
-
-
-
checkBox_advanced
clicked(bool)
@@ -2295,5 +2283,21 @@ p, li { white-space: pre-wrap; }
+
+ checkBox_advanced
+ clicked(bool)
+ groupBox_process
+ setVisible(bool)
+
+
+ 103
+ -59
+
+
+ 610
+ 444
+
+
+
diff --git a/apps/resource.h b/apps/resource.h
index 11f38c22..96ef5c9d 100755
--- a/apps/resource.h
+++ b/apps/resource.h
@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
///////////////////////////////// Program Values ///////////////////////
//
// Program Info (may be visible, but don't mark for tranalation)
-#define VERSION "2020.04.19-1"
+#define VERSION "2020.04.27-1"
#define RELEASE_DATE "12 April 2020"
#define COPYRIGHT_DATE "2013-2020"
diff --git a/text/changelog.txt b/text/changelog.txt
index ac200a70..2bd4f414 100644
--- a/text/changelog.txt
+++ b/text/changelog.txt
@@ -3,6 +3,8 @@
In Progress
- No longer extract key files from OpenVPN .opvn configurations. Not needed.
+- Fixed UI where Advanced options were in Start Options group box.
+- Work on Prefereneces tab to make start options clearer (issue #210).
:
2020.04.12