[pkg-wpa-devel] r1059 - in /wpasupplicant/trunk/debian: changelog patches/50_wpa_gui_qt4_wpaguiui_rework.patch patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch patches/52_wpa_gui_qt4_wpagui_use_new_layout.patch patches/series
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Thu Jan 24 15:15:13 UTC 2008
Author: kelmo-guest
Date: Thu Jan 24 15:15:13 2008
New Revision: 1059
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1059
Log:
enhancements). The also change the main wpa_gui UI to use a listbox
instead of combobox for network selection, with buttons to trigger certain
actions on selected networks.
- debian/patches/50_wpa_gui_qt4_wpaguiui_rework.patch
- debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch
- debian/patches/52_wpa_gui_qt4_wpagui_use_new_layout.patch
Added:
wpasupplicant/trunk/debian/patches/50_wpa_gui_qt4_wpaguiui_rework.patch
wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch
wpasupplicant/trunk/debian/patches/52_wpa_gui_qt4_wpagui_use_new_layout.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=1059&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Jan 24 15:15:13 2008
@@ -38,7 +38,9 @@
* 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 (as well as other
- enhancements).
+ enhancements). The also change the main wpa_gui UI to use a listbox
+ instead of combobox for network selection, with buttons to trigger certain
+ actions on selected networks.
- debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch
- debian/patches/42_wpa_gui_qt4_networkconfigui_label_names.patch
- debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch
@@ -47,8 +49,11 @@
- debian/patches/46_wpa_gui_qt4_networkconfig_check_idstr.patch
- debian/patches/47_wpa_gui_qt4_networkconfig_psk_error_title.patch
- debian/patches/48_wpa_gui_qt4_networkconfig_focus_on_error.patch
-
- -- Kel Modderman <kel at otaku42.de> Wed, 23 Jan 2008 21:07:01 +1000
+ - debian/patches/50_wpa_gui_qt4_wpaguiui_rework.patch
+ - debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch
+ - debian/patches/52_wpa_gui_qt4_wpagui_use_new_layout.patch
+
+ -- Kel Modderman <kel at otaku42.de> Fri, 25 Jan 2008 01:13:24 +1000
wpasupplicant (0.6.2-1) experimental; urgency=low
Added: wpasupplicant/trunk/debian/patches/50_wpa_gui_qt4_wpaguiui_rework.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/50_wpa_gui_qt4_wpaguiui_rework.patch?rev=1059&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/50_wpa_gui_qt4_wpaguiui_rework.patch (added)
+++ wpasupplicant/trunk/debian/patches/50_wpa_gui_qt4_wpaguiui_rework.patch Thu Jan 24 15:15:13 2008
@@ -1,0 +1,704 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.ui
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.ui
+@@ -1,354 +1,361 @@
+-<ui version="4.0" stdsetdef="1" >
+- <author></author>
+- <comment></comment>
+- <exportmacro></exportmacro>
+- <class>WpaGui</class>
+- <widget class="QMainWindow" name="WpaGui" >
+- <property name="geometry" >
+- <rect>
+- <x>0</x>
+- <y>0</y>
+- <width>279</width>
+- <height>308</height>
+- </rect>
+- </property>
+- <property name="windowTitle" >
+- <string>wpa_gui</string>
+- </property>
+- <widget class="QWidget" >
+- <layout class="QGridLayout" >
+- <item rowspan="1" row="0" column="0" colspan="2" >
+- <widget class="QLabel" name="textLabel16" >
+- <property name="text" >
+- <string>Adapter:</string>
+- </property>
+- </widget>
+- </item>
+- <item rowspan="1" row="0" column="2" colspan="2" >
+- <widget class="QComboBox" name="adapterSelect" />
+- </item>
+- <item rowspan="1" row="1" column="0" colspan="2" >
+- <widget class="QLabel" name="textLabel8" >
+- <property name="text" >
+- <string>Network:</string>
+- </property>
+- </widget>
+- </item>
+- <item rowspan="1" row="1" column="2" colspan="2" >
+- <widget class="QComboBox" name="networkSelect" />
+- </item>
+- <item rowspan="1" row="2" column="0" colspan="4" >
+- <widget class="QFrame" name="frame3" >
+- <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="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 rowspan="1" 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 name="spacer7" >
+- <property name="sizeHint" >
+- <size>
+- <width>16</width>
+- <height>16</height>
+- </size>
+- </property>
+- <property name="sizeType" >
+- <enum>Expanding</enum>
+- </property>
+- <property name="orientation" >
+- <enum>Horizontal</enum>
+- </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>
+- </property>
+- </widget>
+- </item>
+- </layout>
+- </widget>
+- <widget class="QMenuBar" name="MenuBar" >
+- <widget class="QMenu" name="fileMenu" >
+- <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="separator" />
+- <addaction name="fileExitAction" />
+- </widget>
+- <widget class="QMenu" name="helpMenu" >
+- <property name="title" >
+- <string>&Help</string>
+- </property>
+- <addaction name="helpContentsAction" />
+- <addaction name="helpIndexAction" />
+- <addaction name="separator" />
+- <addaction name="helpAboutAction" />
+- </widget>
+- <addaction name="fileMenu" />
+- <addaction name="helpMenu" />
+- </widget>
+- <action name="fileExitAction" >
+- <property name="name" stdset="0" >
+- <string>fileExitAction</string>
+- </property>
+- <property name="iconText" >
+- <string>Exit</string>
+- </property>
+- <property name="text" >
+- <string>E&xit</string>
+- </property>
+- <property name="shortcut" >
+- <string>Ctrl+Q</string>
+- </property>
+- </action>
+- <action name="helpContentsAction" >
+- <property name="name" stdset="0" >
+- <string>helpContentsAction</string>
+- </property>
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="iconText" >
+- <string>Contents</string>
+- </property>
++<ui version="4.0" >
++ <class>WpaGui</class>
++ <widget class="QMainWindow" name="WpaGui" >
++ <property name="geometry" >
++ <rect>
++ <x>0</x>
++ <y>0</y>
++ <width>289</width>
++ <height>308</height>
++ </rect>
++ </property>
++ <property name="windowTitle" >
++ <string>wpa_gui</string>
++ </property>
++ <widget class="QWidget" name="widget" >
++ <layout class="QGridLayout" >
++ <item row="0" column="0" colspan="2" >
++ <widget class="QLabel" name="textLabel16" >
+ <property name="text" >
+- <string>&Contents...</string>
+- </property>
+- <property name="shortcut" >
+- <string/>
+- </property>
+- </action>
+- <action name="helpIndexAction" >
+- <property name="name" stdset="0" >
+- <string>helpIndexAction</string>
+- </property>
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="iconText" >
+- <string>Index</string>
++ <string>Adapter:</string>
+ </property>
++ </widget>
++ </item>
++ <item row="0" column="2" colspan="2" >
++ <widget class="QComboBox" name="adapterSelect" />
++ </item>
++ <item row="1" column="0" colspan="2" >
++ <widget class="QLabel" name="textLabel8" >
+ <property name="text" >
+- <string>&Index...</string>
+- </property>
+- <property name="shortcut" >
+- <string/>
+- </property>
+- </action>
+- <action name="helpAboutAction" >
+- <property name="name" stdset="0" >
+- <string>helpAboutAction</string>
+- </property>
+- <property name="iconText" >
+- <string>About</string>
+- </property>
+- <property name="text" >
+- <string>&About</string>
+- </property>
+- <property name="shortcut" >
+- <string/>
++ <string>Network:</string>
+ </property>
+- </action>
+- <action name="fileEventHistoryAction" >
+- <property name="name" stdset="0" >
+- <string>fileEventHistoryAction</string>
++ </widget>
++ </item>
++ <item row="1" column="2" colspan="2" >
++ <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="iconText" >
+- <string>Event History</string>
+- </property>
+- <property name="text" >
+- <string>Event &History</string>
+- </property>
+- </action>
+- <action name="fileAdd_NetworkAction" >
+- <property name="name" stdset="0" >
+- <string>fileAdd_NetworkAction</string>
+- </property>
+- <property name="iconText" >
+- <string>Add Network</string>
+- </property>
+- <property name="text" >
+- <string>&Add Network</string>
+- </property>
+- </action>
+- <action name="fileEdit_networkAction" >
+- <property name="name" stdset="0" >
+- <string>fileEdit_networkAction</string>
+- </property>
+- <property name="iconText" >
+- <string>Edit Network</string>
+- </property>
+- <property name="text" >
+- <string>&Edit Network</string>
+- </property>
+- </action>
+- <action name="fileEnableALLNetworksAction" >
+- <property name="name" stdset="0" >
+- <string>fileEnableALLNetworksAction</string>
+- </property>
+- <property name="iconText" >
+- <string>Enable All Networks</string>
++ <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>E&nable All Networks</string>
+- </property>
+- </action>
+- <action name="fileDisableALLNetworksAction" >
+- <property name="name" stdset="0" >
+- <string>fileDisableALLNetworksAction</string>
+- </property>
+- <property name="iconText" >
+- <string>Disable All Networks</string>
++ <string>Connect</string>
+ </property>
++ </widget>
++ </item>
++ <item row="3" column="2" >
++ <widget class="QPushButton" name="disconnectButton" >
+ <property name="text" >
+- <string>&Disable All Networks</string>
+- </property>
+- </action>
+- <action name="fileSaveConfig" >
+- <property name="name" stdset="0" >
+- <string>fileSaveConfig</string>
+- </property>
+- <property name="iconText" >
+- <string>Save Configuration</string>
++ <string>Disconnect</string>
+ </property>
++ </widget>
++ </item>
++ <item row="3" column="3" >
++ <widget class="QPushButton" name="scanButton" >
+ <property name="text" >
+- <string>&Save Configuration</string>
++ <string>Scan</string>
+ </property>
+- </action>
++ </widget>
++ </item>
++ </layout>
++ </widget>
++ <widget class="QMenuBar" name="MenuBar" >
++ <property name="geometry" >
++ <rect>
++ <x>0</x>
++ <y>0</y>
++ <width>289</width>
++ <height>30</height>
++ </rect>
++ </property>
++ <widget class="QMenu" name="fileMenu" >
++ <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="separator" />
++ <addaction name="fileExitAction" />
++ </widget>
++ <widget class="QMenu" name="helpMenu" >
++ <property name="title" >
++ <string>&Help</string>
++ </property>
++ <addaction name="helpContentsAction" />
++ <addaction name="helpIndexAction" />
++ <addaction name="separator" />
++ <addaction name="helpAboutAction" />
++ </widget>
++ <addaction name="fileMenu" />
++ <addaction name="helpMenu" />
+ </widget>
+- <layoutdefault spacing="6" margin="11" />
+- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+- <includes>
+- <include location="global" >qtimer.h</include>
+- <include location="global" >qsocketnotifier.h</include>
+- <include location="local" >wpamsg.h</include>
+- <include location="local" >eventhistory.h</include>
+- <include location="local" >scanresults.h</include>
+- </includes>
++ <action name="fileExitAction" >
++ <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>
++ </property>
++ </action>
++ <action name="helpContentsAction" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="text" >
++ <string>&Contents...</string>
++ </property>
++ <property name="iconText" >
++ <string>Contents</string>
++ </property>
++ <property name="shortcut" >
++ <string/>
++ </property>
++ <property name="name" stdset="0" >
++ <string>helpContentsAction</string>
++ </property>
++ </action>
++ <action name="helpIndexAction" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="text" >
++ <string>&Index...</string>
++ </property>
++ <property name="iconText" >
++ <string>Index</string>
++ </property>
++ <property name="shortcut" >
++ <string/>
++ </property>
++ <property name="name" stdset="0" >
++ <string>helpIndexAction</string>
++ </property>
++ </action>
++ <action name="helpAboutAction" >
++ <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>
++ </property>
++ </action>
++ <action name="fileEventHistoryAction" >
++ <property name="text" >
++ <string>Event &History</string>
++ </property>
++ <property name="iconText" >
++ <string>Event History</string>
++ </property>
++ <property name="name" stdset="0" >
++ <string>fileEventHistoryAction</string>
++ </property>
++ </action>
++ <action name="fileAdd_NetworkAction" >
++ <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>
++ </property>
++ </action>
++ <action name="fileEdit_networkAction" >
++ <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>
++ </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>
++ </property>
++ </action>
++ <action name="fileDisableALLNetworksAction" >
++ <property name="text" >
++ <string>&Disable All Networks</string>
++ </property>
++ <property name="iconText" >
++ <string>Disable All Networks</string>
++ </property>
++ <property name="name" stdset="0" >
++ <string>fileDisableALLNetworksAction</string>
++ </property>
++ </action>
++ <action name="fileSaveConfig" >
++ <property name="text" >
++ <string>&Save Configuration</string>
++ </property>
++ <property name="iconText" >
++ <string>Save Configuration</string>
++ </property>
++ <property name="name" stdset="0" >
++ <string>fileSaveConfig</string>
++ </property>
++ </action>
++ </widget>
++ <layoutdefault spacing="6" margin="11" />
++ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
++ <includes>
++ <include location="global" >qtimer.h</include>
++ <include location="global" >qsocketnotifier.h</include>
++ <include location="local" >wpamsg.h</include>
++ <include location="local" >eventhistory.h</include>
++ <include location="local" >scanresults.h</include>
++ </includes>
++ <resources/>
++ <connections/>
+ </ui>
Added: wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch?rev=1059&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch (added)
+++ wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch Thu Jan 24 15:15:13 2008
@@ -1,0 +1,253 @@
+--- 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>300</width>
++ <height>600</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+@@ -14,27 +14,65 @@
+ </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="adaptorLabel" >
+ <property name="text" >
+- <string>Adapter:</string>
++ <string>Network Adaptor:</string>
++ </property>
++ <property name="alignment" >
++ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+- <item row="0" column="2" colspan="2" >
+- <widget class="QComboBox" name="adapterSelect" />
++ <item row="0" column="1" >
++ <widget class="QComboBox" name="adaptorSelect" />
+ </item>
+ <item row="1" column="0" colspan="2" >
+- <widget class="QLabel" name="textLabel8" >
++ <widget class="QListWidget" name="networkList" />
++ </item>
++ <item row="2" column="0" colspan="2" >
++ <widget class="QPushButton" name="editNetworkButton" >
++ <property name="text" >
++ <string>View/Edit</string>
++ </property>
++ </widget>
++ </item>
++ <item row="3" column="0" >
++ <widget class="QPushButton" name="addNetworkButton" >
++ <property name="text" >
++ <string>Add</string>
++ </property>
++ </widget>
++ </item>
++ <item row="3" column="1" >
++ <widget class="QPushButton" name="removeNetworkButton" >
++ <property name="text" >
++ <string>Remove</string>
++ </property>
++ </widget>
++ </item>
++ <item row="4" column="0" >
++ <widget class="QPushButton" name="enableNetworkButton" >
+ <property name="text" >
+- <string>Network:</string>
++ <string>Enable</string>
+ </property>
+ </widget>
+ </item>
+- <item row="1" column="2" colspan="2" >
+- <widget class="QComboBox" name="networkSelect" />
++ <item row="4" column="1" >
++ <widget class="QPushButton" name="disableNetworkButton" >
++ <property name="text" >
++ <string>Disable</string>
++ </property>
++ </widget>
++ </item>
++ <item row="5" column="0" colspan="2" >
++ <widget class="QPushButton" name="selectAnyNetworkButton" >
++ <property name="text" >
++ <string>Select Any Network</string>
++ </property>
++ </widget>
+ </item>
+- <item row="2" column="0" colspan="4" >
++ <item row="6" column="0" colspan="2" >
+ <widget class="QFrame" name="frame3" >
+ <property name="frameShape" >
+ <enum>QFrame::NoFrame</enum>
+@@ -144,43 +182,27 @@
+ </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>
++ <item row="7" column="0" colspan="2" >
++ <widget class="QPushButton" name="scanButton" >
++ <property name="text" >
++ <string>Scan</string>
+ </property>
+- </spacer>
++ </widget>
+ </item>
+- <item row="3" column="1" >
++ <item row="8" column="0" >
+ <widget class="QPushButton" name="connectButton" >
+ <property name="text" >
+ <string>Connect</string>
+ </property>
+ </widget>
+ </item>
+- <item row="3" column="2" >
++ <item row="8" column="1" >
+ <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>
+- </property>
+- </widget>
+- </item>
+ </layout>
+ </widget>
+ <widget class="QMenuBar" name="MenuBar" >
+@@ -188,7 +210,7 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>289</width>
++ <width>300</width>
+ <height>30</height>
+ </rect>
+ </property>
+@@ -198,10 +220,6 @@
+ </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="separator" />
+ <addaction name="fileExitAction" />
+@@ -215,7 +233,16 @@
+ <addaction name="separator" />
+ <addaction name="helpAboutAction" />
+ </widget>
++ <widget class="QMenu" name="menuNetworks" >
++ <property name="title" >
++ <string>&Networks</string>
++ </property>
++ <addaction name="networksEnableAllAction" />
++ <addaction name="networksDisableAllAction" />
++ <addaction name="networksRemoveAllAction" />
++ </widget>
+ <addaction name="fileMenu" />
++ <addaction name="menuNetworks" />
+ <addaction name="helpMenu" />
+ </widget>
+ <action name="fileExitAction" >
+@@ -291,59 +318,40 @@
+ <string>fileEventHistoryAction</string>
+ </property>
+ </action>
+- <action name="fileAdd_NetworkAction" >
++ <action name="fileSaveConfig" >
+ <property name="text" >
+- <string>&Add Network</string>
++ <string>&Save Configuration</string>
+ </property>
+ <property name="iconText" >
+- <string>Add Network</string>
++ <string>Save Configuration</string>
+ </property>
+ <property name="name" stdset="0" >
+- <string>fileAdd_NetworkAction</string>
++ <string>fileSaveConfig</string>
+ </property>
+ </action>
+- <action name="fileEdit_networkAction" >
++ <action name="fileConnectAction" >
+ <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>&Connect</string>
+ </property>
+ </action>
+- <action name="fileEnableALLNetworksAction" >
++ <action name="fileDisconnectAction" >
+ <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>
++ <string>&Disconnect</string>
+ </property>
+ </action>
+- <action name="fileDisableALLNetworksAction" >
++ <action name="networksEnableAllAction" >
+ <property name="text" >
+- <string>&Disable All Networks</string>
+- </property>
+- <property name="iconText" >
+- <string>Disable All Networks</string>
+- </property>
+- <property name="name" stdset="0" >
+- <string>fileDisableALLNetworksAction</string>
++ <string>&Enable all networks</string>
+ </property>
+ </action>
+- <action name="fileSaveConfig" >
++ <action name="networksDisableAllAction" >
+ <property name="text" >
+- <string>&Save Configuration</string>
++ <string>&Disable all networks</string>
+ </property>
+- <property name="iconText" >
+- <string>Save Configuration</string>
+- </property>
+- <property name="name" stdset="0" >
+- <string>fileSaveConfig</string>
++ </action>
++ <action name="networksRemoveAllAction" >
++ <property name="text" >
++ <string>&Remove all networks</string>
+ </property>
+ </action>
+ </widget>
Added: wpasupplicant/trunk/debian/patches/52_wpa_gui_qt4_wpagui_use_new_layout.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/52_wpa_gui_qt4_wpagui_use_new_layout.patch?rev=1059&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/52_wpa_gui_qt4_wpagui_use_new_layout.patch (added)
+++ wpasupplicant/trunk/debian/patches/52_wpa_gui_qt4_wpagui_use_new_layout.patch Thu Jan 24 15:15:13 2008
@@ -1,0 +1,308 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -33,29 +33,42 @@
+
+ (void) statusBar();
+
++ /* File menu */
++ connect(fileEventHistoryAction, SIGNAL(triggered()), this,
++ SLOT(eventHistory()));
++ connect(fileSaveConfig, SIGNAL(triggered()), this, SLOT(saveConfig()));
++ connect(fileExitAction, SIGNAL(triggered()), this, SLOT(close()));
++ /* Networks menu */
++ connect(networksEnableAllAction, SIGNAL(triggered()), this,
++ SLOT(enableAllNetworks()));
++ connect(networksDisableAllAction, SIGNAL(triggered()), this,
++ SLOT(disableAllNetworks()));
++ connect(networksRemoveAllAction, SIGNAL(triggered()), this,
++ SLOT(removeAllNetworks()));
++ /* Help menu */
+ 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,
++ /* Main User Interface */
++ connect(adaptorSelect, SIGNAL(activated(const QString&)), this,
++ SLOT(selectAdaptor(const QString&)));
++ connect(networkList, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
++ this, SLOT(selectNetwork(QListWidgetItem *)));
++ connect(editNetworkButton, SIGNAL(clicked()), 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(addNetworkButton, SIGNAL(clicked()), this, SLOT(addNetwork()));
++ connect(removeNetworkButton, SIGNAL(clicked()), this,
++ SLOT(removeNetwork()));
++ connect(enableNetworkButton, SIGNAL(clicked()), this,
++ SLOT(enableNetwork()));
++ connect(disableNetworkButton, SIGNAL(clicked()), this,
++ SLOT(disableNetwork()));
++ connect(selectAnyNetworkButton, SIGNAL(clicked()), this,
++ SLOT(selectAnyNetwork()));
++ connect(scanButton, SIGNAL(clicked()), this, SLOT(scan()));
++ connect(connectButton, SIGNAL(clicked()), this, SLOT(reassociate()));
++ connect(disconnectButton, SIGNAL(clicked()), this, SLOT(disconnect()));
+
+ eh = NULL;
+ scanres = NULL;
+@@ -278,9 +291,9 @@
+ connect(msgNotifier, SIGNAL(activated(int)), SLOT(receiveMsgs()));
+ #endif
+
+- adapterSelect->clear();
+- adapterSelect->addItem(ctrl_iface);
+- adapterSelect->setCurrentIndex(0);
++ adaptorSelect->clear();
++ adaptorSelect->addItem(ctrl_iface);
++ adaptorSelect->setCurrentIndex(0);
+
+ len = sizeof(buf) - 1;
+ if (wpa_ctrl_request(ctrl_conn, "INTERFACES", 10, buf, &len, NULL) >=
+@@ -292,7 +305,7 @@
+ if (pos2)
+ *pos2 = '\0';
+ if (strcmp(pos, ctrl_iface) != 0)
+- adapterSelect->addItem(pos);
++ adaptorSelect->addItem(pos);
+ if (pos2)
+ pos = pos2 + 1;
+ else
+@@ -438,7 +451,7 @@
+ if (!networkMayHaveChanged)
+ return;
+
+- networkSelect->clear();
++ networkList->clear();
+
+ if (ctrl_conn == NULL)
+ return;
+@@ -481,26 +494,22 @@
+ QString network(id);
+ network.append(": ");
+ network.append(ssid);
+- networkSelect->addItem(network);
++ networkList->addItem(network);
+
+ if (strstr(flags, "[CURRENT]")) {
+- networkSelect->setCurrentIndex(networkSelect->count() -
+- 1);
++ networkList->setCurrentRow(networkList->count() - 1);
+ selected = true;
+ } else if (first_active < 0 &&
+ strstr(flags, "[DISABLED]") == NULL)
+- first_active = networkSelect->count() - 1;
++ first_active = networkList->count() - 1;
+
+ if (last)
+ break;
+ start = end + 1;
+ }
+
+- if (networkSelect->count() > 1)
+- networkSelect->addItem("Select any network");
+-
+ if (!selected && first_active >= 0)
+- networkSelect->setCurrentIndex(first_active);
++ networkList->setCurrentRow(first_active);
+
+ networkMayHaveChanged = false;
+ }
+@@ -711,7 +720,7 @@
+ }
+
+
+-void WpaGui::connectB()
++void WpaGui::reassociate()
+ {
+ char reply[10];
+ size_t reply_len = sizeof(reply);
+@@ -719,23 +728,19 @@
+ }
+
+
+-void WpaGui::selectNetwork( const QString &sel )
++void WpaGui::selectNetwork(QListWidgetItem *sel)
+ {
+- QString cmd(sel);
++ QString cmd(sel->text());
+ char reply[10];
+ size_t reply_len = sizeof(reply);
+
+- if (cmd.startsWith("Select any")) {
+- cmd = "any";
+- } else {
+- int pos = cmd.indexOf(':');
+- if (pos < 0) {
+- printf("Invalid selectNetwork '%s'\n",
+- cmd.toAscii().constData());
+- return;
+- }
+- cmd.truncate(pos);
++ int pos = cmd.indexOf(':');
++ if (pos < 0) {
++ printf("Invalid selectNetwork '%s'\n",
++ cmd.toAscii().constData());
++ return;
+ }
++ cmd.truncate(pos);
+ cmd.prepend("SELECT_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
+ }
+@@ -743,13 +748,13 @@
+
+ void WpaGui::editNetwork()
+ {
+- QString sel(networkSelect->currentText());
+ int id = -1;
+
+- if (!sel.startsWith("Select any")) {
++ if (networkList->count() > 0) {
++ QString sel(networkList->currentItem()->text());
+ int pos = sel.indexOf(':');
+ if (pos < 0) {
+- printf("Invalid selectNetwork '%s'\n",
++ printf("Invalid editNetwork '%s'\n",
+ sel.toAscii().constData());
+ return;
+ }
+@@ -792,6 +797,58 @@
+ }
+
+
++void WpaGui::enableNetwork()
++{
++ QString cmd(networkList->currentItem()->text());
++ 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()
++{
++ QString cmd(networkList->currentItem()->text());
++ 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::removeNetwork()
++{
++ QString cmd(networkList->currentItem()->text());
++ 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);
++ networkList->removeItemWidget(networkList->currentItem());
++ triggerUpdate();
++}
++
++
+ void WpaGui::enableAllNetworks()
+ {
+ char reply[10];
+@@ -808,6 +865,24 @@
+ }
+
+
++void WpaGui::removeAllNetworks()
++{
++ char reply[10];
++ size_t reply_len = sizeof(reply);
++ ctrlRequest("REMOVE_NETWORK all", reply, &reply_len);
++ networkList->clear();
++ triggerUpdate();
++}
++
++
++void WpaGui::selectAnyNetwork()
++{
++ char reply[10];
++ size_t reply_len = sizeof(reply);
++ ctrlRequest("SELECT_NETWORK any", reply, &reply_len);
++}
++
++
+ void WpaGui::saveConfig()
+ {
+ char buf[10];
+@@ -832,7 +907,7 @@
+ }
+
+
+-void WpaGui::selectAdapter( const QString & sel )
++void WpaGui::selectAdaptor(const QString &sel)
+ {
+ if (openCtrlConnection(sel.toAscii().constData()) < 0)
+ printf("Failed to open control connection to "
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h
+@@ -40,6 +40,7 @@
+ virtual void helpIndex();
+ virtual void helpContents();
+ virtual void helpAbout();
++ virtual void reassociate();
+ virtual void disconnect();
+ virtual void scan();
+ virtual void eventHistory();
+@@ -47,14 +48,18 @@
+ virtual void processMsg(char *msg);
+ virtual void processCtrlReq(const char *req);
+ virtual void receiveMsgs();
+- virtual void connectB();
+- virtual void selectNetwork(const QString &sel);
++ virtual void selectNetwork(QListWidgetItem *sel);
+ virtual void editNetwork();
+ virtual void addNetwork();
++ virtual void enableNetwork();
++ virtual void disableNetwork();
++ virtual void removeNetwork();
+ virtual void enableAllNetworks();
+ virtual void disableAllNetworks();
++ virtual void removeAllNetworks();
++ virtual void selectAnyNetwork();
+ virtual void saveConfig();
+- virtual void selectAdapter(const QString &sel);
++ virtual void selectAdaptor(const QString &sel);
+
+ protected slots:
+ virtual void languageChange();
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1059&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Thu Jan 24 15:15:13 2008
@@ -23,3 +23,6 @@
46_wpa_gui_qt4_networkconfig_check_idstr.patch
47_wpa_gui_qt4_networkconfig_psk_error_title.patch
48_wpa_gui_qt4_networkconfig_focus_on_error.patch
+50_wpa_gui_qt4_wpaguiui_rework.patch
+51_wpa_gui_qt4_wpaguiui_new_layout.patch
+52_wpa_gui_qt4_wpagui_use_new_layout.patch
More information about the Pkg-wpa-devel
mailing list