GUI changes to profileedit

6 files changed, 476 insertions, 466 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(),
          tr( "<p>Devices that can handle IP packets</p>" ) );
     addNodeType( "line", tr( "Character device" ),
          tr( "<p>Devices that can handle single bytes</p>" ) );
-    addNodeType( "NetworkSetup", tr( "IP NetworkSetup" ),
-         tr( "<p>Nodes that provide working IP NetworkSetups</p>" ) );
-    addNodeType( "fullsetup", tr( "NetworkSetup Profile" ),
-         tr( "<p>Fully configured NetworkSetup profile</p>" ) );
-    addNodeType( "GPRS", tr( "NetworkSetup to GPRS device" ),
-         tr( "<p>NetworkSetup to a GPRS capable device</p>" ) );
+    addNodeType( "connection", tr( "IP Connection" ),
+         tr( "<p>Nodes that provide working IP connection</p>" ) );
+    addNodeType( "fullsetup", tr( "Connection Profile" ),
+         tr( "<p>Fully configured network profile</p>" ) );
+    addNodeType( "GPRS", tr( "Connection to GPRS device" ),
+         tr( "<p>Connection to a GPRS capable device</p>" ) );
 
     // get access to the system
     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 ) {
         continue;
 
       // tokenize
-      SL = QStringList::split( ' ', line, FALSE );
+      SL = QStringList::split( ' ', line.mid(loc+1), FALSE );
 
       // update data
       switch( version ) {
         case 1 :
-          I.RcvBytes = SL[1];
-          I.RcvErrors = SL[3];
-          I.RcvDropped = SL[4];
+          I.RcvBytes = "";
+          I.RcvPackets = SL[0];
+          I.RcvErrors = SL[1];
+          I.RcvDropped = SL[2];
+
+          I.SndBytes = "";
+          I.SndPackets = SL[5];
+          I.SndErrors = SL[6];
+          I.SndDropped = SL[7];
+
+          I.Collisions = SL[9];
+          break;
+        case 2 :
+          I.RcvBytes = SL[0];
+          I.RcvPackets = SL[1];
+          I.RcvErrors = SL[2];
+          I.RcvDropped = SL[3];
+
           I.SndBytes = SL[6];
+          I.SndPackets = SL[7];
           I.SndErrors = SL[8];
           I.SndDropped = SL[9];
+
           I.Collisions = SL[11];
           break;
-        case 2 :
-          I.RcvBytes = SL[1];
-          I.RcvErrors = SL[3];
-          I.RcvDropped = SL[4];
-          I.SndBytes = SL[7];
-          I.SndErrors = SL[9];
-          I.SndDropped = SL[10];
-          I.Collisions = SL[12];
-          break;
         case 3 :
-          I.RcvBytes = SL[1];
-          I.RcvErrors = SL[3];
-          I.RcvDropped = SL[4];
-          I.SndBytes = SL[9];
-          I.SndErrors = SL[11];
-          I.SndDropped = SL[12];
-          I.Collisions = SL[14];
+          I.RcvBytes = SL[0];
+          I.RcvPackets = SL[1];
+          I.RcvErrors = SL[2];
+          I.RcvDropped = SL[3];
+
+          I.SndBytes = SL[8];
+          I.SndPackets = SL[9];
+          I.SndErrors = SL[10];
+          I.SndDropped = SL[11];
+
+          I.Collisions = SL[13];
           break;
       }
       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 :
         bool    IsPointToPoint;         // IsPointToPoint card
 
         QString RcvBytes;
-        QString SndBytes;
         QString RcvErrors;
-        QString SndErrors;
+        QString RcvPackets;
         QString RcvDropped;
+
+        QString SndBytes;
+        QString SndErrors;
+        QString SndPackets;
         QString SndDropped;
         QString Collisions;
 };
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 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>276</width>
-            <height>231</height>
+            <width>551</width>
+            <height>547</height>
         </rect>
     </property>
     <property stdset="1">
@@ -28,11 +28,11 @@
     <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>0</number>
+            <number>1</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>0</number>
+            <number>3</number>
         </property>
         <widget>
             <class>QTabWidget</class>
@@ -948,66 +948,18 @@
                         <number>0</number>
                     </property>
                     <widget>
