[pkg-wpa-devel] r1051 - in /wpasupplicant/trunk/debian: ./ patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Wed Jan 23 08:42:55 UTC 2008
Author: kelmo-guest
Date: Wed Jan 23 08:42:55 2008
New Revision: 1051
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1051
Log:
* Add patches to increase usability of wpa_gui-qt4. These update the
networkconfig.ui file to syntax the qt4-designer prefers, changes the
position of id string and adds a priority counter.
- debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch
- debian/patches/41_wpa_gui_qt4_networkconfigui_inc_size.patch
- debian/patches/42_wpa_gui_qt4_networkconfigui_label_names.patch
- debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch
- debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch
- debian/patches/45_wpa_gui_qt4_networkconfig_idstr_priority.patch
Added:
wpasupplicant/trunk/debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch
wpasupplicant/trunk/debian/patches/41_wpa_gui_qt4_networkconfigui_inc_size.patch
wpasupplicant/trunk/debian/patches/42_wpa_gui_qt4_networkconfigui_label_names.patch
wpasupplicant/trunk/debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch
wpasupplicant/trunk/debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch
wpasupplicant/trunk/debian/patches/45_wpa_gui_qt4_networkconfig_idstr_priority.patch
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/patches/series
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1051&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Jan 23 08:42:55 2008
@@ -35,8 +35,17 @@
miss out on any substvars that debhelper may provide us with.
* Add debian/patches/39_wpa_gui_qt4_closeevent.patch to improve handling of
wpa_gui-qt4 exit, both from File->exit and the X button on the titlebar.
-
- -- Kel Modderman <kel at otaku42.de> Mon, 21 Jan 2008 23:42:55 +1000
+ * Add patches to increase usability of wpa_gui-qt4. These update the
+ networkconfig.ui file to syntax the qt4-designer prefers, changes the
+ position of id string and adds a priority counter.
+ - debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch
+ - debian/patches/41_wpa_gui_qt4_networkconfigui_inc_size.patch
+ - debian/patches/42_wpa_gui_qt4_networkconfigui_label_names.patch
+ - debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch
+ - debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch
+ - debian/patches/45_wpa_gui_qt4_networkconfig_idstr_priority.patch
+
+ -- Kel Modderman <kel at otaku42.de> Wed, 23 Jan 2008 18:38:44 +1000
wpasupplicant (0.6.2-1) experimental; urgency=low
Added: wpasupplicant/trunk/debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch?rev=1051&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch (added)
+++ wpasupplicant/trunk/debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch Wed Jan 23 08:42:55 2008
@@ -1,0 +1,743 @@
+--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
+@@ -1,374 +1,372 @@
+-<ui version="4.0" stdsetdef="1" >
+- <author></author>
+- <comment></comment>
+- <exportmacro></exportmacro>
+- <class>NetworkConfig</class>
+- <widget class="QDialog" name="NetworkConfig" >
+- <property name="geometry" >
+- <rect>
+- <x>0</x>
+- <y>0</y>
+- <width>380</width>
+- <height>430</height>
+- </rect>
+- </property>
+- <property name="windowTitle" >
+- <string>NetworkConfig</string>
+- </property>
+- <layout class="QGridLayout" >
+- <item row="1" column="3" >
+- <widget class="QPushButton" name="cancelButton" >
+- <property name="text" >
+- <string>Cancel</string>
+- </property>
+- </widget>
+- </item>
+- <item rowspan="1" row="0" column="0" colspan="4" >
+- <widget class="QFrame" name="frame9" >
+- <property name="frameShape" >
+- <enum>StyledPanel</enum>
+- </property>
+- <property name="frameShadow" >
+- <enum>Raised</enum>
+- </property>
+- <layout class="QGridLayout" >
+- <item row="0" column="0" >
+- <widget class="QLabel" name="textLabel0" >
+- <property name="text" >
+- <string>SSID</string>
+- </property>
+- </widget>
+- </item>
+- <item row="0" column="1" >
+- <widget class="QLineEdit" name="ssidEdit" >
+- <property name="text" >
+- <string/>
+- </property>
+- <property name="toolTip" stdset="0" >
+- <string>Network name (Service Set IDentifier)</string>
+- </property>
+- </widget>
+- </item>
+- <item row="1" column="0" >
+- <widget class="QLabel" name="textLabel1" >
+- <property name="text" >
+- <string>Network ID</string>
+- </property>
+- </widget>
+- </item>
+- <item row="1" column="1" >
+- <widget class="QLineEdit" name="idstrEdit" >
+- <property name="text" >
+- <string/>
+- </property>
+- <property name="toolTip" stdset="0" >
+- <string>Network Identification String</string>
+- </property>
+- </widget>
+- </item>
+- <item row="2" column="0" >
+- <widget class="QLabel" name="textLabel2" >
+- <property name="text" >
+- <string>Authentication</string>
+- </property>
+- </widget>
+- </item>
+- <item row="2" column="1" >
+- <widget class="QComboBox" name="authSelect" >
+- <item>
+- <property name="text" >
+- <string>Plaintext or static WEP</string>
+- </property>
+- </item>
+- <item>
+- <property name="text" >
+- <string>IEEE 802.1X</string>
+- </property>
+- </item>
+- <item>
+- <property name="text" >
+- <string>WPA-Personal (PSK)</string>
+- </property>
+- </item>
+- <item>
+- <property name="text" >
+- <string>WPA-Enterprise (EAP)</string>
+- </property>
+- </item>
+- <item>
+- <property name="text" >
+- <string>WPA2-Personal (PSK)</string>
+- </property>
+- </item>
+- <item>
+- <property name="text" >
+- <string>WPA2-Enterprise (EAP)</string>
+- </property>
+- </item>
+- </widget>
+- </item>
+- <item row="3" column="0" >
+- <widget class="QLabel" name="textLabel3" >
+- <property name="text" >
+- <string>Encryption</string>
+- </property>
+- </widget>
+- </item>
+- <item row="3" column="1" >
+- <widget class="QComboBox" name="encrSelect" >
+- <item>
+- <property name="text" >
+- <string>None</string>
+- </property>
+- </item>
+- <item>
+- <property name="text" >
+- <string>WEP</string>
+- </property>
+- </item>
+- <item>
+- <property name="text" >
+- <string>TKIP</string>
+- </property>
+- </item>
+- <item>
+- <property name="text" >
+- <string>CCMP</string>
+- </property>
+- </item>
+- </widget>
+- </item>
+- <item row="4" column="0" >
+- <widget class="QLabel" name="textLabel4" >
+- <property name="text" >
+- <string>PSK</string>
+- </property>
+- </widget>
+- </item>
+- <item row="4" column="1" >
+- <widget class="QLineEdit" name="pskEdit" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="echoMode" >
+- <enum>QLineEdit::Password</enum>
+- </property>
+- <property name="toolTip" stdset="0" >
+- <string>WPA/WPA2 pre-shared key or passphrase</string>
+- </property>
+- <property name="whatsThis" stdset="0" >
+- <string/>
+- </property>
+- </widget>
+- </item>
+- <item row="5" column="0" >
+- <widget class="QLabel" name="textLabel5" >
+- <property name="text" >
+- <string>EAP method</string>
+- </property>
+- </widget>
+- </item>
+- <item row="5" column="1" >
+- <widget class="QComboBox" name="eapSelect" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- </widget>
+- </item>
+- <item row="6" column="0" >
+- <widget class="QLabel" name="textLabel6" >
+- <property name="text" >
+- <string>Identity</string>
+- </property>
+- </widget>
+- </item>
+- <item row="6" column="1" >
+- <widget class="QLineEdit" name="identityEdit" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="toolTip" stdset="0" >
+- <string>Username/Identity for EAP methods</string>
+- </property>
+- </widget>
+- </item>
+- <item row="7" column="0" >
+- <widget class="QLabel" name="textLabel7" >
+- <property name="text" >
+- <string>Password</string>
+- </property>
+- </widget>
+- </item>
+- <item row="7" column="1" >
+- <widget class="QLineEdit" name="passwordEdit" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="echoMode" >
+- <enum>QLineEdit::Password</enum>
+- </property>
+- <property name="toolTip" stdset="0" >
+- <string>Password for EAP methods</string>
+- </property>
+- </widget>
+- </item>
+- <item row="8" column="0" >
+- <widget class="QLabel" name="textLabel1_2" >
+- <property name="text" >
+- <string>CA certificate</string>
+- </property>
+- </widget>
+- </item>
+- <item row="8" column="1" >
+- <widget class="QLineEdit" name="cacertEdit" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- </widget>
+- </item>
+- <item rowspan="1" row="9" column="0" colspan="2" >
+- <widget class="QGroupBox" name="buttonGroup1" >
+- <property name="enabled" >
+- <bool>true</bool>
+- </property>
+- <property name="title" >
+- <string>WEP keys</string>
+- </property>
+- <layout class="QGridLayout" >
+- <item row="0" column="0" >
+- <widget class="QRadioButton" name="wep0Radio" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="text" >
+- <string>key 0</string>
+- </property>
+- </widget>
+- </item>
+- <item row="1" column="0" >
+- <widget class="QRadioButton" name="wep1Radio" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="text" >
+- <string>key 1</string>
+- </property>
+- </widget>
+- </item>
+- <item row="3" column="0" >
+- <widget class="QRadioButton" name="wep3Radio" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="text" >
+- <string>key 3</string>
+- </property>
+- </widget>
+- </item>
+- <item row="2" column="0" >
+- <widget class="QRadioButton" name="wep2Radio" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="text" >
+- <string>key 2</string>
+- </property>
+- </widget>
+- </item>
+- <item row="0" column="1" >
+- <widget class="QLineEdit" name="wep0Edit" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- </widget>
+- </item>
+- <item row="1" column="1" >
+- <widget class="QLineEdit" name="wep1Edit" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- </widget>
+- </item>
+- <item row="2" column="1" >
+- <widget class="QLineEdit" name="wep2Edit" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- </widget>
+- </item>
+- <item row="3" column="1" >
+- <widget class="QLineEdit" name="wep3Edit" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- </widget>
+- </item>
+- </layout>
+- </widget>
+- </item>
+- </layout>
+- </widget>
++<ui version="4.0" >
++ <class>NetworkConfig</class>
++ <widget class="QDialog" name="NetworkConfig" >
++ <property name="geometry" >
++ <rect>
++ <x>0</x>
++ <y>0</y>
++ <width>403</width>
++ <height>430</height>
++ </rect>
++ </property>
++ <property name="windowTitle" >
++ <string>NetworkConfig</string>
++ </property>
++ <layout class="QGridLayout" >
++ <item row="1" column="3" >
++ <widget class="QPushButton" name="cancelButton" >
++ <property name="text" >
++ <string>Cancel</string>
++ </property>
++ </widget>
++ </item>
++ <item row="0" column="0" colspan="4" >
++ <widget class="QFrame" name="frame9" >
++ <property name="frameShape" >
++ <enum>QFrame::NoFrame</enum>
++ </property>
++ <property name="frameShadow" >
++ <enum>QFrame::Plain</enum>
++ </property>
++ <layout class="QGridLayout" >
++ <item row="0" column="0" >
++ <widget class="QLabel" name="textLabel0" >
++ <property name="text" >
++ <string>SSID</string>
++ </property>
++ </widget>
++ </item>
++ <item row="0" column="1" >
++ <widget class="QLineEdit" name="ssidEdit" >
++ <property name="toolTip" >
++ <string>Network name (Service Set IDentifier)</string>
++ </property>
++ <property name="text" >
++ <string/>
++ </property>
++ </widget>
+ </item>
+ <item row="1" column="0" >
+- <spacer name="spacer5" >
+- <property name="sizeHint" >
+- <size>
+- <width>130</width>
+- <height>20</height>
+- </size>
+- </property>
+- <property name="sizeType" >
+- <enum>Expanding</enum>
+- </property>
+- <property name="orientation" >
+- <enum>Horizontal</enum>
+- </property>
+- </spacer>
++ <widget class="QLabel" name="textLabel1" >
++ <property name="text" >
++ <string>Network ID</string>
++ </property>
++ </widget>
+ </item>
+ <item row="1" column="1" >
+- <widget class="QPushButton" name="addButton" >
+- <property name="text" >
+- <string>Add</string>
+- </property>
+- </widget>
+- </item>
+- <item row="1" column="2" >
+- <widget class="QPushButton" name="removeButton" >
+- <property name="enabled" >
++ <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="textLabel2" >
++ <property name="text" >
++ <string>Authentication</string>
++ </property>
++ </widget>
++ </item>
++ <item row="2" column="1" >
++ <widget class="QComboBox" name="authSelect" >
++ <item>
++ <property name="text" >
++ <string>Plaintext or static WEP</string>
++ </property>
++ </item>
++ <item>
++ <property name="text" >
++ <string>IEEE 802.1X</string>
++ </property>
++ </item>
++ <item>
++ <property name="text" >
++ <string>WPA-Personal (PSK)</string>
++ </property>
++ </item>
++ <item>
++ <property name="text" >
++ <string>WPA-Enterprise (EAP)</string>
++ </property>
++ </item>
++ <item>
++ <property name="text" >
++ <string>WPA2-Personal (PSK)</string>
++ </property>
++ </item>
++ <item>
++ <property name="text" >
++ <string>WPA2-Enterprise (EAP)</string>
++ </property>
++ </item>
++ </widget>
++ </item>
++ <item row="3" column="0" >
++ <widget class="QLabel" name="textLabel3" >
++ <property name="text" >
++ <string>Encryption</string>
++ </property>
++ </widget>
++ </item>
++ <item row="3" column="1" >
++ <widget class="QComboBox" name="encrSelect" >
++ <item>
++ <property name="text" >
++ <string>None</string>
++ </property>
++ </item>
++ <item>
++ <property name="text" >
++ <string>WEP</string>
++ </property>
++ </item>
++ <item>
++ <property name="text" >
++ <string>TKIP</string>
++ </property>
++ </item>
++ <item>
++ <property name="text" >
++ <string>CCMP</string>
++ </property>
++ </item>
++ </widget>
++ </item>
++ <item row="4" column="0" >
++ <widget class="QLabel" name="textLabel4" >
++ <property name="text" >
++ <string>PSK</string>
++ </property>
++ </widget>
++ </item>
++ <item row="4" column="1" >
++ <widget class="QLineEdit" name="pskEdit" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="toolTip" >
++ <string>WPA/WPA2 pre-shared key or passphrase</string>
++ </property>
++ <property name="whatsThis" >
++ <string/>
++ </property>
++ <property name="echoMode" >
++ <enum>QLineEdit::Password</enum>
++ </property>
++ </widget>
++ </item>
++ <item row="5" column="0" >
++ <widget class="QLabel" name="textLabel5" >
++ <property name="text" >
++ <string>EAP method</string>
++ </property>
++ </widget>
++ </item>
++ <item row="5" column="1" >
++ <widget class="QComboBox" name="eapSelect" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ </widget>
++ </item>
++ <item row="6" column="0" >
++ <widget class="QLabel" name="textLabel6" >
++ <property name="text" >
++ <string>Identity</string>
++ </property>
++ </widget>
++ </item>
++ <item row="6" column="1" >
++ <widget class="QLineEdit" name="identityEdit" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="toolTip" >
++ <string>Username/Identity for EAP methods</string>
++ </property>
++ </widget>
++ </item>
++ <item row="7" column="0" >
++ <widget class="QLabel" name="textLabel7" >
++ <property name="text" >
++ <string>Password</string>
++ </property>
++ </widget>
++ </item>
++ <item row="7" column="1" >
++ <widget class="QLineEdit" name="passwordEdit" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="toolTip" >
++ <string>Password for EAP methods</string>
++ </property>
++ <property name="echoMode" >
++ <enum>QLineEdit::Password</enum>
++ </property>
++ </widget>
++ </item>
++ <item row="8" column="0" >
++ <widget class="QLabel" name="textLabel1_2" >
++ <property name="text" >
++ <string>CA certificate</string>
++ </property>
++ </widget>
++ </item>
++ <item row="8" 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" >
++ <property name="enabled" >
++ <bool>true</bool>
++ </property>
++ <property name="title" >
++ <string>WEP keys</string>
++ </property>
++ <layout class="QGridLayout" >
++ <item row="0" column="0" >
++ <widget class="QRadioButton" name="wep0Radio" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="text" >
++ <string>key 0</string>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="0" >
++ <widget class="QRadioButton" name="wep1Radio" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="text" >
++ <string>key 1</string>
++ </property>
++ </widget>
++ </item>
++ <item row="3" column="0" >
++ <widget class="QRadioButton" name="wep3Radio" >
++ <property name="enabled" >
+ <bool>false</bool>
+- </property>
+- <property name="text" >
+- <string>Remove</string>
+- </property>
+- </widget>
+- </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>
+- <tabstop>eapSelect</tabstop>
+- <tabstop>identityEdit</tabstop>
+- <tabstop>passwordEdit</tabstop>
+- <tabstop>cacertEdit</tabstop>
+- <tabstop>wep0Radio</tabstop>
+- <tabstop>wep1Radio</tabstop>
+- <tabstop>wep2Radio</tabstop>
+- <tabstop>wep3Radio</tabstop>
+- <tabstop>wep0Edit</tabstop>
+- <tabstop>wep1Edit</tabstop>
+- <tabstop>wep2Edit</tabstop>
+- <tabstop>wep3Edit</tabstop>
+- <tabstop>addButton</tabstop>
+- <tabstop>removeButton</tabstop>
+- <tabstop>cancelButton</tabstop>
+- </tabstops>
+- <includes>
+- <include location="global" >qtreewidget.h</include>
+- </includes>
++ </property>
++ <property name="text" >
++ <string>key 3</string>
++ </property>
++ </widget>
++ </item>
++ <item row="2" column="0" >
++ <widget class="QRadioButton" name="wep2Radio" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="text" >
++ <string>key 2</string>
++ </property>
++ </widget>
++ </item>
++ <item row="0" column="1" >
++ <widget class="QLineEdit" name="wep0Edit" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="1" >
++ <widget class="QLineEdit" name="wep1Edit" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ </widget>
++ </item>
++ <item row="2" column="1" >
++ <widget class="QLineEdit" name="wep2Edit" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ </widget>
++ </item>
++ <item row="3" column="1" >
++ <widget class="QLineEdit" name="wep3Edit" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </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" >
++ <string>Add</string>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="2" >
++ <widget class="QPushButton" name="removeButton" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="text" >
++ <string>Remove</string>
++ </property>
++ </widget>
++ </item>
++ </layout>
++ </widget>
++ <layoutdefault spacing="6" margin="11" />
++ <tabstops>
++ <tabstop>ssidEdit</tabstop>
++ <tabstop>idstrEdit</tabstop>
++ <tabstop>authSelect</tabstop>
++ <tabstop>encrSelect</tabstop>
++ <tabstop>pskEdit</tabstop>
++ <tabstop>eapSelect</tabstop>
++ <tabstop>identityEdit</tabstop>
++ <tabstop>passwordEdit</tabstop>
++ <tabstop>cacertEdit</tabstop>
++ <tabstop>wep0Radio</tabstop>
++ <tabstop>wep1Radio</tabstop>
++ <tabstop>wep2Radio</tabstop>
++ <tabstop>wep3Radio</tabstop>
++ <tabstop>wep0Edit</tabstop>
++ <tabstop>wep1Edit</tabstop>
++ <tabstop>wep2Edit</tabstop>
++ <tabstop>wep3Edit</tabstop>
++ <tabstop>addButton</tabstop>
++ <tabstop>removeButton</tabstop>
++ <tabstop>cancelButton</tabstop>
++ </tabstops>
++ <includes>
++ <include location="global" >qtreewidget.h</include>
++ </includes>
++ <resources/>
++ <connections/>
+ </ui>
Added: wpasupplicant/trunk/debian/patches/41_wpa_gui_qt4_networkconfigui_inc_size.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/41_wpa_gui_qt4_networkconfigui_inc_size.patch?rev=1051&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/41_wpa_gui_qt4_networkconfigui_inc_size.patch (added)
+++ wpasupplicant/trunk/debian/patches/41_wpa_gui_qt4_networkconfigui_inc_size.patch Wed Jan 23 08:42:55 2008
@@ -1,0 +1,13 @@
+--- 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>460</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
Added: wpasupplicant/trunk/debian/patches/42_wpa_gui_qt4_networkconfigui_label_names.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/42_wpa_gui_qt4_networkconfigui_label_names.patch?rev=1051&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/42_wpa_gui_qt4_networkconfigui_label_names.patch (added)
+++ wpasupplicant/trunk/debian/patches/42_wpa_gui_qt4_networkconfigui_label_names.patch Wed Jan 23 08:42:55 2008
@@ -1,0 +1,83 @@
+--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
+@@ -30,7 +30,7 @@
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+- <widget class="QLabel" name="textLabel0" >
++ <widget class="QLabel" name="ssidLabel" >
+ <property name="text" >
+ <string>SSID</string>
+ </property>
+@@ -47,7 +47,7 @@
+ </widget>
+ </item>
+ <item row="1" column="0" >
+- <widget class="QLabel" name="textLabel1" >
++ <widget class="QLabel" name="idstrLabel" >
+ <property name="text" >
+ <string>Network ID</string>
+ </property>
+@@ -64,7 +64,7 @@
+ </widget>
+ </item>
+ <item row="2" column="0" >
+- <widget class="QLabel" name="textLabel2" >
++ <widget class="QLabel" name="authLabel" >
+ <property name="text" >
+ <string>Authentication</string>
+ </property>
+@@ -105,7 +105,7 @@
+ </widget>
+ </item>
+ <item row="3" column="0" >
+- <widget class="QLabel" name="textLabel3" >
++ <widget class="QLabel" name="encrLabel" >
+ <property name="text" >
+ <string>Encryption</string>
+ </property>
+@@ -136,7 +136,7 @@
+ </widget>
+ </item>
+ <item row="4" column="0" >
+- <widget class="QLabel" name="textLabel4" >
++ <widget class="QLabel" name="pskLabel" >
+ <property name="text" >
+ <string>PSK</string>
+ </property>
+@@ -159,7 +159,7 @@
+ </widget>
+ </item>
+ <item row="5" column="0" >
+- <widget class="QLabel" name="textLabel5" >
++ <widget class="QLabel" name="eapLabel" >
+ <property name="text" >
+ <string>EAP method</string>
+ </property>
+@@ -173,7 +173,7 @@
+ </widget>
+ </item>
+ <item row="6" column="0" >
+- <widget class="QLabel" name="textLabel6" >
++ <widget class="QLabel" name="identityLabel" >
+ <property name="text" >
+ <string>Identity</string>
+ </property>
+@@ -190,7 +190,7 @@
+ </widget>
+ </item>
+ <item row="7" column="0" >
+- <widget class="QLabel" name="textLabel7" >
++ <widget class="QLabel" name="passwordLabel" >
+ <property name="text" >
+ <string>Password</string>
+ </property>
+@@ -210,7 +210,7 @@
+ </widget>
+ </item>
+ <item row="8" column="0" >
+- <widget class="QLabel" name="textLabel1_2" >
++ <widget class="QLabel" name="cacertLabel" >
+ <property name="text" >
+ <string>CA certificate</string>
+ </property>
Added: wpasupplicant/trunk/debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch?rev=1051&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch (added)
+++ wpasupplicant/trunk/debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch Wed Jan 23 08:42:55 2008
@@ -1,0 +1,18 @@
+--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
+@@ -353,12 +353,12 @@
+ <tabstop>passwordEdit</tabstop>
+ <tabstop>cacertEdit</tabstop>
+ <tabstop>wep0Radio</tabstop>
+- <tabstop>wep1Radio</tabstop>
+- <tabstop>wep2Radio</tabstop>
+- <tabstop>wep3Radio</tabstop>
+ <tabstop>wep0Edit</tabstop>
++ <tabstop>wep1Radio</tabstop>
+ <tabstop>wep1Edit</tabstop>
++ <tabstop>wep2Radio</tabstop>
+ <tabstop>wep2Edit</tabstop>
++ <tabstop>wep3Radio</tabstop>
+ <tabstop>wep3Edit</tabstop>
+ <tabstop>addButton</tabstop>
+ <tabstop>removeButton</tabstop>
Added: wpasupplicant/trunk/debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch?rev=1051&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch (added)
+++ wpasupplicant/trunk/debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch Wed Jan 23 08:42:55 2008
@@ -1,0 +1,261 @@
+--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
+@@ -6,7 +6,7 @@
+ <x>0</x>
+ <y>0</y>
+ <width>410</width>
+- <height>460</height>
++ <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,12 +352,24 @@
+ </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" />
+ <tabstops>
+ <tabstop>ssidEdit</tabstop>
+- <tabstop>idstrEdit</tabstop>
+ <tabstop>authSelect</tabstop>
+ <tabstop>encrSelect</tabstop>
+ <tabstop>pskEdit</tabstop>
+@@ -360,6 +385,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>
Added: wpasupplicant/trunk/debian/patches/45_wpa_gui_qt4_networkconfig_idstr_priority.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/45_wpa_gui_qt4_networkconfig_idstr_priority.patch?rev=1051&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/45_wpa_gui_qt4_networkconfig_idstr_priority.patch (added)
+++ wpasupplicant/trunk/debian/patches/45_wpa_gui_qt4_networkconfig_idstr_priority.patch Wed Jan 23 08:42:55 2008
@@ -1,0 +1,77 @@
+--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
+@@ -163,11 +163,6 @@
+ setNetworkParam(id, "ssid", ssidEdit->text().toAscii().constData(),
+ true);
+
+- if (idstrEdit->isEnabled())
+- setNetworkParam(id, "id_str",
+- idstrEdit->text().toAscii().constData(),
+- true);
+-
+ const char *key_mgmt = NULL, *proto = NULL, *pairwise = NULL;
+ switch (auth) {
+ case AUTH_NONE:
+@@ -249,6 +244,18 @@
+ else if (wep3Radio->isEnabled() && wep3Radio->isChecked())
+ setNetworkParam(id, "wep_tx_keyidx", "3", false);
+
++ if (idstrEdit->isEnabled())
++ setNetworkParam(id, "id_str",
++ idstrEdit->text().toAscii().constData(),
++ true);
++
++ if (prioritySpinBox->value() > 0) {
++ QString prio;
++ prio = prio.setNum(prioritySpinBox->value());
++ setNetworkParam(id, "priority", prio.toAscii().constData(),
++ true);
++ }
++
+ snprintf(cmd, sizeof(cmd), "ENABLE_NETWORK %d", id);
+ reply_len = sizeof(reply);
+ wpagui->ctrlRequest(cmd, reply, &reply_len);
+@@ -368,17 +375,6 @@
+ ssidEdit->setText(reply + 1);
+ }
+
+- snprintf(cmd, sizeof(cmd), "GET_NETWORK %d id_str", network_id);
+- reply_len = sizeof(reply) - 1;
+- if (wpagui->ctrlRequest(cmd, reply, &reply_len) >= 0 &&
+- reply_len >= 2 && reply[0] == '"') {
+- reply[reply_len] = '\0';
+- pos = strchr(reply + 1, '"');
+- if (pos)
+- *pos = '\0';
+- idstrEdit->setText(reply + 1);
+- }
+-
+ snprintf(cmd, sizeof(cmd), "GET_NETWORK %d proto", network_id);
+ reply_len = sizeof(reply) - 1;
+ int wpa = 0;
+@@ -538,6 +534,25 @@
+ }
+ }
+
++ snprintf(cmd, sizeof(cmd), "GET_NETWORK %d id_str", network_id);
++ reply_len = sizeof(reply) - 1;
++ if (wpagui->ctrlRequest(cmd, reply, &reply_len) >= 0 &&
++ reply_len >= 2 && reply[0] == '"') {
++ reply[reply_len] = '\0';
++ pos = strchr(reply + 1, '"');
++ if (pos)
++ *pos = '\0';
++ idstrEdit->setText(reply + 1);
++ }
++
++ snprintf(cmd, sizeof(cmd), "GET_NETWORK %d priority", network_id);
++ reply_len = sizeof(reply) - 1;
++ if (wpagui->ctrlRequest(cmd, reply, &reply_len) >= 0 && reply_len >= 1)
++ {
++ reply[reply_len] = '\0';
++ prioritySpinBox->setValue(atoi(reply));
++ }
++
+ authSelect->setCurrentIndex(auth);
+ authChanged(auth);
+ encrSelect->setCurrentIndex(encr);
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1051&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Wed Jan 23 08:42:55 2008
@@ -15,3 +15,9 @@
37_rm_wait_for_interface.patch
38_dbus_blob_support.patch
39_wpa_gui_qt4_closeevent.patch
+40_wpa_gui_qt4_networkconfigui_rework.patch
+41_wpa_gui_qt4_networkconfigui_inc_size.patch
+42_wpa_gui_qt4_networkconfigui_label_names.patch
+43_wpa_gui_qt4_networkconfigui_tab_order.patch
+44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch
+45_wpa_gui_qt4_networkconfig_idstr_priority.patch
More information about the Pkg-wpa-devel
mailing list