author | wimpie <wimpie> | 2005-01-12 00:09:13 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-12 00:09:13 (UTC) |
commit | 4b1d4fc9f4170ec22d196dd352cae5d9c1ecb232 (patch) (unidiff) | |
tree | 90d4ac2f37ec43f69008b3cba67ff018e3af3ee1 | |
parent | b0afa096730ac7893fcd25873f6fd09fcef32a95 (diff) | |
download | opie-4b1d4fc9f4170ec22d196dd352cae5d9c1ecb232.zip opie-4b1d4fc9f4170ec22d196dd352cae5d9c1ecb232.tar.gz opie-4b1d4fc9f4170ec22d196dd352cae5d9c1ecb232.tar.bz2 |
GUI changes to profileedit
6 files changed, 335 insertions, 325 deletions
diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp index 2dd91f8..4d46778 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.cpp +++ b/noncore/settings/networksettings2/networksettings2/resources.cpp | |||
@@ -80,12 +80,12 @@ TheNSResources::TheNSResources( void ) : NodeTypeNameMap(), | |||
80 | tr( "<p>Devices that can handle IP packets</p>" ) ); | 80 | tr( "<p>Devices that can handle IP packets</p>" ) ); |
81 | addNodeType( "line", tr( "Character device" ), | 81 | addNodeType( "line", tr( "Character device" ), |
82 | tr( "<p>Devices that can handle single bytes</p>" ) ); | 82 | tr( "<p>Devices that can handle single bytes</p>" ) ); |
83 | addNodeType( "NetworkSetup", tr( "IP NetworkSetup" ), | 83 | addNodeType( "connection", tr( "IP Connection" ), |
84 | tr( "<p>Nodes that provide working IP NetworkSetups</p>" ) ); | 84 | tr( "<p>Nodes that provide working IP connection</p>" ) ); |
85 | addNodeType( "fullsetup", tr( "NetworkSetup Profile" ), | 85 | addNodeType( "fullsetup", tr( "Connection Profile" ), |
86 | tr( "<p>Fully configured NetworkSetup profile</p>" ) ); | 86 | tr( "<p>Fully configured network profile</p>" ) ); |
87 | addNodeType( "GPRS", tr( "NetworkSetup to GPRS device" ), | 87 | addNodeType( "GPRS", tr( "Connection to GPRS device" ), |
88 | tr( "<p>NetworkSetup to a GPRS capable device</p>" ) ); | 88 | tr( "<p>Connection to a GPRS capable device</p>" ) ); |
89 | 89 | ||
90 | // get access to the system | 90 | // get access to the system |
91 | TheSystem = new System(); | 91 | TheSystem = new System(); |
diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp index 33cc5bd..82f5c43 100644 --- a/noncore/settings/networksettings2/networksettings2/system.cpp +++ b/noncore/settings/networksettings2/networksettings2/system.cpp | |||
@@ -218,36 +218,48 @@ void System::refreshStatistics( InterfaceInfo & I ) { | |||
218 | continue; | 218 | continue; |
219 | 219 | ||
220 | // tokenize | 220 | // tokenize |
221 | SL = QStringList::split( ' ', line, FALSE ); | 221 | SL = QStringList::split( ' ', line.mid(loc+1), FALSE ); |
222 | 222 | ||
223 | // update data | 223 | // update data |
224 | switch( version ) { | 224 | switch( version ) { |
225 | case 1 : | 225 | case 1 : |
226 | I.RcvBytes = SL[1]; | 226 | I.RcvBytes = ""; |
227 | I.RcvErrors = SL[3]; | 227 | I.RcvPackets = SL[0]; |
228 | I.RcvDropped = SL[4]; | 228 | I.RcvErrors = SL[1]; |
229 | I.RcvDropped = SL[2]; | ||
230 | |||
231 | I.SndBytes = ""; | ||
232 | I.SndPackets = SL[5]; | ||
233 | I.SndErrors = SL[6]; | ||
234 | I.SndDropped = SL[7]; | ||
235 | |||
236 | I.Collisions = SL[9]; | ||
237 | break; | ||
238 | case 2 : | ||
239 | I.RcvBytes = SL[0]; | ||
240 | I.RcvPackets = SL[1]; | ||
241 | I.RcvErrors = SL[2]; | ||
242 | I.RcvDropped = SL[3]; | ||
243 | |||
229 | I.SndBytes = SL[6]; | 244 | I.SndBytes = SL[6]; |
245 | I.SndPackets = SL[7]; | ||
230 | I.SndErrors = SL[8]; | 246 | I.SndErrors = SL[8]; |
231 | I.SndDropped = SL[9]; | 247 | I.SndDropped = SL[9]; |
248 | |||
232 | I.Collisions = SL[11]; | 249 | I.Collisions = SL[11]; |
233 | break; | 250 | break; |
234 | case 2 : | ||
235 | I.RcvBytes = SL[1]; | ||
236 | I.RcvErrors = SL[3]; | ||
237 | I.RcvDropped = SL[4]; | ||
238 | I.SndBytes = SL[7]; | ||
239 | I.SndErrors = SL[9]; | ||
240 | I.SndDropped = SL[10]; | ||
241 | I.Collisions = SL[12]; | ||
242 | break; | ||
243 | case 3 : | 251 | case 3 : |
244 | I.RcvBytes = SL[1]; | 252 | I.RcvBytes = SL[0]; |
245 | I.RcvErrors = SL[3]; | 253 | I.RcvPackets = SL[1]; |
246 | I.RcvDropped = SL[4]; | 254 | I.RcvErrors = SL[2]; |
247 | I.SndBytes = SL[9]; | 255 | I.RcvDropped = SL[3]; |
248 | I.SndErrors = SL[11]; | 256 | |
249 | I.SndDropped = SL[12]; | 257 | I.SndBytes = SL[8]; |
250 | I.Collisions = SL[14]; | 258 | I.SndPackets = SL[9]; |
259 | I.SndErrors = SL[10]; | ||
260 | I.SndDropped = SL[11]; | ||
261 | |||
262 | I.Collisions = SL[13]; | ||
251 | break; | 263 | break; |
252 | } | 264 | } |
253 | break; | 265 | break; |
diff --git a/noncore/settings/networksettings2/networksettings2/system.h b/noncore/settings/networksettings2/networksettings2/system.h index 794b868..52613d8 100644 --- a/noncore/settings/networksettings2/networksettings2/system.h +++ b/noncore/settings/networksettings2/networksettings2/system.h | |||
@@ -85,10 +85,13 @@ public : | |||
85 | bool IsPointToPoint; // IsPointToPoint card | 85 | bool IsPointToPoint; // IsPointToPoint card |
86 | 86 | ||
87 | QString RcvBytes; | 87 | QString RcvBytes; |
88 | QString SndBytes; | ||
89 | QString RcvErrors; | 88 | QString RcvErrors; |
90 | QString SndErrors; | 89 | QString RcvPackets; |
91 | QString RcvDropped; | 90 | QString RcvDropped; |
91 | |||
92 | QString SndBytes; | ||
93 | QString SndErrors; | ||
94 | QString SndPackets; | ||
92 | QString SndDropped; | 95 | QString SndDropped; |
93 | QString Collisions; | 96 | QString Collisions; |
94 | }; | 97 | }; |
diff --git a/noncore/settings/networksettings2/profile/profileGUI.ui b/noncore/settings/networksettings2/profile/profileGUI.ui index 5bf9a9c..8b421e8 100644 --- a/noncore/settings/networksettings2/profile/profileGUI.ui +++ b/noncore/settings/networksettings2/profile/profileGUI.ui | |||
@@ -11,8 +11,8 @@ | |||
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>276</width> | 14 | <width>551</width> |
15 | <height>231</height> | 15 | <height>547</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <property stdset="1"> | 18 | <property stdset="1"> |
@@ -28,11 +28,11 @@ | |||
28 | <vbox> | 28 | <vbox> |
29 | <property stdset="1"> | 29 | <property stdset="1"> |
30 | <name>margin</name> | 30 | <name>margin</name> |
31 | <number>0</number> | 31 | <number>1</number> |
32 | </property> | 32 | </property> |
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>spacing</name> | 34 | <name>spacing</name> |
35 | <number>0</number> | 35 | <number>3</number> |
36 | </property> | 36 | </property> |
37 | <widget> | 37 | <widget> |
38 | <class>QTabWidget</class> | 38 | <class>QTabWidget</class> |
@@ -948,69 +948,39 @@ | |||
948 | <number>0</number> | 948 | <number>0</number> |
949 | </property> | 949 | </property> |
950 | <widget> | 950 | <widget> |
951 | <class>QLayoutWidget</class> | 951 | <class>QGroupBox</class> |
952 | <property stdset="1"> | ||
953 | <name>name</name> | ||
954 | <cstring>Layout5</cstring> | ||
955 | </property> | ||
956 | <hbox> | ||
957 | <property stdset="1"> | ||
958 | <name>margin</name> | ||
959 | <number>0</number> | ||
960 | </property> | ||
961 | <property stdset="1"> | ||
962 | <name>spacing</name> | ||
963 | <number>6</number> | ||
964 | </property> | ||
965 | <widget> | ||
966 | <class>QLabel</class> | ||
967 | <property stdset="1"> | 952 | <property stdset="1"> |
968 | <name>name</name> | 953 | <name>name</name> |
969 | <cstring>TextLabel1_2</cstring> | 954 | <cstring>Receiving_GB</cstring> |
970 | </property> | 955 | </property> |
971 | <property stdset="1"> | 956 | <property stdset="1"> |
972 | <name>sizePolicy</name> | 957 | <name>enabled</name> |
973 | <sizepolicy> | 958 | <bool>false</bool> |
974 | <hsizetype>0</hsizetype> | ||
975 | <vsizetype>1</vsizetype> | ||
976 | </sizepolicy> | ||
977 | </property> | 959 | </property> |
978 | <property stdset="1"> | 960 | <property stdset="1"> |
979 | <name>text</name> | 961 | <name>title</name> |
980 | <string>Receiving</string> | 962 | <string>Receiving</string> |
981 | </property> | 963 | </property> |
982 | </widget> | ||
983 | <spacer> | ||
984 | <property> | 964 | <property> |
985 | <name>name</name> | 965 | <name>layoutMargin</name> |
986 | <cstring>Spacer17_2</cstring> | ||
987 | </property> | 966 | </property> |
988 | <property stdset="1"> | 967 | <property> |
989 | <name>orientation</name> | 968 | <name>layoutSpacing</name> |
990 | <enum>Horizontal</enum> | ||
991 | </property> | 969 | </property> |
970 | <vbox> | ||
992 | <property stdset="1"> | 971 | <property stdset="1"> |
993 | <name>sizeType</name> | 972 | <name>margin</name> |
994 | <enum>Expanding</enum> | 973 | <number>4</number> |
995 | </property> | 974 | </property> |
996 | <property> | 975 | <property stdset="1"> |
997 | <name>sizeHint</name> | 976 | <name>spacing</name> |
998 | <size> | 977 | <number>2</number> |
999 | <width>20</width> | ||
1000 | <height>20</height> | ||
1001 | </size> | ||
1002 | </property> | 978 | </property> |
1003 | </spacer> | ||
1004 | </hbox> | ||
1005 | </widget> | ||
1006 | <widget> | 979 | <widget> |
1007 | <class>QLayoutWidget</class> | 980 | <class>QLayoutWidget</class> |
1008 | <property stdset="1"> | 981 | <property stdset="1"> |
1009 | <name>name</name> | 982 | <name>name</name> |
1010 | <cstring>Layout43</cstring> | 983 | <cstring>Layout11</cstring> |
1011 | </property> | ||
1012 | <property> | ||
1013 | <name>layoutMargin</name> | ||
1014 | </property> | 984 | </property> |
1015 | <property> | 985 | <property> |
1016 | <name>layoutSpacing</name> | 986 | <name>layoutSpacing</name> |
@@ -1018,100 +988,61 @@ | |||
1018 | <hbox> | 988 | <hbox> |
1019 | <property stdset="1"> | 989 | <property stdset="1"> |
1020 | <name>margin</name> | 990 | <name>margin</name> |
1021 | <number>2</number> | 991 | <number>0</number> |
1022 | </property> | 992 | </property> |
1023 | <property stdset="1"> | 993 | <property stdset="1"> |
1024 | <name>spacing</name> | 994 | <name>spacing</name> |
1025 | <number>0</number> | 995 | <number>2</number> |
1026 | </property> | 996 | </property> |
1027 | <widget> | 997 | <widget> |
1028 | <class>QFrame</class> | 998 | <class>QLabel</class> |
1029 | <property stdset="1"> | 999 | <property stdset="1"> |
1030 | <name>name</name> | 1000 | <name>name</name> |
1031 | <cstring>Frame114</cstring> | 1001 | <cstring>xxxxxxxxxxxxx</cstring> |
1032 | </property> | ||
1033 | <property stdset="1"> | ||
1034 | <name>sizePolicy</name> | ||
1035 | <sizepolicy> | ||
1036 | <hsizetype>0</hsizetype> | ||
1037 | <vsizetype>5</vsizetype> | ||
1038 | </sizepolicy> | ||
1039 | </property> | ||
1040 | <property stdset="1"> | ||
1041 | <name>minimumSize</name> | ||
1042 | <size> | ||
1043 | <width>5</width> | ||
1044 | <height>0</height> | ||
1045 | </size> | ||
1046 | </property> | ||
1047 | <property stdset="1"> | ||
1048 | <name>maximumSize</name> | ||
1049 | <size> | ||
1050 | <width>5</width> | ||
1051 | <height>32767</height> | ||
1052 | </size> | ||
1053 | </property> | 1002 | </property> |
1054 | <property stdset="1"> | 1003 | <property stdset="1"> |
1055 | <name>frameShape</name> | 1004 | <name>text</name> |
1056 | <enum>NoFrame</enum> | 1005 | <string>Pkt</string> |
1057 | </property> | ||
1058 | <property stdset="1"> | ||
1059 | <name>frameShadow</name> | ||
1060 | <enum>Raised</enum> | ||
1061 | </property> | 1006 | </property> |
1062 | </widget> | 1007 | </widget> |
1063 | <widget> | 1008 | <widget> |
1064 | <class>QFrame</class> | 1009 | <class>QLabel</class> |
1065 | <property stdset="1"> | 1010 | <property stdset="1"> |
1066 | <name>name</name> | 1011 | <name>name</name> |
1067 | <cstring>Rcv_GB</cstring> | 1012 | <cstring>RcvPackets_LBL</cstring> |
1068 | </property> | ||
1069 | <property stdset="1"> | ||
1070 | <name>enabled</name> | ||
1071 | <bool>false</bool> | ||
1072 | </property> | 1013 | </property> |
1073 | <property stdset="1"> | 1014 | <property stdset="1"> |
1074 | <name>sizePolicy</name> | 1015 | <name>sizePolicy</name> |
1075 | <sizepolicy> | 1016 | <sizepolicy> |
1076 | <hsizetype>7</hsizetype> | 1017 | <hsizetype>7</hsizetype> |
1077 | <vsizetype>5</vsizetype> | 1018 | <vsizetype>1</vsizetype> |
1078 | </sizepolicy> | 1019 | </sizepolicy> |
1079 | </property> | 1020 | </property> |
1080 | <property stdset="1"> | 1021 | <property stdset="1"> |
1081 | <name>frameShape</name> | 1022 | <name>frameShape</name> |
1082 | <enum>NoFrame</enum> | 1023 | <enum>Panel</enum> |
1083 | </property> | 1024 | </property> |
1084 | <property stdset="1"> | 1025 | <property stdset="1"> |
1085 | <name>frameShadow</name> | 1026 | <name>frameShadow</name> |
1086 | <enum>Raised</enum> | 1027 | <enum>Sunken</enum> |
1087 | </property> | ||
1088 | <property> | ||
1089 | <name>layoutMargin</name> | ||
1090 | </property> | ||
1091 | <property> | ||
1092 | <name>layoutSpacing</name> | ||
1093 | </property> | 1028 | </property> |
1094 | <grid> | ||
1095 | <property stdset="1"> | 1029 | <property stdset="1"> |
1096 | <name>margin</name> | 1030 | <name>indent</name> |
1097 | <number>0</number> | 1031 | <number>0</number> |
1098 | </property> | 1032 | </property> |
1099 | <property stdset="1"> | 1033 | </widget> |
1100 | <name>spacing</name> | 1034 | <widget> |
1101 | <number>1</number> | ||
1102 | </property> | ||
1103 | <widget row="1" column="0" > | ||
1104 | <class>QLabel</class> | 1035 | <class>QLabel</class> |
1105 | <property stdset="1"> | 1036 | <property stdset="1"> |
1106 | <name>name</name> | 1037 | <name>name</name> |
1107 | <cstring>TextLabel1_5_9</cstring> | 1038 | <cstring>TextLabel1_5_3_4</cstring> |
1108 | </property> | 1039 | </property> |
1109 | <property stdset="1"> | 1040 | <property stdset="1"> |
1110 | <name>text</name> | 1041 | <name>text</name> |
1111 | <string>Errors</string> | 1042 | <string>Bytes</string> |
1112 | </property> | 1043 | </property> |
1113 | </widget> | 1044 | </widget> |
1114 | <widget row="0" column="1" rowspan="1" colspan="3" > | 1045 | <widget> |
1115 | <class>QLabel</class> | 1046 | <class>QLabel</class> |
1116 | <property stdset="1"> | 1047 | <property stdset="1"> |
1117 | <name>name</name> | 1048 | <name>name</name> |
@@ -1137,11 +1068,22 @@ | |||
1137 | <number>0</number> | 1068 | <number>0</number> |
1138 | </property> | 1069 | </property> |
1139 | </widget> | 1070 | </widget> |
1140 | <widget row="1" column="3" > | 1071 | <widget> |
1141 | <class>QLabel</class> | 1072 | <class>QLabel</class> |
1142 | <property stdset="1"> | 1073 | <property stdset="1"> |
1143 | <name>name</name> | 1074 | <name>name</name> |
1144 | <cstring>RcvDropped_LBL</cstring> | 1075 | <cstring>TextLabel1_5_3_4_2</cstring> |
1076 | </property> | ||
1077 | <property stdset="1"> | ||
1078 | <name>text</name> | ||
1079 | <string>ODO</string> | ||
1080 | </property> | ||
1081 | </widget> | ||
1082 | <widget> | ||
1083 | <class>QLabel</class> | ||
1084 | <property stdset="1"> | ||
1085 | <name>name</name> | ||
1086 | <cstring>RcvODO_LBL</cstring> | ||
1145 | </property> | 1087 | </property> |
1146 | <property stdset="1"> | 1088 | <property stdset="1"> |
1147 | <name>sizePolicy</name> | 1089 | <name>sizePolicy</name> |
@@ -1163,7 +1105,38 @@ | |||
1163 | <number>0</number> | 1105 | <number>0</number> |
1164 | </property> | 1106 | </property> |
1165 | </widget> | 1107 | </widget> |
1166 | <widget row="1" column="1" > | 1108 | </hbox> |
1109 | </widget> | ||
1110 | <widget> | ||
1111 | <class>QLayoutWidget</class> | ||
1112 | <property stdset="1"> | ||
1113 | <name>name</name> | ||
1114 | <cstring>Layout12</cstring> | ||
1115 | </property> | ||
1116 | <property> | ||
1117 | <name>layoutSpacing</name> | ||
1118 | </property> | ||
1119 | <hbox> | ||
1120 | <property stdset="1"> | ||
1121 | <name>margin</name> | ||
1122 | <number>0</number> | ||
1123 | </property> | ||
1124 | <property stdset="1"> | ||
1125 | <name>spacing</name> | ||
1126 | <number>2</number> | ||
1127 | </property> | ||
1128 | <widget> | ||
1129 | <class>QLabel</class> | ||
1130 | <property stdset="1"> | ||
1131 | <name>name</name> | ||
1132 | <cstring>TextLabel1_5_9</cstring> | ||
1133 | </property> | ||
1134 | <property stdset="1"> | ||
1135 | <name>text</name> | ||
1136 | <string>Errors</string> | ||
1137 | </property> | ||
1138 | </widget> | ||
1139 | <widget> | ||
1167 | <class>QLabel</class> | 1140 | <class>QLabel</class> |
1168 | <property stdset="1"> | 1141 | <property stdset="1"> |
1169 | <name>name</name> | 1142 | <name>name</name> |
@@ -1189,7 +1162,7 @@ | |||
1189 | <number>0</number> | 1162 | <number>0</number> |
1190 | </property> | 1163 | </property> |
1191 | </widget> | 1164 | </widget> |
1192 | <widget row="1" column="2" > | 1165 | <widget> |
1193 | <class>QLabel</class> | 1166 | <class>QLabel</class> |
1194 | <property stdset="1"> | 1167 | <property stdset="1"> |
1195 | <name>name</name> | 1168 | <name>name</name> |
@@ -1200,98 +1173,72 @@ | |||
1200 | <string>Dropped</string> | 1173 | <string>Dropped</string> |
1201 | </property> | 1174 | </property> |
1202 | </widget> | 1175 | </widget> |
1203 | <widget row="0" column="0" > | 1176 | <widget> |
1204 | <class>QLabel</class> | 1177 | <class>QLabel</class> |
1205 | <property stdset="1"> | 1178 | <property stdset="1"> |
1206 | <name>name</name> | 1179 | <name>name</name> |
1207 | <cstring>TextLabel1_5_3</cstring> | 1180 | <cstring>RcvDropped_LBL</cstring> |
1208 | </property> | 1181 | </property> |
1209 | <property stdset="1"> | 1182 | <property stdset="1"> |
1210 | <name>text</name> | 1183 | <name>sizePolicy</name> |
1211 | <string>Bytes</string> | 1184 | <sizepolicy> |
1185 | <hsizetype>7</hsizetype> | ||
1186 | <vsizetype>1</vsizetype> | ||
1187 | </sizepolicy> | ||
1212 | </property> | 1188 | </property> |
1213 | </widget> | ||
1214 | </grid> | ||
1215 | </widget> | ||
1216 | </hbox> | ||
1217 | </widget> | ||
1218 | <widget> | ||
1219 | <class>QLayoutWidget</class> | ||
1220 | <property stdset="1"> | 1189 | <property stdset="1"> |
1221 | <name>name</name> | 1190 | <name>frameShape</name> |
1222 | <cstring>Layout6</cstring> | 1191 | <enum>Panel</enum> |
1223 | </property> | 1192 | </property> |
1224 | <hbox> | ||
1225 | <property stdset="1"> | 1193 | <property stdset="1"> |
1226 | <name>margin</name> | 1194 | <name>frameShadow</name> |
1227 | <number>0</number> | 1195 | <enum>Sunken</enum> |
1228 | </property> | 1196 | </property> |
1229 | <property stdset="1"> | 1197 | <property stdset="1"> |
1230 | <name>spacing</name> | 1198 | <name>indent</name> |
1231 | <number>6</number> | 1199 | <number>0</number> |
1232 | </property> | 1200 | </property> |
1201 | </widget> | ||
1202 | </hbox> | ||
1203 | </widget> | ||
1204 | </vbox> | ||
1205 | </widget> | ||
1233 | <widget> | 1206 | <widget> |
1234 | <class>QLabel</class> | 1207 | <class>QFrame</class> |
1235 | <property stdset="1"> | 1208 | <property stdset="1"> |
1236 | <name>name</name> | 1209 | <name>name</name> |
1237 | <cstring>TextLabel1</cstring> | 1210 | <cstring>Frame114</cstring> |
1238 | </property> | 1211 | </property> |
1239 | <property stdset="1"> | 1212 | <property stdset="1"> |
1240 | <name>sizePolicy</name> | 1213 | <name>sizePolicy</name> |
1241 | <sizepolicy> | 1214 | <sizepolicy> |
1242 | <hsizetype>0</hsizetype> | 1215 | <hsizetype>0</hsizetype> |
1243 | <vsizetype>1</vsizetype> | 1216 | <vsizetype>5</vsizetype> |
1244 | </sizepolicy> | 1217 | </sizepolicy> |
1245 | </property> | 1218 | </property> |
1246 | <property stdset="1"> | 1219 | <property stdset="1"> |
1247 | <name>text</name> | 1220 | <name>minimumSize</name> |
1248 | <string>Transmitting</string> | ||
1249 | </property> | ||
1250 | </widget> | ||
1251 | <spacer> | ||
1252 | <property> | ||
1253 | <name>name</name> | ||
1254 | <cstring>Spacer18_2</cstring> | ||
1255 | </property> | ||
1256 | <property stdset="1"> | ||
1257 | <name>orientation</name> | ||
1258 | <enum>Horizontal</enum> | ||
1259 | </property> | ||
1260 | <property stdset="1"> | ||
1261 | <name>sizeType</name> | ||
1262 | <enum>Expanding</enum> | ||
1263 | </property> | ||
1264 | <property> | ||
1265 | <name>sizeHint</name> | ||
1266 | <size> | 1221 | <size> |
1267 | <width>20</width> | 1222 | <width>5</width> |
1268 | <height>20</height> | 1223 | <height>0</height> |
1269 | </size> | 1224 | </size> |
1270 | </property> | 1225 | </property> |
1271 | </spacer> | ||
1272 | </hbox> | ||
1273 | </widget> | ||
1274 | <widget> | ||
1275 | <class>QLayoutWidget</class> | ||
1276 | <property stdset="1"> | 1226 | <property stdset="1"> |
1277 | <name>name</name> | 1227 | <name>maximumSize</name> |
1278 | <cstring>Layout44</cstring> | 1228 | <size> |
1279 | </property> | 1229 | <width>5</width> |
1280 | <property> | 1230 | <height>32767</height> |
1281 | <name>layoutMargin</name> | 1231 | </size> |
1282 | </property> | ||
1283 | <property> | ||
1284 | <name>layoutSpacing</name> | ||
1285 | </property> | 1232 | </property> |
1286 | <hbox> | ||
1287 | <property stdset="1"> | 1233 | <property stdset="1"> |
1288 | <name>margin</name> | 1234 | <name>frameShape</name> |
1289 | <number>2</number> | 1235 | <enum>NoFrame</enum> |
1290 | </property> | 1236 | </property> |
1291 | <property stdset="1"> | 1237 | <property stdset="1"> |
1292 | <name>spacing</name> | 1238 | <name>frameShadow</name> |
1293 | <number>0</number> | 1239 | <enum>Raised</enum> |
1294 | </property> | 1240 | </property> |
1241 | </widget> | ||
1295 | <widget> | 1242 | <widget> |
1296 | <class>QFrame</class> | 1243 | <class>QFrame</class> |
1297 | <property stdset="1"> | 1244 | <property stdset="1"> |
@@ -1329,29 +1276,18 @@ | |||
1329 | </property> | 1276 | </property> |
1330 | </widget> | 1277 | </widget> |
1331 | <widget> | 1278 | <widget> |
1332 | <class>QFrame</class> | 1279 | <class>QGroupBox</class> |
1333 | <property stdset="1"> | 1280 | <property stdset="1"> |
1334 | <name>name</name> | 1281 | <name>name</name> |
1335 | <cstring>Snd_GB</cstring> | 1282 | <cstring>Sending_GB</cstring> |
1336 | </property> | 1283 | </property> |
1337 | <property stdset="1"> | 1284 | <property stdset="1"> |
1338 | <name>enabled</name> | 1285 | <name>enabled</name> |
1339 | <bool>false</bool> | 1286 | <bool>false</bool> |
1340 | </property> | 1287 | </property> |
1341 | <property stdset="1"> | 1288 | <property stdset="1"> |
1342 | <name>sizePolicy</name> | 1289 | <name>title</name> |
1343 | <sizepolicy> | 1290 | <string>Sending</string> |
1344 | <hsizetype>7</hsizetype> | ||
1345 | <vsizetype>5</vsizetype> | ||
1346 | </sizepolicy> | ||
1347 | </property> | ||
1348 | <property stdset="1"> | ||
1349 | <name>frameShape</name> | ||
1350 | <enum>NoFrame</enum> | ||
1351 | </property> | ||
1352 | <property stdset="1"> | ||
1353 | <name>frameShadow</name> | ||
1354 | <enum>Raised</enum> | ||
1355 | </property> | 1291 | </property> |
1356 | <property> | 1292 | <property> |
1357 | <name>layoutMargin</name> | 1293 | <name>layoutMargin</name> |
@@ -1359,53 +1295,49 @@ | |||
1359 | <property> | 1295 | <property> |
1360 | <name>layoutSpacing</name> | 1296 | <name>layoutSpacing</name> |
1361 | </property> | 1297 | </property> |
1362 | <grid> | 1298 | <vbox> |
1363 | <property stdset="1"> | 1299 | <property stdset="1"> |
1364 | <name>margin</name> | 1300 | <name>margin</name> |
1365 | <number>0</number> | 1301 | <number>4</number> |
1366 | </property> | 1302 | </property> |
1367 | <property stdset="1"> | 1303 | <property stdset="1"> |
1368 | <name>spacing</name> | 1304 | <name>spacing</name> |
1369 | <number>1</number> | 1305 | <number>2</number> |
1370 | </property> | 1306 | </property> |
1371 | <widget row="1" column="0" > | 1307 | <widget> |
1372 | <class>QLabel</class> | 1308 | <class>QLayoutWidget</class> |
1373 | <property stdset="1"> | 1309 | <property stdset="1"> |
1374 | <name>name</name> | 1310 | <name>name</name> |
1375 | <cstring>TextLabel1_5_9_2</cstring> | 1311 | <cstring>Layout13</cstring> |
1376 | </property> | 1312 | </property> |
1377 | <property stdset="1"> | 1313 | <property> |
1378 | <name>text</name> | 1314 | <name>layoutSpacing</name> |
1379 | <string>Errors</string> | ||
1380 | </property> | 1315 | </property> |
1381 | </widget> | 1316 | <hbox> |
1382 | <widget row="1" column="2" > | ||
1383 | <class>QLabel</class> | ||
1384 | <property stdset="1"> | 1317 | <property stdset="1"> |
1385 | <name>name</name> | 1318 | <name>margin</name> |
1386 | <cstring>TextLabel1_5_4_2</cstring> | 1319 | <number>0</number> |
1387 | </property> | 1320 | </property> |
1388 | <property stdset="1"> | 1321 | <property stdset="1"> |
1389 | <name>text</name> | 1322 | <name>spacing</name> |
1390 | <string>Dropped</string> | 1323 | <number>2</number> |
1391 | </property> | 1324 | </property> |
1392 | </widget> | 1325 | <widget> |
1393 | <widget row="0" column="0" > | ||
1394 | <class>QLabel</class> | 1326 | <class>QLabel</class> |
1395 | <property stdset="1"> | 1327 | <property stdset="1"> |
1396 | <name>name</name> | 1328 | <name>name</name> |
1397 | <cstring>TextLabel1_5_3_2</cstring> | 1329 | <cstring>dfsfadf</cstring> |
1398 | </property> | 1330 | </property> |
1399 | <property stdset="1"> | 1331 | <property stdset="1"> |
1400 | <name>text</name> | 1332 | <name>text</name> |
1401 | <string>Bytes</string> | 1333 | <string>Pkt</string> |
1402 | </property> | 1334 | </property> |
1403 | </widget> | 1335 | </widget> |
1404 | <widget row="1" column="3" > | 1336 | <widget> |
1405 | <class>QLabel</class> | 1337 | <class>QLabel</class> |
1406 | <property stdset="1"> | 1338 | <property stdset="1"> |
1407 | <name>name</name> | 1339 | <name>name</name> |
1408 | <cstring>SndDropped_LBL</cstring> | 1340 | <cstring>SndPackets_LBL</cstring> |
1409 | </property> | 1341 | </property> |
1410 | <property stdset="1"> | 1342 | <property stdset="1"> |
1411 | <name>sizePolicy</name> | 1343 | <name>sizePolicy</name> |
@@ -1427,11 +1359,22 @@ | |||
1427 | <number>0</number> | 1359 | <number>0</number> |
1428 | </property> | 1360 | </property> |
1429 | </widget> | 1361 | </widget> |
1430 | <widget row="1" column="1" > | 1362 | <widget> |
1431 | <class>QLabel</class> | 1363 | <class>QLabel</class> |
1432 | <property stdset="1"> | 1364 | <property stdset="1"> |
1433 | <name>name</name> | 1365 | <name>name</name> |
1434 | <cstring>SndErrors_LBL</cstring> | 1366 | <cstring>TextLabel1_5_3_4_4</cstring> |
1367 | </property> | ||
1368 | <property stdset="1"> | ||
1369 | <name>text</name> | ||
1370 | <string>Bytes</string> | ||
1371 | </property> | ||
1372 | </widget> | ||
1373 | <widget> | ||
1374 | <class>QLabel</class> | ||
1375 | <property stdset="1"> | ||
1376 | <name>name</name> | ||
1377 | <cstring>SndBytes_LBL</cstring> | ||
1435 | </property> | 1378 | </property> |
1436 | <property stdset="1"> | 1379 | <property stdset="1"> |
1437 | <name>sizePolicy</name> | 1380 | <name>sizePolicy</name> |
@@ -1453,11 +1396,22 @@ | |||
1453 | <number>0</number> | 1396 | <number>0</number> |
1454 | </property> | 1397 | </property> |
1455 | </widget> | 1398 | </widget> |
1456 | <widget row="0" column="1" rowspan="1" colspan="3" > | 1399 | <widget> |
1457 | <class>QLabel</class> | 1400 | <class>QLabel</class> |
1458 | <property stdset="1"> | 1401 | <property stdset="1"> |
1459 | <name>name</name> | 1402 | <name>name</name> |
1460 | <cstring>SndBytes_LBL</cstring> | 1403 | <cstring>TextLabel1_5_3_4_2_3</cstring> |
1404 | </property> | ||
1405 | <property stdset="1"> | ||
1406 | <name>text</name> | ||
1407 | <string>ODO</string> | ||
1408 | </property> | ||
1409 | </widget> | ||
1410 | <widget> | ||
1411 | <class>QLabel</class> | ||
1412 | <property stdset="1"> | ||
1413 | <name>name</name> | ||
1414 | <cstring>SndODO_LBL</cstring> | ||
1461 | </property> | 1415 | </property> |
1462 | <property stdset="1"> | 1416 | <property stdset="1"> |
1463 | <name>sizePolicy</name> | 1417 | <name>sizePolicy</name> |
@@ -1479,15 +1433,16 @@ | |||
1479 | <number>0</number> | 1433 | <number>0</number> |
1480 | </property> | 1434 | </property> |
1481 | </widget> | 1435 | </widget> |
1482 | </grid> | ||
1483 | </widget> | ||
1484 | </hbox> | 1436 | </hbox> |
1485 | </widget> | 1437 | </widget> |
1486 | <widget> | 1438 | <widget> |
1487 | <class>QLayoutWidget</class> | 1439 | <class>QLayoutWidget</class> |
1488 | <property stdset="1"> | 1440 | <property stdset="1"> |
1489 | <name>name</name> | 1441 | <name>name</name> |
1490 | <cstring>Layout7</cstring> | 1442 | <cstring>Layout14</cstring> |
1443 | </property> | ||
1444 | <property> | ||
1445 | <name>layoutSpacing</name> | ||
1491 | </property> | 1446 | </property> |
1492 | <hbox> | 1447 | <hbox> |
1493 | <property stdset="1"> | 1448 | <property stdset="1"> |
@@ -1496,130 +1451,99 @@ | |||
1496 | </property> | 1451 | </property> |
1497 | <property stdset="1"> | 1452 | <property stdset="1"> |
1498 | <name>spacing</name> | 1453 | <name>spacing</name> |
1499 | <number>6</number> | 1454 | <number>2</number> |
1500 | </property> | 1455 | </property> |
1501 | <widget> | 1456 | <widget> |
1502 | <class>QLabel</class> | 1457 | <class>QLabel</class> |
1503 | <property stdset="1"> | 1458 | <property stdset="1"> |
1504 | <name>name</name> | 1459 | <name>name</name> |
1505 | <cstring>TextLabel1_3</cstring> | 1460 | <cstring>TextLabel1_5_9_3</cstring> |
1461 | </property> | ||
1462 | <property stdset="1"> | ||
1463 | <name>text</name> | ||
1464 | <string>Errors</string> | ||
1465 | </property> | ||
1466 | </widget> | ||
1467 | <widget> | ||
1468 | <class>QLabel</class> | ||
1469 | <property stdset="1"> | ||
1470 | <name>name</name> | ||
1471 | <cstring>SndErrors_LBL</cstring> | ||
1506 | </property> | 1472 | </property> |
1507 | <property stdset="1"> | 1473 | <property stdset="1"> |
1508 | <name>sizePolicy</name> | 1474 | <name>sizePolicy</name> |
1509 | <sizepolicy> | 1475 | <sizepolicy> |
1510 | <hsizetype>0</hsizetype> | 1476 | <hsizetype>7</hsizetype> |
1511 | <vsizetype>1</vsizetype> | 1477 | <vsizetype>1</vsizetype> |
1512 | </sizepolicy> | 1478 | </sizepolicy> |
1513 | </property> | 1479 | </property> |
1514 | <property stdset="1"> | 1480 | <property stdset="1"> |
1515 | <name>text</name> | 1481 | <name>frameShape</name> |
1516 | <string>Others</string> | 1482 | <enum>Panel</enum> |
1517 | </property> | ||
1518 | </widget> | ||
1519 | <spacer> | ||
1520 | <property> | ||
1521 | <name>name</name> | ||
1522 | <cstring>Spacer19</cstring> | ||
1523 | </property> | 1483 | </property> |
1524 | <property stdset="1"> | 1484 | <property stdset="1"> |
1525 | <name>orientation</name> | 1485 | <name>frameShadow</name> |
1526 | <enum>Horizontal</enum> | 1486 | <enum>Sunken</enum> |
1527 | </property> | 1487 | </property> |
1528 | <property stdset="1"> | 1488 | <property stdset="1"> |
1529 | <name>sizeType</name> | 1489 | <name>indent</name> |
1530 | <enum>Expanding</enum> | 1490 | <number>0</number> |
1531 | </property> | ||
1532 | <property> | ||
1533 | <name>sizeHint</name> | ||
1534 | <size> | ||
1535 | <width>20</width> | ||
1536 | <height>20</height> | ||
1537 | </size> | ||
1538 | </property> | 1491 | </property> |
1539 | </spacer> | ||
1540 | </hbox> | ||
1541 | </widget> | 1492 | </widget> |
1542 | <widget> | 1493 | <widget> |
1543 | <class>QLayoutWidget</class> | 1494 | <class>QLabel</class> |
1544 | <property stdset="1"> | 1495 | <property stdset="1"> |
1545 | <name>name</name> | 1496 | <name>name</name> |
1546 | <cstring>Layout45</cstring> | 1497 | <cstring>TextLabel1_5_4_3</cstring> |
1547 | </property> | 1498 | </property> |
1548 | <property> | ||
1549 | <name>layoutMargin</name> | ||
1550 | </property> | ||
1551 | <property> | ||
1552 | <name>layoutSpacing</name> | ||
1553 | </property> | ||
1554 | <hbox> | ||
1555 | <property stdset="1"> | 1499 | <property stdset="1"> |
1556 | <name>margin</name> | 1500 | <name>text</name> |
1557 | <number>2</number> | 1501 | <string>Dropped</string> |
1558 | </property> | ||
1559 | <property stdset="1"> | ||
1560 | <name>spacing</name> | ||
1561 | <number>0</number> | ||
1562 | </property> | 1502 | </property> |
1503 | </widget> | ||
1563 | <widget> | 1504 | <widget> |
1564 | <class>QFrame</class> | 1505 | <class>QLabel</class> |
1565 | <property stdset="1"> | 1506 | <property stdset="1"> |
1566 | <name>name</name> | 1507 | <name>name</name> |
1567 | <cstring>Frame116</cstring> | 1508 | <cstring>SndDropped_LBL</cstring> |
1568 | </property> | 1509 | </property> |
1569 | <property stdset="1"> | 1510 | <property stdset="1"> |
1570 | <name>sizePolicy</name> | 1511 | <name>sizePolicy</name> |
1571 | <sizepolicy> | 1512 | <sizepolicy> |
1572 | <hsizetype>0</hsizetype> | 1513 | <hsizetype>7</hsizetype> |
1573 | <vsizetype>5</vsizetype> | 1514 | <vsizetype>1</vsizetype> |
1574 | </sizepolicy> | 1515 | </sizepolicy> |
1575 | </property> | 1516 | </property> |
1576 | <property stdset="1"> | 1517 | <property stdset="1"> |
1577 | <name>minimumSize</name> | ||
1578 | <size> | ||
1579 | <width>5</width> | ||
1580 | <height>0</height> | ||
1581 | </size> | ||
1582 | </property> | ||
1583 | <property stdset="1"> | ||
1584 | <name>maximumSize</name> | ||
1585 | <size> | ||
1586 | <width>5</width> | ||
1587 | <height>32767</height> | ||
1588 | </size> | ||
1589 | </property> | ||
1590 | <property stdset="1"> | ||
1591 | <name>frameShape</name> | 1518 | <name>frameShape</name> |
1592 | <enum>NoFrame</enum> | 1519 | <enum>Panel</enum> |
1593 | </property> | 1520 | </property> |
1594 | <property stdset="1"> | 1521 | <property stdset="1"> |
1595 | <name>frameShadow</name> | 1522 | <name>frameShadow</name> |
1596 | <enum>Raised</enum> | 1523 | <enum>Sunken</enum> |
1597 | </property> | 1524 | </property> |
1525 | <property stdset="1"> | ||
1526 | <name>indent</name> | ||
1527 | <number>0</number> | ||
1528 | </property> | ||
1529 | </widget> | ||
1530 | </hbox> | ||
1531 | </widget> | ||
1532 | </vbox> | ||
1598 | </widget> | 1533 | </widget> |
1599 | <widget> | 1534 | <widget> |
1600 | <class>QFrame</class> | 1535 | <class>QGroupBox</class> |
1601 | <property stdset="1"> | 1536 | <property stdset="1"> |
1602 | <name>name</name> | 1537 | <name>name</name> |
1603 | <cstring>Collisions_FRM</cstring> | 1538 | <cstring>Misc_GB</cstring> |
1604 | </property> | 1539 | </property> |
1605 | <property stdset="1"> | 1540 | <property stdset="1"> |
1606 | <name>enabled</name> | 1541 | <name>enabled</name> |
1607 | <bool>false</bool> | 1542 | <bool>false</bool> |
1608 | </property> | 1543 | </property> |
1609 | <property stdset="1"> | 1544 | <property stdset="1"> |
1610 | <name>sizePolicy</name> | 1545 | <name>title</name> |
1611 | <sizepolicy> | 1546 | <string>Miscellaneous</string> |
1612 | <hsizetype>7</hsizetype> | ||
1613 | <vsizetype>5</vsizetype> | ||
1614 | </sizepolicy> | ||
1615 | </property> | ||
1616 | <property stdset="1"> | ||
1617 | <name>frameShape</name> | ||
1618 | <enum>NoFrame</enum> | ||
1619 | </property> | ||
1620 | <property stdset="1"> | ||
1621 | <name>frameShadow</name> | ||
1622 | <enum>Raised</enum> | ||
1623 | </property> | 1547 | </property> |
1624 | <property> | 1548 | <property> |
1625 | <name>layoutMargin</name> | 1549 | <name>layoutMargin</name> |
@@ -1630,7 +1554,7 @@ | |||
1630 | <hbox> | 1554 | <hbox> |
1631 | <property stdset="1"> | 1555 | <property stdset="1"> |
1632 | <name>margin</name> | 1556 | <name>margin</name> |
1633 | <number>0</number> | 1557 | <number>4</number> |
1634 | </property> | 1558 | </property> |
1635 | <property stdset="1"> | 1559 | <property stdset="1"> |
1636 | <name>spacing</name> | 1560 | <name>spacing</name> |
@@ -1676,7 +1600,28 @@ | |||
1676 | <spacer> | 1600 | <spacer> |
1677 | <property> | 1601 | <property> |
1678 | <name>name</name> | 1602 | <name>name</name> |
1679 | <cstring>Spacer18</cstring> | 1603 | <cstring>Spacer10</cstring> |
1604 | </property> | ||
1605 | <property stdset="1"> | ||
1606 | <name>orientation</name> | ||
1607 | <enum>Horizontal</enum> | ||
1608 | </property> | ||
1609 | <property stdset="1"> | ||
1610 | <name>sizeType</name> | ||
1611 | <enum>Expanding</enum> | ||
1612 | </property> | ||
1613 | <property> | ||
1614 | <name>sizeHint</name> | ||
1615 | <size> | ||
1616 | <width>20</width> | ||
1617 | <height>20</height> | ||
1618 | </size> | ||
1619 | </property> | ||
1620 | </spacer> | ||
1621 | <spacer> | ||
1622 | <property> | ||
1623 | <name>name</name> | ||
1624 | <cstring>Spacer13</cstring> | ||
1680 | </property> | 1625 | </property> |
1681 | <property stdset="1"> | 1626 | <property stdset="1"> |
1682 | <name>orientation</name> | 1627 | <name>orientation</name> |
@@ -1694,8 +1639,6 @@ | |||
1694 | </size> | 1639 | </size> |
1695 | </property> | 1640 | </property> |
1696 | </spacer> | 1641 | </spacer> |
1697 | </hbox> | ||
1698 | </widget> | ||
1699 | </hbox> | 1642 | </hbox> |
1700 | </widget> | 1643 | </widget> |
1701 | <spacer> | 1644 | <spacer> |
@@ -1723,7 +1666,7 @@ | |||
1723 | <class>QLayoutWidget</class> | 1666 | <class>QLayoutWidget</class> |
1724 | <property stdset="1"> | 1667 | <property stdset="1"> |
1725 | <name>name</name> | 1668 | <name>name</name> |
1726 | <cstring>Layout17</cstring> | 1669 | <cstring>Layout10</cstring> |
1727 | </property> | 1670 | </property> |
1728 | <hbox> | 1671 | <hbox> |
1729 | <property stdset="1"> | 1672 | <property stdset="1"> |
@@ -1741,6 +1684,10 @@ | |||
1741 | <cstring>Refresh_CB</cstring> | 1684 | <cstring>Refresh_CB</cstring> |
1742 | </property> | 1685 | </property> |
1743 | <property stdset="1"> | 1686 | <property stdset="1"> |
1687 | <name>enabled</name> | ||
1688 | <bool>false</bool> | ||
1689 | </property> | ||
1690 | <property stdset="1"> | ||
1744 | <name>text</name> | 1691 | <name>text</name> |
1745 | <string>Live feed </string> | 1692 | <string>Live feed </string> |
1746 | </property> | 1693 | </property> |
@@ -1766,6 +1713,21 @@ | |||
1766 | </size> | 1713 | </size> |
1767 | </property> | 1714 | </property> |
1768 | </spacer> | 1715 | </spacer> |
1716 | <widget> | ||
1717 | <class>QPushButton</class> | ||
1718 | <property stdset="1"> | ||
1719 | <name>name</name> | ||
1720 | <cstring>ResetODO_But</cstring> | ||
1721 | </property> | ||
1722 | <property stdset="1"> | ||
1723 | <name>enabled</name> | ||
1724 | <bool>false</bool> | ||
1725 | </property> | ||
1726 | <property stdset="1"> | ||
1727 | <name>text</name> | ||
1728 | <string>Reset ODO</string> | ||
1729 | </property> | ||
1730 | </widget> | ||
1769 | </hbox> | 1731 | </hbox> |
1770 | </widget> | 1732 | </widget> |
1771 | </vbox> | 1733 | </vbox> |
@@ -1780,6 +1742,13 @@ | |||
1780 | <receiver>Profile_FRM</receiver> | 1742 | <receiver>Profile_FRM</receiver> |
1781 | <slot>SLOT_AutoRefresh(bool)</slot> | 1743 | <slot>SLOT_AutoRefresh(bool)</slot> |
1782 | </connection> | 1744 | </connection> |
1745 | <connection> | ||
1746 | <sender>ResetODO_But</sender> | ||
1747 | <signal>clicked()</signal> | ||
1748 | <receiver>Profile_FRM</receiver> | ||
1749 | <slot>SLOT_ResetODO()</slot> | ||
1750 | </connection> | ||
1783 | <slot access="public">SLOT_AutoRefresh(bool)</slot> | 1751 | <slot access="public">SLOT_AutoRefresh(bool)</slot> |
1752 | <slot access="public">SLOT_ResetODO()</slot> | ||
1784 | </connections> | 1753 | </connections> |
1785 | </UI> | 1754 | </UI> |
diff --git a/noncore/settings/networksettings2/profile/profileedit.cpp b/noncore/settings/networksettings2/profile/profileedit.cpp index ad943fe..1713f0c 100644 --- a/noncore/settings/networksettings2/profile/profileedit.cpp +++ b/noncore/settings/networksettings2/profile/profileedit.cpp | |||
@@ -1,4 +1,6 @@ | |||
1 | #include <qlabel.h> | 1 | #include <qlabel.h> |
2 | #include <qgroupbox.h> | ||
3 | #include <qpushbutton.h> | ||
2 | #include <qframe.h> | 4 | #include <qframe.h> |
3 | #include <qcheckbox.h> | 5 | #include <qcheckbox.h> |
4 | #include <qmultilineedit.h> | 6 | #include <qmultilineedit.h> |
@@ -23,13 +25,17 @@ ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : | |||
23 | if( ( II = NNI->networkSetup()->assignedInterface() ) ) { | 25 | if( ( II = NNI->networkSetup()->assignedInterface() ) ) { |
24 | 26 | ||
25 | Refresh_CB->setEnabled( TRUE ); | 27 | Refresh_CB->setEnabled( TRUE ); |
26 | Snd_GB->setEnabled( TRUE ); | 28 | ResetODO_But->setEnabled( TRUE ); |
27 | Rcv_GB->setEnabled( TRUE ); | 29 | Sending_GB->setEnabled( TRUE ); |
28 | Collisions_FRM->setEnabled( TRUE ); | 30 | Receiving_GB->setEnabled( TRUE ); |
31 | Misc_GB->setEnabled( TRUE ); | ||
29 | 32 | ||
30 | // show current content | 33 | // show current content |
31 | SLOT_Refresh(); | 34 | SLOT_Refresh(); |
32 | 35 | ||
36 | // initialize ODO | ||
37 | SLOT_ResetODO(); | ||
38 | |||
33 | // fill in static data | 39 | // fill in static data |
34 | InterfaceName_LBL->setText( II->Name ); | 40 | InterfaceName_LBL->setText( II->Name ); |
35 | IPAddress_LBL->setText( II->Address ); | 41 | IPAddress_LBL->setText( II->Address ); |
@@ -82,13 +88,23 @@ bool ProfileEdit::commit( ProfileData & Data ) { | |||
82 | 88 | ||
83 | void ProfileEdit::SLOT_Refresh( void ) { | 89 | void ProfileEdit::SLOT_Refresh( void ) { |
84 | InterfaceInfo * II = NNI->networkSetup()->assignedInterface(); | 90 | InterfaceInfo * II = NNI->networkSetup()->assignedInterface(); |
91 | QString S; | ||
85 | NSResources->system().refreshStatistics( *II ); | 92 | NSResources->system().refreshStatistics( *II ); |
93 | |||
86 | RcvBytes_LBL->setText( II->RcvBytes ); | 94 | RcvBytes_LBL->setText( II->RcvBytes ); |
87 | SndBytes_LBL->setText( II->SndBytes ); | 95 | RcvPackets_LBL->setText( II->RcvPackets ); |
88 | RcvErrors_LBL->setText( II->RcvErrors ); | 96 | RcvErrors_LBL->setText( II->RcvErrors ); |
89 | SndErrors_LBL->setText( II->SndErrors ); | ||
90 | RcvDropped_LBL->setText( II->RcvDropped ); | 97 | RcvDropped_LBL->setText( II->RcvDropped ); |
98 | S.setNum( II->RcvBytes.toLong() - RcvODO ); | ||
99 | RcvODO_LBL->setText( S ); | ||
100 | |||
101 | SndBytes_LBL->setText( II->SndBytes ); | ||
102 | SndPackets_LBL->setText( II->SndPackets ); | ||
103 | SndErrors_LBL->setText( II->SndErrors ); | ||
91 | SndDropped_LBL->setText( II->SndDropped ); | 104 | SndDropped_LBL->setText( II->SndDropped ); |
105 | S.setNum( II->SndBytes.toLong() - SndODO ); | ||
106 | SndODO_LBL->setText( S ); | ||
107 | |||
92 | Collisions_LBL->setText( II->Collisions ); | 108 | Collisions_LBL->setText( II->Collisions ); |
93 | } | 109 | } |
94 | 110 | ||
@@ -100,3 +116,10 @@ void ProfileEdit::SLOT_AutoRefresh( bool ar ) { | |||
100 | RefreshTimer.stop(); | 116 | RefreshTimer.stop(); |
101 | } | 117 | } |
102 | } | 118 | } |
119 | |||
120 | void ProfileEdit::SLOT_ResetODO( void ) { | ||
121 | InterfaceInfo * II = NNI->networkSetup()->assignedInterface(); | ||
122 | RcvODO = II->RcvBytes.toLong(); | ||
123 | SndODO = II->SndBytes.toLong(); | ||
124 | SLOT_Refresh(); | ||
125 | } | ||
diff --git a/noncore/settings/networksettings2/profile/profileedit.h b/noncore/settings/networksettings2/profile/profileedit.h index 9cde845..56bd15d 100644 --- a/noncore/settings/networksettings2/profile/profileedit.h +++ b/noncore/settings/networksettings2/profile/profileedit.h | |||
@@ -20,10 +20,13 @@ public slots : | |||
20 | 20 | ||
21 | void SLOT_AutoRefresh( bool ); | 21 | void SLOT_AutoRefresh( bool ); |
22 | void SLOT_Refresh( void ); | 22 | void SLOT_Refresh( void ); |
23 | void SLOT_ResetODO( void ); | ||
23 | 24 | ||
24 | private : | 25 | private : |
25 | 26 | ||
26 | QTimer RefreshTimer; | 27 | QTimer RefreshTimer; |
27 | ANetNodeInstance * NNI; | 28 | ANetNodeInstance * NNI; |
28 | RuntimeInfo * Dev; | 29 | RuntimeInfo * Dev; |
30 | long RcvODO; | ||
31 | long SndODO; | ||
29 | }; | 32 | }; |