-                        <class>QLayoutWidget</class>
+                        <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout5</cstring>
+                            <cstring>Receiving_GB</cstring>
                         </property>
-                        <hbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget>
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>TextLabel1_2</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizePolicy</name>
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>1</vsizetype>
-                                    </sizepolicy>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Receiving</string>
-                                </property>
-                            </widget>
-                            <spacer>
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer17_2</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                        </hbox>
-                    </widget>
-                    <widget>
-                        <class>QLayoutWidget</class>
                         <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout43</cstring>
+                            <name>enabled</name>
+                            <bool>false</bool>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Receiving</string>
                         </property>
                         <property>
                             <name>layoutMargin</name>
@@ -1015,103 +967,82 @@
                         <property>
                             <name>layoutSpacing</name>
                         </property>
-                        <hbox>
+                        <vbox>
                             <property stdset="1">
                                 <name>margin</name>
-                                <number>2</number>
+                                <number>4</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
-                                <number>0</number>
+                                <number>2</number>
                             </property>
                             <widget>
-                                <class>QFrame</class>
+                                <class>QLayoutWidget</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>Frame114</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizePolicy</name>
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                    </sizepolicy>
-                                </property>
-                                <property stdset="1">
-                                    <name>minimumSize</name>
-                                    <size>
-                                        <width>5</width>
-                                        <height>0</height>
-                                    </size>
-                                </property>
-                                <property stdset="1">
-                                    <name>maximumSize</name>
-                                    <size>
-                                        <width>5</width>
-                                        <height>32767</height>
-                                    </size>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShape</name>
-                                    <enum>NoFrame</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShadow</name>
-                                    <enum>Raised</enum>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QFrame</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>Rcv_GB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>enabled</name>
-                                    <bool>false</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizePolicy</name>
-                                    <sizepolicy>
-                                        <hsizetype>7</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                    </sizepolicy>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShape</name>
-                                    <enum>NoFrame</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShadow</name>
-                                    <enum>Raised</enum>
-                                </property>
-                                <property>
-                                    <name>layoutMargin</name>
+                                    <cstring>Layout11</cstring>
                                 </property>
                                 <property>
                                     <name>layoutSpacing</name>
                                 </property>
-                                <grid>
+                                <hbox>
                                     <property stdset="1">
                                         <name>margin</name>
                                         <number>0</number>
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
-                                        <number>1</number>
+                                        <number>2</number>
                                     </property>
-                                    <widget row="1"  column="0" >
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>TextLabel1_5_9</cstring>
+                                            <cstring>xxxxxxxxxxxxx</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
-                                            <string>Errors</string>
+                                            <string>Pkt</string>
                                         </property>
                                     </widget>
-                                    <widget row="0"  column="1"  rowspan="1"  colspan="3" >
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>RcvPackets_LBL</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>sizePolicy</name>
+                                            <sizepolicy>
+                                                <hsizetype>7</hsizetype>
+                                                <vsizetype>1</vsizetype>
+                                            </sizepolicy>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>frameShape</name>
+                                            <enum>Panel</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>frameShadow</name>
+                                            <enum>Sunken</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>indent</name>
+                                            <number>0</number>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>TextLabel1_5_3_4</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Bytes</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
@@ -1137,11 +1068,22 @@
                                             <number>0</number>
                                         </property>
                                     </widget>
-                                    <widget row="1"  column="3" >
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>RcvDropped_LBL</cstring>
+                                            <cstring>TextLabel1_5_3_4_2</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>ODO</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>RcvODO_LBL</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>sizePolicy</name>
@@ -1163,7 +1105,38 @@
                                             <number>0</number>
                                         </property>
                                     </widget>
-                                    <widget row="1"  column="1" >
+                                </hbox>
+                            </widget>
+                            <widget>
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout12</cstring>
+                                </property>
+                                <property>
+                                    <name>layoutSpacing</name>
+                                </property>
+                                <hbox>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>0</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>2</number>
+                                    </property>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>TextLabel1_5_9</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Errors</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
@@ -1189,7 +1162,7 @@
                                             <number>0</number>
                                         </property>
                                     </widget>
-                                    <widget row="1"  column="2" >
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
@@ -1200,82 +1173,121 @@
                                             <string>Dropped</string>
                                         </property>
                                     </widget>
