GUI build in progress.

The next step is to adapt .ui.h files to use Qt4 UIC-generated headers.

1 files changed, 163 insertions, 197 deletions

diff --git a/src/gui/selectnicform.ui b/src/gui/selectnicform.ui
index 7f10220..c6aee9b 100644
--- a/src/gui/selectnicform.ui
+++ b/src/gui/selectnicform.ui
@@ -1,212 +1,178 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>SelectNicForm</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>SelectNicForm</cstring>
-    </property>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0" stdsetdef="1">
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>SelectNicForm</class>
+  <widget class="QDialog" name="SelectNicForm">
     <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>482</width>
-            <height>144</height>
-        </rect>
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>482</width>
+        <height>144</height>
+      </rect>
     </property>
-    <property name="caption">
-        <string>Twinkle - Select NIC</string>
+    <property name="windowTitle">
+      <string>Twinkle - Select NIC</string>
     </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>nicIconTextLabel</cstring>
-            </property>
-            <property name="text">
-                <string></string>
-            </property>
-            <property name="pixmap">
-                <pixmap>kcmpci.png</pixmap>
-            </property>
+    <layout class="QGridLayout">
+      <item row="0" column="0">
+        <widget class="QLabel" name="nicIconTextLabel">
+          <property name="text">
+            <string/>
+          </property>
+          <property name="pixmap">
+            <pixmap>kcmpci.png</pixmap>
+          </property>
+          <property name="wordWrap">
+            <bool>false</bool>
+          </property>
         </widget>
-        <spacer row="1" column="0" rowspan="2" colspan="1">
-            <property name="name">
-                <cstring>spacer53</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>41</height>
-                </size>
-            </property>
+      </item>
+      <item row="1" column="0" rowspan="2" colspan="1">
+        <spacer name="spacer53">
+          <property name="sizeHint">
+            <size>
+              <width>20</width>
+              <height>41</height>
+            </size>
+          </property>
+          <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+          </property>
+          <property name="orientation">
+            <enum>Qt::Vertical</enum>
+          </property>
         </spacer>
-        <widget class="QLayoutWidget" row="0" column="1">
-            <property name="name">
-                <cstring>layout42</cstring>
-            </property>
-            <hbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>selectTextLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Select the network interface/IP address that you want to use:</string>
-                    </property>
-                    <property name="alignment">
-                        <set>WordBreak|AlignTop</set>
-                    </property>
-                </widget>
-                <widget class="QListBox">
-                    <property name="name">
-                        <cstring>nicListBox</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>You have multiple IP addresses. Here you must select which IP address should be used. This IP address will be used inside the SIP messages.</string>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-        <spacer row="1" column="1">
-            <property name="name">
-                <cstring>spacer9</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
+      </item>
+      <item row="0" column="1">
+        <layout class="QHBoxLayout">
+          <item>
+            <widget class="QLabel" name="selectTextLabel">
+              <property name="text">
+                <string>Select the network interface/IP address that you want to use:</string>
+              </property>
+              <property name="alignment">
+                <set>Qt::AlignTop</set>
+              </property>
+              <property name="wordWrap">
+                <bool>true</bool>
+              </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="Q3ListBox" name="nicListBox">
+              <property name="whatsThis" stdset="0">
+                <string>You have multiple IP addresses. Here you must select which IP address should be used. This IP address will be used inside the SIP messages.</string>
+              </property>
+            </widget>
+          </item>
+        </layout>
+      </item>
+      <item row="1" column="1">
+        <spacer name="spacer9">
+          <property name="sizeHint">
+            <size>
+              <width>20</width>
+              <height>16</height>
+            </size>
+          </property>
+          <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+          </property>
+          <property name="orientation">
+            <enum>Qt::Vertical</enum>
+          </property>
+        </spacer>
+      </item>
+      <item row="2" column="1">
+        <layout class="QHBoxLayout">
+          <item>
+            <spacer name="spacer7">
+              <property name="sizeHint">
                 <size>
-                    <width>20</width>
-                    <height>16</height>
+                  <width>40</width>
+                  <height>20</height>
                 </size>
