From 6bd687e2bc2d9997903d978ac8ebcc6aed9624be Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Fri, 22 Sep 2017 20:45:42 +0530
Subject: [PATCH] UX: Enhance StreamConfigDialog

* Add stream name/enabled fields to dialog
* Change Dialog title to include current stream name
---
 client/portswindow.cpp        |   2 +-
 client/streamconfigdialog.cpp |  16 +
 client/streamconfigdialog.h   |   3 +
 client/streamconfigdialog.ui  | 922 +++++++++++++++++-----------------
 4 files changed, 492 insertions(+), 451 deletions(-)

diff --git a/client/portswindow.cpp b/client/portswindow.cpp
index 2fa93bc..d47d2d7 100644
--- a/client/portswindow.cpp
+++ b/client/portswindow.cpp
@@ -797,7 +797,7 @@ void PortsWindow::on_actionNew_Stream_triggered()
         streams.append(new Stream);
 
     StreamConfigDialog scd(streams, curPort, this);
-    scd.setWindowTitle(tr("Add Stream(s)"));
+    scd.setWindowTitle(tr("Add Stream"));
     if (scd.exec() == QDialog::Accepted)
         streamModel->insert(row, streams);
 }
diff --git a/client/streamconfigdialog.cpp b/client/streamconfigdialog.cpp
index e8db52e..7c4bcd8 100644
--- a/client/streamconfigdialog.cpp
+++ b/client/streamconfigdialog.cpp
@@ -67,6 +67,8 @@ StreamConfigDialog::StreamConfigDialog(
     setupUi(this);
     setupUiExtra();
 
+    _windowTitle = windowTitle();
+
     for (int i = ProtoMin; i < ProtoMax; i++)
     {
         bgProto[i]->setProperty("ProtocolLevel", i);
@@ -333,6 +335,12 @@ StreamConfigDialog::~StreamConfigDialog()
         delete _streamList.takeFirst();
 }
 
+void StreamConfigDialog::setWindowTitle(const QString &title)
+{
+    _windowTitle = title;
+    QDialog::setWindowTitle(title);
+}
+
 void StreamConfigDialog::loadProtocolWidgets()
 {
     ProtocolListIterator    *iter;
@@ -950,8 +958,14 @@ void StreamConfigDialog::LoadCurrentStream()
     qDebug("loading mpStream %p", mpStream);
     variableFieldsWidget->setStream(mpStream);
 
+    QDialog::setWindowTitle(QString("%1 [%2]").arg(_windowTitle)
+                .arg(mpStream->name().isEmpty() ?
+                            tr("<unnamed>") : mpStream->name()));
+
     // Meta Data
     {
+        name->setText(mpStream->name());
+        enabled->setChecked(mpStream->isEnabled());
         cmbPktLenMode->setCurrentIndex(mpStream->lenMode());
         lePktLen->setText(str.setNum(mpStream->frameLen()));
         lePktLenMin->setText(str.setNum(mpStream->frameLenMin()));
@@ -1037,6 +1051,8 @@ void StreamConfigDialog::StoreCurrentStream()
     qDebug("storing pStream %p", pStream);
 
     // Meta Data
+    pStream->setName(name->text());
+    pStream->setEnabled(enabled->isChecked());
     pStream->setLenMode((Stream::FrameLengthMode) cmbPktLenMode->currentIndex());
     pStream->setFrameLen(lePktLen->text().toULong(&isOk));
     pStream->setFrameLenMin(lePktLenMin->text().toULong(&isOk));
diff --git a/client/streamconfigdialog.h b/client/streamconfigdialog.h
index cecb9cc..62c2fdd 100644
--- a/client/streamconfigdialog.h
+++ b/client/streamconfigdialog.h
@@ -47,6 +47,8 @@ public:
             QWidget *parent = 0);
     ~StreamConfigDialog();
 
+    void setWindowTitle(const QString &title);
+
 private: 
 
     enum ButtonId
@@ -76,6 +78,7 @@ private:
     QList<Stream*>  _userStreamList;
     QList<Stream*>  _streamList;
     const Port&     mPort;
+    QString         _windowTitle;
     uint            mCurrentStreamIndex;
 
     Stream                    *mpStream;
diff --git a/client/streamconfigdialog.ui b/client/streamconfigdialog.ui
index eacf894..2c02119 100644
--- a/client/streamconfigdialog.ui
+++ b/client/streamconfigdialog.ui
@@ -1,10 +1,11 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>StreamConfigDialog</class>
- <widget class="QDialog" name="StreamConfigDialog" >
-  <property name="windowModality" >
+ <widget class="QDialog" name="StreamConfigDialog">
+  <property name="windowModality">
    <enum>Qt::ApplicationModal</enum>
   </property>
-  <property name="geometry" >
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -12,123 +13,140 @@
     <height>507</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Edit Stream</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="ostinato.qrc" >:/icons/stream_edit.png</iconset>
+  <property name="windowIcon">
+   <iconset resource="ostinato.qrc">
+    <normaloff>:/icons/stream_edit.png</normaloff>:/icons/stream_edit.png</iconset>
   </property>
-  <property name="styleSheet" >
-   <string>QLineEdit:enabled[inputMask = "HH; "],&#xd;
-QLineEdit:enabled[inputMask = "HH HH; "],&#xd;
-QLineEdit:enabled[inputMask = "HH HH HH; "],&#xd;
-QLineEdit:enabled[inputMask = "HH HH HH HH; "], &#xd;
-QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff  } &#xd;
+  <property name="styleSheet">
+   <string>QLineEdit:enabled[inputMask = &quot;HH; &quot;],
+QLineEdit:enabled[inputMask = &quot;HH HH; &quot;],
+QLineEdit:enabled[inputMask = &quot;HH HH HH; &quot;],
+QLineEdit:enabled[inputMask = &quot;HH HH HH HH; &quot;],
+QLineEdit:enabled[inputMask = &quot;HH HH HH HH HH HH; &quot;] { background-color: #ccccff  }
 </string>
   </property>
-  <property name="modal" >
+  <property name="modal">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <item row="0" column="0" >
-    <widget class="QTabWidget" name="twTopLevel" >
-     <property name="toolTip" >
+  <layout class="QGridLayout">
+   <item row="0" column="0">
+    <widget class="QTabWidget" name="twTopLevel">
+     <property name="toolTip">
       <string/>
      </property>
-     <property name="currentIndex" >
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="packetConfigTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="packetConfigTab">
+      <attribute name="title">
        <string>Protocol Selection</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" >
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
+      <layout class="QGridLayout">
+       <item row="0" column="1">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Basics</string>
          </property>
-         <property name="sizeHint" >
-          <size>
-           <width>241</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_3">
+            <property name="text">
+             <string>Name</string>
+            </property>
+            <property name="buddy">
+             <cstring>name</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="name"/>
+          </item>
+          <item row="1" column="0" colspan="2">
+           <widget class="QCheckBox" name="enabled">
+            <property name="text">
+             <string>Enabled</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
        </item>
-       <item row="0" column="1" >
-        <widget class="QGroupBox" name="gbFrameLength" >
-         <property name="title" >
+       <item row="0" column="2">
+        <widget class="QGroupBox" name="gbFrameLength">
+         <property name="title">
           <string>Frame Length (including FCS)</string>
          </property>
-         <layout class="QGridLayout" >
-          <item row="0" column="0" >
-           <widget class="QComboBox" name="cmbPktLenMode" >
+         <layout class="QGridLayout">
+          <item row="0" column="0">
+           <widget class="QComboBox" name="cmbPktLenMode">
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Fixed</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Increment</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Decrement</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Random</string>
              </property>
             </item>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QLabel" name="label_18" >
-            <property name="text" >
+          <item row="0" column="1">
+           <widget class="QLabel" name="label_18">
+            <property name="text">
              <string>Min</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="2" >
-           <widget class="QLineEdit" name="lePktLenMin" >
-            <property name="enabled" >
+          <item row="0" column="2">
+           <widget class="QLineEdit" name="lePktLenMin">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLineEdit" name="lePktLen" >
-            <property name="alignment" >
+          <item row="1" column="0">
+           <widget class="QLineEdit" name="lePktLen">
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QLabel" name="label_19" >
-            <property name="text" >
+          <item row="1" column="1">
+           <widget class="QLabel" name="label_19">
+            <property name="text">
              <string>Max</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="2" >
-           <widget class="QLineEdit" name="lePktLenMax" >
-            <property name="enabled" >
+          <item row="1" column="2">
+           <widget class="QLineEdit" name="lePktLenMax">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
@@ -136,13 +154,13 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
          </layout>
         </widget>
        </item>
-       <item row="1" column="0" colspan="2" >
-        <widget class="QToolBox" name="tbSelectProtocols" >
-         <property name="currentIndex" >
+       <item row="1" column="0" colspan="3">
+        <widget class="QToolBox" name="tbSelectProtocols">
+         <property name="currentIndex">
           <number>0</number>
          </property>
-         <widget class="QWidget" name="page" >
-          <property name="geometry" >
+         <widget class="QWidget" name="page">
+          <property name="geometry">
            <rect>
             <x>0</x>
             <y>0</y>
@@ -150,42 +168,42 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
             <height>269</height>
            </rect>
           </property>
-          <attribute name="label" >
+          <attribute name="label">
            <string>Simple</string>
           </attribute>
-          <layout class="QGridLayout" >
-           <item row="0" column="0" >
-            <widget class="QGroupBox" name="gbL1Proto" >
-             <property name="title" >
+          <layout class="QGridLayout">
+           <item row="0" column="0">
+            <widget class="QGroupBox" name="gbL1Proto">
+             <property name="title">
               <string>L1</string>
              </property>
-             <layout class="QVBoxLayout" >
+             <layout class="QVBoxLayout">
               <item>
-               <widget class="QRadioButton" name="rbL1None" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbL1None">
+                <property name="text">
                  <string>None</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbL1Mac" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbL1Mac">
+                <property name="text">
                  <string>Mac</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>false</bool>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbL1Other" >
-                <property name="enabled" >
+               <widget class="QRadioButton" name="rbL1Other">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>Other</string>
                 </property>
                </widget>
@@ -193,65 +211,65 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
              </layout>
             </widget>
            </item>
-           <item rowspan="2" row="0" column="1" >
-            <widget class="QGroupBox" name="gbFrameType" >
-             <property name="enabled" >
+           <item row="0" column="1" rowspan="2">
+            <widget class="QGroupBox" name="gbFrameType">
+             <property name="enabled">
               <bool>true</bool>
              </property>
-             <property name="title" >
+             <property name="title">
               <string>L2</string>
              </property>
-             <layout class="QVBoxLayout" >
+             <layout class="QVBoxLayout">
               <item>
-               <widget class="QRadioButton" name="rbFtNone" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbFtNone">
+                <property name="text">
                  <string>None</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbFtEthernet2" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbFtEthernet2">
+                <property name="text">
                  <string>Ethernet II</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>false</bool>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbFt802Dot3Raw" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbFt802Dot3Raw">
+                <property name="text">
                  <string>802.3 Raw</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbFt802Dot3Llc" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbFt802Dot3Llc">
+                <property name="text">
                  <string>802.3 LLC</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>false</bool>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbFtLlcSnap" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbFtLlcSnap">
+                <property name="text">
                  <string>802.3 LLC SNAP</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbFtOther" >
-                <property name="enabled" >
+               <widget class="QRadioButton" name="rbFtOther">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>Other</string>
                 </property>
                </widget>
@@ -259,116 +277,116 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
              </layout>
             </widget>
            </item>
-           <item row="0" column="2" >
-            <widget class="QGroupBox" name="gbL3Proto" >
-             <property name="enabled" >
+           <item row="0" column="2">
+            <widget class="QGroupBox" name="gbL3Proto">
+             <property name="enabled">
               <bool>true</bool>
              </property>
-             <property name="title" >
+             <property name="title">
               <string>L3</string>
              </property>
-             <layout class="QGridLayout" >
-              <item row="0" column="0" >
-               <widget class="QRadioButton" name="rbL3None" >
-                <property name="text" >
+             <layout class="QGridLayout">
+              <item row="0" column="0">
+               <widget class="QRadioButton" name="rbL3None">
+                <property name="text">
                  <string>None</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
-              <item row="0" column="1" >
-               <widget class="QRadioButton" name="rbL3Arp" >
-                <property name="enabled" >
+              <item row="0" column="1">
+               <widget class="QRadioButton" name="rbL3Arp">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>ARP</string>
                 </property>
                </widget>
               </item>
-              <item row="0" column="2" >
-               <widget class="QRadioButton" name="rbL3Ipv4" >
-                <property name="enabled" >
+              <item row="0" column="2">
+               <widget class="QRadioButton" name="rbL3Ipv4">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>IPv4</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>false</bool>
                 </property>
                </widget>
               </item>
-              <item row="1" column="0" >
-               <widget class="QRadioButton" name="rbL3Ipv6" >
-                <property name="enabled" >
+              <item row="1" column="0">
+               <widget class="QRadioButton" name="rbL3Ipv6">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>IPv6</string>
                 </property>
                </widget>
               </item>
-              <item row="1" column="1" >
-               <widget class="QRadioButton" name="rbL3Ip6over4" >
-                <property name="enabled" >
+              <item row="1" column="1">
+               <widget class="QRadioButton" name="rbL3Ip6over4">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>IP 6over4</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>false</bool>
                 </property>
                </widget>
               </item>
-              <item row="1" column="2" >
-               <widget class="QRadioButton" name="rbL3Ip4over6" >
-                <property name="enabled" >
+              <item row="1" column="2">
+               <widget class="QRadioButton" name="rbL3Ip4over6">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>IP 4over6</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>false</bool>
                 </property>
                </widget>
               </item>
-              <item row="2" column="0" >
-               <widget class="QRadioButton" name="rbL3Ip4over4" >
-                <property name="enabled" >
+              <item row="2" column="0">
+               <widget class="QRadioButton" name="rbL3Ip4over4">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>IP 4over4</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>false</bool>
                 </property>
                </widget>
               </item>
-              <item row="2" column="1" >
-               <widget class="QRadioButton" name="rbL3Ip6over6" >
-                <property name="enabled" >
+              <item row="2" column="1">
+               <widget class="QRadioButton" name="rbL3Ip6over6">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>IP 6over6</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>false</bool>
                 </property>
                </widget>
               </item>
-              <item row="2" column="2" >
-               <widget class="QRadioButton" name="rbL3Other" >
-                <property name="enabled" >
+              <item row="2" column="2">
+               <widget class="QRadioButton" name="rbL3Other">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>Other</string>
                 </property>
                </widget>
@@ -376,41 +394,41 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
              </layout>
             </widget>
            </item>
-           <item row="0" column="3" >
-            <widget class="QGroupBox" name="gbL5Proto" >
-             <property name="enabled" >
+           <item row="0" column="3">
+            <widget class="QGroupBox" name="gbL5Proto">
+             <property name="enabled">
               <bool>true</bool>
              </property>
-             <property name="title" >
+             <property name="title">
               <string>L5</string>
              </property>
-             <layout class="QVBoxLayout" >
+             <layout class="QVBoxLayout">
               <item>
-               <widget class="QRadioButton" name="rbL5None" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbL5None">
+                <property name="text">
                  <string>None</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbL5Text" >
-                <property name="enabled" >
+               <widget class="QRadioButton" name="rbL5Text">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>Text</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbL5Other" >
-                <property name="enabled" >
+               <widget class="QRadioButton" name="rbL5Other">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>Other</string>
                 </property>
                </widget>
@@ -418,41 +436,41 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
              </layout>
             </widget>
            </item>
-           <item row="1" column="0" >
-            <widget class="QGroupBox" name="gbVlan" >
-             <property name="enabled" >
+           <item row="1" column="0">
+            <widget class="QGroupBox" name="gbVlan">
+             <property name="enabled">
               <bool>true</bool>
              </property>
-             <property name="title" >
+             <property name="title">
               <string>VLAN</string>
              </property>
-             <property name="checkable" >
+             <property name="checkable">
               <bool>false</bool>
              </property>
-             <property name="checked" >
+             <property name="checked">
               <bool>false</bool>
              </property>
-             <layout class="QVBoxLayout" >
+             <layout class="QVBoxLayout">
               <item>
-               <widget class="QRadioButton" name="rbVlanNone" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbVlanNone">
+                <property name="text">
                  <string>Untagged</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbVlanSingle" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbVlanSingle">
+                <property name="text">
                  <string>Tagged</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbVlanDouble" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbVlanDouble">
+                <property name="text">
                  <string>Stacked</string>
                 </property>
                </widget>
@@ -460,81 +478,81 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
              </layout>
             </widget>
            </item>
-           <item row="1" column="2" >
-            <widget class="QGroupBox" name="gbL4Proto" >
-             <property name="enabled" >
+           <item row="1" column="2">
+            <widget class="QGroupBox" name="gbL4Proto">
+             <property name="enabled">
               <bool>true</bool>
              </property>
-             <property name="title" >
+             <property name="title">
               <string>L4</string>
              </property>
-             <layout class="QGridLayout" >
-              <item row="0" column="0" >
-               <widget class="QRadioButton" name="rbL4None" >
-                <property name="text" >
+             <layout class="QGridLayout">
+              <item row="0" column="0">
+               <widget class="QRadioButton" name="rbL4None">
+                <property name="text">
                  <string>None</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
-              <item row="0" column="1" >
-               <widget class="QRadioButton" name="rbL4Icmp" >
-                <property name="enabled" >
+              <item row="0" column="1">
+               <widget class="QRadioButton" name="rbL4Icmp">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>ICMP</string>
                 </property>
                </widget>
               </item>
-              <item row="0" column="2" >
-               <widget class="QRadioButton" name="rbL4Igmp" >
-                <property name="enabled" >
+              <item row="0" column="2">
+               <widget class="QRadioButton" name="rbL4Igmp">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>IGMP</string>
                 </property>
                </widget>
               </item>
-              <item row="1" column="0" >
-               <widget class="QRadioButton" name="rbL4Tcp" >
-                <property name="enabled" >
+              <item row="1" column="0">
+               <widget class="QRadioButton" name="rbL4Tcp">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>TCP</string>
                 </property>
                </widget>
               </item>
-              <item row="1" column="1" >
-               <widget class="QRadioButton" name="rbL4Udp" >
-                <property name="enabled" >
+              <item row="1" column="1">
+               <widget class="QRadioButton" name="rbL4Udp">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>UDP</string>
                 </property>
                </widget>
               </item>
-              <item row="1" column="2" >
-               <widget class="QRadioButton" name="rbL4Other" >
-                <property name="enabled" >
+              <item row="1" column="2">
+               <widget class="QRadioButton" name="rbL4Other">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>Other</string>
                 </property>
                </widget>
               </item>
-              <item row="0" column="3" >
-               <widget class="QRadioButton" name="rbL4Mld" >
-                <property name="enabled" >
+              <item row="0" column="3">
+               <widget class="QRadioButton" name="rbL4Mld">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>MLD</string>
                 </property>
                </widget>
@@ -542,48 +560,48 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
              </layout>
             </widget>
            </item>
-           <item row="1" column="3" >
-            <widget class="QGroupBox" name="gbPayloadProto" >
-             <property name="enabled" >
+           <item row="1" column="3">
+            <widget class="QGroupBox" name="gbPayloadProto">
+             <property name="enabled">
               <bool>true</bool>
              </property>
-             <property name="title" >
+             <property name="title">
               <string>Payload</string>
              </property>
-             <layout class="QVBoxLayout" >
+             <layout class="QVBoxLayout">
               <item>
-               <widget class="QRadioButton" name="rbPayloadNone" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbPayloadNone">
+                <property name="text">
                  <string>None</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbPayloadPattern" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbPayloadPattern">
+                <property name="text">
                  <string>Pattern</string>
                 </property>
-                <property name="checked" >
+                <property name="checked">
                  <bool>false</bool>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbPayloadHexDump" >
-                <property name="text" >
+               <widget class="QRadioButton" name="rbPayloadHexDump">
+                <property name="text">
                  <string>Hex Dump</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="rbPayloadOther" >
-                <property name="enabled" >
+               <widget class="QRadioButton" name="rbPayloadOther">
+                <property name="enabled">
                  <bool>false</bool>
                 </property>
-                <property name="text" >
+                <property name="text">
                  <string>Other</string>
                 </property>
                </widget>
@@ -593,8 +611,8 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
            </item>
           </layout>
          </widget>
-         <widget class="QWidget" name="page_2" >
-          <property name="geometry" >
+         <widget class="QWidget" name="page_2">
+          <property name="geometry">
            <rect>
             <x>0</x>
             <y>0</y>
@@ -602,28 +620,28 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
             <height>135</height>
            </rect>
           </property>
-          <attribute name="label" >
+          <attribute name="label">
            <string>Advanced</string>
           </attribute>
-          <layout class="QHBoxLayout" >
+          <layout class="QHBoxLayout">
            <item>
-            <layout class="QVBoxLayout" >
+            <layout class="QVBoxLayout">
              <item>
-              <widget class="QLabel" name="label" >
-               <property name="text" >
+              <widget class="QLabel" name="label">
+               <property name="text">
                 <string>Available Protocols</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QListView" name="lvAllProtocols" >
-               <property name="dragEnabled" >
+              <widget class="QListView" name="lvAllProtocols">
+               <property name="dragEnabled">
                 <bool>true</bool>
                </property>
-               <property name="selectionMode" >
+               <property name="selectionMode">
                 <enum>QAbstractItemView::ExtendedSelection</enum>
                </property>
-               <property name="selectionBehavior" >
+               <property name="selectionBehavior">
                 <enum>QAbstractItemView::SelectRows</enum>
                </property>
               </widget>
@@ -631,13 +649,13 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
             </layout>
            </item>
            <item>
-            <layout class="QVBoxLayout" >
+            <layout class="QVBoxLayout">
              <item>
               <spacer>
-               <property name="orientation" >
+               <property name="orientation">
                 <enum>Qt::Vertical</enum>
                </property>
-               <property name="sizeHint" >
+               <property name="sizeHint" stdset="0">
                 <size>
                  <width>20</width>
                  <height>40</height>
@@ -646,24 +664,25 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
               </spacer>
              </item>
              <item>
-              <widget class="QToolButton" name="tbAdd" >
-               <property name="enabled" >
+              <widget class="QToolButton" name="tbAdd">
+               <property name="enabled">
                 <bool>false</bool>
                </property>
-               <property name="text" >
-                <string>></string>
+               <property name="text">
+                <string>&gt;</string>
                </property>
-               <property name="icon" >
-                <iconset resource="ostinato.qrc" >:/icons/arrow_right.png</iconset>
+               <property name="icon">
+                <iconset resource="ostinato.qrc">
+                 <normaloff>:/icons/arrow_right.png</normaloff>:/icons/arrow_right.png</iconset>
                </property>
               </widget>
              </item>
              <item>
               <spacer>
-               <property name="orientation" >
+               <property name="orientation">
                 <enum>Qt::Vertical</enum>
                </property>
-               <property name="sizeHint" >
+               <property name="sizeHint" stdset="0">
                 <size>
                  <width>20</width>
                  <height>40</height>
@@ -674,61 +693,64 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
             </layout>
            </item>
            <item>
-            <layout class="QVBoxLayout" >
+            <layout class="QVBoxLayout">
              <item>
-              <widget class="QLabel" name="label_2" >
-               <property name="text" >
+              <widget class="QLabel" name="label_2">
+               <property name="text">
                 <string>Selected Protocols</string>
                </property>
               </widget>
              </item>
              <item>
-              <layout class="QHBoxLayout" >
+              <layout class="QHBoxLayout">
                <item>
-                <widget class="QToolButton" name="tbUp" >
-                 <property name="enabled" >
+                <widget class="QToolButton" name="tbUp">
+                 <property name="enabled">
                   <bool>false</bool>
                  </property>
-                 <property name="text" >
+                 <property name="text">
                   <string>^</string>
                  </property>
-                 <property name="icon" >
-                  <iconset resource="ostinato.qrc" >:/icons/arrow_up.png</iconset>
+                 <property name="icon">
+                  <iconset resource="ostinato.qrc">
+                   <normaloff>:/icons/arrow_up.png</normaloff>:/icons/arrow_up.png</iconset>
                  </property>
                 </widget>
                </item>
                <item>
-                <widget class="QToolButton" name="tbDown" >
-                 <property name="enabled" >
+                <widget class="QToolButton" name="tbDown">
+                 <property name="enabled">
                   <bool>false</bool>
                  </property>
-                 <property name="text" >
+                 <property name="text">
                   <string>v</string>
                  </property>
-                 <property name="icon" >
-                  <iconset resource="ostinato.qrc" >:/icons/arrow_down.png</iconset>
+                 <property name="icon">
+                  <iconset resource="ostinato.qrc">
+                   <normaloff>:/icons/arrow_down.png</normaloff>:/icons/arrow_down.png</iconset>
                  </property>
                 </widget>
                </item>
                <item>
-                <widget class="QToolButton" name="tbDelete" >
-                 <property name="enabled" >
+                <widget class="QToolButton" name="tbDelete">
+                 <property name="enabled">
                   <bool>false</bool>
                  </property>
-                 <property name="text" >
+                 <property name="text">
                   <string>-</string>
                  </property>
-                 <property name="icon" >
-                  <iconset resource="ostinato.qrc" >:/icons/delete.png</iconset>
+                 <property name="icon">
+                  <iconset resource="ostinato.qrc">
+                   <normaloff>:/icons/delete.png</normaloff>:/icons/delete.png</iconset>
                  </property>
                 </widget>
                </item>
                <item>
                 <spacer>
-                 <property name="orientation" >
+                 <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
-                 <property name="sizeHint" >
+                 <property name="sizeHint" stdset="0">
                   <size>
                    <width>40</width>
                    <height>20</height>
@@ -739,8 +761,8 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
               </layout>
              </item>
              <item>
-              <widget class="QListView" name="lvSelectedProtocols" >
-               <property name="selectionBehavior" >
+              <widget class="QListView" name="lvSelectedProtocols">
+               <property name="selectionBehavior">
                 <enum>QAbstractItemView::SelectRows</enum>
                </property>
               </widget>
@@ -753,54 +775,54 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
        <string>Protocol Data</string>
       </attribute>
-      <layout class="QHBoxLayout" >
+      <layout class="QHBoxLayout">
        <item>
-        <widget class="QToolBox" name="tbProtocolData" >
-         <property name="currentIndex" >
+        <widget class="QToolBox" name="tbProtocolData">
+         <property name="currentIndex">
           <number>-1</number>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
        <string>Variable Fields</string>
       </attribute>
-      <layout class="QHBoxLayout" >
+      <layout class="QHBoxLayout">
        <item>
-        <widget class="VariableFieldsWidget" native="1" name="variableFieldsWidget" />
+        <widget class="VariableFieldsWidget" name="variableFieldsWidget" native="true"/>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="streamControlTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="streamControlTab">
+      <attribute name="title">
        <string>Stream Control</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" >
-        <widget class="QGroupBox" name="groupBox_3" >
-         <property name="title" >
+      <layout class="QGridLayout">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
           <string>Send</string>
          </property>
-         <layout class="QVBoxLayout" >
+         <layout class="QVBoxLayout">
           <item>
-           <widget class="QRadioButton" name="rbSendPackets" >
-            <property name="text" >
+           <widget class="QRadioButton" name="rbSendPackets">
+            <property name="text">
              <string>Packets</string>
             </property>
-            <property name="checked" >
+            <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QRadioButton" name="rbSendBursts" >
-            <property name="text" >
+           <widget class="QRadioButton" name="rbSendBursts">
+            <property name="text">
              <string>Bursts</string>
             </property>
            </widget>
@@ -808,71 +830,71 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
          </layout>
         </widget>
        </item>
-       <item rowspan="2" row="0" column="1" >
-        <widget class="QGroupBox" name="groupBox_13" >
-         <property name="title" >
+       <item row="0" column="1" rowspan="2">
+        <widget class="QGroupBox" name="groupBox_13">
+         <property name="title">
           <string>Numbers</string>
          </property>
-         <layout class="QVBoxLayout" >
+         <layout class="QVBoxLayout">
           <item>
-           <widget class="QLabel" name="label_7" >
-            <property name="text" >
+           <widget class="QLabel" name="label_7">
+            <property name="text">
              <string>Number of Packets</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>leNumPackets</cstring>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QLineEdit" name="leNumPackets" >
-            <property name="inputMask" >
+           <widget class="QLineEdit" name="leNumPackets">
+            <property name="inputMask">
              <string/>
             </property>
-            <property name="text" >
+            <property name="text">
              <string/>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QLabel" name="label_13" >
-            <property name="text" >
+           <widget class="QLabel" name="label_13">
+            <property name="text">
              <string>Number of Bursts</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>leNumBursts</cstring>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QLineEdit" name="leNumBursts" >
-            <property name="enabled" >
+           <widget class="QLineEdit" name="leNumBursts">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QLabel" name="label_12" >
-            <property name="text" >
+           <widget class="QLabel" name="label_12">
+            <property name="text">
              <string>Packets per Burst</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>lePacketsPerBurst</cstring>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QLineEdit" name="lePacketsPerBurst" >
-            <property name="enabled" >
+           <widget class="QLineEdit" name="lePacketsPerBurst">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
@@ -880,68 +902,68 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
          </layout>
         </widget>
        </item>
-       <item rowspan="2" row="0" column="2" >
-        <widget class="QGroupBox" name="groupBox_14" >
-         <property name="title" >
+       <item row="0" column="2" rowspan="2">
+        <widget class="QGroupBox" name="groupBox_14">
+         <property name="title">
           <string>Rate</string>
          </property>
-         <property name="checkable" >
+         <property name="checkable">
           <bool>false</bool>
          </property>
-         <property name="checked" >
+         <property name="checked">
           <bool>false</bool>
          </property>
-         <layout class="QVBoxLayout" >
+         <layout class="QVBoxLayout">
           <item>
-           <widget class="QRadioButton" name="rbPacketsPerSec" >
-            <property name="text" >
+           <widget class="QRadioButton" name="rbPacketsPerSec">
+            <property name="text">
              <string>Packets/Sec</string>
             </property>
-            <property name="checked" >
+            <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QLineEdit" name="lePacketsPerSec" >
-            <property name="alignment" >
+           <widget class="QLineEdit" name="lePacketsPerSec">
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QRadioButton" name="rbBurstsPerSec" >
-            <property name="enabled" >
+           <widget class="QRadioButton" name="rbBurstsPerSec">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Bursts/Sec</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QLineEdit" name="leBurstsPerSec" >
-            <property name="enabled" >
+           <widget class="QLineEdit" name="leBurstsPerSec">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QRadioButton" name="rbBitsPerSec" >
-            <property name="text" >
+           <widget class="QRadioButton" name="rbBitsPerSec">
+            <property name="text">
              <string>Bits/Sec</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QLineEdit" name="leBitsPerSec" >
-            <property name="enabled" >
+           <widget class="QLineEdit" name="leBitsPerSec">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
@@ -949,42 +971,42 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
          </layout>
         </widget>
        </item>
-       <item rowspan="2" row="0" column="3" >
-        <widget class="QGroupBox" name="nextWhat" >
-         <property name="title" >
+       <item row="0" column="3" rowspan="2">
+        <widget class="QGroupBox" name="nextWhat">
+         <property name="title">
           <string>After this stream</string>
          </property>
-         <layout class="QVBoxLayout" >
+         <layout class="QVBoxLayout">
           <item>
-           <widget class="QRadioButton" name="rbActionStop" >
-            <property name="text" >
+           <widget class="QRadioButton" name="rbActionStop">
+            <property name="text">
              <string>Stop</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QRadioButton" name="rbActionGotoNext" >
-            <property name="text" >
+           <widget class="QRadioButton" name="rbActionGotoNext">
+            <property name="text">
              <string>Goto Next Stream</string>
             </property>
-            <property name="checked" >
+            <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QRadioButton" name="rbActionGotoStream" >
-            <property name="text" >
+           <widget class="QRadioButton" name="rbActionGotoStream">
+            <property name="text">
              <string>Goto First</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QLineEdit" name="leStreamId" >
-            <property name="enabled" >
+           <widget class="QLineEdit" name="leStreamId">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
@@ -992,12 +1014,12 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
          </layout>
         </widget>
        </item>
-       <item rowspan="2" row="0" column="4" >
+       <item row="0" column="4" rowspan="2">
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>41</height>
@@ -1005,25 +1027,25 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
          </property>
         </spacer>
        </item>
-       <item row="1" column="0" >
-        <widget class="QGroupBox" name="groupBox_5" >
-         <property name="title" >
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupBox_5">
+         <property name="title">
           <string>Mode</string>
          </property>
-         <layout class="QVBoxLayout" >
+         <layout class="QVBoxLayout">
           <item>
-           <widget class="QRadioButton" name="rbModeFixed" >
-            <property name="text" >
+           <widget class="QRadioButton" name="rbModeFixed">
+            <property name="text">
              <string>Fixed</string>
             </property>
-            <property name="checked" >
+            <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QRadioButton" name="rbModeContinuous" >
-            <property name="text" >
+           <widget class="QRadioButton" name="rbModeContinuous">
+            <property name="text">
              <string>Continuous</string>
             </property>
            </widget>
@@ -1031,87 +1053,87 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
          </layout>
         </widget>
        </item>
-       <item row="3" column="0" colspan="5" >
-        <widget class="QGroupBox" name="groupBox_12" >
-         <property name="enabled" >
+       <item row="3" column="0" colspan="5">
+        <widget class="QGroupBox" name="groupBox_12">
+         <property name="enabled">
           <bool>true</bool>
          </property>
-         <property name="title" >
+         <property name="title">
           <string>Gaps (in seconds)</string>
          </property>
-         <property name="checkable" >
+         <property name="checkable">
           <bool>false</bool>
          </property>
-         <property name="checked" >
+         <property name="checked">
           <bool>false</bool>
          </property>
-         <layout class="QGridLayout" >
-          <item row="0" column="0" colspan="4" >
-           <widget class="QLabel" name="label_45" >
-            <property name="text" >
+         <layout class="QGridLayout">
+          <item row="0" column="0" colspan="4">
+           <widget class="QLabel" name="label_45">
+            <property name="text">
              <string/>
             </property>
-            <property name="pixmap" >
-             <pixmap resource="ostinato.qrc" >:/icons/gaps.png</pixmap>
+            <property name="pixmap">
+             <pixmap resource="ostinato.qrc">:/icons/gaps.png</pixmap>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="label_14" >
-            <property name="text" >
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_14">
+            <property name="text">
              <string>ISG</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>leGapIsg</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QLineEdit" name="leGapIsg" >
-            <property name="enabled" >
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="leGapIsg">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
-          <item row="1" column="2" >
-           <widget class="QLabel" name="label_42" >
-            <property name="text" >
+          <item row="1" column="2">
+           <widget class="QLabel" name="label_42">
+            <property name="text">
              <string>IBG</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>leGapIbg</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="3" >
-           <widget class="QLineEdit" name="leGapIbg" >
-            <property name="enabled" >
+          <item row="1" column="3">
+           <widget class="QLineEdit" name="leGapIbg">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
-          <item row="1" column="4" >
-           <widget class="QLabel" name="label_15" >
-            <property name="text" >
+          <item row="1" column="4">
+           <widget class="QLabel" name="label_15">
+            <property name="text">
              <string>IPG</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>leGapIpg</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="5" >
-           <widget class="QLineEdit" name="leGapIpg" >
-            <property name="enabled" >
+          <item row="1" column="5">
+           <widget class="QLineEdit" name="leGapIpg">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
@@ -1119,12 +1141,12 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
          </layout>
         </widget>
        </item>
-       <item row="4" column="1" colspan="2" >
+       <item row="4" column="1" colspan="2">
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>153</width>
            <height>21</height>
@@ -1134,56 +1156,56 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="packetViewTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="packetViewTab">
+      <attribute name="title">
        <string>Packet View</string>
       </attribute>
-      <layout class="QHBoxLayout" >
+      <layout class="QHBoxLayout">
        <item>
-        <widget class="QSplitter" name="splitter" >
-         <property name="orientation" >
+        <widget class="QSplitter" name="splitter">
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <widget class="QTreeView" name="tvPacketTree" >
-          <property name="selectionBehavior" >
+         <widget class="QTreeView" name="tvPacketTree">
+          <property name="selectionBehavior">
            <enum>QAbstractItemView::SelectItems</enum>
           </property>
-          <property name="verticalScrollMode" >
+          <property name="verticalScrollMode">
            <enum>QAbstractItemView::ScrollPerPixel</enum>
           </property>
-          <property name="wordWrap" >
+          <property name="wordWrap">
            <bool>true</bool>
           </property>
          </widget>
-         <widget class="DumpView" native="1" name="vwPacketDump" />
+         <widget class="DumpView" name="vwPacketDump" native="true"/>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <layout class="QHBoxLayout" >
+   <item row="1" column="0">
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QPushButton" name="pbPrev" >
-       <property name="text" >
+      <widget class="QPushButton" name="pbPrev">
+       <property name="text">
         <string>Prev</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="pbNext" >
-       <property name="text" >
+      <widget class="QPushButton" name="pbNext">
+       <property name="text">
         <string>Next</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>191</width>
          <height>20</height>
@@ -1192,18 +1214,18 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="pbOk" >
-       <property name="text" >
+      <widget class="QPushButton" name="pbOk">
+       <property name="text">
         <string>OK</string>
        </property>
-       <property name="default" >
+       <property name="default">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="pbCancel" >
-       <property name="text" >
+      <widget class="QPushButton" name="pbCancel">
+       <property name="text">
         <string>Cancel</string>
        </property>
       </widget>
@@ -1298,7 +1320,7 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
   <tabstop>pbCancel</tabstop>
  </tabstops>
  <resources>
-  <include location="ostinato.qrc" />
+  <include location="ostinato.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -1307,11 +1329,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>StreamConfigDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>623</x>
      <y>496</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>533</x>
      <y>466</y>
     </hint>
@@ -1323,11 +1345,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>leStreamId</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>463</x>
      <y>143</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>463</x>
      <y>177</y>
     </hint>
@@ -1339,11 +1361,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>rbPacketsPerSec</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>30</x>
      <y>68</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>299</x>
      <y>82</y>
     </hint>
@@ -1355,11 +1377,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>rbBurstsPerSec</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>30</x>
      <y>95</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>299</x>
      <y>132</y>
     </hint>
@@ -1371,11 +1393,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>lePacketsPerBurst</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>30</x>
      <y>95</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>134</x>
      <y>189</y>
     </hint>
@@ -1387,11 +1409,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>lePacketsPerSec</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>299</x>
      <y>82</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>299</x>
      <y>108</y>
     </hint>
@@ -1403,11 +1425,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>leBurstsPerSec</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>299</x>
      <y>132</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>299</x>
      <y>158</y>
     </hint>
@@ -1419,11 +1441,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>leBitsPerSec</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>299</x>
      <y>182</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>299</x>
      <y>208</y>
     </hint>
@@ -1435,11 +1457,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>rbPacketsPerSec</receiver>
    <slot>setChecked(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>95</x>
      <y>70</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>299</x>
      <y>82</y>
     </hint>
@@ -1451,11 +1473,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>rbBurstsPerSec</receiver>
    <slot>setChecked(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>96</x>
      <y>98</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>299</x>
      <y>132</y>
     </hint>
@@ -1467,11 +1489,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>leNumPackets</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>73</x>
      <y>196</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>164</x>
      <y>108</y>
     </hint>
@@ -1483,11 +1505,11 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-color: #ccccff
    <receiver>leNumBursts</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>96</x>
      <y>199</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>226</x>
      <y>155</y>
     </hint>