-                                    <widget row="0"  column="0" >
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>TextLabel1_5_3</cstring>
+                                            <cstring>RcvDropped_LBL</cstring>
                                         </property>
                                         <property stdset="1">
-                                            <name>text</name>
-                                            <string>Bytes</string>
+                                            <name>sizePolicy</name>
+                                            <sizepolicy>
+                                                <hsizetype>7</hsizetype>
+                                                <vsizetype>1</vsizetype>
+                                            </sizepolicy>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>frameShape</name>
+                                            <enum>Panel</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>frameShadow</name>
+                                            <enum>Sunken</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>indent</name>
+                                            <number>0</number>
                                         </property>
                                     </widget>
-                                </grid>
+                                </hbox>
                             </widget>
-                        </hbox>
+                        </vbox>
                     </widget>
                     <widget>
-                        <class>QLayoutWidget</class>
+                        <class>QFrame</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout6</cstring>
+                            <cstring>Frame114</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>sizePolicy</name>
+                            <sizepolicy>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>5</vsizetype>
+                            </sizepolicy>
+                        </property>
+                        <property stdset="1">
+                            <name>minimumSize</name>
+                            <size>
+                                <width>5</width>
+                                <height>0</height>
+                            </size>
+                        </property>
+                        <property stdset="1">
+                            <name>maximumSize</name>
+                            <size>
+                                <width>5</width>
+                                <height>32767</height>
+                            </size>
+                        </property>
+                        <property stdset="1">
+                            <name>frameShape</name>
+                            <enum>NoFrame</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>frameShadow</name>
+                            <enum>Raised</enum>
                         </property>
-                        <hbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget>
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>TextLabel1</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizePolicy</name>
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>1</vsizetype>
-                                    </sizepolicy>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Transmitting</string>
-                                </property>
-                            </widget>
-                            <spacer>
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer18_2</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                        </hbox>
                     </widget>
                     <widget>
-                        <class>QLayoutWidget</class>
+                        <class>QFrame</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout44</cstring>
+                            <cstring>Frame115</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>sizePolicy</name>
+                            <sizepolicy>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>5</vsizetype>
+                            </sizepolicy>
+                        </property>
+                        <property stdset="1">
+                            <name>minimumSize</name>
+                            <size>
+                                <width>5</width>
+                                <height>0</height>
+                            </size>
+                        </property>
+                        <property stdset="1">
+                            <name>maximumSize</name>
+                            <size>
+                                <width>5</width>
+                                <height>32767</height>
+                            </size>
+                        </property>
+                        <property stdset="1">
+                            <name>frameShape</name>
+                            <enum>NoFrame</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>frameShadow</name>
+                            <enum>Plain</enum>
+                        </property>
+                    </widget>
+                    <widget>
+                        <class>QGroupBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>Sending_GB</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>enabled</name>
+                            <bool>false</bool>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Sending</string>
                         </property>
                         <property>
                             <name>layoutMargin</name>
@@ -1283,129 +1295,123 @@
                         <property>
                             <name>layoutSpacing</name>
                         </property>
-                        <hbox>
+                        <vbox>
                             <property stdset="1">
                                 <name>margin</name>
-                                <number>2</number>
+                                <number>4</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
-                                <number>0</number>
+                                <number>2</number>
                             </property>
                             <widget>
-                                <class>QFrame</class>
+                                <class>QLayoutWidget</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>Frame115</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizePolicy</name>
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                    </sizepolicy>
-                                </property>
-                                <property stdset="1">
-                                    <name>minimumSize</name>
-                                    <size>
-                                        <width>5</width>
-                                        <height>0</height>
-                                    </size>
-                                </property>
-                                <property stdset="1">
-                                    <name>maximumSize</name>
-                                    <size>
-                                        <width>5</width>
-                                        <height>32767</height>
-                                    </size>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShape</name>
-                                    <enum>NoFrame</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShadow</name>
-                                    <enum>Plain</enum>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QFrame</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>Snd_GB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>enabled</name>
-                                    <bool>false</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizePolicy</name>
-                                    <sizepolicy>
-                                        <hsizetype>7</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                    </sizepolicy>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShape</name>
-                                    <enum>NoFrame</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShadow</name>
-                                    <enum>Raised</enum>
-                                </property>
-                                <property>
-                                    <name>layoutMargin</name>
+                                    <cstring>Layout13</cstring>
                                 </property>
                                 <property>
                                     <name>layoutSpacing</name>
                                 </property>