-            </property>
-        </spacer>
-        <widget class="QLayoutWidget" row="2" column="1">
-            <property name="name">
-                <cstring>layout11</cstring>
-            </property>
-            <hbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <spacer>
-                    <property name="name">
-                        <cstring>spacer7</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>40</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>defaultIpPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Set as default &amp;IP</string>
-                    </property>
-                    <property name="accel">
-                        <string>Alt+I</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Make the selected IP address the default IP address. The next time you start Twinkle, this IP address will be automatically selected.</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>defaultNicPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Set as default &amp;NIC</string>
-                    </property>
-                    <property name="accel">
-                        <string>Alt+N</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Make the selected network interface the default interface. The next time you start Twinkle, this interface will be automatically selected.</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>okPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;OK</string>
-                    </property>
-                    <property name="accel">
-                        <string>Alt+O</string>
-                    </property>
-                    <property name="default">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-    </grid>
-</widget>
-<connections>
+              </property>
+              <property name="sizeType">
+                <enum>QSizePolicy::Expanding</enum>
+              </property>
+              <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+              </property>
+            </spacer>
+          </item>
+          <item>
+            <widget class="QPushButton" name="defaultIpPushButton">
+              <property name="text">
+                <string>Set as default &amp;IP</string>
+              </property>
+              <property name="shortcut">
+                <string>Alt+I</string>
+              </property>
+              <property name="whatsThis" stdset="0">
+                <string>Make the selected IP address the default IP address. The next time you start Twinkle, this IP address will be automatically selected.</string>
+              </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="QPushButton" name="defaultNicPushButton">
+              <property name="text">
+                <string>Set as default &amp;NIC</string>
+              </property>
+              <property name="shortcut">
+                <string>Alt+N</string>
+              </property>
+              <property name="whatsThis" stdset="0">
+                <string>Make the selected network interface the default interface. The next time you start Twinkle, this interface will be automatically selected.</string>
+              </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="QPushButton" name="okPushButton">
+              <property name="text">
+                <string>&amp;OK</string>
+              </property>
+              <property name="shortcut">
+                <string>Alt+O</string>
+              </property>
+              <property name="default">
+                <bool>true</bool>
+              </property>
+            </widget>
+          </item>
+        </layout>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11"/>
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <connections>
     <connection>
-        <sender>okPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>SelectNicForm</receiver>
-        <slot>accept()</slot>
+      <sender>okPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>SelectNicForm</receiver>
+      <slot>accept()</slot>
     </connection>
     <connection>
-        <sender>nicListBox</sender>
-        <signal>selected(const QString&amp;)</signal>
-        <receiver>SelectNicForm</receiver>
-        <slot>accept()</slot>
+      <sender>nicListBox</sender>
+      <signal>selected(QString)</signal>
+      <receiver>SelectNicForm</receiver>
+      <slot>accept()</slot>
     </connection>
     <connection>
-        <sender>defaultIpPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>SelectNicForm</receiver>
-        <slot>setAsDefaultIp()</slot>
+      <sender>defaultIpPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>SelectNicForm</receiver>
+      <slot>setAsDefaultIp()</slot>
     </connection>
     <connection>
-        <sender>defaultNicPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>SelectNicForm</receiver>
-        <slot>setAsDefaultNic()</slot>
+      <sender>defaultNicPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>SelectNicForm</receiver>
+      <slot>setAsDefaultNic()</slot>
     </connection>
-</connections>
-<includes>
-    <include location="local" impldecl="in implementation">gui.h</include>
-    <include location="local" impldecl="in implementation">qmessagebox.h</include>
-    <include location="local" impldecl="in implementation">sys_settings.h</include>
-    <include location="local" impldecl="in implementation">selectnicform.ui.h</include>
-</includes>
-<variables>
-    <variable access="private">int idxDefault;</variable>
-</variables>
-<slots>
-    <slot>setAsDefault( bool setIp )</slot>
-    <slot>setAsDefaultIp()</slot>
-    <slot>setAsDefaultNic()</slot>
-</slots>
-<functions>
-    <function access="private" specifier="non virtual">init()</function>
-</functions>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+  </connections>
+</ui>