[PATCH 4/8]: wpa_gui-qt4: add "Optional Settings" box with priority spin box
Kel Modderman
kel
Wed Jan 23 03:51:20 PST 2008
This adds an "Optional Settings" box at the bottom of the networkconfig form
containing the ID String input field and a network priority spin box.
The layout was "broken" to add/move widgets to the form, during which the form
size was increased and the vertical spacer at the bottom of form removed. The
spacer was re-added once the layout was finalized.
Signed-off-by: Kel Modderman <kel at otaku42.de>
---
--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
+++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>403</width>
- <height>430</height>
+ <width>410</width>
+ <height>510</height>
</rect>
</property>
<property name="windowTitle" >
@@ -47,30 +47,13 @@
</widget>
</item>
<item row="1" column="0" >
- <widget class="QLabel" name="idstrLabel" >
- <property name="text" >
- <string>Network ID</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="idstrEdit" >
- <property name="toolTip" >
- <string>Network Identification String</string>
- </property>
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
<widget class="QLabel" name="authLabel" >
<property name="text" >
<string>Authentication</string>
</property>
</widget>
</item>
- <item row="2" column="1" >
+ <item row="1" column="1" >
<widget class="QComboBox" name="authSelect" >
<item>
<property name="text" >
@@ -104,14 +87,14 @@
</item>
</widget>
</item>
- <item row="3" column="0" >
+ <item row="2" column="0" >
<widget class="QLabel" name="encrLabel" >
<property name="text" >
<string>Encryption</string>
</property>
</widget>
</item>
- <item row="3" column="1" >
+ <item row="2" column="1" >
<widget class="QComboBox" name="encrSelect" >
<item>
<property name="text" >
@@ -135,14 +118,14 @@
</item>
</widget>
</item>
- <item row="4" column="0" >
+ <item row="3" column="0" >
<widget class="QLabel" name="pskLabel" >
<property name="text" >
<string>PSK</string>
</property>
</widget>
</item>
- <item row="4" column="1" >
+ <item row="3" column="1" >
<widget class="QLineEdit" name="pskEdit" >
<property name="enabled" >
<bool>false</bool>
@@ -158,28 +141,28 @@
</property>
</widget>
</item>
- <item row="5" column="0" >
+ <item row="4" column="0" >
<widget class="QLabel" name="eapLabel" >
<property name="text" >
<string>EAP method</string>
</property>
</widget>
</item>
- <item row="5" column="1" >
+ <item row="4" column="1" >
<widget class="QComboBox" name="eapSelect" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
- <item row="6" column="0" >
+ <item row="5" column="0" >
<widget class="QLabel" name="identityLabel" >
<property name="text" >
<string>Identity</string>
</property>
</widget>
</item>
- <item row="6" column="1" >
+ <item row="5" column="1" >
<widget class="QLineEdit" name="identityEdit" >
<property name="enabled" >
<bool>false</bool>
@@ -189,14 +172,14 @@
</property>
</widget>
</item>
- <item row="7" column="0" >
+ <item row="6" column="0" >
<widget class="QLabel" name="passwordLabel" >
<property name="text" >
<string>Password</string>
</property>
</widget>
</item>
- <item row="7" column="1" >
+ <item row="6" column="1" >
<widget class="QLineEdit" name="passwordEdit" >
<property name="enabled" >
<bool>false</bool>
@@ -209,22 +192,22 @@
</property>
</widget>
</item>
- <item row="8" column="0" >
+ <item row="7" column="0" >
<widget class="QLabel" name="cacertLabel" >
<property name="text" >
<string>CA certificate</string>
</property>
</widget>
</item>
- <item row="8" column="1" >
+ <item row="7" column="1" >
<widget class="QLineEdit" name="cacertEdit" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
- <item row="9" column="0" colspan="2" >
- <widget class="QGroupBox" name="buttonGroup1" >
+ <item row="8" column="0" colspan="2" >
+ <widget class="QGroupBox" name="wepBox" >
<property name="enabled" >
<bool>true</bool>
</property>
@@ -303,25 +286,55 @@
</layout>
</widget>
</item>
+ <item row="9" column="0" colspan="2" >
+ <widget class="QGroupBox" name="optionalSettingsBox" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="title" >
+ <string>Optional Settings</string>
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="1" >
+ <widget class="QLineEdit" name="idstrEdit" >
+ <property name="toolTip" >
+ <string>Network Identification String</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3" >
+ <widget class="QSpinBox" name="prioritySpinBox" >
+ <property name="toolTip" >
+ <string>Network Priority</string>
+ </property>
+ <property name="maximum" >
+ <number>10000</number>
+ </property>
+ <property name="singleStep" >
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="idstrLabel" >
+ <property name="text" >
+ <string>IDString</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" >
+ <widget class="QLabel" name="priorityLabel" >
+ <property name="text" >
+ <string>Priority</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
</item>
- <item row="1" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>130</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="1" column="1" >
<widget class="QPushButton" name="addButton" >
<property name="text" >
@@ -339,13 +352,25 @@
</property>
</widget>
</item>
+ <item row="1" column="0" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<tabstops>
<tabstop>ssidEdit</tabstop>
- <tabstop>idstrEdit</tabstop>
<tabstop>authSelect</tabstop>
<tabstop>encrSelect</tabstop>
<tabstop>pskEdit</tabstop>
@@ -361,6 +386,8 @@
<tabstop>wep2Edit</tabstop>
<tabstop>wep3Radio</tabstop>
<tabstop>wep3Edit</tabstop>
+ <tabstop>idstrEdit</tabstop>
+ <tabstop>prioritySpinBox</tabstop>
<tabstop>addButton</tabstop>
<tabstop>removeButton</tabstop>
<tabstop>cancelButton</tabstop>
---
More information about the Hostap
mailing list