-                                <grid>
+                                <hbox>
                                     <property stdset="1">
                                         <name>margin</name>
                                         <number>0</number>
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
-                                        <number>1</number>
+                                        <number>2</number>
                                     </property>
-                                    <widget row="1"  column="0" >
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>TextLabel1_5_9_2</cstring>
+                                            <cstring>dfsfadf</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
-                                            <string>Errors</string>
+                                            <string>Pkt</string>
                                         </property>
                                     </widget>
-                                    <widget row="1"  column="2" >
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>TextLabel1_5_4_2</cstring>
+                                            <cstring>SndPackets_LBL</cstring>
                                         </property>
                                         <property stdset="1">
-                                            <name>text</name>
-                                            <string>Dropped</string>
+                                            <name>sizePolicy</name>
+                                            <sizepolicy>
+                                                <hsizetype>7</hsizetype>
+                                                <vsizetype>1</vsizetype>
+                                            </sizepolicy>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>frameShape</name>
+                                            <enum>Panel</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>frameShadow</name>
+                                            <enum>Sunken</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>indent</name>
+                                            <number>0</number>
                                         </property>
                                     </widget>
-                                    <widget row="0"  column="0" >
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>TextLabel1_5_3_2</cstring>
+                                            <cstring>TextLabel1_5_3_4_4</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Bytes</string>
                                         </property>
                                     </widget>
-                                    <widget row="1"  column="3" >
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>SndDropped_LBL</cstring>
+                                            <cstring>SndBytes_LBL</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>sizePolicy</name>
+                                            <sizepolicy>
+                                                <hsizetype>7</hsizetype>
+                                                <vsizetype>1</vsizetype>
+                                            </sizepolicy>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>frameShape</name>
+                                            <enum>Panel</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>frameShadow</name>
+                                            <enum>Sunken</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>indent</name>
+                                            <number>0</number>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>TextLabel1_5_3_4_2_3</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>ODO</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>SndODO_LBL</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>sizePolicy</name>
@@ -1427,7 +1433,38 @@
                                             <number>0</number>
                                         </property>
                                     </widget>
-                                    <widget row="1"  column="1" >
+                                </hbox>
+                            </widget>
+                            <widget>
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout14</cstring>
+                                </property>
+                                <property>
+                                    <name>layoutSpacing</name>
+                                </property>
+                                <hbox>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>0</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>2</number>
+                                    </property>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>TextLabel1_5_9_3</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Errors</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
@@ -1453,11 +1490,22 @@
                                             <number>0</number>
                                         </property>
                                     </widget>
-                                    <widget row="0"  column="1"  rowspan="1"  colspan="3" >
+                                    <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>SndBytes_LBL</cstring>
+                                            <cstring>TextLabel1_5_4_3</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Dropped</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>SndDropped_LBL</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>sizePolicy</name>
@@ -1479,47 +1527,80 @@
                                             <number>0</number>
                                         </property>
                                     </widget>
-                                </grid>
+                                </hbox>
                             </widget>
-                        </hbox>
+                        </vbox>
                     </widget>
                     <widget>
-                        <class>QLayoutWidget</class>
+                        <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout7</cstring>
+                            <cstring>Misc_GB</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>enabled</name>
+                            <bool>false</bool>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Miscellaneous</string>
+                        </property>
+                        <property>
+                            <name>layoutMargin</name>
+                        </property>
+                        <property>
+                            <name>layoutSpacing</name>
                         </property>
                         <hbox>
                             <property stdset="1">
                                 <name>margin</name>
-                                <number>0</number>
+                                <number>4</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
-                                <number>6</number>
+                                <number>2</number>
                             </property>
                             <widget>
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>TextLabel1_3</cstring>
+                                    <cstring>TextLabel1_5_3_3</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Collisions</string>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Collisions_LBL</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
-                                        <hsizetype>0</hsizetype>
+                                        <hsizetype>7</hsizetype>
                                         <vsizetype>1</vsizetype>
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
-                                    <name>text</name>
-                                    <string>Others</string>
+                                    <name>frameShape</name>
+                                    <enum>Panel</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>frameShadow</name>
+                                    <enum>Sunken</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>indent</name>
+                                    <number>0</number>
                                 </property>
                             </widget>
                             <spacer>
                                 <property>
                                     <name>name</name>
