Bug with interface font in editor panel is fixed and task "object dialogs are too tall - tidy up, make object editor panel take as little space as possible" is finished

src/gui/AddressRangeDialog.cpp

@@ -42,6 +42,7 @@
 #include <qcombobox.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
+#include "FWBSettings.h"
 
 using namespace std;
 using namespace libfwbuilder;
@@ -51,6 +52,7 @@ AddressRangeDialog::AddressRangeDialog(QWidget *parent):
 { 
     m_dialog = new Ui::AddressRangeDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     
     obj=NULL; 
     

src/gui/AddressTableDialog.cpp

@@ -53,6 +53,7 @@
 #include <qfile.h>
 #include <qtextstream.h> 
 #include <qdir.h>
+#include "FWBSettings.h"
 
 
 #include <iostream>
@@ -64,6 +65,7 @@ AddressTableDialog::AddressTableDialog(QWidget *parent) : QWidget(parent)
 {
     m_dialog = new Ui::AddressTableDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     obj=NULL; 
 }
 

src/gui/CustomServiceDialog.cpp

@@ -43,6 +43,7 @@
 #include <qpushbutton.h>
 
 #include <iostream>
+#include "FWBSettings.h"
 
 using namespace libfwbuilder;
 using namespace std;
@@ -51,6 +52,7 @@ CustomServiceDialog::CustomServiceDialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::CustomServiceDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     obj=NULL; 
 }
 

src/gui/DNSNameDialog.cpp

@@ -46,6 +46,7 @@
 #include <qpushbutton.h>
 #include <qapplication.h>
 #include <qcursor.h>
+#include "FWBSettings.h"
 
 #include <iostream>
 
@@ -56,6 +57,7 @@ DNSNameDialog::DNSNameDialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::DNSNameDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     
     obj=NULL; 
 }

src/gui/FWBMainWindow_q.ui

@@ -413,7 +413,7 @@
              <property name="sizePolicy" >
               <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
                <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
+               <verstretch>144</verstretch>
               </sizepolicy>
              </property>
              <widget class="QWidget" name="tab" >
@@ -471,7 +471,7 @@
            <item row="2" column="0" >
             <widget class="QFrame" name="objectEditorFrame" >
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+              <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -504,18 +504,31 @@
               <item row="0" column="0" >
                <widget class="QStackedWidget" name="objectEditorStack" >
                 <property name="sizePolicy" >
-                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                 <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
+                <property name="minimumSize" >
+                 <size>
+                  <width>16</width>
+                  <height>10</height>
+                 </size>
+                </property>
                 <property name="focusPolicy" >
                  <enum>Qt::StrongFocus</enum>
                 </property>
                 <property name="frameShape" >
                  <enum>QFrame::NoFrame</enum>
                 </property>
-                <widget class="QWidget" name="WStackPage" />
+                <widget class="QWidget" name="WStackPage" >
+                 <property name="sizePolicy" >
+                  <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
                </widget>
               </item>
               <item row="1" column="0" >
@@ -653,7 +666,7 @@
      <x>0</x>
      <y>0</y>
      <width>741</width>
-     <height>24</height>
+     <height>32</height>
     </rect>
    </property>
    <widget class="QMenu" name="editMenu" >

src/gui/FWWindow.cpp

@@ -2369,6 +2369,9 @@ void FWWindow::editPrefs()
     if ((QDialog::Accepted == pd.exec()) && (m_mainWindow->ruleSets->count()!=0))
     {
         QApplication::setFont(st->getUiFont());
+        oi->setFont(st->getUiFont());
+        for (int i = 0; i < m_mainWindow->objectEditorStack->count(); i++)
+            m_mainWindow->objectEditorStack->widget(i)->setFont(st->getUiFont());
         for (int i = 0; i < m_mainWindow->ruleSets->count(); i++)
             dynamic_cast<RuleSetView*>(m_mainWindow->ruleSets->widget(i))->updateAll();        
         om->getCurrentObjectTree()->updateAfterPrefEdit();
@@ -2668,8 +2671,10 @@ void FWWindow::closeEditorPanel()
 }
 
 void FWWindow::openEditorPanel()
-{
+{   
+    m_mainWindow->objectEditorFrame->adjustSize();    
     m_mainWindow->objectEditorFrame->show();
+    
 }
 
 void FWWindow::ruleSetTabChanged(int tab)

src/gui/FirewallDialog.cpp

@@ -40,6 +40,7 @@
 #include "fwbuilder/Management.h"
 #include "fwbuilder/FWException.h"
 #include "fwbuilder/Resources.h"
+#include "FWBSettings.h"
 
 #include <vector>
 #include <map>
@@ -71,6 +72,7 @@ FirewallDialog::FirewallDialog(QWidget *parent) : QWidget(parent)
     m_dialog = new Ui::FirewallDialog_q;
     m_dialog->setupUi(this);
     obj=NULL; 
+    setFont(st->getUiFont());
 }
 
 void FirewallDialog::loadFWObject(FWObject *o)

src/gui/GroupObjectDialog.cpp

@@ -62,6 +62,7 @@
 
 #include <iostream>
 #include <algorithm>
+#include "FWBSettings.h"
 
 using namespace std;
 using namespace libfwbuilder;
@@ -77,6 +78,7 @@ GroupObjectDialog::GroupObjectDialog(QWidget *parent) :
 {
     m_dialog = new Ui::GroupObjectDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     
     obj=NULL;
     selectedObject=NULL;

src/gui/HostDialog.cpp

@@ -44,6 +44,7 @@
 #include <qcombobox.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
+#include "FWBSettings.h"
 
 using namespace std;
 using namespace libfwbuilder;
@@ -52,6 +53,7 @@ HostDialog::HostDialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::HostDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     obj=NULL; 
 }
 

src/gui/ICMPServiceDialog.cpp

@@ -41,6 +41,7 @@
 #include <qtextedit.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
+#include "FWBSettings.h"
 
 #include <iostream>
 
@@ -52,6 +53,7 @@ ICMPServiceDialog::ICMPServiceDialog(QWidget *parent) :
 { 
     m_dialog = new Ui::ICMPServiceDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     obj=NULL; 
 }
 

src/gui/IPServiceDialog.cpp

@@ -44,6 +44,7 @@
 #include <qpushbutton.h>
 
 #include <iostream>
+#include "FWBSettings.h"
 
 using namespace libfwbuilder;
 using namespace std;
@@ -52,6 +53,7 @@ IPServiceDialog::IPServiceDialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::IPServiceDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     obj=NULL; 
 }
 

src/gui/IPv4Dialog.cpp

@@ -46,6 +46,7 @@
 #include <qhostinfo.h>
 #include <qapplication.h>
 #include <qcursor.h>
+#include "FWBSettings.h"
 
 #include <iostream>
 
@@ -56,6 +57,7 @@ IPv4Dialog::IPv4Dialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::IPv4Dialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     obj=NULL; 
 }
 

src/gui/InterfaceDialog.cpp

@@ -52,6 +52,7 @@
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
+#include "FWBSettings.h"
 
 using namespace std;
 using namespace libfwbuilder;
