[pkg-wpa-devel] r1066 - in /wpasupplicant/trunk/debian: changelog patches/50_wpa_gui_qt4_wpaguiui_rework.patch patches/series
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Fri Jan 25 05:36:41 UTC 2008
Author: kelmo-guest
Date: Fri Jan 25 05:36:41 2008
New Revision: 1066
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1066
Log:
cherry pick ui form rework from upstream
Added:
wpasupplicant/trunk/debian/patches/50_wpa_gui_qt4_wpaguiui_rework.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=1066&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Jan 25 05:36:41 2008
@@ -48,8 +48,10 @@
- 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
-
- -- Kel Modderman <kel at otaku42.de> Fri, 25 Jan 2008 15:31:33 +1000
+ * Add patches to enhance the initial wpa_gui status form.
+ - debian/patches/50_wpa_gui_qt4_wpaguiui_rework.patch
+
+ -- Kel Modderman <kel at otaku42.de> Fri, 25 Jan 2008 15:35:48 +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=1066&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 Fri Jan 25 05:36:41 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>24</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>
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1066&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Fri Jan 25 05:36:41 2008
@@ -24,3 +24,4 @@
47_wpa_gui_qt4_networkconfig_psk_error_title.patch
48_wpa_gui_qt4_networkconfig_focus_on_error.patch
49_wpa_gui_qt4_networkconfig_wep_preseed.patch
+50_wpa_gui_qt4_wpaguiui_rework.patch
More information about the Pkg-wpa-devel
mailing list