-                                    <cstring>Spacer19</cstring>
+                                    <cstring>Spacer10</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>orientation</name>
@@ -1537,165 +1618,27 @@
                                     </size>
                                 </property>
                             </spacer>
-                        </hbox>
-                    </widget>
-                    <widget>
-                        <class>QLayoutWidget</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout45</cstring>
-                        </property>
-                        <property>
-                            <name>layoutMargin</name>
-                        </property>
-                        <property>
-                            <name>layoutSpacing</name>
-                        </property>
-                        <hbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>2</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>0</number>
-                            </property>
-                            <widget>
-                                <class>QFrame</class>
-                                <property stdset="1">
+                            <spacer>
+                                <property>
                                     <name>name</name>
-                                    <cstring>Frame116</cstring>
+                                    <cstring>Spacer13</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>sizePolicy</name>
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                    </sizepolicy>
+                                    <name>orientation</name>
+                                    <enum>Horizontal</enum>
                                 </property>
                                 <property stdset="1">
-                                    <name>minimumSize</name>
-                                    <size>
-                                        <width>5</width>
-                                        <height>0</height>
-                                    </size>
+                                    <name>sizeType</name>
+                                    <enum>Expanding</enum>
                                 </property>
-                                <property stdset="1">
-                                    <name>maximumSize</name>
+                                <property>
+                                    <name>sizeHint</name>
                                     <size>
-                                        <width>5</width>
-                                        <height>32767</height>
+                                        <width>20</width>
+                                        <height>20</height>
                                     </size>
                                 </property>
-                                <property stdset="1">
-                                    <name>frameShape</name>
-                                    <enum>NoFrame</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShadow</name>
-                                    <enum>Raised</enum>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QFrame</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>Collisions_FRM</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>enabled</name>
-                                    <bool>false</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizePolicy</name>
-                                    <sizepolicy>
-                                        <hsizetype>7</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                    </sizepolicy>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShape</name>
-                                    <enum>NoFrame</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>frameShadow</name>
-                                    <enum>Raised</enum>
-                                </property>
-                                <property>
-                                    <name>layoutMargin</name>
-                                </property>
-                                <property>
-                                    <name>layoutSpacing</name>
-                                </property>
-                                <hbox>
-                                    <property stdset="1">
-                                        <name>margin</name>
-                                        <number>0</number>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>spacing</name>
-                                        <number>2</number>
-                                    </property>
-                                    <widget>
-                                        <class>QLabel</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>TextLabel1_5_3_3</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>text</name>
-                                            <string>Collisions</string>
-                                        </property>
-                                    </widget>
-                                    <widget>
-                                        <class>QLabel</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>Collisions_LBL</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>sizePolicy</name>
-                                            <sizepolicy>
-                                                <hsizetype>7</hsizetype>
-                                                <vsizetype>1</vsizetype>
-                                            </sizepolicy>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>frameShape</name>
-                                            <enum>Panel</enum>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>frameShadow</name>
-                                            <enum>Sunken</enum>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>indent</name>
-                                            <number>0</number>
-                                        </property>
-                                    </widget>
-                                    <spacer>
-                                        <property>
-                                            <name>name</name>
-                                            <cstring>Spacer18</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>orientation</name>
-                                            <enum>Horizontal</enum>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>sizeType</name>
-                                            <enum>Expanding</enum>
-                                        </property>
-                                        <property>
-                                            <name>sizeHint</name>
-                                            <size>
-                                                <width>20</width>
-                                                <height>20</height>
-                                            </size>
-                                        </property>
-                                    </spacer>
-                                </hbox>
-                            </widget>
+                            </spacer>
                         </hbox>
                     </widget>
                     <spacer>
@@ -1723,7 +1666,7 @@
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout17</cstring>
+                            <cstring>Layout10</cstring>
                         </property>
                         <hbox>
                             <property stdset="1">
