[pkg-wpa-devel] r1070 - in /wpasupplicant/trunk/debian: ./ patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Tue Jan 29 06:56:07 UTC 2008
Author: kelmo-guest
Date: Tue Jan 29 06:56:07 2008
New Revision: 1070
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1070
Log:
* Add patches to enhance the initial wpa_gui user interface. Present a
tabbed interface, the default tab containing the current status updates
and the second tab containing an interface to add/remove/manipulate
networks in the current configuration.
- debian/patches/51_wpa_gui_qt4_wpaguiui_cleanup_menus.patch
- debian/patches/52_wpa_gui_qt4_wpaguiui_tabbed_ui.patch
- debian/patches/53_wpa_gui_qt4_wpagui_populate_network_list.patch
- debian/patches/54_wpa_gui_qt4_wpagui_add_button.patch
- debian/patches/55_wpa_gui_qt4_wpagui_edit_button.patch
- debian/patches/56_wpa_gui_qt4_wpagui_remove_button.patch
- debian/patches/57_wpa_gui_qt4_wpagui_enable_disable_radio.patch
- debian/patches/58_wpa_gui_qt4_wpagui_network_scan_button.patch
- debian/patches/59_wpa_gui_qt4_wpagui_networklist_doubleclick.patch
- debian/patches/60_wpa_gui_qt4_wpagui_remove_menu.patch
- debian/patches/61_wpa_gui_qt4_wpagui_remove_enable_disable_all.patch
- debian/patches/62_wpa_gui_qt4_wpagui_update_on_disable_and_enable.patch
- debian/patches/63_wpa_gui_qt4_wpagui_reselect_list_index.patch
- debian/patches/64_wpa_gui_qt4_wpagui_info_no_network.patch
Added:
wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_cleanup_menus.patch
wpasupplicant/trunk/debian/patches/52_wpa_gui_qt4_wpaguiui_tabbed_ui.patch
wpasupplicant/trunk/debian/patches/53_wpa_gui_qt4_wpagui_populate_network_list.patch
wpasupplicant/trunk/debian/patches/54_wpa_gui_qt4_wpagui_add_button.patch
wpasupplicant/trunk/debian/patches/55_wpa_gui_qt4_wpagui_edit_button.patch
wpasupplicant/trunk/debian/patches/56_wpa_gui_qt4_wpagui_remove_button.patch
wpasupplicant/trunk/debian/patches/57_wpa_gui_qt4_wpagui_enable_disable_radio.patch
wpasupplicant/trunk/debian/patches/58_wpa_gui_qt4_wpagui_network_scan_button.patch
wpasupplicant/trunk/debian/patches/59_wpa_gui_qt4_wpagui_networklist_doubleclick.patch
wpasupplicant/trunk/debian/patches/60_wpa_gui_qt4_wpagui_remove_menu.patch
wpasupplicant/trunk/debian/patches/61_wpa_gui_qt4_wpagui_remove_enable_disable_all.patch
wpasupplicant/trunk/debian/patches/62_wpa_gui_qt4_wpagui_update_on_disable_and_enable.patch
wpasupplicant/trunk/debian/patches/63_wpa_gui_qt4_wpagui_reselect_list_index.patch
wpasupplicant/trunk/debian/patches/64_wpa_gui_qt4_wpagui_info_no_network.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=1070&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Tue Jan 29 06:56:07 2008
@@ -48,10 +48,27 @@
- debian/patches/47_wpa_gui_qt4_networkconfig_psk_error_title.patch
- debian/patches/48_wpa_gui_qt4_networkconfig_focus_on_error.patch
- debian/patches/49_wpa_gui_qt4_networkconfig_wep_preseed.patch
- * Add patches to enhance the initial wpa_gui status form.
+ * Add patches to enhance the initial wpa_gui user interface. Present a
+ tabbed interface, the default tab containing the current status updates
+ and the second tab containing an interface to add/remove/manipulate
+ networks in the current configuration.
- debian/patches/50_wpa_gui_qt4_wpaguiui_rework.patch
-
- -- Kel Modderman <kel at otaku42.de> Fri, 25 Jan 2008 15:35:48 +1000
+ - debian/patches/51_wpa_gui_qt4_wpaguiui_cleanup_menus.patch
+ - debian/patches/52_wpa_gui_qt4_wpaguiui_tabbed_ui.patch
+ - debian/patches/53_wpa_gui_qt4_wpagui_populate_network_list.patch
+ - debian/patches/54_wpa_gui_qt4_wpagui_add_button.patch
+ - debian/patches/55_wpa_gui_qt4_wpagui_edit_button.patch
+ - debian/patches/56_wpa_gui_qt4_wpagui_remove_button.patch
+ - debian/patches/57_wpa_gui_qt4_wpagui_enable_disable_radio.patch
+ - debian/patches/58_wpa_gui_qt4_wpagui_network_scan_button.patch
+ - debian/patches/59_wpa_gui_qt4_wpagui_networklist_doubleclick.patch
+ - debian/patches/60_wpa_gui_qt4_wpagui_remove_menu.patch
+ - debian/patches/61_wpa_gui_qt4_wpagui_remove_enable_disable_all.patch
+ - debian/patches/62_wpa_gui_qt4_wpagui_update_on_disable_and_enable.patch
+ - debian/patches/63_wpa_gui_qt4_wpagui_reselect_list_index.patch
+ - debian/patches/64_wpa_gui_qt4_wpagui_info_no_network.patch
+
+ -- Kel Modderman <kel at otaku42.de> Tue, 29 Jan 2008 16:53:16 +1000
wpasupplicant (0.6.2-1) experimental; urgency=low
Added: wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_cleanup_menus.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_cleanup_menus.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_cleanup_menus.patch (added)
+++ wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_cleanup_menus.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,241 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.ui
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.ui
+@@ -196,16 +196,21 @@
+ <property name="title" >
+ <string>&File</string>
+ </property>
+- <addaction name="separator" />
+ <addaction name="fileEventHistoryAction" />
+- <addaction name="fileAdd_NetworkAction" />
+- <addaction name="fileEdit_networkAction" />
+- <addaction name="fileEnableALLNetworksAction" />
+- <addaction name="fileDisableALLNetworksAction" />
+- <addaction name="fileSaveConfig" />
++ <addaction name="fileSaveConfigAction" />
+ <addaction name="separator" />
+ <addaction name="fileExitAction" />
+ </widget>
++ <widget class="QMenu" name="networkMenu" >
++ <property name="title" >
++ <string>&Network</string>
++ </property>
++ <addaction name="networkAddAction" />
++ <addaction name="networkEditAction" />
++ <addaction name="separator" />
++ <addaction name="networkEnableAllAction" />
++ <addaction name="networkDisableAllAction" />
++ </widget>
+ <widget class="QMenu" name="helpMenu" >
+ <property name="title" >
+ <string>&Help</string>
+@@ -216,134 +221,69 @@
+ <addaction name="helpAboutAction" />
+ </widget>
+ <addaction name="fileMenu" />
++ <addaction name="networkMenu" />
+ <addaction name="helpMenu" />
+ </widget>
+- <action name="fileExitAction" >
++ <action name="fileEventHistoryAction" >
+ <property name="text" >
+- <string>E&xit</string>
+- </property>
+- <property name="iconText" >
+- <string>Exit</string>
+- </property>
+- <property name="shortcut" >
+- <string>Ctrl+Q</string>
+- </property>
+- <property name="name" stdset="0" >
+- <string>fileExitAction</string>
++ <string>Event &History</string>
+ </property>
+ </action>
+- <action name="helpContentsAction" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
++ <action name="fileSaveConfigAction" >
+ <property name="text" >
+- <string>&Contents...</string>
+- </property>
+- <property name="iconText" >
+- <string>Contents</string>
++ <string>&Save Configuration</string>
+ </property>
+ <property name="shortcut" >
+- <string/>
+- </property>
+- <property name="name" stdset="0" >
+- <string>helpContentsAction</string>
++ <string>Ctrl+S</string>
+ </property>
+ </action>
+- <action name="helpIndexAction" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
++ <action name="fileExitAction" >
+ <property name="text" >
+- <string>&Index...</string>
+- </property>
+- <property name="iconText" >
+- <string>Index</string>
++ <string>E&xit</string>
+ </property>
+ <property name="shortcut" >
+- <string/>
+- </property>
+- <property name="name" stdset="0" >
+- <string>helpIndexAction</string>
++ <string>Ctrl+Q</string>
+ </property>
+ </action>
+- <action name="helpAboutAction" >
++ <action name="networkAddAction" >
+ <property name="text" >
+- <string>&About</string>
+- </property>
+- <property name="iconText" >
+- <string>About</string>
+- </property>
+- <property name="shortcut" >
+- <string/>
+- </property>
+- <property name="name" stdset="0" >
+- <string>helpAboutAction</string>
++ <string>&Add</string>
+ </property>
+ </action>
+- <action name="fileEventHistoryAction" >
++ <action name="networkEditAction" >
+ <property name="text" >
+- <string>Event &History</string>
+- </property>
+- <property name="iconText" >
+- <string>Event History</string>
+- </property>
+- <property name="name" stdset="0" >
+- <string>fileEventHistoryAction</string>
++ <string>&Edit</string>
+ </property>
+ </action>
+- <action name="fileAdd_NetworkAction" >
++ <action name="networkEnableAllAction" >
+ <property name="text" >
+- <string>&Add Network</string>
+- </property>
+- <property name="iconText" >
+- <string>Add Network</string>
+- </property>
+- <property name="name" stdset="0" >
+- <string>fileAdd_NetworkAction</string>
++ <string>E&nable All</string>
+ </property>
+ </action>
+- <action name="fileEdit_networkAction" >
++ <action name="networkDisableAllAction" >
+ <property name="text" >
+- <string>&Edit Network</string>
+- </property>
+- <property name="iconText" >
+- <string>Edit Network</string>
+- </property>
+- <property name="name" stdset="0" >
+- <string>fileEdit_networkAction</string>
++ <string>&Disable All</string>
+ </property>
+ </action>
+- <action name="fileEnableALLNetworksAction" >
+- <property name="text" >
+- <string>E&nable All Networks</string>
+- </property>
+- <property name="iconText" >
+- <string>Enable All Networks</string>
+- </property>
+- <property name="name" stdset="0" >
+- <string>fileEnableALLNetworksAction</string>
++ <action name="helpContentsAction" >
++ <property name="enabled" >
++ <bool>false</bool>
+ </property>
+- </action>
+- <action name="fileDisableALLNetworksAction" >
+ <property name="text" >
+- <string>&Disable All Networks</string>
++ <string>&Contents...</string>
+ </property>
+- <property name="iconText" >
+- <string>Disable All Networks</string>
++ </action>
++ <action name="helpIndexAction" >
++ <property name="enabled" >
++ <bool>false</bool>
+ </property>
+- <property name="name" stdset="0" >
+- <string>fileDisableALLNetworksAction</string>
++ <property name="text" >
++ <string>&Index...</string>
+ </property>
+ </action>
+- <action name="fileSaveConfig" >
++ <action name="helpAboutAction" >
+ <property name="text" >
+- <string>&Save Configuration</string>
+- </property>
+- <property name="iconText" >
+- <string>Save Configuration</string>
+- </property>
+- <property name="name" stdset="0" >
+- <string>fileSaveConfig</string>
++ <string>&About</string>
+ </property>
+ </action>
+ </widget>
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -33,29 +33,30 @@
+
+ (void) statusBar();
+
++ connect(fileEventHistoryAction, SIGNAL(triggered()), this,
++ SLOT(eventHistory()));
++ connect(fileSaveConfigAction, SIGNAL(triggered()), this,
++ SLOT(saveConfig()));
++ connect(fileExitAction, SIGNAL(triggered()), this, SLOT(close()));
++ connect(networkAddAction, SIGNAL(triggered()), this,
++ SLOT(addNetwork()));
++ connect(networkEditAction, SIGNAL(triggered()), this,
++ SLOT(editNetwork()));
++ connect(networkEnableAllAction, SIGNAL(triggered()), this,
++ SLOT(enableAllNetworks()));
++ connect(networkDisableAllAction, SIGNAL(triggered()), this,
++ SLOT(disableAllNetworks()));
+ connect(helpIndexAction, SIGNAL(triggered()), this, SLOT(helpIndex()));
+ connect(helpContentsAction, SIGNAL(triggered()), this,
+ SLOT(helpContents()));
+ connect(helpAboutAction, SIGNAL(triggered()), this, SLOT(helpAbout()));
+- connect(fileExitAction, SIGNAL(triggered()), this, SLOT(close()));
+ connect(disconnectButton, SIGNAL(clicked()), this, SLOT(disconnect()));
+ connect(scanButton, SIGNAL(clicked()), this, SLOT(scan()));
+ connect(connectButton, SIGNAL(clicked()), this, SLOT(connectB()));
+- connect(fileEventHistoryAction, SIGNAL(triggered()), this,
+- SLOT(eventHistory()));
+- connect(networkSelect, SIGNAL(activated(const QString&)), this,
+- SLOT(selectNetwork(const QString&)));
+- connect(fileEdit_networkAction, SIGNAL(triggered()), this,
+- SLOT(editNetwork()));
+- connect(fileAdd_NetworkAction, SIGNAL(triggered()), this,
+- SLOT(addNetwork()));
+- connect(fileEnableALLNetworksAction, SIGNAL(triggered()), this,
+- SLOT(enableAllNetworks()));
+- connect(fileDisableALLNetworksAction, SIGNAL(triggered()), this,
+- SLOT(disableAllNetworks()));
+- connect(fileSaveConfig, SIGNAL(triggered()), this, SLOT(saveConfig()));
+ connect(adapterSelect, SIGNAL(activated(const QString&)), this,
+ SLOT(selectAdapter(const QString&)));
++ connect(networkSelect, SIGNAL(activated(const QString&)), this,
++ SLOT(selectNetwork(const QString&)));
+
+ eh = NULL;
+ scanres = NULL;
Added: wpasupplicant/trunk/debian/patches/52_wpa_gui_qt4_wpaguiui_tabbed_ui.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/52_wpa_gui_qt4_wpaguiui_tabbed_ui.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/52_wpa_gui_qt4_wpaguiui_tabbed_ui.patch (added)
+++ wpasupplicant/trunk/debian/patches/52_wpa_gui_qt4_wpaguiui_tabbed_ui.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,450 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.ui
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.ui
+@@ -5,8 +5,8 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>289</width>
+- <height>308</height>
++ <width>345</width>
++ <height>330</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+@@ -14,171 +14,277 @@
+ </property>
+ <widget class="QWidget" name="widget" >
+ <layout class="QGridLayout" >
+- <item row="0" column="0" colspan="2" >
+- <widget class="QLabel" name="textLabel16" >
++ <item row="0" column="0" >
++ <widget class="QLabel" name="adapterLabel" >
+ <property name="text" >
+ <string>Adapter:</string>
+ </property>
+ </widget>
+ </item>
+- <item row="0" column="2" colspan="2" >
++ <item row="0" column="1" >
+ <widget class="QComboBox" name="adapterSelect" />
+ </item>
+- <item row="1" column="0" colspan="2" >
+- <widget class="QLabel" name="textLabel8" >
++ <item row="1" column="0" >
++ <widget class="QLabel" name="networkLabel" >
+ <property name="text" >
+ <string>Network:</string>
+ </property>
+ </widget>
+ </item>
+- <item row="1" column="2" colspan="2" >
++ <item row="1" column="1" >
+ <widget class="QComboBox" name="networkSelect" />
+ </item>
+- <item row="2" column="0" colspan="4" >
+- <widget class="QFrame" name="frame3" >
+- <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="textLabel1" >
+- <property name="text" >
+- <string>Status:</string>
+- </property>
+- </widget>
+- </item>
+- <item row="1" column="0" >
+- <widget class="QLabel" name="textLabel2" >
+- <property name="text" >
+- <string>Last message:</string>
+- </property>
+- </widget>
+- </item>
+- <item row="2" column="0" >
+- <widget class="QLabel" name="textLabel3" >
+- <property name="text" >
+- <string>Authentication:</string>
+- </property>
+- </widget>
+- </item>
+- <item row="3" column="0" >
+- <widget class="QLabel" name="textLabel4" >
+- <property name="text" >
+- <string>Encryption:</string>
+- </property>
+- </widget>
+- </item>
+- <item row="4" column="0" >
+- <widget class="QLabel" name="textLabel5" >
+- <property name="text" >
+- <string>SSID:</string>
+- </property>
+- </widget>
+- </item>
+- <item row="5" column="0" >
+- <widget class="QLabel" name="textLabel6" >
+- <property name="text" >
+- <string>BSSID:</string>
+- </property>
+- </widget>
+- </item>
+- <item row="6" column="0" >
+- <widget class="QLabel" name="textLabel7" >
+- <property name="text" >
+- <string>IP address:</string>
+- </property>
+- </widget>
+- </item>
+- <item row="0" column="1" >
+- <widget class="QLabel" name="textStatus" >
+- <property name="text" >
+- <string/>
+- </property>
+- </widget>
+- </item>
+- <item row="1" column="1" colspan="3" >
+- <widget class="QLabel" name="textLastMessage" >
+- <property name="text" >
+- <string/>
+- </property>
+- </widget>
+- </item>
+- <item row="2" column="1" >
+- <widget class="QLabel" name="textAuthentication" >
+- <property name="text" >
+- <string/>
+- </property>
+- </widget>
+- </item>
+- <item row="3" column="1" >
+- <widget class="QLabel" name="textEncryption" >
+- <property name="text" >
+- <string/>
+- </property>
+- </widget>
+- </item>
+- <item row="4" column="1" >
+- <widget class="QLabel" name="textSsid" >
+- <property name="text" >
+- <string/>
+- </property>
+- </widget>
+- </item>
+- <item row="5" column="1" >
+- <widget class="QLabel" name="textBssid" >
+- <property name="text" >
+- <string/>
+- </property>
+- </widget>
+- </item>
+- <item row="6" column="1" >
+- <widget class="QLabel" name="textIpAddress" >
+- <property name="text" >
+- <string/>
+- </property>
+- </widget>
+- </item>
+- </layout>
+- </widget>
+- </item>
+- <item row="3" column="0" >
+- <spacer>
+- <property name="orientation" >
+- <enum>Qt::Vertical</enum>
+- </property>
+- <property name="sizeType" >
+- <enum>QSizePolicy::Expanding</enum>
+- </property>
+- <property name="sizeHint" >
+- <size>
+- <width>16</width>
+- <height>16</height>
+- </size>
+- </property>
+- </spacer>
+- </item>
+- <item row="3" column="1" >
+- <widget class="QPushButton" name="connectButton" >
+- <property name="text" >
+- <string>Connect</string>
+- </property>
+- </widget>
+- </item>
+- <item row="3" column="2" >
+- <widget class="QPushButton" name="disconnectButton" >
+- <property name="text" >
+- <string>Disconnect</string>
+- </property>
+- </widget>
+- </item>
+- <item row="3" column="3" >
+- <widget class="QPushButton" name="scanButton" >
+- <property name="text" >
+- <string>Scan</string>
++ <item row="2" column="0" colspan="2" >
++ <widget class="QTabWidget" name="wpaguiTab" >
++ <property name="currentIndex" >
++ <number>0</number>
+ </property>
++ <widget class="QWidget" name="statusTab" >
++ <attribute name="title" >
++ <string>Current Status</string>
++ </attribute>
++ <layout class="QGridLayout" >
++ <item row="0" column="0" colspan="5" >
++ <widget class="QFrame" name="frame3" >
++ <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="statusLabel" >
++ <property name="text" >
++ <string>Status:</string>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="0" >
++ <widget class="QLabel" name="lastMessageLabel" >
++ <property name="text" >
++ <string>Last message:</string>
++ </property>
++ </widget>
++ </item>
++ <item row="2" column="0" >
++ <widget class="QLabel" name="authenticationLabel" >
++ <property name="text" >
++ <string>Authentication:</string>
++ </property>
++ </widget>
++ </item>
++ <item row="3" column="0" >
++ <widget class="QLabel" name="encryptionLabel" >
++ <property name="text" >
++ <string>Encryption:</string>
++ </property>
++ </widget>
++ </item>
++ <item row="4" column="0" >
++ <widget class="QLabel" name="ssidLabel" >
++ <property name="text" >
++ <string>SSID:</string>
++ </property>
++ </widget>
++ </item>
++ <item row="5" column="0" >
++ <widget class="QLabel" name="bssidLabel" >
++ <property name="text" >
++ <string>BSSID:</string>
++ </property>
++ </widget>
++ </item>
++ <item row="6" column="0" >
++ <widget class="QLabel" name="ipAddressLabel" >
++ <property name="text" >
++ <string>IP address:</string>
++ </property>
++ </widget>
++ </item>
++ <item row="0" column="1" >
++ <widget class="QLabel" name="textStatus" >
++ <property name="text" >
++ <string/>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="1" colspan="3" >
++ <widget class="QLabel" name="textLastMessage" >
++ <property name="text" >
++ <string/>
++ </property>
++ </widget>
++ </item>
++ <item row="2" column="1" >
++ <widget class="QLabel" name="textAuthentication" >
++ <property name="text" >
++ <string/>
++ </property>
++ </widget>
++ </item>
++ <item row="3" column="1" >
++ <widget class="QLabel" name="textEncryption" >
++ <property name="text" >
++ <string/>
++ </property>
++ </widget>
++ </item>
++ <item row="4" column="1" >
++ <widget class="QLabel" name="textSsid" >
++ <property name="text" >
++ <string/>
++ </property>
++ </widget>
++ </item>
++ <item row="5" column="1" >
++ <widget class="QLabel" name="textBssid" >
++ <property name="text" >
++ <string/>
++ </property>
++ </widget>
++ </item>
++ <item row="6" column="1" >
++ <widget class="QLabel" name="textIpAddress" >
++ <property name="text" >
++ <string/>
++ </property>
++ </widget>
++ </item>
++ </layout>
++ </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>
++ <item row="1" column="1" >
++ <widget class="QPushButton" name="connectButton" >
++ <property name="text" >
++ <string>Connect</string>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="2" >
++ <widget class="QPushButton" name="disconnectButton" >
++ <property name="text" >
++ <string>Disconnect</string>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="3" >
++ <widget class="QPushButton" name="scanButton" >
++ <property name="text" >
++ <string>Scan</string>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="4" >
++ <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>
++ <widget class="QWidget" name="networkconfigTab" >
++ <attribute name="title" >
++ <string>Manage Networks</string>
++ </attribute>
++ <layout class="QGridLayout" >
++ <item row="0" column="0" colspan="5" >
++ <widget class="QListWidget" name="networkList" >
++ <property name="selectionRectVisible" >
++ <bool>true</bool>
++ </property>
++ </widget>
++ </item>
++ <item rowspan="2" row="1" column="0" >
++ <spacer>
++ <property name="orientation" >
++ <enum>Qt::Vertical</enum>
++ </property>
++ <property name="sizeHint" >
++ <size>
++ <width>20</width>
++ <height>61</height>
++ </size>
++ </property>
++ </spacer>
++ </item>
++ <item row="1" column="1" >
++ <widget class="QRadioButton" name="enableRadioButton" >
++ <property name="text" >
++ <string>Enabled</string>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="2" >
++ <widget class="QPushButton" name="editNetworkButton" >
++ <property name="text" >
++ <string>Edit</string>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="3" >
++ <widget class="QPushButton" name="removeNetworkButton" >
++ <property name="text" >
++ <string>Remove</string>
++ </property>
++ </widget>
++ </item>
++ <item rowspan="2" row="1" column="4" >
++ <spacer>
++ <property name="orientation" >
++ <enum>Qt::Vertical</enum>
++ </property>
++ <property name="sizeHint" >
++ <size>
++ <width>20</width>
++ <height>61</height>
++ </size>
++ </property>
++ </spacer>
++ </item>
++ <item row="2" column="1" >
++ <widget class="QRadioButton" name="disableRadioButton" >
++ <property name="text" >
++ <string>Disabled</string>
++ </property>
++ </widget>
++ </item>
++ <item row="2" column="2" >
++ <widget class="QPushButton" name="addNetworkButton" >
++ <property name="text" >
++ <string>Add</string>
++ </property>
++ </widget>
++ </item>
++ <item row="2" column="3" >
++ <widget class="QPushButton" name="scanNetworkButton" >
++ <property name="text" >
++ <string>Scan</string>
++ </property>
++ </widget>
++ </item>
++ </layout>
++ </widget>
+ </widget>
+ </item>
+ </layout>
+@@ -188,7 +294,7 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>289</width>
++ <width>345</width>
+ <height>24</height>
+ </rect>
+ </property>
Added: wpasupplicant/trunk/debian/patches/53_wpa_gui_qt4_wpagui_populate_network_list.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/53_wpa_gui_qt4_wpagui_populate_network_list.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/53_wpa_gui_qt4_wpagui_populate_network_list.patch (added)
+++ wpasupplicant/trunk/debian/patches/53_wpa_gui_qt4_wpagui_populate_network_list.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,18 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -440,6 +440,7 @@
+ return;
+
+ networkSelect->clear();
++ networkList->clear();
+
+ if (ctrl_conn == NULL)
+ return;
+@@ -483,6 +484,7 @@
+ network.append(": ");
+ network.append(ssid);
+ networkSelect->addItem(network);
++ networkList->addItem(network);
+
+ if (strstr(flags, "[CURRENT]")) {
+ networkSelect->setCurrentIndex(networkSelect->count() -
Added: wpasupplicant/trunk/debian/patches/54_wpa_gui_qt4_wpagui_add_button.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/54_wpa_gui_qt4_wpagui_add_button.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/54_wpa_gui_qt4_wpagui_add_button.patch (added)
+++ wpasupplicant/trunk/debian/patches/54_wpa_gui_qt4_wpagui_add_button.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,10 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -57,6 +57,7 @@
+ SLOT(selectAdapter(const QString&)));
+ connect(networkSelect, SIGNAL(activated(const QString&)), this,
+ SLOT(selectNetwork(const QString&)));
++ connect(addNetworkButton, SIGNAL(clicked()), this, SLOT(addNetwork()));
+
+ eh = NULL;
+ scanres = NULL;
Added: wpasupplicant/trunk/debian/patches/55_wpa_gui_qt4_wpagui_edit_button.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/55_wpa_gui_qt4_wpagui_edit_button.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/55_wpa_gui_qt4_wpagui_edit_button.patch (added)
+++ wpasupplicant/trunk/debian/patches/55_wpa_gui_qt4_wpagui_edit_button.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,95 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -41,7 +41,7 @@
+ connect(networkAddAction, SIGNAL(triggered()), this,
+ SLOT(addNetwork()));
+ connect(networkEditAction, SIGNAL(triggered()), this,
+- SLOT(editNetwork()));
++ SLOT(editSelectedNetwork()));
+ connect(networkEnableAllAction, SIGNAL(triggered()), this,
+ SLOT(enableAllNetworks()));
+ connect(networkDisableAllAction, SIGNAL(triggered()), this,
+@@ -58,6 +58,8 @@
+ connect(networkSelect, SIGNAL(activated(const QString&)), this,
+ SLOT(selectNetwork(const QString&)));
+ connect(addNetworkButton, SIGNAL(clicked()), this, SLOT(addNetwork()));
++ connect(editNetworkButton, SIGNAL(clicked()), this,
++ SLOT(editListedNetwork()));
+
+ eh = NULL;
+ scanres = NULL;
+@@ -745,20 +747,20 @@
+ }
+
+
+-void WpaGui::editNetwork()
++void WpaGui::editNetwork(const QString &sel)
+ {
+- QString sel(networkSelect->currentText());
++ QString cmd(sel);
+ int id = -1;
+
+- if (!sel.startsWith("Select any")) {
++ if (!cmd.startsWith("Select any")) {
+ int pos = sel.indexOf(':');
+ if (pos < 0) {
+- printf("Invalid selectNetwork '%s'\n",
+- sel.toAscii().constData());
++ printf("Invalid editNetwork '%s'\n",
++ cmd.toAscii().constData());
+ return;
+ }
+- sel.truncate(pos);
+- id = sel.toInt();
++ cmd.truncate(pos);
++ id = cmd.toInt();
+ }
+
+ NetworkConfig *nc = new NetworkConfig();
+@@ -776,6 +778,26 @@
+ }
+
+
++void WpaGui::editSelectedNetwork()
++{
++ QString sel(networkSelect->currentText());
++ editNetwork(sel);
++}
++
++
++void WpaGui::editListedNetwork()
++{
++ if (networkList->currentRow() < 0) {
++ QMessageBox::information(this, "Select A Network",
++ "Select a network from the list to"
++ " edit it.\n");
++ return;
++ }
++ QString sel(networkList->currentItem()->text());
++ editNetwork(sel);
++}
++
++
+ void WpaGui::triggerUpdate()
+ {
+ updateStatus();
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h
+@@ -32,6 +32,7 @@
+
+ virtual int ctrlRequest(const char *cmd, char *buf, size_t *buflen);
+ virtual void triggerUpdate();
++ virtual void editNetwork(const QString &sel);
+
+ public slots:
+ virtual void parse_argv();
+@@ -49,7 +50,8 @@
+ virtual void receiveMsgs();
+ virtual void connectB();
+ virtual void selectNetwork(const QString &sel);
+- virtual void editNetwork();
++ virtual void editSelectedNetwork();
++ virtual void editListedNetwork();
+ virtual void addNetwork();
+ virtual void enableAllNetworks();
+ virtual void disableAllNetworks();
Added: wpasupplicant/trunk/debian/patches/56_wpa_gui_qt4_wpagui_remove_button.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/56_wpa_gui_qt4_wpagui_remove_button.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/56_wpa_gui_qt4_wpagui_remove_button.patch (added)
+++ wpasupplicant/trunk/debian/patches/56_wpa_gui_qt4_wpagui_remove_button.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,67 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -60,6 +60,8 @@
+ connect(addNetworkButton, SIGNAL(clicked()), this, SLOT(addNetwork()));
+ connect(editNetworkButton, SIGNAL(clicked()), this,
+ SLOT(editListedNetwork()));
++ connect(removeNetworkButton, SIGNAL(clicked()), this,
++ SLOT(removeListedNetwork()));
+
+ eh = NULL;
+ scanres = NULL;
+@@ -818,6 +820,37 @@
+ }
+
+
++void WpaGui::removeNetwork(const QString &sel)
++{
++ QString cmd(sel);
++ char reply[10];
++ size_t reply_len = sizeof(reply);
++ int pos = cmd.indexOf(':');
++ if (pos < 0) {
++ printf("Invalid removeNetwork '%s'\n",
++ cmd.toAscii().constData());
++ return;
++ }
++ cmd.truncate(pos);
++ cmd.prepend("REMOVE_NETWORK ");
++ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
++ triggerUpdate();
++}
++
++
++void WpaGui::removeListedNetwork()
++{
++ if (networkList->currentRow() < 0) {
++ QMessageBox::information(this, "Select A Network",
++ "Select a network from the list to"
++ " remove it.\n");
++ return;
++ }
++ QString sel(networkList->currentItem()->text());
++ removeNetwork(sel);
++}
++
++
+ void WpaGui::enableAllNetworks()
+ {
+ char reply[10];
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h
+@@ -33,6 +33,7 @@
+ virtual int ctrlRequest(const char *cmd, char *buf, size_t *buflen);
+ virtual void triggerUpdate();
+ virtual void editNetwork(const QString &sel);
++ virtual void removeNetwork(const QString &sel);
+
+ public slots:
+ virtual void parse_argv();
+@@ -52,6 +53,7 @@
+ virtual void selectNetwork(const QString &sel);
+ virtual void editSelectedNetwork();
+ virtual void editListedNetwork();
++ virtual void removeListedNetwork();
+ virtual void addNetwork();
+ virtual void enableAllNetworks();
+ virtual void disableAllNetworks();
Added: wpasupplicant/trunk/debian/patches/57_wpa_gui_qt4_wpagui_enable_disable_radio.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/57_wpa_gui_qt4_wpagui_enable_disable_radio.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/57_wpa_gui_qt4_wpagui_enable_disable_radio.patch (added)
+++ wpasupplicant/trunk/debian/patches/57_wpa_gui_qt4_wpagui_enable_disable_radio.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,155 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -62,6 +62,12 @@
+ SLOT(editListedNetwork()));
+ connect(removeNetworkButton, SIGNAL(clicked()), this,
+ SLOT(removeListedNetwork()));
++ connect(networkList, SIGNAL(itemSelectionChanged()), this,
++ SLOT(updateNetworkDisabledStatus()));
++ connect(enableRadioButton, SIGNAL(toggled(bool)), this,
++ SLOT(enableListedNetwork(bool)));
++ connect(disableRadioButton, SIGNAL(toggled(bool)), this,
++ SLOT(disableListedNetwork(bool)));
+
+ eh = NULL;
+ scanres = NULL;
+@@ -749,6 +755,40 @@
+ }
+
+
++void WpaGui::enableNetwork(const QString &sel)
++{
++ QString cmd(sel);
++ char reply[10];
++ size_t reply_len = sizeof(reply);
++ int pos = cmd.indexOf(':');
++ if (pos < 0) {
++ printf("Invalid enableNetwork '%s'\n",
++ cmd.toAscii().constData());
++ return;
++ }
++ cmd.truncate(pos);
++ cmd.prepend("ENABLE_NETWORK ");
++ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
++}
++
++
++void WpaGui::disableNetwork(const QString &sel)
++{
++ QString cmd(sel);
++ char reply[10];
++ size_t reply_len = sizeof(reply);
++ int pos = cmd.indexOf(':');
++ if (pos < 0) {
++ printf("Invalid disableNetwork '%s'\n",
++ cmd.toAscii().constData());
++ return;
++ }
++ cmd.truncate(pos);
++ cmd.prepend("DISABLE_NETWORK ");
++ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
++}
++
++
+ void WpaGui::editNetwork(const QString &sel)
+ {
+ QString cmd(sel);
+@@ -867,6 +907,76 @@
+ }
+
+
++int WpaGui::getNetworkDisabled(const QString &sel)
++{
++ QString cmd(sel);
++ char reply[10];
++ size_t reply_len = sizeof(reply) - 1;
++ int pos = cmd.indexOf(':');
++ if (pos < 0) {
++ printf("Invalid getNetworkDisabled '%s'\n",
++ cmd.toAscii().constData());
++ return -1;
++ }
++ cmd.truncate(pos);
++ cmd.prepend("GET_NETWORK ");
++ cmd.append(" disabled");
++
++ if (ctrlRequest(cmd.toAscii().constData(), reply, &reply_len) >= 0
++ && reply_len >= 1) {
++ reply[reply_len] = '\0';
++ if (!str_match(reply, "FAIL"))
++ return atoi(reply);
++ }
++
++ return -1;
++}
++
++
++void WpaGui::updateNetworkDisabledStatus()
++{
++ if (networkList->currentRow() < 0)
++ return;
++
++ QString sel(networkList->currentItem()->text());
++
++ switch (getNetworkDisabled(sel)) {
++ case 0:
++ if (!enableRadioButton->isChecked())
++ enableRadioButton->setChecked(true);
++ return;
++ case 1:
++ if (!disableRadioButton->isChecked())
++ disableRadioButton->setChecked(true);
++ return;
++ }
++}
++
++
++void WpaGui::enableListedNetwork(bool enabled)
++{
++ if (networkList->currentRow() < 0 || !enabled)
++ return;
++
++ QString sel(networkList->currentItem()->text());
++
++ if (getNetworkDisabled(sel) == 1)
++ enableNetwork(sel);
++}
++
++
++void WpaGui::disableListedNetwork(bool disabled)
++{
++ if (networkList->currentRow() < 0 || !disabled)
++ return;
++
++ QString sel(networkList->currentItem()->text());
++
++ if (getNetworkDisabled(sel) == 0)
++ disableNetwork(sel);
++}
++
++
+ void WpaGui::saveConfig()
+ {
+ char buf[10];
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h
+@@ -34,6 +34,9 @@
+ virtual void triggerUpdate();
+ virtual void editNetwork(const QString &sel);
+ virtual void removeNetwork(const QString &sel);
++ virtual void enableNetwork(const QString &sel);
++ virtual void disableNetwork(const QString &sel);
++ virtual int getNetworkDisabled(const QString &sel);
+
+ public slots:
+ virtual void parse_argv();
+@@ -59,6 +62,9 @@
+ virtual void disableAllNetworks();
+ virtual void saveConfig();
+ virtual void selectAdapter(const QString &sel);
++ virtual void updateNetworkDisabledStatus();
++ virtual void enableListedNetwork(bool);
++ virtual void disableListedNetwork(bool);
+
+ protected slots:
+ virtual void languageChange();
Added: wpasupplicant/trunk/debian/patches/58_wpa_gui_qt4_wpagui_network_scan_button.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/58_wpa_gui_qt4_wpagui_network_scan_button.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/58_wpa_gui_qt4_wpagui_network_scan_button.patch (added)
+++ wpasupplicant/trunk/debian/patches/58_wpa_gui_qt4_wpagui_network_scan_button.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,10 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -68,6 +68,7 @@
+ SLOT(enableListedNetwork(bool)));
+ connect(disableRadioButton, SIGNAL(toggled(bool)), this,
+ SLOT(disableListedNetwork(bool)));
++ connect(scanNetworkButton, SIGNAL(clicked()), this, SLOT(scan()));
+
+ eh = NULL;
+ scanres = NULL;
Added: wpasupplicant/trunk/debian/patches/59_wpa_gui_qt4_wpagui_networklist_doubleclick.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/59_wpa_gui_qt4_wpagui_networklist_doubleclick.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/59_wpa_gui_qt4_wpagui_networklist_doubleclick.patch (added)
+++ wpasupplicant/trunk/debian/patches/59_wpa_gui_qt4_wpagui_networklist_doubleclick.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,11 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -69,6 +69,8 @@
+ connect(disableRadioButton, SIGNAL(toggled(bool)), this,
+ SLOT(disableListedNetwork(bool)));
+ connect(scanNetworkButton, SIGNAL(clicked()), this, SLOT(scan()));
++ connect(networkList, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
++ this, SLOT(editListedNetwork()));
+
+ eh = NULL;
+ scanres = NULL;
Added: wpasupplicant/trunk/debian/patches/60_wpa_gui_qt4_wpagui_remove_menu.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/60_wpa_gui_qt4_wpagui_remove_menu.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/60_wpa_gui_qt4_wpagui_remove_menu.patch (added)
+++ wpasupplicant/trunk/debian/patches/60_wpa_gui_qt4_wpagui_remove_menu.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,110 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.ui
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.ui
+@@ -313,9 +313,11 @@
+ </property>
+ <addaction name="networkAddAction" />
+ <addaction name="networkEditAction" />
++ <addaction name="networkRemoveAction" />
+ <addaction name="separator" />
+ <addaction name="networkEnableAllAction" />
+ <addaction name="networkDisableAllAction" />
++ <addaction name="networkRemoveAllAction" />
+ </widget>
+ <widget class="QMenu" name="helpMenu" >
+ <property name="title" >
+@@ -361,6 +363,11 @@
+ <string>&Edit</string>
+ </property>
+ </action>
++ <action name="networkRemoveAction" >
++ <property name="text" >
++ <string>&Remove</string>
++ </property>
++ </action>
+ <action name="networkEnableAllAction" >
+ <property name="text" >
+ <string>E&nable All</string>
+@@ -371,6 +378,11 @@
+ <string>&Disable All</string>
+ </property>
+ </action>
++ <action name="networkRemoveAllAction" >
++ <property name="text" >
++ <string>Re&move All</string>
++ </property>
++ </action>
+ <action name="helpContentsAction" >
+ <property name="enabled" >
+ <bool>false</bool>
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -42,10 +42,14 @@
+ SLOT(addNetwork()));
+ connect(networkEditAction, SIGNAL(triggered()), this,
+ SLOT(editSelectedNetwork()));
++ connect(networkRemoveAction, SIGNAL(triggered()), this,
++ SLOT(removeSelectedNetwork()));
+ connect(networkEnableAllAction, SIGNAL(triggered()), this,
+ SLOT(enableAllNetworks()));
+ connect(networkDisableAllAction, SIGNAL(triggered()), this,
+ SLOT(disableAllNetworks()));
++ connect(networkRemoveAllAction, SIGNAL(triggered()), this,
++ SLOT(removeAllNetworks()));
+ connect(helpIndexAction, SIGNAL(triggered()), this, SLOT(helpIndex()));
+ connect(helpContentsAction, SIGNAL(triggered()), this,
+ SLOT(helpContents()));
+@@ -868,6 +872,10 @@
+ QString cmd(sel);
+ char reply[10];
+ size_t reply_len = sizeof(reply);
++
++ if (cmd.startsWith("Select any"))
++ return;
++
+ int pos = cmd.indexOf(':');
+ if (pos < 0) {
+ printf("Invalid removeNetwork '%s'\n",
+@@ -881,6 +889,13 @@
+ }
+
+
++void WpaGui::removeSelectedNetwork()
++{
++ QString sel(networkSelect->currentText());
++ removeNetwork(sel);
++}
++
++
+ void WpaGui::removeListedNetwork()
+ {
+ if (networkList->currentRow() < 0) {
+@@ -910,6 +925,14 @@
+ }
+
+
++void WpaGui::removeAllNetworks()
++{
++ char reply[10];
++ size_t reply_len = sizeof(reply);
++ ctrlRequest("REMOVE_NETWORK all", reply, &reply_len);
++}
++
++
+ int WpaGui::getNetworkDisabled(const QString &sel)
+ {
+ QString cmd(sel);
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h
+@@ -56,10 +56,12 @@
+ virtual void selectNetwork(const QString &sel);
+ virtual void editSelectedNetwork();
+ virtual void editListedNetwork();
++ virtual void removeSelectedNetwork();
+ virtual void removeListedNetwork();
+ virtual void addNetwork();
+ virtual void enableAllNetworks();
+ virtual void disableAllNetworks();
++ virtual void removeAllNetworks();
+ virtual void saveConfig();
+ virtual void selectAdapter(const QString &sel);
+ virtual void updateNetworkDisabledStatus();
Added: wpasupplicant/trunk/debian/patches/61_wpa_gui_qt4_wpagui_remove_enable_disable_all.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/61_wpa_gui_qt4_wpagui_remove_enable_disable_all.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/61_wpa_gui_qt4_wpagui_remove_enable_disable_all.patch (added)
+++ wpasupplicant/trunk/debian/patches/61_wpa_gui_qt4_wpagui_remove_enable_disable_all.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,102 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -767,13 +767,16 @@
+ QString cmd(sel);
+ char reply[10];
+ size_t reply_len = sizeof(reply);
+- int pos = cmd.indexOf(':');
+- if (pos < 0) {
+- printf("Invalid enableNetwork '%s'\n",
+- cmd.toAscii().constData());
+- return;
++
++ if (!cmd.startsWith("all")) {
++ int pos = cmd.indexOf(':');
++ if (pos < 0) {
++ printf("Invalid enableNetwork '%s'\n",
++ cmd.toAscii().constData());
++ return;
++ }
++ cmd.truncate(pos);
+ }
+- cmd.truncate(pos);
+ cmd.prepend("ENABLE_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
+ }
+@@ -784,13 +787,16 @@
+ QString cmd(sel);
+ char reply[10];
+ size_t reply_len = sizeof(reply);
+- int pos = cmd.indexOf(':');
+- if (pos < 0) {
+- printf("Invalid disableNetwork '%s'\n",
+- cmd.toAscii().constData());
+- return;
++
++ if (!cmd.startsWith("all")) {
++ int pos = cmd.indexOf(':');
++ if (pos < 0) {
++ printf("Invalid disableNetwork '%s'\n",
++ cmd.toAscii().constData());
++ return;
++ }
++ cmd.truncate(pos);
+ }
+- cmd.truncate(pos);
+ cmd.prepend("DISABLE_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
+ }
+@@ -876,13 +882,15 @@
+ if (cmd.startsWith("Select any"))
+ return;
+
+- int pos = cmd.indexOf(':');
+- if (pos < 0) {
+- printf("Invalid removeNetwork '%s'\n",
+- cmd.toAscii().constData());
+- return;
++ if (!cmd.startsWith("all")) {
++ int pos = cmd.indexOf(':');
++ if (pos < 0) {
++ printf("Invalid removeNetwork '%s'\n",
++ cmd.toAscii().constData());
++ return;
++ }
++ cmd.truncate(pos);
+ }
+- cmd.truncate(pos);
+ cmd.prepend("REMOVE_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
+ triggerUpdate();
+@@ -911,25 +919,22 @@
+
+ void WpaGui::enableAllNetworks()
+ {
+- char reply[10];
+- size_t reply_len = sizeof(reply);
+- ctrlRequest("ENABLE_NETWORK all", reply, &reply_len);
++ QString sel("all");
++ enableNetwork(sel);
+ }
+
+
+ void WpaGui::disableAllNetworks()
+ {
+- char reply[10];
+- size_t reply_len = sizeof(reply);
+- ctrlRequest("DISABLE_NETWORK all", reply, &reply_len);
++ QString sel("all");
++ disableNetwork(sel);
+ }
+
+
+ void WpaGui::removeAllNetworks()
+ {
+- char reply[10];
+- size_t reply_len = sizeof(reply);
+- ctrlRequest("REMOVE_NETWORK all", reply, &reply_len);
++ QString sel("all");
++ removeNetwork(sel);
+ }
+
+
Added: wpasupplicant/trunk/debian/patches/62_wpa_gui_qt4_wpagui_update_on_disable_and_enable.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/62_wpa_gui_qt4_wpagui_update_on_disable_and_enable.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/62_wpa_gui_qt4_wpagui_update_on_disable_and_enable.patch (added)
+++ wpasupplicant/trunk/debian/patches/62_wpa_gui_qt4_wpagui_update_on_disable_and_enable.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,26 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -759,6 +759,7 @@
+ }
+ cmd.prepend("SELECT_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
++ triggerUpdate();
+ }
+
+
+@@ -779,6 +780,7 @@
+ }
+ cmd.prepend("ENABLE_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
++ triggerUpdate();
+ }
+
+
+@@ -799,6 +801,7 @@
+ }
+ cmd.prepend("DISABLE_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
++ triggerUpdate();
+ }
+
+
Added: wpasupplicant/trunk/debian/patches/63_wpa_gui_qt4_wpagui_reselect_list_index.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/63_wpa_gui_qt4_wpagui_reselect_list_index.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/63_wpa_gui_qt4_wpagui_reselect_list_index.patch (added)
+++ wpasupplicant/trunk/debian/patches/63_wpa_gui_qt4_wpagui_reselect_list_index.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,48 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -452,11 +452,15 @@
+ char buf[2048], *start, *end, *id, *ssid, *bssid, *flags;
+ size_t len;
+ int first_active = -1;
+- bool selected = false;
++ int was_selected = -1;
++ bool current = false;
+
+ if (!networkMayHaveChanged)
+ return;
+
++ if (networkList->currentRow() >= 0)
++ was_selected = networkList->currentRow();
++
+ networkSelect->clear();
+ networkList->clear();
+
+@@ -507,7 +511,7 @@
+ if (strstr(flags, "[CURRENT]")) {
+ networkSelect->setCurrentIndex(networkSelect->count() -
+ 1);
+- selected = true;
++ current = true;
+ } else if (first_active < 0 &&
+ strstr(flags, "[DISABLED]") == NULL)
+ first_active = networkSelect->count() - 1;
+@@ -520,9 +524,18 @@
+ if (networkSelect->count() > 1)
+ networkSelect->addItem("Select any network");
+
+- if (!selected && first_active >= 0)
++ if (!current && first_active >= 0)
+ networkSelect->setCurrentIndex(first_active);
+
++ if (was_selected >= 0 && networkList->count() > 0) {
++ if (was_selected < networkList->count())
++ networkList->setCurrentRow(was_selected);
++ else
++ networkList->setCurrentRow(networkList->count() - 1);
++ }
++ else
++ networkList->setCurrentRow(networkSelect->currentIndex());
++
+ networkMayHaveChanged = false;
+ }
+
Added: wpasupplicant/trunk/debian/patches/64_wpa_gui_qt4_wpagui_info_no_network.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/64_wpa_gui_qt4_wpagui_info_no_network.patch?rev=1070&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/64_wpa_gui_qt4_wpagui_info_no_network.patch (added)
+++ wpasupplicant/trunk/debian/patches/64_wpa_gui_qt4_wpagui_info_no_network.patch Tue Jan 29 06:56:07 2008
@@ -1,0 +1,26 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -851,6 +851,11 @@
+
+ void WpaGui::editSelectedNetwork()
+ {
++ if (networkSelect->count() < 1) {
++ QMessageBox::information(this, "No Networks",
++ "There are no networks to edit.\n");
++ return;
++ }
+ QString sel(networkSelect->currentText());
+ editNetwork(sel);
+ }
+@@ -915,6 +920,11 @@
+
+ void WpaGui::removeSelectedNetwork()
+ {
++ if (networkSelect->count() < 1) {
++ QMessageBox::information(this, "No Networks",
++ "There are no networks to remove.\n");
++ return;
++ }
+ QString sel(networkSelect->currentText());
+ removeNetwork(sel);
+ }
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1070&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Tue Jan 29 06:56:07 2008
@@ -25,3 +25,17 @@
48_wpa_gui_qt4_networkconfig_focus_on_error.patch
49_wpa_gui_qt4_networkconfig_wep_preseed.patch
50_wpa_gui_qt4_wpaguiui_rework.patch
+51_wpa_gui_qt4_wpaguiui_cleanup_menus.patch
+52_wpa_gui_qt4_wpaguiui_tabbed_ui.patch
+53_wpa_gui_qt4_wpagui_populate_network_list.patch
+54_wpa_gui_qt4_wpagui_add_button.patch
+55_wpa_gui_qt4_wpagui_edit_button.patch
+56_wpa_gui_qt4_wpagui_remove_button.patch
+57_wpa_gui_qt4_wpagui_enable_disable_radio.patch
+58_wpa_gui_qt4_wpagui_network_scan_button.patch
+59_wpa_gui_qt4_wpagui_networklist_doubleclick.patch
+60_wpa_gui_qt4_wpagui_remove_menu.patch
+61_wpa_gui_qt4_wpagui_remove_enable_disable_all.patch
+62_wpa_gui_qt4_wpagui_update_on_disable_and_enable.patch
+63_wpa_gui_qt4_wpagui_reselect_list_index.patch
+64_wpa_gui_qt4_wpagui_info_no_network.patch
More information about the Pkg-wpa-devel
mailing list