Skip to content

Commit 9e59885

Browse files
andrew-bibbandrew-bibb
committed
touch up for 14.07.01 release
1 parent ddce803 commit 9e59885

File tree

3 files changed

+77
-13
lines changed

3 files changed

+77
-13
lines changed

‎code/control_box/ui/controlbox.ui‎

Lines changed: 70 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@
800800
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked the GUI will be restored from settings saved on disk. Settings include the geometry of the dialog and the state of various check boxes, such as this one. &lt;/p&gt;&lt;p&gt;These settings will be used at next boot to restore the user interface to the way it was at shutdown.&lt;/p&gt;&lt;p style='white-space:pre'&gt;The settings file is: &lt;span style=&quot; font-weight:600;&quot;&gt;${HOME}/.config/cmst/cmst.conf &lt;/span&gt;&lt;br&gt;This is a standard ini type text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
801801
</property>
802802
<property name="text">
803-
<string>&amp;Retain Settings</string>
803+
<string>Retain Settings</string>
804804
</property>
805805
</widget>
806806
</item>
@@ -813,7 +813,7 @@
813813
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked the display of tooltips will be enabled for the interface widgets.&lt;/p&gt;&lt;p&gt;Tooltips are the small popups that appear when you hover the mouse pointer over an area of the interface. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
814814
</property>
815815
<property name="text">
816-
<string>Enable ToolTips (&amp;Interface)</string>
816+
<string>Enable ToolTips (Interface)</string>
817817
</property>
818818
</widget>
819819
</item>
@@ -829,14 +829,14 @@
829829
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally counters are cummulative and will retain the connect time and the TX and RX counts between boots. &lt;/p&gt;&lt;p&gt;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. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
830830
</property>
831831
<property name="text">
832-
<string>Reset C&amp;ounters</string>
832+
<string>Reset Counters</string>
833833
</property>
834834
</widget>
835835
</item>
836836
</layout>
837837
</widget>
838838
</item>
839-
<item row="4" column="0">
839+
<item row="5" column="0">
840840
<spacer name="verticalSpacer_4">
841841
<property name="orientation">
842842
<enum>Qt::Vertical</enum>
@@ -870,7 +870,7 @@
870870
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked an icon will not be displayed in the system tray. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
871871
</property>
872872
<property name="text">
873-
<string>Hide &amp;Tray Icon</string>
873+
<string>Hide Tray Icon</string>
874874
</property>
875875
</widget>
876876
</item>
@@ -883,7 +883,7 @@
883883
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked the system tray icon will popup a status message when you hover the mouse over it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
884884
</property>
885885
<property name="text">
886-
<string>&amp;Enable System Tray Popups</string>
886+
<string>Enable System Tray Popups</string>
887887
</property>
888888
<property name="checked">
889889
<bool>true</bool>
@@ -899,10 +899,35 @@
899899
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable notifications from the systemtray&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
900900
</property>
901901
<property name="whatsThis">
902-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked the system tray will popup a notify message when a significant connman related event is received.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
902+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked the system tray will popup a notify message when a significant connman related event is received.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
903+
</property>
904+
<property name="text">
905+
<string>Enable System Tray Notifications</string>
906+
</property>
907+
</widget>
908+
</item>
909+
</layout>
910+
</widget>
911+
</item>
912+
<item row="4" column="0">
913+
<widget class="QGroupBox" name="groupBox_notfications">
914+
<property name="title">
915+
<string>Notifications</string>
916+
</property>
917+
<layout class="QVBoxLayout" name="verticalLayout_12">
918+
<item>
919+
<widget class="QCheckBox" name="checkBox_notifydaemon">
920+
<property name="enabled">
921+
<bool>false</bool>
922+
</property>
923+
<property name="toolTip">
924+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable notifications from the notify system daemon&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
925+
</property>
926+
<property name="whatsThis">
927+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked the system notify daemon will popup a notify message when a significant connman related event is received.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
903928
</property>
904929
<property name="text">
905-
<string>Enable System Tray &amp;Notifications</string>
930+
<string>Notification Daemon</string>
906931
</property>
907932
</widget>
908933
</item>
@@ -1111,6 +1136,39 @@
11111136
</property>
11121137
</action>
11131138
</widget>
1139+
<tabstops>
1140+
<tabstop>checkBox_devicesoff</tabstop>
1141+
<tabstop>tableWidget_technologies</tabstop>
1142+
<tabstop>tableWidget_services</tabstop>
1143+
<tabstop>pushButton_movebefore</tabstop>
1144+
<tabstop>pushButton_moveafter</tabstop>
1145+
<tabstop>checkBox_hidecnxn</tabstop>
1146+
<tabstop>pushButton_scanWifi</tabstop>
1147+
<tabstop>comboBox_service</tabstop>
1148+
<tabstop>pushButton_connect</tabstop>
1149+
<tabstop>pushButton_disconnect</tabstop>
1150+
<tabstop>pushButton_remove</tabstop>
1151+
<tabstop>tableWidget_wifi</tabstop>
1152+
<tabstop>scrollArea_home_counter</tabstop>
1153+
<tabstop>checkBox_notifydaemon</tabstop>
1154+
<tabstop>scrollArea_roaming_counter</tabstop>
1155+
<tabstop>checkBox_retainsettings</tabstop>
1156+
<tabstop>checkBox_enableinterfacetooltips</tabstop>
1157+
<tabstop>checkBox_resetcounters</tabstop>
1158+
<tabstop>checkBox_hideIcon</tabstop>
1159+
<tabstop>checkBox_enablesystemtraytooltips</tabstop>
1160+
<tabstop>checkBox_enablesystemtraynotification</tabstop>
1161+
<tabstop>pushButton_aboutCMST</tabstop>
1162+
<tabstop>pushButton_aboutIconSet</tabstop>
1163+
<tabstop>pushButton_aboutQT</tabstop>
1164+
<tabstop>pushButton_license</tabstop>
1165+
<tabstop>pushButton_change_log</tabstop>
1166+
<tabstop>scrollArea</tabstop>
1167+
<tabstop>toolButton_whatsthis</tabstop>
1168+
<tabstop>pushButton_exit</tabstop>
1169+
<tabstop>pushButton_minimize</tabstop>
1170+
<tabstop>tabWidget</tabstop>
1171+
</tabstops>
11141172
<resources>
11151173
<include location="../../../cmst.qrc"/>
11161174
</resources>
@@ -1154,12 +1212,12 @@
11541212
<slot>setDisabled(bool)</slot>
11551213
<hints>
11561214
<hint type="sourcelabel">
1157-
<x>102</x>
1158-
<y>181</y>
1215+
<x>125</x>
1216+
<y>211</y>
11591217
</hint>
11601218
<hint type="destinationlabel">
1161-
<x>105</x>
1162-
<y>203</y>
1219+
<x>128</x>
1220+
<y>237</y>
11631221
</hint>
11641222
</hints>
11651223
</connection>

‎code/resource.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ DEALINGS IN THE SOFTWARE.
3434

3535
///////////////////////////////// Program Values ///////////////////////
3636
// Program Info
37-
#define VERSION "14.06.29-1"
37+
#define VERSION "14.07.01-1"
3838
#define RELEASE_DATE "14 June 2014"
3939
#define COPYRIGHT_DATE "2013-2014"
4040

‎text/changelog.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<b><center>Connman System Tray (CMST)</center></b>
22
<b><center>Change Log</center></b>
33
<br>
4+
<br><b>2014.07.01 </b>
5+
<ul>
6+
<li>Added "scan wifi" button to force a rescan of wifi sevices.</li>
7+
<li>Added a checkbox to preferences to reset the counters at startup and when a service changes.</li>
8+
<li>Finished the internal rework to catch and process dbus signals.</li>
9+
</ul>
410
<br><b>2014.06.22 </b>
511
<ul>
612
<li>Check to make sure only a single instance of the program can be run.</li>

0 commit comments

Comments
 (0)