@@ -1741,6 +1684,10 @@
                                     <cstring>Refresh_CB</cstring>
                                 </property>
                                 <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>false</bool>
+                                </property>
+                                <property stdset="1">
                                     <name>text</name>
                                     <string>Live feed </string>
                                 </property>
@@ -1766,6 +1713,21 @@
                                     </size>
                                 </property>
                             </spacer>
+                            <widget>
+                                <class>QPushButton</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>ResetODO_But</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>false</bool>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Reset ODO</string>
+                                </property>
+                            </widget>
                         </hbox>
                     </widget>
                 </vbox>
@@ -1780,6 +1742,13 @@
         <receiver>Profile_FRM</receiver>
         <slot>SLOT_AutoRefresh(bool)</slot>
     </connection>
+    <connection>
+        <sender>ResetODO_But</sender>
+        <signal>clicked()</signal>
+        <receiver>Profile_FRM</receiver>
+        <slot>SLOT_ResetODO()</slot>
+    </connection>
     <slot access="public">SLOT_AutoRefresh(bool)</slot>
+    <slot access="public">SLOT_ResetODO()</slot>
 </connections>
 </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 @@
 #include <qlabel.h>
+#include <qgroupbox.h>
+#include <qpushbutton.h>
 #include <qframe.h>
 #include <qcheckbox.h>
 #include <qmultilineedit.h>
@@ -23,13 +25,17 @@ ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) :
       if( ( II = NNI->networkSetup()->assignedInterface() ) ) {
 
         Refresh_CB->setEnabled( TRUE );
-        Snd_GB->setEnabled( TRUE );
-        Rcv_GB->setEnabled( TRUE );
-        Collisions_FRM->setEnabled( TRUE );
+        ResetODO_But->setEnabled( TRUE );
+        Sending_GB->setEnabled( TRUE );
+        Receiving_GB->setEnabled( TRUE );
+        Misc_GB->setEnabled( TRUE );
 
         // show current content
         SLOT_Refresh();
 
+        // initialize ODO
+        SLOT_ResetODO();
+
         // fill in static data
         InterfaceName_LBL->setText( II->Name );
         IPAddress_LBL->setText( II->Address );
@@ -82,13 +88,23 @@ bool ProfileEdit::commit( ProfileData & Data ) {
 
 void ProfileEdit::SLOT_Refresh( void ) {
     InterfaceInfo * II = NNI->networkSetup()->assignedInterface();
+    QString S;
     NSResources->system().refreshStatistics( *II );
+
     RcvBytes_LBL->setText( II->RcvBytes );
-    SndBytes_LBL->setText( II->SndBytes );
+    RcvPackets_LBL->setText( II->RcvPackets );
     RcvErrors_LBL->setText( II->RcvErrors );
-    SndErrors_LBL->setText( II->SndErrors );
     RcvDropped_LBL->setText( II->RcvDropped );
+    S.setNum( II->RcvBytes.toLong() - RcvODO );
+    RcvODO_LBL->setText( S );
+
+    SndBytes_LBL->setText( II->SndBytes );
+    SndPackets_LBL->setText( II->SndPackets );
+    SndErrors_LBL->setText( II->SndErrors );
     SndDropped_LBL->setText( II->SndDropped );
+    S.setNum( II->SndBytes.toLong() - SndODO );
+    SndODO_LBL->setText( S );
+
     Collisions_LBL->setText( II->Collisions );
 }
 
@@ -100,3 +116,10 @@ void ProfileEdit::SLOT_AutoRefresh( bool ar ) {
       RefreshTimer.stop();
     }
 }
+
+void ProfileEdit::SLOT_ResetODO( void ) {
+    InterfaceInfo * II = NNI->networkSetup()->assignedInterface();
+    RcvODO = II->RcvBytes.toLong();
+    SndODO = II->SndBytes.toLong();
+    SLOT_Refresh();
+}
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 :
 
     void SLOT_AutoRefresh( bool );
     void SLOT_Refresh( void );
+    void SLOT_ResetODO( void );
 
 private :
 
     QTimer RefreshTimer;
     ANetNodeInstance * NNI;
     RuntimeInfo * Dev;
+    long          RcvODO;
+    long          SndODO;
 };