@@ -61,6 +62,7 @@ InterfaceDialog::InterfaceDialog(QWidget *parent) :
 {
     m_dialog = new Ui::InterfaceDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
 /*
     seclevel->hide();    seclevelLabel->hide();
     netzone->hide();     netzoneLabel->hide();

src/gui/LibraryDialog.cpp

@@ -42,6 +42,7 @@
 #include <qpixmapcache.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
+#include "FWBSettings.h"
 
 using namespace std;
 using namespace libfwbuilder;
@@ -52,7 +53,9 @@ LibraryDialog::LibraryDialog(QWidget *parent) : QWidget(parent)
     m_dialog->setupUi(this);
     
     obj=NULL;
-
+    setFont(st->getUiFont());
+    //layout()->setSizeConstraint(QLayout::SetFixedSize);
+    
     Qt::WindowFlags flags = windowFlags();
     flags &= ~Qt::WindowMaximizeButtonHint;
     flags &= ~Qt::WindowMinimizeButtonHint;

src/gui/NATRuleOptionsDialog.cpp

@@ -43,6 +43,7 @@
 #include <qlabel.h>
 
 #include <iostream>
+#include "FWBSettings.h"
 
 using namespace libfwbuilder;
 using namespace std;
@@ -56,6 +57,7 @@ NATRuleOptionsDialog::NATRuleOptionsDialog(QWidget *parent) : QWidget(parent)
 {
     m_dialog = new Ui::NATRuleOptionsDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     
     init=false;
 }

src/gui/NetworkDialog.cpp

@@ -43,6 +43,7 @@
 #include <qcombobox.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
+#include "FWBSettings.h"
 
 using namespace std;
 using namespace libfwbuilder;
@@ -51,6 +52,7 @@ NetworkDialog::NetworkDialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::NetworkDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     obj=NULL; 
 }
 

src/gui/ObjectEditor.cpp

@@ -190,15 +190,15 @@ ObjectEditor::ObjectEditor( QWidget *parent ): QObject(parent)
     w= DialogFactory::createDialog(parent,DNSName::TYPENAME);
     stackIds[DNSName::TYPENAME]  = parentWidget->addWidget(w);
     dialogs[stackIds[DNSName::TYPENAME]] = w;
-    
+
     w= DialogFactory::createDialog(parent,AddressTable::TYPENAME);
     stackIds[AddressTable::TYPENAME]  = parentWidget->addWidget(w);
     dialogs[stackIds[AddressTable::TYPENAME]] = w;
-    
+
     w= DialogFactory::createDialog(parent,TagService::TYPENAME);
     stackIds[TagService::TYPENAME]  = parentWidget->addWidget(w);
     dialogs[stackIds[TagService::TYPENAME]] = w;
-    
+
 
     w= new ActionsDialog(parent);
     stackIds[getOptDialogName(optAction)]  = parentWidget->addWidget(w);
@@ -208,7 +208,7 @@ ObjectEditor::ObjectEditor( QWidget *parent ): QObject(parent)
     stackIds[getOptDialogName(optComment)]  = parentWidget->addWidget(w);
     dialogs[stackIds[getOptDialogName(optComment)]] = w;
 
-   
+
     w= new MetricEditorPanel(parent);
     stackIds[getOptDialogName(optMetric)]  = parentWidget->addWidget(w);
     dialogs[stackIds[getOptDialogName(optMetric)]] = w;
@@ -216,7 +216,7 @@ ObjectEditor::ObjectEditor( QWidget *parent ): QObject(parent)
     w=new QWidget(parent);
     stackIds["BLANK"]  = parentWidget->addWidget(w);
     dialogs[stackIds["BLANK"]] = w;
-    
+
 
 }
 

src/gui/PhysicalAddressDialog.cpp

@@ -44,6 +44,7 @@
 #include <qmessagebox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
+#include "FWBSettings.h"
 
 #include <iostream>
 
@@ -54,6 +55,7 @@ PhysicalAddressDialog::PhysicalAddressDialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::PhysAddressDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     obj=NULL; 
 }
 

src/gui/RoutingRuleOptionsDialog.cpp

@@ -48,6 +48,7 @@
 #include <qlabel.h>
 
 #include <iostream>
+#include "FWBSettings.h"
 
 using namespace libfwbuilder;
 using namespace std;
@@ -61,6 +62,7 @@ RoutingRuleOptionsDialog::RoutingRuleOptionsDialog(QWidget *parent) : QWidget(pa
 {
     m_dialog = new Ui::RoutingRuleOptionsDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
 }
 
 void RoutingRuleOptionsDialog::loadFWObject(FWObject *o)

src/gui/RuleOptionsDialog.cpp

@@ -51,6 +51,7 @@
 #include <qlabel.h>
 
 #include <iostream>
+#include "FWBSettings.h"
 
 using namespace libfwbuilder;
 using namespace std;
@@ -64,6 +65,7 @@ RuleOptionsDialog::RuleOptionsDialog(QWidget *parent) : QWidget(parent)
 {
     m_dialog = new Ui::RuleOptionsDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     
     init=false;
 }

src/gui/TCPServiceDialog.cpp

@@ -43,6 +43,7 @@
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlabel.h>
+#include "FWBSettings.h"
 
 using namespace std;
 using namespace libfwbuilder;
@@ -51,6 +52,7 @@ TCPServiceDialog::TCPServiceDialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::TCPServiceDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
         
     obj=NULL; 
 }

src/gui/TagServiceDialog.cpp

@@ -48,6 +48,7 @@
 #include <qcursor.h>
 
 #include <iostream>
+#include "FWBSettings.h"
 
 using namespace std;
 using namespace libfwbuilder;
@@ -61,6 +62,7 @@ TagServiceDialog::TagServiceDialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::TagServiceDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     obj=NULL; 
 }
 

src/gui/TimeDialog.cpp

@@ -45,6 +45,7 @@
 #include <qcheckbox.h>
 
 #include <iostream>
+#include "FWBSettings.h"
 
 using namespace libfwbuilder;
 using namespace std;
@@ -53,6 +54,7 @@ TimeDialog::TimeDialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::TimeDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
     
     obj=NULL;
 }

src/gui/UDPServiceDialog.cpp

@@ -42,6 +42,7 @@
 #include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
+#include "FWBSettings.h"
 
 using namespace std;
 using namespace libfwbuilder;
@@ -50,6 +51,7 @@ UDPServiceDialog::UDPServiceDialog(QWidget *parent) : QWidget(parent)
 { 
     m_dialog = new Ui::UDPServiceDialog_q;
     m_dialog->setupUi(this);
+    setFont(st->getUiFont());
         
     obj=NULL; 
 }

src/gui/addressrangedialog_q.ui

@@ -9,13 +9,11 @@
     <x>0</x>
     <y>0</y>
     <width>633</width>
-    <height>412</height>
+    <height>169</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>5</hsizetype>
-    <vsizetype>5</vsizetype>
+   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -24,30 +22,52 @@
    <string>Address Range</string>
   </property>
   <layout class="QHBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
    <property name="spacing" >
-    <number>6</number>
+    <number>0</number>
+   </property>
+   <property name="leftMargin" >
+    <number>2</number>
+   </property>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
    </property>
    <item>
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -55,18 +75,25 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>4</number>
-        </property>
         <property name="spacing" >
-         <number>6</number>
+         <number>2</number>
+        </property>
+        <property name="leftMargin" >
+         <number>2</number>
+        </property>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
         </property>
         <item>
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -91,10 +118,8 @@
         <item>
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
-            <horstretch>0</horstretch>
+           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+            <horstretch>254</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
@@ -130,18 +155,28 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>10</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="1" column="1" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
             <horstretch>0</horstretch>
             <verstretch>100</verstretch>
            </sizepolicy>
@@ -173,22 +208,6 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Preferred</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>101</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="1" column="0" >
          <widget class="QFrame" name="frame7_2" >
           <property name="frameShape" >
@@ -198,11 +217,23 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="4" column="1" >
             <spacer>
@@ -210,12 +241,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>32</height>
+               <height>5</height>
               </size>
              </property>
             </spacer>
@@ -223,9 +254,7 @@
            <item row="3" column="1" >
             <widget class="QLineEdit" name="rangeEnd" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -235,9 +264,7 @@
            <item row="2" column="1" >
             <widget class="QLineEdit" name="rangeStart" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -287,9 +314,7 @@
            <item row="0" column="1" >
             <widget class="QLineEdit" name="obj_name" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -299,9 +324,7 @@
            <item row="1" column="1" >
             <widget class="QComboBox" name="libs" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -316,22 +339,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::MinimumExpanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>16</width>
-       <height>234</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />

src/gui/addresstabledialog_q.ui

@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>765</width>
-    <height>287</height>
+    <height>200</height>
    </rect>
   </property>
   <property name="baseSize" >
@@ -19,30 +19,55 @@
    <string>Address Table</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -50,11 +75,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
@@ -75,9 +112,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -105,28 +140,24 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
-        <item row="1" column="3" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="0" column="2" >
          <widget class="QLabel" name="textLabel2" >
           <property name="text" >
@@ -146,11 +177,23 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="2" column="1" >
             <spacer>
@@ -158,12 +201,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>20</height>
+               <height>0</height>
               </size>
              </property>
             </spacer>
@@ -197,9 +240,7 @@
            <item row="0" column="1" >
             <widget class="QLineEdit" name="obj_name" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -209,9 +250,7 @@
            <item row="1" column="1" >
             <widget class="QComboBox" name="libs" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -227,18 +266,28 @@
            <string/>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>7</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="0" column="0" >
             <widget class="QRadioButton" name="r_compiletime" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>7</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -251,9 +300,7 @@
            <item row="1" column="0" >
             <widget class="QRadioButton" name="r_runtime" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>7</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -269,12 +316,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>20</height>
+               <height>0</height>
               </size>
              </property>
             </spacer>
@@ -291,18 +338,25 @@
            </item>
            <item row="4" column="0" >
             <layout class="QHBoxLayout" >
-             <property name="margin" >
-              <number>0</number>
-             </property>
              <property name="spacing" >
               <number>6</number>
              </property>
+             <property name="leftMargin" >
+              <number>0</number>
+             </property>
+             <property name="topMargin" >
+              <number>0</number>
+             </property>
+             <property name="rightMargin" >
+              <number>0</number>
+             </property>
+             <property name="bottomMargin" >
+              <number>0</number>
+             </property>
              <item>
               <widget class="QPushButton" name="BrowseButton" >
                <property name="sizePolicy" >
-                <sizepolicy>
-                 <hsizetype>0</hsizetype>
-                 <vsizetype>0</vsizetype>
+                <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -343,9 +397,7 @@
            <item row="3" column="0" >
             <widget class="QLineEdit" name="filename" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>7</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -364,9 +416,7 @@
         <item row="1" column="2" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
             <horstretch>0</horstretch>
             <verstretch>100</verstretch>
            </sizepolicy>
@@ -387,25 +437,9 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>

src/gui/commenteditorpanel_q.ui

@@ -9,37 +9,62 @@
     <x>0</x>
     <y>0</y>
     <width>643</width>
-    <height>254</height>
+    <height>217</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Comment Editor Panel</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
-      <number>6</number>
-     </property>
      <property name="spacing" >
-      <number>6</number>
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
+      <number>2</number>
+     </property>
+     <property name="topMargin" >
+      <number>2</number>
+     </property>
+     <property name="rightMargin" >
+      <number>2</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>2</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -47,11 +72,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="0" >
          <widget class="QLabel" name="editorTitle" >
@@ -85,9 +122,7 @@
      <item>
       <widget class="Line" name="line6" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>1</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -105,11 +140,20 @@
      </item>
      <item>
       <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>6</number>
-       </property>
        <property name="spacing" >
-        <number>6</number>
+        <number>2</number>
+       </property>
+       <property name="leftMargin" >
+        <number>2</number>
+       </property>
+       <property name="topMargin" >
+        <number>2</number>
+       </property>
+       <property name="rightMargin" >
+        <number>2</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>2</number>
        </property>
        <item>
         <widget class="QPushButton" name="inputFromFileButton" >
@@ -138,22 +182,6 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />

src/gui/customservicedialog_q.ui

@@ -1,386 +1,472 @@
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>CustomServiceDialog_q</class>
-  <widget class="QWidget" name="CustomServiceDialog_q" >
-    <property name="enabled" >
-      <bool>true</bool>
-    </property>
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>822</width>
-        <height>277</height>
-      </rect>
-    </property>
-    <property name="windowTitle" >
-      <string>Custom Service</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item row="0" column="0" >
-        <layout class="QVBoxLayout" >
-          <property name="margin" >
-            <number>0</number>
+<ui version="4.0" >
+ <class>CustomServiceDialog_q</class>
+ <widget class="QWidget" name="CustomServiceDialog_q" >
+  <property name="enabled" >
+   <bool>true</bool>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>770</width>
+    <height>202</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Custom Service</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>2</number>
+   </property>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <layout class="QVBoxLayout" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QFrame" name="frame3" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="leftMargin" >
+         <number>2</number>
+        </property>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
+        </property>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="editorTitle" >
+          <property name="font" >
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
           </property>
-          <item>
-            <widget class="QFrame" name="frame3" >
-              <property name="sizePolicy" >
-                <sizepolicy>
-                  <hsizetype>5</hsizetype>
-                  <vsizetype>0</vsizetype>
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                </sizepolicy>
-              </property>
-              <property name="frameShape" >
-                <enum>Box</enum>
-              </property>
-              <property name="frameShadow" >
-                <enum>Sunken</enum>
-              </property>
-              <layout class="QGridLayout" >
-                <property name="margin" >
-                  <number>5</number>
-                </property>
-                <item row="0" column="1" >
-                  <widget class="QLabel" name="editorTitle" >
-                    <property name="font" >
-                      <font>
-                        <bold>true</bold>
-                      </font>
-                    </property>
-                    <property name="text" >
-                      <string>Custom Service</string>
-                    </property>
-                    <property name="wordWrap" >
-                      <bool>false</bool>
-                    </property>
-                  </widget>
-                </item>
-                <item row="0" column="0" >
-                  <widget class="QLabel" name="pixmapLabel1" >
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>0</hsizetype>
-                        <vsizetype>0</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="pixmap" >
-                      <pixmap>custom_25.png</pixmap>
-                    </property>
-                    <property name="scaledContents" >
-                      <bool>true</bool>
-                    </property>
-                    <property name="wordWrap" >
-                      <bool>false</bool>
-                    </property>
-                  </widget>
-                </item>
-              </layout>
+          <property name="text" >
+           <string>Custom Service</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0" >
+         <widget class="QLabel" name="pixmapLabel1" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="pixmap" >
+           <pixmap/>
+          </property>
+          <property name="scaledContents" >
+           <bool>true</bool>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="frame7" >
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="leftMargin" >
+         <number>2</number>
+        </property>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
+        </property>
+        <item row="0" column="2" >
+         <widget class="QLabel" name="textLabel2" >
+          <property name="text" >
+           <string>Comment:</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2" >
+         <widget class="QTextEdit" name="comment" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>90</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>200</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="tabChangesFocus" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="QFrame" name="frame13" >
+          <property name="frameShape" >
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="frameShadow" >
+           <enum>QFrame::Plain</enum>
+          </property>
+          <layout class="QGridLayout" >
+           <item row="2" column="1" >
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType" >
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" >
+              <size>
+               <width>20</width>
+               <height>5</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="0" column="0" >
+            <widget class="QLabel" name="textLabel1" >
+             <property name="text" >
+              <string>Name:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
             </widget>
-          </item>
-          <item>
-            <widget class="QFrame" name="frame7" >
-              <property name="frameShape" >
-                <enum>Box</enum>
-              </property>
-              <property name="frameShadow" >
-                <enum>Sunken</enum>
-              </property>
-              <layout class="QGridLayout" >
-                <property name="spacing" >
-                  <number>10</number>
-                </property>
-                <item row="0" column="2" >
-                  <widget class="QLabel" name="textLabel2" >
-                    <property name="text" >
-                      <string>Comment:</string>
-                    </property>
-                    <property name="wordWrap" >
-                      <bool>false</bool>
-                    </property>
-                  </widget>
-                </item>
-                <item row="1" column="3" >
-                  <spacer name="spacer14" >
-                    <property name="sizeHint" >
-                      <size>
-                        <width>0</width>
-                        <height>20</height>
-                      </size>
-                    </property>
-                    <property name="sizeType" >
-                      <enum>Expanding</enum>
-                    </property>
-                    <property name="orientation" >
-                      <enum>Horizontal</enum>
-                    </property>
-                  </spacer>
-                </item>
-                <item row="1" column="2" >
-                  <widget class="QTextEdit" name="comment" >
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>7</hsizetype>
-                        <vsizetype>7</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>90</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="minimumSize" >
-                      <size>
-                        <width>200</width>
-                        <height>0</height>
-                      </size>
-                    </property>
-                    <property name="tabChangesFocus" >
-                      <bool>true</bool>
-                    </property>
-                  </widget>
-                </item>
-                <item row="1" column="0" >
-                  <widget class="QFrame" name="frame13" >
-                    <property name="frameShape" >
-                      <enum>Box</enum>
-                    </property>
-                    <property name="frameShadow" >
-                      <enum>Sunken</enum>
-                    </property>
-                    <layout class="QGridLayout" >
-                      <item row="2" column="1" >
-                        <spacer name="spacer32" >
-                          <property name="sizeHint" >
-                            <size>
-                              <width>20</width>
-                              <height>30</height>
-                            </size>
-                          </property>
-                          <property name="sizeType" >
-                            <enum>Expanding</enum>
-                          </property>
-                          <property name="orientation" >
-                            <enum>Vertical</enum>
-                          </property>
-                        </spacer>
-                      </item>
-                      <item row="0" column="0" >
-                        <widget class="QLabel" name="textLabel1" >
-                          <property name="text" >
-                            <string>Name:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="0" column="1" >
-                        <widget class="QLineEdit" name="obj_name" >
-                          <property name="sizePolicy" >
-                            <sizepolicy>
-                              <hsizetype>5</hsizetype>
-                              <vsizetype>0</vsizetype>
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                            </sizepolicy>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="1" column="0" >
-                        <widget class="QLabel" name="textLabel1_2" >
-                          <property name="text" >
-                            <string>Library:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="1" column="1" >
-                        <widget class="QComboBox" name="libs" >
-                          <property name="sizePolicy" >
-                            <sizepolicy>
-                              <hsizetype>5</hsizetype>
-                              <vsizetype>0</vsizetype>
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                            </sizepolicy>
-                          </property>
-                        </widget>
-                      </item>
-                    </layout>
-                  </widget>
-                </item>
-                <item row="1" column="1" >
-                  <widget class="QFrame" name="frame14" >
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>5</hsizetype>
-                        <vsizetype>5</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="frameShape" >
-                      <enum>Box</enum>
-                    </property>
-                    <property name="frameShadow" >
-                      <enum>Sunken</enum>
-                    </property>
-                    <layout class="QGridLayout" >
-                      <item row="4" column="0" >
-                        <spacer name="spacer98" >
-                          <property name="sizeHint" >
-                            <size>
-                              <width>20</width>
-                              <height>16</height>
-                            </size>
-                          </property>
-                          <property name="sizeType" >
-                            <enum>Expanding</enum>
-                          </property>
-                          <property name="orientation" >
-                            <enum>Vertical</enum>
-                          </property>
-                        </spacer>
-                      </item>
-                      <item rowspan="1" row="0" column="0" colspan="2" >
-                        <widget class="QLabel" name="textLabel2_2" >
-                          <property name="sizePolicy" >
-                            <sizepolicy>
-                              <hsizetype>7</hsizetype>
-                              <vsizetype>1</vsizetype>
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                            </sizepolicy>
-                          </property>
-                          <property name="minimumSize" >
-                            <size>
-                              <width>0</width>
-                              <height>0</height>
-                            </size>
-                          </property>
-                          <property name="maximumSize" >
-                            <size>
-                              <width>32767</width>
-                              <height>60</height>
-                            </size>
-                          </property>
-                          <property name="text" >
-                            <string>Custom service object has separate code string for each supported firewall platform.</string>
-                          </property>
-                          <property name="alignment" >
-                            <set>Qt::AlignVCenter</set>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>true</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="1" column="0" >
-                        <widget class="QLabel" name="textLabel3" >
-                          <property name="text" >
-                            <string>Platform:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="1" column="1" >
-                        <widget class="QComboBox" name="platform" />
-                      </item>
-                      <item rowspan="1" row="2" column="0" colspan="2" >
-                        <widget class="QLabel" name="textLabel1_3" >
-                          <property name="text" >
-                            <string>Code:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item rowspan="1" row="3" column="0" colspan="2" >
-                        <widget class="QLineEdit" name="code" >
-                          <property name="minimumSize" >
-                            <size>
-                              <width>250</width>
-                              <height>0</height>
-                            </size>
-                          </property>
-                          <property name="alignment" >
-                            <set>Qt::AlignLeft</set>
-                          </property>
-                        </widget>
-                      </item>
-                    </layout>
-                  </widget>
-                </item>
-              </layout>
+           </item>
+           <item row="0" column="1" >
+            <widget class="QLineEdit" name="obj_name" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
             </widget>
-          </item>
-        </layout>
-      </item>
-      <item row="0" column="1" >
-        <spacer name="spacer53" >
-          <property name="sizeHint" >
-            <size>
-              <width>40</width>
-              <height>20</height>
-            </size>
+           </item>
+           <item row="1" column="0" >
+            <widget class="QLabel" name="textLabel1_2" >
+             <property name="text" >
+              <string>Library:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1" >
+            <widget class="QComboBox" name="libs" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QFrame" name="frame14" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
           </property>
-          <property name="sizeType" >
-            <enum>Expanding</enum>
+          <property name="frameShape" >
+           <enum>QFrame::NoFrame</enum>
           </property>
-          <property name="orientation" >
-            <enum>Horizontal</enum>
+          <property name="frameShadow" >
+           <enum>QFrame::Plain</enum>
           </property>
-        </spacer>
-      </item>
+          <layout class="QGridLayout" >
+           <property name="leftMargin" >
+            <number>2</number>
+           </property>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
+           </property>
+           <item row="4" column="0" >
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType" >
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" >
+              <size>
+               <width>20</width>
+               <height>5</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="0" column="0" colspan="2" >
+            <widget class="QLabel" name="textLabel2_2" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize" >
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize" >
+              <size>
+               <width>32767</width>
+               <height>60</height>
+              </size>
+             </property>
+             <property name="text" >
+              <string>Custom service object has separate code string for each supported firewall platform.</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignVCenter</set>
+             </property>
+             <property name="wordWrap" >
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0" >
+            <widget class="QLabel" name="textLabel3" >
+             <property name="text" >
+              <string>Platform:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1" >
+            <widget class="QComboBox" name="platform" />
+           </item>
+           <item row="2" column="0" colspan="2" >
+            <widget class="QLabel" name="textLabel1_3" >
+             <property name="text" >
+              <string>Code:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0" colspan="2" >
+            <widget class="QLineEdit" name="code" >
+             <property name="minimumSize" >
+              <size>
+               <width>250</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignLeading</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
     </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction></pixmapfunction>
-  <tabstops>
-    <tabstop>obj_name</tabstop>
-    <tabstop>libs</tabstop>
-    <tabstop>platform</tabstop>
-    <tabstop>code</tabstop>
-    <tabstop>comment</tabstop>
-  </tabstops>
-  <connections>
-    <connection>
-      <sender>obj_name</sender>
-      <signal>textChanged(QString)</signal>
-      <receiver>CustomServiceDialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>libs</sender>
-      <signal>activated(int)</signal>
-      <receiver>CustomServiceDialog_q</receiver>
-      <slot>libChanged()</slot>
-    </connection>
-    <connection>
-      <sender>platform</sender>
-      <signal>activated(int)</signal>
-      <receiver>CustomServiceDialog_q</receiver>
-      <slot>platformChanged()</slot>
-    </connection>
-    <connection>
-      <sender>code</sender>
-      <signal>textChanged(QString)</signal>
-      <receiver>CustomServiceDialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>comment</sender>
-      <signal>textChanged()</signal>
-      <receiver>CustomServiceDialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-  </connections>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="2" margin="2" />
+ <tabstops>
+  <tabstop>obj_name</tabstop>
+  <tabstop>libs</tabstop>
+  <tabstop>platform</tabstop>
+  <tabstop>code</tabstop>
+  <tabstop>comment</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>obj_name</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>CustomServiceDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>libs</sender>
+   <signal>activated(int)</signal>
+   <receiver>CustomServiceDialog_q</receiver>
+   <slot>libChanged()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>platform</sender>
+   <signal>activated(int)</signal>
+   <receiver>CustomServiceDialog_q</receiver>
+   <slot>platformChanged()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>code</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>CustomServiceDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>comment</sender>
+   <signal>textChanged()</signal>
+   <receiver>CustomServiceDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

src/gui/dnsnamedialog_q.ui

@@ -1,346 +1,459 @@
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>DNSNameDialog_q</class>
-  <widget class="QWidget" name="DNSNameDialog_q" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>630</width>
-        <height>260</height>
-      </rect>
-    </property>
-    <property name="windowTitle" >
-      <string>DNS Name</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item row="0" column="0" >
-        <layout class="QVBoxLayout" >
-          <property name="margin" >
+<ui version="4.0" >
+ <class>DNSNameDialog_q</class>
+ <widget class="QWidget" name="DNSNameDialog_q" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>630</width>
+    <height>214</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>DNS Name</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>2</number>
+   </property>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
+   </property>
+   <item row="0" column="0" >
+    <layout class="QVBoxLayout" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QFrame" name="frame3" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="leftMargin" >
+         <number>2</number>
+        </property>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
+        </property>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="editorTitle" >
+          <property name="font" >
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text" >
+           <string>DNS Name</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0" >
+         <widget class="QLabel" name="pixmapLabel1" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="pixmap" >
+           <pixmap/>
+          </property>
+          <property name="scaledContents" >
+           <bool>true</bool>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="frame7" >
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="leftMargin" >
+         <number>2</number>
+        </property>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
+        </property>
+        <item row="0" column="2" >
+         <widget class="QLabel" name="textLabel2" >
+          <property name="text" >
+           <string>Comment:</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2" >
+         <widget class="QTextEdit" name="comment" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>100</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>200</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="tabChangesFocus" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QGroupBox" name="buttonGroup1" >
+          <property name="title" >
+           <string/>
+          </property>
+          <layout class="QVBoxLayout" >
+           <property name="spacing" >
+            <number>2</number>
+           </property>
+           <property name="leftMargin" >
             <number>0</number>
-          </property>
-          <item>
-            <widget class="QFrame" name="frame3" >
-              <property name="sizePolicy" >
-                <sizepolicy>
-                  <hsizetype>5</hsizetype>
-                  <vsizetype>0</vsizetype>
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                </sizepolicy>
-              </property>
-              <property name="frameShape" >
-                <enum>Box</enum>
-              </property>
-              <property name="frameShadow" >
-                <enum>Sunken</enum>
-              </property>
-              <layout class="QGridLayout" >
-                <property name="margin" >
-                  <number>5</number>
-                </property>
-                <item row="0" column="1" >
-                  <widget class="QLabel" name="editorTitle" >
-                    <property name="font" >
-                      <font>
-                        <bold>true</bold>
-                      </font>
-                    </property>
-                    <property name="text" >
-                      <string>DNS Name</string>
-                    </property>
-                    <property name="wordWrap" >
-                      <bool>false</bool>
-                    </property>
-                  </widget>
-                </item>
-                <item row="0" column="0" >
-                  <widget class="QLabel" name="pixmapLabel1" >
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>0</hsizetype>
-                        <vsizetype>0</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="pixmap" >
-                      <pixmap>domainname_25.png</pixmap>
-                    </property>
-                    <property name="scaledContents" >
-                      <bool>true</bool>
-                    </property>
-                    <property name="wordWrap" >
-                      <bool>false</bool>
-                    </property>
-                  </widget>
-                </item>
-              </layout>
+           </property>
+           <property name="topMargin" >
+            <number>0</number>
+           </property>
+           <property name="rightMargin" >
+            <number>0</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QRadioButton" name="r_compiletime" >
+             <property name="text" >
+              <string>Compile Time</string>
+             </property>
             </widget>
-          </item>
-          <item>
-            <widget class="QFrame" name="frame7" >
-              <property name="frameShape" >
-                <enum>Box</enum>
-              </property>
-              <property name="frameShadow" >
-                <enum>Sunken</enum>
-              </property>
-              <layout class="QGridLayout" >
-                <item row="0" column="2" >
-                  <widget class="QLabel" name="textLabel2" >
-                    <property name="text" >
-                      <string>Comment:</string>
-                    </property>
-                    <property name="wordWrap" >
-                      <bool>false</bool>
-                    </property>
-                  </widget>
-                </item>
-                <item row="1" column="2" >
-                  <widget class="QTextEdit" name="comment" >
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>7</hsizetype>
-                        <vsizetype>7</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>100</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="minimumSize" >
-                      <size>
-                        <width>200</width>
-                        <height>0</height>
-                      </size>
-                    </property>
-                    <property name="tabChangesFocus" >
-                      <bool>true</bool>
-                    </property>
-                  </widget>
-                </item>
-                <item row="1" column="1" >
-                  <widget class="QGroupBox" name="buttonGroup1" >
-                    <property name="title" >
-                      <string/>
-                    </property>
-                    <layout class="QVBoxLayout" >
-                      <property name="margin" >
-                        <number>0</number>
-                      </property>
-                      <item>
-                        <widget class="QRadioButton" name="r_compiletime" >
-                          <property name="text" >
-                            <string>Compile Time</string>
-                          </property>
-                        </widget>
-                      </item>
-                      <item>
-                        <widget class="QRadioButton" name="r_runtime" >
-                          <property name="text" >
-                            <string>Run Time</string>
-                          </property>
-                        </widget>
-                      </item>
-                      <item>
-                        <spacer name="spacer10" >
-                          <property name="sizeHint" >
-                            <size>
-                              <width>20</width>
-                              <height>21</height>
-                            </size>
-                          </property>
-                          <property name="sizeType" >
-                            <enum>Expanding</enum>
-                          </property>
-                          <property name="orientation" >
-                            <enum>Vertical</enum>
-                          </property>
-                        </spacer>
-                      </item>
-                    </layout>
-                  </widget>
-                </item>
-                <item row="1" column="3" >
-                  <spacer name="spacer17" >
-                    <property name="sizeHint" >
-                      <size>
-                        <width>0</width>
-                        <height>20</height>
-                      </size>
-                    </property>
-                    <property name="sizeType" >
-                      <enum>Expanding</enum>
-                    </property>
-                    <property name="orientation" >
-                      <enum>Horizontal</enum>
-                    </property>
-                  </spacer>
-                </item>
-                <item row="1" column="0" >
-                  <widget class="QFrame" name="frame17" >
-                    <property name="frameShape" >
-                      <enum>Box</enum>
-                    </property>
-                    <property name="frameShadow" >
-                      <enum>Sunken</enum>
-                    </property>
-                    <layout class="QGridLayout" >
-                      <item row="3" column="1" >
-                        <spacer name="spacer11" >
-                          <property name="sizeHint" >
-                            <size>
-                              <width>20</width>
-                              <height>16</height>
-                            </size>
-                          </property>
-                          <property name="sizeType" >
-                            <enum>Expanding</enum>
-                          </property>
-                          <property name="orientation" >
-                            <enum>Vertical</enum>
-                          </property>
-                        </spacer>
-                      </item>
-                      <item row="1" column="0" >
-                        <widget class="QLabel" name="textLabel1_2" >
-                          <property name="text" >
-                            <string>Library:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="0" column="0" >
-                        <widget class="QLabel" name="textLabel1" >
-                          <property name="text" >
-                            <string>Name:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="2" column="0" >
-                        <widget class="QLabel" name="textLabel2_2" >
-                          <property name="text" >
-                            <string>DNS Record:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="2" column="1" >
-                        <widget class="QLineEdit" name="dnsrec" >
-                          <property name="sizePolicy" >
-                            <sizepolicy>
-                              <hsizetype>5</hsizetype>
-                              <vsizetype>0</vsizetype>
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                            </sizepolicy>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="0" column="1" >
-                        <widget class="QLineEdit" name="obj_name" >
-                          <property name="sizePolicy" >
-                            <sizepolicy>
-                              <hsizetype>5</hsizetype>
-                              <vsizetype>0</vsizetype>
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                            </sizepolicy>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="1" column="1" >
-                        <widget class="QComboBox" name="libs" >
-                          <property name="sizePolicy" >
-                            <sizepolicy>
-                              <hsizetype>5</hsizetype>
-                              <vsizetype>0</vsizetype>
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                            </sizepolicy>
-                          </property>
-                        </widget>
-                      </item>
-                    </layout>
-                  </widget>
-                </item>
-              </layout>
+           </item>
+           <item>
+            <widget class="QRadioButton" name="r_runtime" >
+             <property name="text" >
+              <string>Run Time</string>
+             </property>
             </widget>
-          </item>
-        </layout>
-      </item>
-      <item row="0" column="1" >
-        <spacer name="spacer57" >
-          <property name="sizeHint" >
-            <size>
-              <width>40</width>
-              <height>20</height>
-            </size>
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType" >
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" >
+              <size>
+               <width>20</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="QFrame" name="frame17" >
+          <property name="frameShape" >
+           <enum>QFrame::NoFrame</enum>
           </property>
-          <property name="sizeType" >
-            <enum>Expanding</enum>
+          <property name="frameShadow" >
+           <enum>QFrame::Plain</enum>
           </property>
-          <property name="orientation" >
-            <enum>Horizontal</enum>
-          </property>
-        </spacer>
-      </item>
+          <layout class="QGridLayout" >
+           <property name="leftMargin" >
+            <number>2</number>
+           </property>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
+           </property>
+           <item row="3" column="1" >
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType" >
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" >
+              <size>
+               <width>20</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="1" column="0" >
+            <widget class="QLabel" name="textLabel1_2" >
+             <property name="text" >
+              <string>Library:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0" >
+            <widget class="QLabel" name="textLabel1" >
+             <property name="text" >
+              <string>Name:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0" >
+            <widget class="QLabel" name="textLabel2_2" >
+             <property name="text" >
+              <string>DNS Record:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1" >
+            <widget class="QLineEdit" name="dnsrec" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1" >
+            <widget class="QLineEdit" name="obj_name" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1" >
+            <widget class="QComboBox" name="libs" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
     </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction></pixmapfunction>
-  <tabstops>
-    <tabstop>obj_name</tabstop>
-    <tabstop>libs</tabstop>
-    <tabstop>dnsrec</tabstop>
-    <tabstop>r_compiletime</tabstop>
-    <tabstop>r_runtime</tabstop>
-    <tabstop>comment</tabstop>
-  </tabstops>
-  <connections>
-    <connection>
-      <sender>obj_name</sender>
-      <signal>textChanged(QString)</signal>
-      <receiver>DNSNameDialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>libs</sender>
-      <signal>activated(int)</signal>
-      <receiver>DNSNameDialog_q</receiver>
-      <slot>libChanged()</slot>
-    </connection>
-    <connection>
-      <sender>comment</sender>
-      <signal>textChanged()</signal>
-      <receiver>DNSNameDialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>dnsrec</sender>
-      <signal>textChanged(QString)</signal>
-      <receiver>DNSNameDialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>r_compiletime</sender>
-      <signal>toggled(bool)</signal>
-      <receiver>DNSNameDialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>r_runtime</sender>
-      <signal>toggled(bool)</signal>
-      <receiver>DNSNameDialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-  </connections>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="2" margin="2" />
+ <tabstops>
+  <tabstop>obj_name</tabstop>
+  <tabstop>libs</tabstop>
+  <tabstop>dnsrec</tabstop>
+  <tabstop>r_compiletime</tabstop>
+  <tabstop>r_runtime</tabstop>
+  <tabstop>comment</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>obj_name</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>DNSNameDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>libs</sender>
+   <signal>activated(int)</signal>
+   <receiver>DNSNameDialog_q</receiver>
+   <slot>libChanged()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>comment</sender>
+   <signal>textChanged()</signal>
+   <receiver>DNSNameDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>dnsrec</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>DNSNameDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>r_compiletime</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>DNSNameDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>r_runtime</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>DNSNameDialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

src/gui/firewalldialog_q.ui

@@ -9,37 +9,65 @@
     <x>0</x>
     <y>0</y>
     <width>810</width>
-    <height>368</height>
+    <height>155</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle" >
    <string>Firewall</string>
   </property>
   <layout class="QHBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
    <property name="spacing" >
-    <number>6</number>
+    <number>2</number>
+   </property>
+   <property name="leftMargin" >
+    <number>2</number>
+   </property>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
    </property>
    <item>
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -47,11 +75,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
@@ -72,9 +112,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -101,133 +139,26 @@
        <property name="frameShadow" >
         <enum>QFrame::Sunken</enum>
        </property>
-       <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>9</number>
-        </property>
+       <layout class="QHBoxLayout" >
         <property name="spacing" >
-         <number>6</number>
+         <number>2</number>
         </property>
-        <item row="1" column="1" >
-         <layout class="QVBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item>
-           <widget class="QPushButton" name="osAdvanced" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>0</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize" >
-             <size>
-              <width>200</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize" >
-             <size>
-              <width>32767</width>
-              <height>32767</height>
-             </size>
-            </property>
-            <property name="text" >
-             <string>Host OS Settings ...</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="fwAdvanced" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>0</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize" >
-             <size>
-              <width>200</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize" >
-             <size>
-              <width>32767</width>
-              <height>32767</height>
-             </size>
-            </property>
-            <property name="text" >
-             <string>Firewall Settings ...</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="inactive" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>1</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip" >
-             <string>Skip this firewall for batch compile and install operations</string>
-            </property>
-            <property name="text" >
-             <string>Inactive firewall</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer>
-            <property name="orientation" >
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType" >
-             <enum>QSizePolicy::Expanding</enum>
-            </property>
-            <property name="sizeHint" >
-             <size>
-              <width>200</width>
-              <height>91</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
-        <item row="1" column="3" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="1" column="0" >
+        <property name="leftMargin" >
+         <number>0</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <item>
          <widget class="QFrame" name="frame7_2" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
+           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -238,205 +169,204 @@
           <property name="frameShadow" >
            <enum>QFrame::Sunken</enum>
           </property>
-          <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
-           </property>
+          <layout class="QVBoxLayout" >
            <property name="spacing" >
-            <number>6</number>
+            <number>2</number>
            </property>
-           <item row="0" column="0" >
-            <widget class="QLabel" name="textLabel1_4_2" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>5</vsizetype>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
+           <property name="leftMargin" >
+            <number>2</number>
+           </property>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <item>
+            <layout class="QGridLayout" >
+             <property name="horizontalSpacing" >
+              <number>4</number>
              </property>
-             <property name="maximumSize" >
-              <size>
-               <width>150</width>
-               <height>32767</height>
-              </size>
+             <property name="verticalSpacing" >
+              <number>4</number>
              </property>
-             <property name="text" >
-              <string>Name:</string>
-             </property>
-             <property name="wordWrap" >
-              <bool>false</bool>
-             </property>
-            </widget>
+             <item row="0" column="0" >
+              <widget class="QLabel" name="textLabel1_4_2" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="maximumSize" >
+                <size>
+                 <width>32767</width>
+                 <height>32767</height>
+                </size>
+               </property>
+               <property name="text" >
+                <string>Name:</string>
+               </property>
+               <property name="wordWrap" >
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1" >
+              <widget class="QLineEdit" name="obj_name" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0" >
+              <widget class="QLabel" name="textLabel1_2_2_2" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="maximumSize" >
+                <size>
+                 <width>32767</width>
+                 <height>32767</height>
+                </size>
+               </property>
+               <property name="text" >
+                <string>Library:</string>
+               </property>
+               <property name="wordWrap" >
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1" >
+              <widget class="QComboBox" name="libs" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0" >
+              <widget class="QLabel" name="textLabel1_3_2_2" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="maximumSize" >
+                <size>
+                 <width>32767</width>
+                 <height>32767</height>
+                </size>
+               </property>
+               <property name="text" >
+                <string>Platform:</string>
+               </property>
+               <property name="wordWrap" >
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1" >
+              <widget class="QComboBox" name="platform" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0" >
+              <widget class="QLabel" name="textLabel7_2_2" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="maximumSize" >
+                <size>
+                 <width>32767</width>
+                 <height>32767</height>
+                </size>
+               </property>
+               <property name="text" >
+                <string>Version:</string>
+               </property>
+               <property name="wordWrap" >
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="1" >
+              <widget class="QComboBox" name="version" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="0" >
+              <widget class="QLabel" name="textLabel2_3_2_2" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="maximumSize" >
+                <size>
+                 <width>32767</width>
+                 <height>32767</height>
+                </size>
+               </property>
+               <property name="text" >
+                <string>Host OS:</string>
+               </property>
+               <property name="wordWrap" >
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="1" >
+              <widget class="QComboBox" name="hostOS" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+            </layout>
            </item>
-           <item row="0" column="1" >
-            <widget class="QLineEdit" name="obj_name" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>1</hsizetype>
-               <vsizetype>0</vsizetype>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1" >
-            <widget class="QComboBox" name="libs" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>1</hsizetype>
-               <vsizetype>0</vsizetype>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0" >
-            <widget class="QLabel" name="textLabel1_2_2_2" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>5</vsizetype>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize" >
-              <size>
-               <width>150</width>
-               <height>32767</height>
-              </size>
-             </property>
-             <property name="text" >
-              <string>Library:</string>
-             </property>
-             <property name="wordWrap" >
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0" >
-            <widget class="QLabel" name="textLabel1_3_2_2" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>5</vsizetype>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize" >
-              <size>
-               <width>150</width>
-               <height>32767</height>
-              </size>
-             </property>
-             <property name="text" >
-              <string>Platform:</string>
-             </property>
-             <property name="wordWrap" >
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1" >
-            <widget class="QComboBox" name="platform" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>1</hsizetype>
-               <vsizetype>0</vsizetype>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="0" >
-            <widget class="QLabel" name="textLabel7_2_2" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>5</vsizetype>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize" >
-              <size>
-               <width>150</width>
-               <height>32767</height>
-              </size>
-             </property>
-             <property name="text" >
-              <string>Version:</string>
-             </property>
-             <property name="wordWrap" >
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="1" >
-            <widget class="QComboBox" name="version" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>1</hsizetype>
-               <vsizetype>0</vsizetype>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="1" >
-            <widget class="QComboBox" name="hostOS" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>1</hsizetype>
-               <vsizetype>0</vsizetype>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="0" >
-            <widget class="QLabel" name="textLabel2_3_2_2" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>5</vsizetype>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize" >
-              <size>
-               <width>150</width>
-               <height>32767</height>
-              </size>
-             </property>
-             <property name="text" >
-              <string>Host OS:</string>
-             </property>
-             <property name="wordWrap" >
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="5" column="1" >
+           <item>
             <spacer>
              <property name="orientation" >
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>40</height>
+               <height>0</height>
               </size>
              </property>
             </spacer>
@@ -444,58 +374,149 @@
           </layout>
          </widget>
         </item>
-        <item row="0" column="2" >
-         <widget class="QLabel" name="textLabel2" >
-          <property name="text" >
-           <string>Comment:</string>
+        <item>
+         <layout class="QVBoxLayout" >
+          <property name="spacing" >
+           <number>0</number>
           </property>
-          <property name="wordWrap" >
-           <bool>false</bool>
-          </property>
-         </widget>
+          <item>
+           <layout class="QVBoxLayout" >
+            <property name="spacing" >
+             <number>4</number>
+            </property>
+            <item>
+             <widget class="QPushButton" name="osAdvanced" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize" >
+               <size>
+                <width>200</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="maximumSize" >
+               <size>
+                <width>32767</width>
+                <height>32767</height>
+               </size>
+              </property>
+              <property name="text" >
+               <string>Host OS Settings ...</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="fwAdvanced" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize" >
+               <size>
+                <width>200</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="maximumSize" >
+               <size>
+                <width>32767</width>
+                <height>32767</height>
+               </size>
+              </property>
+              <property name="text" >
+               <string>Firewall Settings ...</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="inactive" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="toolTip" >
+               <string>Skip this firewall for batch compile and install operations</string>
+              </property>
+              <property name="text" >
+               <string>Inactive firewall</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType" >
+             <enum>QSizePolicy::MinimumExpanding</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>200</width>
+              <height>10</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
         </item>
-        <item row="1" column="2" >
-         <widget class="QTextEdit" name="comment" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>100</verstretch>
-           </sizepolicy>
+        <item>
+         <layout class="QVBoxLayout" >
+          <property name="spacing" >
+           <number>2</number>
           </property>
-          <property name="minimumSize" >
-           <size>
-            <width>200</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="tabChangesFocus" >
-           <bool>true</bool>
-          </property>
-         </widget>
+          <item>
+           <widget class="QLabel" name="textLabel2" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text" >
+             <string>Comment:</string>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QTextEdit" name="comment" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize" >
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="tabChangesFocus" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </item>
        </layout>
       </widget>
      </item>
     </layout>
    </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>16</width>
-       <height>302</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />

src/gui/groupobjectdialog_q.ui

@@ -8,14 +8,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>924</width>
-    <height>253</height>
+    <width>725</width>
+    <height>200</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>5</vsizetype>
+   <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -24,30 +22,55 @@
    <string>Group</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -55,11 +78,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
@@ -80,9 +115,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -104,9 +137,7 @@
      <item>
       <widget class="QFrame" name="frame16" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>7</hsizetype>
-         <vsizetype>7</vsizetype>
+        <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -118,11 +149,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>10</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="3" >
          <widget class="QLabel" name="textLabel2" >
@@ -137,18 +180,28 @@
         <item row="0" column="2" >
          <widget class="QGroupBox" name="buttonGroup2" >
           <layout class="QGridLayout" >
-           <property name="margin" >
+           <property name="leftMargin" >
             <number>2</number>
            </property>
-           <property name="spacing" >
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
             <number>2</number>
            </property>
            <item row="0" column="0" >
             <widget class="QToolButton" name="iconViewBtn" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>0</hsizetype>
-               <vsizetype>5</vsizetype>
+              <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -179,9 +232,7 @@
            <item row="0" column="1" >
             <widget class="QToolButton" name="listViewBtn" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>0</hsizetype>
-               <vsizetype>5</vsizetype>
+              <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -231,9 +282,7 @@
         <item row="1" column="3" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -252,9 +301,7 @@
         <item row="1" column="1" colspan="2" >
          <widget class="QStackedWidget" name="objectViewsStack" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -280,11 +327,23 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="2" column="1" >
             <spacer>
@@ -292,12 +351,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>31</height>
+               <height>2</height>
               </size>
              </property>
             </spacer>
@@ -315,9 +374,7 @@
            <item row="0" column="1" >
             <widget class="QLineEdit" name="obj_name" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -329,16 +386,14 @@
               </size>
              </property>
              <property name="cursor" >
-              <cursor>0</cursor>
+              <cursorShape>ArrowCursor</cursorShape>
              </property>
             </widget>
            </item>
            <item row="1" column="1" >
             <widget class="QComboBox" name="libs" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -369,25 +424,9 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>

src/gui/hostdialog_q.ui

@@ -9,7 +9,7 @@
     <x>0</x>
     <y>0</y>
     <width>563</width>
-    <height>247</height>
+    <height>146</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -17,19 +17,28 @@
   </property>
   <layout class="QGridLayout" >
    <property name="leftMargin" >
-    <number>11</number>
+    <number>2</number>
    </property>
    <property name="topMargin" >
-    <number>11</number>
+    <number>2</number>
    </property>
    <property name="rightMargin" >
-    <number>11</number>
+    <number>2</number>
    </property>
    <property name="bottomMargin" >
-    <number>11</number>
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
@@ -38,6 +47,12 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -46,19 +61,31 @@
        </property>
        <layout class="QGridLayout" >
         <property name="leftMargin" >
-         <number>5</number>
+         <number>2</number>
         </property>
         <property name="topMargin" >
-         <number>5</number>
+         <number>2</number>
         </property>
         <property name="rightMargin" >
-         <number>5</number>
+         <number>2</number>
         </property>
         <property name="bottomMargin" >
-         <number>5</number>
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="font" >
            <font>
             <weight>75</weight>
@@ -105,22 +132,22 @@
        </property>
        <layout class="QGridLayout" >
         <property name="leftMargin" >
-         <number>11</number>
+         <number>2</number>
         </property>
         <property name="topMargin" >
-         <number>11</number>
+         <number>2</number>
         </property>
         <property name="rightMargin" >
-         <number>11</number>
+         <number>2</number>
         </property>
         <property name="bottomMargin" >
-         <number>11</number>
+         <number>2</number>
         </property>
         <property name="horizontalSpacing" >
-         <number>10</number>
+         <number>2</number>
         </property>
         <property name="verticalSpacing" >
-         <number>10</number>
+         <number>2</number>
         </property>
         <item row="1" column="0" >
          <widget class="QFrame" name="frame27" >
@@ -132,16 +159,22 @@
           </property>
           <layout class="QGridLayout" >
            <property name="leftMargin" >
-            <number>11</number>
+            <number>2</number>
            </property>
            <property name="topMargin" >
-            <number>11</number>
+            <number>2</number>
            </property>
            <property name="rightMargin" >
-            <number>11</number>
+            <number>2</number>
            </property>
            <property name="bottomMargin" >
-            <number>11</number>
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="2" column="0" colspan="2" >
             <widget class="QCheckBox" name="MACmatching" >
@@ -156,12 +189,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>30</height>
+               <height>5</height>
               </size>
              </property>
             </spacer>
@@ -238,53 +271,20 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>0</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>
   <tabstop>MACmatching</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <includes/>
  <resources/>
  <connections>
   <connection>

src/gui/icmpservicedialog_q.ui

@@ -9,13 +9,11 @@
     <x>0</x>
     <y>0</y>
     <width>562</width>
-    <height>261</height>
+    <height>179</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>5</vsizetype>
+   <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -24,30 +22,55 @@
    <string>ICMP</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -55,11 +78,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
@@ -80,9 +115,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -110,18 +143,28 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>10</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="1" column="1" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -147,22 +190,6 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>0</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="1" column="0" >
          <widget class="QFrame" name="frame30" >
           <property name="frameShape" >
@@ -172,11 +199,23 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="4" column="2" >
             <spacer>
@@ -184,12 +223,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>20</height>
+               <height>5</height>
               </size>
              </property>
             </spacer>
@@ -197,9 +236,7 @@
            <item row="0" column="0" >
             <widget class="QLabel" name="textLabel1" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>5</vsizetype>
+              <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -215,9 +252,7 @@
            <item row="1" column="1" colspan="3" >
             <widget class="QComboBox" name="libs" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>7</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -268,12 +303,12 @@
              <property name="specialValueText" >
               <string>any</string>
              </property>
-             <property name="maximum" >
-              <number>255</number>
-             </property>
              <property name="minimum" >
               <number>-1</number>
              </property>
+             <property name="maximum" >
+              <number>255</number>
+             </property>
             </widget>
            </item>
            <item row="3" column="0" colspan="2" >
@@ -307,12 +342,12 @@
              <property name="specialValueText" >
               <string>any</string>
              </property>
-             <property name="maximum" >
-              <number>255</number>
-             </property>
              <property name="minimum" >
               <number>-1</number>
              </property>
+             <property name="maximum" >
+              <number>255</number>
+             </property>
             </widget>
            </item>
           </layout>
@@ -323,26 +358,9 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>

src/gui/interfacedialog_q.ui

@@ -9,7 +9,7 @@
     <x>0</x>
     <y>0</y>
     <width>780</width>
-    <height>437</height>
+    <height>236</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -23,19 +23,28 @@
   </property>
   <layout class="QGridLayout" >
    <property name="leftMargin" >
-    <number>11</number>
+    <number>2</number>
    </property>
    <property name="topMargin" >
-    <number>11</number>
+    <number>2</number>
    </property>
    <property name="rightMargin" >
-    <number>11</number>
+    <number>2</number>
    </property>
    <property name="bottomMargin" >
-    <number>11</number>
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
@@ -44,6 +53,12 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -52,19 +67,31 @@
        </property>
        <layout class="QGridLayout" >
         <property name="leftMargin" >
-         <number>5</number>
+         <number>2</number>
         </property>
         <property name="topMargin" >
-         <number>5</number>
+         <number>2</number>
         </property>
         <property name="rightMargin" >
-         <number>5</number>
+         <number>2</number>
         </property>
         <property name="bottomMargin" >
-         <number>5</number>
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="font" >
            <font>
             <weight>75</weight>
@@ -117,33 +144,23 @@
        </property>
        <layout class="QGridLayout" >
         <property name="leftMargin" >
-         <number>11</number>
+         <number>1</number>
         </property>
         <property name="topMargin" >
-         <number>11</number>
+         <number>1</number>
         </property>
         <property name="rightMargin" >
-         <number>11</number>
+         <number>1</number>
         </property>
         <property name="bottomMargin" >
-         <number>11</number>
+         <number>1</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
-        <item row="1" column="4" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>16</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="0" column="3" >
          <widget class="QLabel" name="textLabel2" >
           <property name="text" >
@@ -157,7 +174,7 @@
         <item rowspan="3" row="1" column="3" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+           <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
             <horstretch>0</horstretch>
             <verstretch>100</verstretch>
            </sizepolicy>
@@ -183,16 +200,22 @@
           </property>
           <layout class="QGridLayout" >
            <property name="leftMargin" >
-            <number>11</number>
+            <number>2</number>
            </property>
            <property name="topMargin" >
-            <number>11</number>
+            <number>2</number>
            </property>
            <property name="rightMargin" >
-            <number>11</number>
+            <number>2</number>
            </property>
            <property name="bottomMargin" >
-            <number>11</number>
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="0" column="0" >
             <widget class="QLabel" name="textLabel1" >
@@ -273,12 +296,12 @@ Security level can be any number between 0 and 100, 0 being least secure and 100
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>16</height>
+               <height>2</height>
               </size>
              </property>
             </spacer>
@@ -286,22 +309,6 @@ Security level can be any number between 0 and 100, 0 being least secure and 100
           </layout>
          </widget>
         </item>
-        <item row="3" column="2" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="2" column="1" colspan="2" >
          <widget class="QComboBox" name="netzone" >
           <property name="toolTip" >
@@ -350,22 +357,12 @@ If network zone for this interface consists of only one subnet, you can simply c
            <property name="bottomMargin" >
             <number>0</number>
            </property>
-           <item row="7" column="0" >
-            <spacer>
-             <property name="orientation" >
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
-             </property>
-             <property name="sizeHint" >
-              <size>
-               <width>20</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
+           <property name="horizontalSpacing" >
+            <number>1</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>1</number>
+           </property>
            <item row="1" column="0" >
             <widget class="QCheckBox" name="ext" >
              <property name="toolTip" >
@@ -435,25 +432,9 @@ If network zone for this interface consists of only one subnet, you can simply c
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>
@@ -468,7 +449,6 @@ If network zone for this interface consists of only one subnet, you can simply c
   <tabstop>comment</tabstop>
   <tabstop>netzone</tabstop>
  </tabstops>
- <includes/>
  <resources/>
  <connections>
   <connection>

src/gui/ipservicedialog_q.ui

@@ -8,14 +8,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>762</width>
-    <height>267</height>
+    <width>652</width>
+    <height>203</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>5</vsizetype>
+   <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -24,30 +22,55 @@
    <string>IP</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -55,11 +78,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
@@ -80,9 +115,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -110,34 +143,28 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>10</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
-        <item row="1" column="3" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>0</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="1" column="2" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
             <horstretch>0</horstretch>
             <verstretch>100</verstretch>
            </sizepolicy>
@@ -172,11 +199,20 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QVBoxLayout" >
-           <property name="margin" >
-            <number>11</number>
-           </property>
            <property name="spacing" >
-            <number>6</number>
+            <number>2</number>
+           </property>
+           <property name="leftMargin" >
+            <number>2</number>
+           </property>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
            </property>
            <item>
             <widget class="QGroupBox" name="buttonGroup2" >
@@ -184,11 +220,23 @@
               <string/>
              </property>
              <layout class="QGridLayout" >
-              <property name="margin" >
-               <number>6</number>
+              <property name="leftMargin" >
+               <number>2</number>
               </property>
-              <property name="spacing" >
-               <number>6</number>
+              <property name="topMargin" >
+               <number>2</number>
+              </property>
+              <property name="rightMargin" >
+               <number>2</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>2</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>2</number>
+              </property>
+              <property name="verticalSpacing" >
+               <number>2</number>
               </property>
               <item row="4" column="0" >
                <widget class="QCheckBox" name="all_fragments" >
@@ -247,11 +295,23 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item rowspan="2" row="2" column="2" >
             <widget class="QSpinBox" name="protocolNum" >
@@ -266,12 +326,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>30</height>
+               <height>5</height>
               </size>
              </property>
             </spacer>
@@ -302,9 +362,7 @@
            <item row="1" column="1" colspan="2" >
             <widget class="QComboBox" name="libs" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>7</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -339,25 +397,9 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>

src/gui/ipv4dialog_q.ui

@@ -1,354 +1,466 @@
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>IPv4Dialog_q</class>
-  <widget class="QWidget" name="IPv4Dialog_q" >
-    <property name="enabled" >
-      <bool>true</bool>
-    </property>
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>562</width>
-        <height>297</height>
-      </rect>
-    </property>
-    <property name="windowTitle" >
-      <string>IPv4</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item row="0" column="0" >
-        <layout class="QVBoxLayout" >
-          <property name="margin" >
-            <number>0</number>
+<ui version="4.0" >
+ <class>IPv4Dialog_q</class>
+ <widget class="QWidget" name="IPv4Dialog_q" >
+  <property name="enabled" >
+   <bool>true</bool>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>488</width>
+    <height>188</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>IPv4</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>2</number>
+   </property>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
+   </property>
+   <item row="0" column="0" >
+    <layout class="QVBoxLayout" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QFrame" name="frame3" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="leftMargin" >
+         <number>2</number>
+        </property>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
+        </property>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="editorTitle" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
           </property>
-          <item>
-            <widget class="QFrame" name="frame3" >
-              <property name="sizePolicy" >
-                <sizepolicy>
-                  <hsizetype>5</hsizetype>
-                  <vsizetype>0</vsizetype>
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                </sizepolicy>
-              </property>
-              <property name="frameShape" >
-                <enum>Box</enum>
-              </property>
-              <property name="frameShadow" >
-                <enum>Sunken</enum>
-              </property>
-              <layout class="QGridLayout" >
-                <property name="margin" >
-                  <number>5</number>
-                </property>
-                <item row="0" column="1" >
-                  <widget class="QLabel" name="editorTitle" >
-                    <property name="font" >
-                      <font>
-                        <bold>true</bold>
-                      </font>
-                    </property>
-                    <property name="text" >
-                      <string>Address</string>
-                    </property>
-                    <property name="wordWrap" >
-                      <bool>false</bool>
-                    </property>
-                  </widget>
-                </item>
-                <item row="0" column="0" >
-                  <widget class="QLabel" name="pixmapLabel1" >
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>0</hsizetype>
-                        <vsizetype>0</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="pixmap" >
-                      <pixmap>address_25.png</pixmap>
-                    </property>
-                    <property name="scaledContents" >
-                      <bool>true</bool>
-                    </property>
-                    <property name="wordWrap" >
-                      <bool>false</bool>
-                    </property>
-                  </widget>
-                </item>
-              </layout>
+          <property name="font" >
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text" >
+           <string>Address</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0" >
+         <widget class="QLabel" name="pixmapLabel1" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="pixmap" >
+           <pixmap/>
+          </property>
+          <property name="scaledContents" >
+           <bool>true</bool>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="frame7" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="leftMargin" >
+         <number>2</number>
+        </property>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
+        </property>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="textLabel2" >
+          <property name="text" >
+           <string>Comment:</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QTextEdit" name="comment" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>100</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>200</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="tabChangesFocus" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="QFrame" name="frame14" >
+          <property name="frameShape" >
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="frameShadow" >
+           <enum>QFrame::Plain</enum>
+          </property>
+          <layout class="QGridLayout" >
+           <property name="leftMargin" >
+            <number>2</number>
+           </property>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
+           </property>
+           <item row="0" column="1" >
+            <widget class="QLineEdit" name="obj_name" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
             </widget>
-          </item>
-          <item>
-            <widget class="QFrame" name="frame7" >
-              <property name="sizePolicy" >
-                <sizepolicy>
-                  <hsizetype>5</hsizetype>
-                  <vsizetype>5</vsizetype>
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                </sizepolicy>
-              </property>
-              <property name="frameShape" >
-                <enum>Box</enum>
-              </property>
-              <property name="frameShadow" >
-                <enum>Sunken</enum>
-              </property>
-              <layout class="QGridLayout" >
-                <property name="spacing" >
-                  <number>10</number>
-                </property>
-                <item row="0" column="1" >
-                  <widget class="QLabel" name="textLabel2" >
-                    <property name="text" >
-                      <string>Comment:</string>
-                    </property>
-                    <property name="wordWrap" >
-                      <bool>false</bool>
-                    </property>
-                  </widget>
-                </item>
-                <item row="1" column="1" >
-                  <widget class="QTextEdit" name="comment" >
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>7</hsizetype>
-                        <vsizetype>7</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>100</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="minimumSize" >
-                      <size>
-                        <width>200</width>
-                        <height>0</height>
-                      </size>
-                    </property>
-                    <property name="tabChangesFocus" >
-                      <bool>true</bool>
-                    </property>
-                  </widget>
-                </item>
-                <item row="1" column="2" >
-                  <spacer name="spacer142" >
-                    <property name="sizeHint" >
-                      <size>
-                        <width>0</width>
-                        <height>20</height>
-                      </size>
-                    </property>
-                    <property name="sizeType" >
-                      <enum>Expanding</enum>
-                    </property>
-                    <property name="orientation" >
-                      <enum>Horizontal</enum>
-                    </property>
-                  </spacer>
-                </item>
-                <item row="1" column="0" >
-                  <widget class="QFrame" name="frame14" >
-                    <property name="frameShape" >
-                      <enum>Box</enum>
-                    </property>
-                    <property name="frameShadow" >
-                      <enum>Sunken</enum>
-                    </property>
-                    <layout class="QGridLayout" >
-                      <item row="0" column="1" >
-                        <widget class="QLineEdit" name="obj_name" >
-                          <property name="sizePolicy" >
-                            <sizepolicy>
-                              <hsizetype>5</hsizetype>
-                              <vsizetype>0</vsizetype>
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                            </sizepolicy>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="0" column="0" >
-                        <widget class="QLabel" name="textLabel1" >
-                          <property name="text" >
-                            <string>Name:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="1" column="1" >
-                        <widget class="QComboBox" name="libs" >
-                          <property name="sizePolicy" >
-                            <sizepolicy>
-                              <hsizetype>5</hsizetype>
-                              <vsizetype>0</vsizetype>
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                            </sizepolicy>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="1" column="0" >
-                        <widget class="QLabel" name="textLabel1_2" >
-                          <property name="text" >
-                            <string>Library:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="2" column="1" >
-                        <widget class="QLineEdit" name="address" >
-                          <property name="sizePolicy" >
-                            <sizepolicy>
-                              <hsizetype>5</hsizetype>
-                              <vsizetype>0</vsizetype>
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                            </sizepolicy>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="2" column="0" >
-                        <widget class="QLabel" name="textLabel2_2" >
-                          <property name="text" >
-                            <string>Address:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="3" column="1" >
-                        <widget class="QLineEdit" name="netmask" >
-                          <property name="sizePolicy" >
-                            <sizepolicy>
-                              <hsizetype>5</hsizetype>
-                              <vsizetype>0</vsizetype>
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                            </sizepolicy>
-                          </property>
-                        </widget>
-                      </item>
-                      <item row="3" column="0" >
-                        <widget class="QLabel" name="netmaskLabel" >
-                          <property name="text" >
-                            <string>Netmask:</string>
-                          </property>
-                          <property name="wordWrap" >
-                            <bool>false</bool>
-                          </property>
-                        </widget>
-                      </item>
-                      <item rowspan="1" row="4" column="0" colspan="2" >
-                        <layout class="QHBoxLayout" >
-                          <property name="margin" >
-                            <number>0</number>
-                          </property>
-                          <item>
-                            <spacer name="spacer12" >
-                              <property name="sizeHint" >
-                                <size>
-                                  <width>30</width>
-                                  <height>20</height>
-                                </size>
-                              </property>
-                              <property name="sizeType" >
-                                <enum>Expanding</enum>
-                              </property>
-                              <property name="orientation" >
-                                <enum>Horizontal</enum>
-                              </property>
-                            </spacer>
-                          </item>
-                          <item>
-                            <widget class="QPushButton" name="dnsLookup" >
-                              <property name="text" >
-                                <string>DNS Lookup...</string>
-                              </property>
-                            </widget>
-                          </item>
-                        </layout>
-                      </item>
-                    </layout>
-                  </widget>
-                </item>
-              </layout>
+           </item>
+           <item row="0" column="0" >
+            <widget class="QLabel" name="textLabel1" >
+             <property name="text" >
+              <string>Name:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
             </widget>
-          </item>
-        </layout>
-      </item>
-      <item row="0" column="1" >
-        <spacer name="spacer88" >
-          <property name="sizeHint" >
-            <size>
-              <width>40</width>
-              <height>20</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Horizontal</enum>
-          </property>
-        </spacer>
-      </item>
+           </item>
+           <item row="1" column="1" >
+            <widget class="QComboBox" name="libs" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0" >
+            <widget class="QLabel" name="textLabel1_2" >
+             <property name="text" >
+              <string>Library:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1" >
+            <widget class="QLineEdit" name="address" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0" >
+            <widget class="QLabel" name="textLabel2_2" >
+             <property name="text" >
+              <string>Address:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1" >
+            <widget class="QLineEdit" name="netmask" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0" >
+            <widget class="QLabel" name="netmaskLabel" >
+             <property name="text" >
+              <string>Netmask:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="0" colspan="2" >
+            <layout class="QHBoxLayout" >
+             <property name="spacing" >
+              <number>2</number>
+             </property>
+             <property name="leftMargin" >
+              <number>0</number>
+             </property>
+             <property name="topMargin" >
+              <number>0</number>
+             </property>
+             <property name="rightMargin" >
+              <number>0</number>
+             </property>
+             <property name="bottomMargin" >
+              <number>0</number>
+             </property>
+             <item>
+              <spacer>
+               <property name="orientation" >
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeType" >
+                <enum>QSizePolicy::MinimumExpanding</enum>
+               </property>
+               <property name="sizeHint" >
+                <size>
+                 <width>30</width>
+                 <height>5</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QPushButton" name="dnsLookup" >
+               <property name="text" >
+                <string>DNS Lookup...</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
     </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction></pixmapfunction>
-  <tabstops>
-    <tabstop>obj_name</tabstop>
-    <tabstop>libs</tabstop>
-    <tabstop>address</tabstop>
-    <tabstop>netmask</tabstop>
-    <tabstop>dnsLookup</tabstop>
-    <tabstop>comment</tabstop>
-  </tabstops>
-  <connections>
-    <connection>
-      <sender>comment</sender>
-      <signal>textChanged()</signal>
-      <receiver>IPv4Dialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>address</sender>
-      <signal>textChanged(QString)</signal>
-      <receiver>IPv4Dialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>libs</sender>
-      <signal>activated(int)</signal>
-      <receiver>IPv4Dialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>netmask</sender>
-      <signal>textChanged(QString)</signal>
-      <receiver>IPv4Dialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>obj_name</sender>
-      <signal>textChanged(QString)</signal>
-      <receiver>IPv4Dialog_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-    <connection>
-      <sender>dnsLookup</sender>
-      <signal>clicked()</signal>
-      <receiver>IPv4Dialog_q</receiver>
-      <slot>DNSlookup()</slot>
-    </connection>
-  </connections>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="2" margin="4" />
+ <tabstops>
+  <tabstop>obj_name</tabstop>
+  <tabstop>libs</tabstop>
+  <tabstop>address</tabstop>
+  <tabstop>netmask</tabstop>
+  <tabstop>dnsLookup</tabstop>
+  <tabstop>comment</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>comment</sender>
+   <signal>textChanged()</signal>
+   <receiver>IPv4Dialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>address</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>IPv4Dialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>libs</sender>
+   <signal>activated(int)</signal>
+   <receiver>IPv4Dialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>netmask</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>IPv4Dialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>obj_name</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>IPv4Dialog_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>dnsLookup</sender>
+   <signal>clicked()</signal>
+   <receiver>IPv4Dialog_q</receiver>
+   <slot>DNSlookup()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

src/gui/librarydialog_q.ui

@@ -9,37 +9,62 @@
     <x>0</x>
     <y>0</y>
     <width>657</width>
-    <height>263</height>
+    <height>154</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Library</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -47,14 +72,32 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="font" >
            <font>
             <weight>75</weight>
@@ -72,9 +115,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -102,11 +143,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>10</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="1" column="0" >
          <widget class="QFrame" name="frame56" >
@@ -117,18 +170,28 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="0" column="1" >
             <widget class="QLineEdit" name="obj_name" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -158,9 +221,7 @@
            <item row="1" column="1" >
             <widget class="QPushButton" name="colorButton" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -176,7 +237,7 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
@@ -192,11 +253,9 @@
         <item row="1" column="1" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
             <horstretch>0</horstretch>
-            <verstretch>100</verstretch>
+            <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize" >
@@ -212,6 +271,12 @@
         </item>
         <item row="0" column="1" >
          <widget class="QLabel" name="textLabel2" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text" >
            <string>Comment:</string>
           </property>
@@ -220,22 +285,6 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>91</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </widget>
      </item>
@@ -259,7 +308,7 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="4" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>colorButton</tabstop>

src/gui/main.cpp

@@ -611,7 +611,7 @@ int main( int argc, char ** argv )
 
 /* initialize preferences */
         st->init();
-
+        QApplication::setFont(st->getUiFont());
         if (fwbdebug) qDebug("done");
 
         QPixmapCache::setCacheLimit(4096);

src/gui/metriceditorpanel_q.ui

@@ -1,113 +1,136 @@
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>MetricEditorPanel_q</class>
-  <widget class="QWidget" name="MetricEditorPanel_q" >
-    <property name="enabled" >
+<ui version="4.0" >
+ <class>MetricEditorPanel_q</class>
+ <widget class="QWidget" name="MetricEditorPanel_q" >
+  <property name="enabled" >
+   <bool>true</bool>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>313</width>
+    <height>154</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Script Editor</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>2</number>
+   </property>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
+   </property>
+   <item row="2" column="0" >
+    <widget class="QSpinBox" name="spin_box" >
+     <property name="enabled" >
       <bool>true</bool>
-    </property>
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>313</width>
-        <height>154</height>
-      </rect>
-    </property>
-    <property name="windowTitle" >
-      <string>Script Editor</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item row="2" column="0" >
-        <widget class="QSpinBox" name="spin_box" >
-          <property name="enabled" >
-            <bool>true</bool>
-          </property>
-          <property name="prefix" >
-            <string/>
-          </property>
-          <property name="buttonSymbols" >
-            <enum>QAbstractSpinBox::PlusMinus</enum>
-          </property>
-          <property name="maximum" >
-            <number>255</number>
-          </property>
-          <property name="singleStep" >
-            <number>1</number>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="0" >
-        <spacer name="spacer4" >
-          <property name="sizeHint" >
-            <size>
-              <width>20</width>
-              <height>40</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Vertical</enum>
-          </property>
-        </spacer>
-      </item>
-      <item row="2" column="1" >
-        <spacer name="spacer3" >
-          <property name="sizeHint" >
-            <size>
-              <width>40</width>
-              <height>20</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Horizontal</enum>
-          </property>
-        </spacer>
-      </item>
-      <item rowspan="1" row="1" column="0" colspan="2" >
-        <widget class="Line" name="line6" >
-          <property name="sizePolicy" >
-            <sizepolicy>
-              <hsizetype>1</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-            </sizepolicy>
-          </property>
-          <property name="frameShape" >
-            <enum>QFrame::HLine</enum>
-          </property>
-          <property name="frameShadow" >
-            <enum>QFrame::Sunken</enum>
-          </property>
-        </widget>
-      </item>
-      <item rowspan="1" row="0" column="0" colspan="2" >
-        <widget class="QLabel" name="editorTitle" >
-          <property name="text" >
-            <string>textLabel2</string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-    </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction></pixmapfunction>
-  <connections>
-    <connection>
-      <sender>spin_box</sender>
-      <signal>valueChanged(int)</signal>
-      <receiver>MetricEditorPanel_q</receiver>
-      <slot>changed()</slot>
-    </connection>
-  </connections>
+     </property>
+     <property name="buttonSymbols" >
+      <enum>QAbstractSpinBox::PlusMinus</enum>
+     </property>
+     <property name="prefix" >
+      <string/>
+     </property>
+     <property name="maximum" >
+      <number>255</number>
+     </property>
+     <property name="singleStep" >
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>40</width>
+       <height>5</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="Line" name="line6" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape" >
+      <enum>QFrame::HLine</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Sunken</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2" >
+    <widget class="QLabel" name="editorTitle" >
+     <property name="text" >
+      <string>textLabel2</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <resources/>
+ <connections>
+  <connection>
+   <sender>spin_box</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>MetricEditorPanel_q</receiver>
+   <slot>changed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

src/gui/natruleoptionsdialog_q.ui

@@ -6,37 +6,62 @@
     <x>0</x>
     <y>0</y>
     <width>562</width>
-    <height>289</height>
+    <height>174</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>NAT Rule Options</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -44,11 +69,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="0" >
          <widget class="QLabel" name="editorTitle" >
@@ -79,11 +116,20 @@
        </property>
        <widget class="QWidget" name="WStackPage" >
         <layout class="QVBoxLayout" >
-         <property name="margin" >
-          <number>6</number>
-         </property>
          <property name="spacing" >
-          <number>6</number>
+          <number>2</number>
+         </property>
+         <property name="leftMargin" >
+          <number>2</number>
+         </property>
+         <property name="topMargin" >
+          <number>2</number>
+         </property>
+         <property name="rightMargin" >
+          <number>2</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>2</number>
          </property>
          <item>
           <widget class="QFrame" name="frame1" >
@@ -94,11 +140,23 @@
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QGridLayout" >
-            <property name="margin" >
-             <number>11</number>
+            <property name="leftMargin" >
+             <number>2</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
+            <property name="topMargin" >
+             <number>2</number>
+            </property>
+            <property name="rightMargin" >
+             <number>2</number>
+            </property>
+            <property name="bottomMargin" >
+             <number>2</number>
+            </property>
+            <property name="horizontalSpacing" >
+             <number>2</number>
+            </property>
+            <property name="verticalSpacing" >
+             <number>2</number>
             </property>
             <item row="2" column="0" colspan="3" >
              <widget class="QLabel" name="hint_no_go" >
@@ -116,12 +174,12 @@
                <enum>Qt::Vertical</enum>
               </property>
               <property name="sizeType" >
-               <enum>QSizePolicy::Expanding</enum>
+               <enum>QSizePolicy::MinimumExpanding</enum>
               </property>
               <property name="sizeHint" >
                <size>
                 <width>20</width>
-                <height>20</height>
+                <height>0</height>
                </size>
               </property>
              </spacer>
@@ -133,11 +191,23 @@
        </widget>
        <widget class="QWidget" name="pfNATRuleOptions" >
         <layout class="QGridLayout" >
-         <property name="margin" >
-          <number>6</number>
+         <property name="leftMargin" >
+          <number>2</number>
          </property>
-         <property name="spacing" >
-          <number>6</number>
+         <property name="topMargin" >
+          <number>2</number>
+         </property>
+         <property name="rightMargin" >
+          <number>2</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>2</number>
+         </property>
+         <property name="horizontalSpacing" >
+          <number>2</number>
+         </property>
+         <property name="verticalSpacing" >
+          <number>2</number>
          </property>
          <item row="3" column="0" >
           <spacer>
@@ -158,9 +228,7 @@
          <item rowspan="3" row="0" column="0" >
           <widget class="QGroupBox" name="buttonGroup1" >
            <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>5</hsizetype>
-             <vsizetype>1</vsizetype>
+            <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -169,11 +237,23 @@
             <string>Pool type</string>
            </property>
            <layout class="QGridLayout" >
-            <property name="margin" >
+            <property name="leftMargin" >
              <number>0</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
+            <property name="topMargin" >
+             <number>0</number>
+            </property>
+            <property name="rightMargin" >
+             <number>0</number>
+            </property>
+            <property name="bottomMargin" >
+             <number>0</number>
+            </property>
+            <property name="horizontalSpacing" >
+             <number>2</number>
+            </property>
+            <property name="verticalSpacing" >
+             <number>2</number>
             </property>
             <item row="0" column="0" >
              <widget class="QRadioButton" name="pf_pool_type_none" >
@@ -283,11 +363,11 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
+      <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>40</width>
+       <width>0</width>
        <height>20</height>
       </size>
      </property>
@@ -295,7 +375,7 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <resources/>
  <connections>
   <connection>

src/gui/networkdialog_q.ui

@@ -9,13 +9,11 @@
     <x>0</x>
     <y>0</y>
     <width>562</width>
-    <height>279</height>
+    <height>166</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>1</vsizetype>
+   <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -24,30 +22,55 @@
    <string>Network</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -55,14 +78,32 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="font" >
            <font>
             <weight>75</weight>
@@ -86,9 +127,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -110,9 +149,7 @@
      <item>
       <widget class="QFrame" name="frame7" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>7</hsizetype>
-         <vsizetype>7</vsizetype>
+        <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -124,18 +161,28 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>10</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="1" column="1" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
             <horstretch>0</horstretch>
             <verstretch>100</verstretch>
            </sizepolicy>
@@ -161,22 +208,6 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>0</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="1" column="0" >
          <widget class="QFrame" name="frame50" >
           <property name="frameShape" >
@@ -186,11 +217,23 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="4" column="1" >
             <spacer>
@@ -198,12 +241,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>20</height>
+               <height>5</height>
               </size>
              </property>
             </spacer>
@@ -241,9 +284,7 @@
            <item row="2" column="1" >
             <widget class="QLineEdit" name="address" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -253,9 +294,7 @@
            <item row="3" column="1" >
             <widget class="QLineEdit" name="netmask" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -275,9 +314,7 @@
            <item row="0" column="1" >
             <widget class="QLineEdit" name="obj_name" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -287,9 +324,7 @@
            <item row="1" column="1" >
             <widget class="QComboBox" name="libs" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -304,26 +339,9 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>

src/gui/physaddressdialog_q.ui

@@ -8,38 +8,63 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>562</width>
-    <height>272</height>
+    <width>429</width>
+    <height>190</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>physAddress</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -47,14 +72,32 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="font" >
            <font>
             <weight>75</weight>
@@ -72,9 +115,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -102,11 +143,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>0</number>
         </property>
-        <property name="spacing" >
-         <number>10</number>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="1" column="0" >
          <widget class="QFrame" name="frame46" >
@@ -117,26 +170,45 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QVBoxLayout" >
-           <property name="margin" >
-            <number>11</number>
-           </property>
            <property name="spacing" >
-            <number>6</number>
+            <number>2</number>
+           </property>
+           <property name="leftMargin" >
+            <number>2</number>
+           </property>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
            </property>
            <item>
             <layout class="QGridLayout" >
-             <property name="margin" >
+             <property name="leftMargin" >
               <number>0</number>
              </property>
-             <property name="spacing" >
-              <number>6</number>
+             <property name="topMargin" >
+              <number>0</number>
+             </property>
+             <property name="rightMargin" >
+              <number>0</number>
+             </property>
+             <property name="bottomMargin" >
+              <number>0</number>
+             </property>
+             <property name="horizontalSpacing" >
+              <number>2</number>
+             </property>
+             <property name="verticalSpacing" >
+              <number>2</number>
              </property>
              <item row="0" column="1" >
               <widget class="QLineEdit" name="obj_name" >
                <property name="sizePolicy" >
-                <sizepolicy>
-                 <hsizetype>5</hsizetype>
-                 <vsizetype>0</vsizetype>
+                <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -166,9 +238,7 @@
              <item row="1" column="1" >
               <widget class="QComboBox" name="libs" >
                <property name="sizePolicy" >
-                <sizepolicy>
-                 <hsizetype>1</hsizetype>
-                 <vsizetype>0</vsizetype>
+                <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -190,9 +260,7 @@
            <item>
             <widget class="QLineEdit" name="pAddress" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -205,12 +273,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>20</height>
+               <height>5</height>
               </size>
              </property>
             </spacer>
@@ -221,9 +289,7 @@
         <item row="1" column="1" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
             <horstretch>0</horstretch>
             <verstretch>100</verstretch>
            </sizepolicy>
@@ -249,47 +315,14 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>41</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>

src/gui/routingruleoptionsdialog_q.ui

@@ -6,37 +6,62 @@
     <x>0</x>
     <y>0</y>
     <width>562</width>
-    <height>237</height>
+    <height>161</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Routing Rule Options</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -44,11 +69,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="0" >
          <widget class="QLabel" name="editorTitle" >
@@ -72,9 +109,7 @@
      <item>
       <widget class="QStackedWidget" name="wStack" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>1</vsizetype>
+        <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -87,11 +122,23 @@
        </property>
        <widget class="QWidget" name="page0" >
         <layout class="QGridLayout" >
-         <property name="margin" >
+         <property name="leftMargin" >
           <number>0</number>
          </property>
-         <property name="spacing" >
-          <number>6</number>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
+         <property name="horizontalSpacing" >
+          <number>2</number>
+         </property>
+         <property name="verticalSpacing" >
+          <number>2</number>
          </property>
          <item row="0" column="0" >
           <widget class="QFrame" name="frame1" >
@@ -102,11 +149,23 @@
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QGridLayout" >
-            <property name="margin" >
-             <number>11</number>
+            <property name="leftMargin" >
+             <number>2</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
+            <property name="topMargin" >
+             <number>2</number>
+            </property>
+            <property name="rightMargin" >
+             <number>2</number>
+            </property>
+            <property name="bottomMargin" >
+             <number>2</number>
+            </property>
+            <property name="horizontalSpacing" >
+             <number>2</number>
+            </property>
+            <property name="verticalSpacing" >
+             <number>2</number>
             </property>
             <item row="2" column="0" colspan="3" >
              <widget class="QCheckBox" name="routing_non_critical_rule" >
@@ -121,12 +180,12 @@
                <enum>Qt::Vertical</enum>
               </property>
               <property name="sizeType" >
-               <enum>QSizePolicy::Expanding</enum>
+               <enum>QSizePolicy::MinimumExpanding</enum>
               </property>
               <property name="sizeHint" >
                <size>
                 <width>20</width>
-                <height>50</height>
+                <height>0</height>
                </size>
               </property>
              </spacer>
@@ -138,11 +197,23 @@
        </widget>
        <widget class="QWidget" name="page1" >
         <layout class="QGridLayout" >
-         <property name="margin" >
+         <property name="leftMargin" >
           <number>0</number>
          </property>
-         <property name="spacing" >
-          <number>6</number>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
+         <property name="horizontalSpacing" >
+          <number>2</number>
+         </property>
+         <property name="verticalSpacing" >
+          <number>2</number>
          </property>
          <item row="0" column="0" >
           <widget class="QFrame" name="frame2" >
@@ -153,11 +224,23 @@
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QGridLayout" >
-            <property name="margin" >
-             <number>11</number>
+            <property name="leftMargin" >
+             <number>2</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
+            <property name="topMargin" >
+             <number>2</number>
+            </property>
+            <property name="rightMargin" >
+             <number>2</number>
+            </property>
+            <property name="bottomMargin" >
+             <number>2</number>
+            </property>
+            <property name="horizontalSpacing" >
+             <number>2</number>
+            </property>
+            <property name="verticalSpacing" >
+             <number>2</number>
             </property>
             <item row="2" column="0" colspan="3" >
              <widget class="QLabel" name="hint_no_go" >
@@ -194,25 +277,9 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>routing_non_critical_rule</tabstop>
  </tabstops>

src/gui/tagservicedialog_q.ui

@@ -6,37 +6,62 @@
     <x>0</x>
     <y>0</y>
     <width>562</width>
-    <height>261</height>
+    <height>177</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form1</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>2</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -44,11 +69,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
@@ -69,9 +106,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -99,18 +134,28 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="1" column="1" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
             <horstretch>0</horstretch>
             <verstretch>100</verstretch>
            </sizepolicy>
@@ -130,22 +175,6 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>61</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="1" column="0" >
          <widget class="QFrame" name="frame39" >
           <property name="frameShape" >
@@ -155,11 +184,23 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="3" column="1" >
             <spacer>
@@ -167,12 +208,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>30</height>
+               <height>0</height>
               </size>
              </property>
             </spacer>
@@ -180,9 +221,7 @@
            <item row="1" column="1" >
             <widget class="QComboBox" name="libs" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -202,9 +241,7 @@
            <item row="0" column="1" >
             <widget class="QLineEdit" name="obj_name" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -234,9 +271,7 @@
            <item row="2" column="1" >
             <widget class="QLineEdit" name="tagcode" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -251,25 +286,9 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>

src/gui/tcpservicedialog_q.ui

@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>840</width>
-    <height>408</height>
+    <width>649</width>
+    <height>228</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -23,24 +23,24 @@
   </property>
   <layout class="QHBoxLayout" >
    <property name="spacing" >
-    <number>6</number>
+    <number>2</number>
    </property>
    <property name="leftMargin" >
-    <number>9</number>
+    <number>2</number>
    </property>
    <property name="topMargin" >
-    <number>9</number>
+    <number>2</number>
    </property>
    <property name="rightMargin" >
-    <number>9</number>
+    <number>2</number>
    </property>
    <property name="bottomMargin" >
-    <number>9</number>
+    <number>2</number>
    </property>
    <item>
     <layout class="QVBoxLayout" >
      <property name="spacing" >
-      <number>6</number>
+      <number>2</number>
      </property>
      <property name="leftMargin" >
       <number>0</number>
@@ -62,6 +62,12 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -70,22 +76,22 @@
        </property>
        <layout class="QGridLayout" >
         <property name="leftMargin" >
-         <number>5</number>
+         <number>2</number>
         </property>
         <property name="topMargin" >
-         <number>5</number>
+         <number>2</number>
         </property>
         <property name="rightMargin" >
-         <number>5</number>
+         <number>2</number>
         </property>
         <property name="bottomMargin" >
-         <number>5</number>
+         <number>2</number>
         </property>
         <property name="horizontalSpacing" >
-         <number>6</number>
+         <number>2</number>
         </property>
         <property name="verticalSpacing" >
-         <number>6</number>
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
@@ -135,22 +141,22 @@
        </property>
        <layout class="QGridLayout" >
         <property name="leftMargin" >
-         <number>9</number>
+         <number>2</number>
         </property>
         <property name="topMargin" >
-         <number>9</number>
+         <number>2</number>
         </property>
         <property name="rightMargin" >
-         <number>9</number>
+         <number>2</number>
         </property>
         <property name="bottomMargin" >
-         <number>9</number>
+         <number>2</number>
         </property>
         <property name="horizontalSpacing" >
-         <number>6</number>
+         <number>2</number>
         </property>
         <property name="verticalSpacing" >
-         <number>6</number>
+         <number>2</number>
         </property>
         <item row="1" column="1" >
          <widget class="QFrame" name="frame36" >
@@ -162,22 +168,22 @@
           </property>
           <layout class="QGridLayout" >
            <property name="leftMargin" >
-            <number>11</number>
+            <number>2</number>
            </property>
            <property name="topMargin" >
-            <number>11</number>
+            <number>2</number>
            </property>
            <property name="rightMargin" >
-            <number>11</number>
+            <number>2</number>
            </property>
            <property name="bottomMargin" >
-            <number>11</number>
+            <number>2</number>
            </property>
            <property name="horizontalSpacing" >
-            <number>6</number>
+            <number>2</number>
            </property>
            <property name="verticalSpacing" >
-            <number>6</number>
+            <number>2</number>
            </property>
            <item row="0" column="0" >
             <widget class="QGroupBox" name="groupBox1" >
@@ -186,22 +192,22 @@
              </property>
              <layout class="QGridLayout" >
               <property name="leftMargin" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="topMargin" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="rightMargin" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="bottomMargin" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="horizontalSpacing" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="verticalSpacing" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <item row="0" column="1" >
                <widget class="QSpinBox" name="ss" >
@@ -259,22 +265,22 @@
              </property>
              <layout class="QGridLayout" >
               <property name="leftMargin" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="topMargin" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="rightMargin" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="bottomMargin" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="horizontalSpacing" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="verticalSpacing" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <item row="0" column="1" >
                <widget class="QSpinBox" name="ds" >
@@ -331,12 +337,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>40</height>
+               <height>0</height>
               </size>
              </property>
             </spacer>
@@ -360,22 +366,22 @@
           </property>
           <layout class="QGridLayout" >
            <property name="leftMargin" >
-            <number>9</number>
+            <number>2</number>
            </property>
            <property name="topMargin" >
-            <number>9</number>
+            <number>2</number>
            </property>
            <property name="rightMargin" >
-            <number>9</number>
+            <number>2</number>
            </property>
            <property name="bottomMargin" >
-            <number>9</number>
+            <number>2</number>
            </property>
            <property name="horizontalSpacing" >
-            <number>6</number>
+            <number>2</number>
            </property>
            <property name="verticalSpacing" >
-            <number>6</number>
+            <number>2</number>
            </property>
            <item row="0" column="0" >
             <widget class="QLabel" name="textLabel1" >
@@ -400,22 +406,28 @@
              </property>
              <layout class="QVBoxLayout" >
               <property name="spacing" >
-               <number>6</number>
+               <number>2</number>
               </property>
               <property name="leftMargin" >
-               <number>9</number>
+               <number>2</number>
               </property>
               <property name="topMargin" >
-               <number>9</number>
+               <number>0</number>
               </property>
               <property name="rightMargin" >
-               <number>9</number>
+               <number>2</number>
               </property>
               <property name="bottomMargin" >
-               <number>9</number>
+               <number>0</number>
               </property>
               <item>
                <widget class="QLabel" name="textLabel9" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="text" >
                  <string/>
                 </property>
@@ -439,10 +451,10 @@
                  <number>0</number>
                 </property>
                 <property name="horizontalSpacing" >
-                 <number>6</number>
+                 <number>2</number>
                 </property>
                 <property name="verticalSpacing" >
-                 <number>6</number>
+                 <number>2</number>
                 </property>
                 <item row="1" column="3" >
                  <widget class="QCheckBox" name="psh_m" >
@@ -751,7 +763,7 @@
                 <property name="sizeHint" >
                  <size>
                   <width>20</width>
-                  <height>16</height>
+                  <height>0</height>
                  </size>
                 </property>
                </spacer>
@@ -759,7 +771,7 @@
               <item>
                <layout class="QHBoxLayout" >
                 <property name="spacing" >
-                 <number>6</number>
+                 <number>2</number>
                 </property>
                 <property name="leftMargin" >
                  <number>0</number>
@@ -866,46 +878,14 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="3" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>16</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </widget>
      </item>
     </layout>
    </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>16</width>
-       <height>386</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>

src/gui/timedialog_q.ui

@@ -8,38 +8,60 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>874</width>
-    <height>365</height>
+    <width>679</width>
+    <height>200</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Time</string>
   </property>
   <layout class="QHBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
    <property name="spacing" >
-    <number>6</number>
+    <number>2</number>
+   </property>
+   <property name="leftMargin" >
+    <number>2</number>
+   </property>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
    </property>
    <item>
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -47,11 +69,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
@@ -72,9 +106,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -102,10 +134,22 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>10</number>
+        </property>
+        <property name="verticalSpacing" >
          <number>10</number>
         </property>
         <item row="1" column="1" >
@@ -117,11 +161,20 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QVBoxLayout" >
-           <property name="margin" >
-            <number>11</number>
-           </property>
            <property name="spacing" >
-            <number>6</number>
+            <number>2</number>
+           </property>
+           <property name="leftMargin" >
+            <number>2</number>
+           </property>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
            </property>
            <item>
             <widget class="QGroupBox" name="groupBox2" >
@@ -129,11 +182,23 @@
               <string/>
              </property>
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
-               <number>6</number>
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>2</number>
+              </property>
+              <property name="verticalSpacing" >
+               <number>2</number>
               </property>
               <item row="0" column="2" colspan="2" >
                <widget class="QDateEdit" name="startDate" >
@@ -236,11 +301,23 @@
               <string/>
              </property>
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
-               <number>6</number>
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>2</number>
+              </property>
+              <property name="verticalSpacing" >
+               <number>2</number>
               </property>
               <item row="1" column="4" >
                <widget class="QTimeEdit" name="endTime" />
@@ -352,11 +429,23 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="0" column="0" >
             <widget class="QLabel" name="textLabel1" >
@@ -384,12 +473,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>41</height>
+               <height>5</height>
               </size>
              </property>
             </spacer>
@@ -397,9 +486,7 @@
            <item row="0" column="1" >
             <widget class="QLineEdit" name="obj_name" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -409,9 +496,7 @@
            <item row="1" column="1" >
             <widget class="QComboBox" name="libs" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -424,9 +509,7 @@
         <item row="1" column="2" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
             <horstretch>0</horstretch>
             <verstretch>100</verstretch>
            </sizepolicy>
@@ -442,46 +525,14 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="3" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </widget>
      </item>
     </layout>
    </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>

src/gui/udpservicedialog_q.ui

@@ -8,14 +8,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>761</width>
-    <height>269</height>
+    <width>638</width>
+    <height>195</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>5</vsizetype>
+   <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -24,30 +22,55 @@
    <string>UDP</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>11</number>
+   <property name="leftMargin" >
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin" >
+    <number>2</number>
+   </property>
+   <property name="rightMargin" >
+    <number>2</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>2</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
    </property>
    <item row="0" column="0" >
     <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="spacing" >
+      <number>2</number>
+     </property>
+     <property name="leftMargin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
      </property>
      <item>
       <widget class="QFrame" name="frame3" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -55,11 +78,23 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>5</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
         <item row="0" column="1" >
          <widget class="QLabel" name="editorTitle" >
@@ -80,9 +115,7 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="pixmapLabel1" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -110,34 +143,28 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
+        <property name="leftMargin" >
+         <number>2</number>
         </property>
-        <property name="spacing" >
-         <number>10</number>
+        <property name="topMargin" >
+         <number>2</number>
+        </property>
+        <property name="rightMargin" >
+         <number>2</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>2</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>2</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>2</number>
         </property>
-        <item row="1" column="3" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>30</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="1" column="2" >
          <widget class="QTextEdit" name="comment" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>7</vsizetype>
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -172,11 +199,23 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="0" column="0" >
             <widget class="QGroupBox" name="groupBox1" >
@@ -184,11 +223,23 @@
               <string>Source Port Range</string>
              </property>
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
-               <number>6</number>
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>2</number>
+              </property>
+              <property name="verticalSpacing" >
+               <number>2</number>
               </property>
               <item row="0" column="0" >
                <widget class="QLabel" name="textLabel3" >
@@ -245,11 +296,23 @@
               <string>Destination Port Range</string>
              </property>
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
-               <number>6</number>
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>2</number>
+              </property>
+              <property name="verticalSpacing" >
+               <number>2</number>
               </property>
               <item row="0" column="0" >
                <widget class="QLabel" name="textLabel3_3" >
@@ -312,11 +375,23 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
+           <property name="leftMargin" >
+            <number>2</number>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <property name="topMargin" >
+            <number>2</number>
+           </property>
+           <property name="rightMargin" >
+            <number>2</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>2</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing" >
+            <number>2</number>
            </property>
            <item row="2" column="1" >
             <spacer>
@@ -324,12 +399,12 @@
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeType" >
-              <enum>QSizePolicy::Expanding</enum>
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
              <property name="sizeHint" >
               <size>
                <width>20</width>
-               <height>41</height>
+               <height>2</height>
               </size>
              </property>
             </spacer>
@@ -357,9 +432,7 @@
            <item row="0" column="1" >
             <widget class="QLineEdit" name="obj_name" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -369,9 +442,7 @@
            <item row="1" column="1" >
             <widget class="QComboBox" name="libs" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -386,25 +457,9 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="2" margin="2" />
  <tabstops>
   <tabstop>obj_name</tabstop>
   <tabstop>libs</tabstop>