[pkg-wpa-devel] r1054 - in /wpasupplicant/trunk/debian/patches: 40_wpa_gui_qt4_networkconfigui_rework.patch 43_wpa_gui_qt4_networkconfigui_tab_order.patch 44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Wed Jan 23 09:33:53 2008
New Revision: 1054

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1054
Log:
keep <pixmapfunction> in this ui file, it is present in scanresults.ui which has already been converted to qt4 ui layout

Modified:
    wpasupplicant/trunk/debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch
    wpasupplicant/trunk/debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch
    wpasupplicant/trunk/debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch

Modified: wpasupplicant/trunk/debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch?rev=1054&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch (original)
+++ wpasupplicant/trunk/debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch Wed Jan 23 09:33:53 2008
@@ -1,6 +1,6 @@
 --- a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
 +++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
-@@ -1,374 +1,372 @@
+@@ -1,374 +1,373 @@
 -<ui version="4.0" stdsetdef="1" >
 -  <author></author>
 -  <comment></comment>
@@ -713,6 +713,7 @@
 +  </layout>
 + </widget>
 + <layoutdefault spacing="6" margin="11" />
++ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
 + <tabstops>
 +  <tabstop>ssidEdit</tabstop>
 +  <tabstop>idstrEdit</tabstop>

Modified: wpasupplicant/trunk/debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch?rev=1054&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch (original)
+++ wpasupplicant/trunk/debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch Wed Jan 23 09:33:53 2008
@@ -1,6 +1,6 @@
 --- a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
 +++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
-@@ -353,12 +353,12 @@
+@@ -354,12 +354,12 @@
    <tabstop>passwordEdit</tabstop>
    <tabstop>cacertEdit</tabstop>
    <tabstop>wep0Radio</tabstop>

Modified: wpasupplicant/trunk/debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch?rev=1054&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch (original)
+++ wpasupplicant/trunk/debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch Wed Jan 23 09:33:53 2008
@@ -224,7 +224,7 @@
     <item row="1" column="1" >
      <widget class="QPushButton" name="addButton" >
       <property name="text" >
-@@ -339,12 +352,24 @@
+@@ -339,13 +352,25 @@
       </property>
      </widget>
     </item>
@@ -244,13 +244,14 @@
    </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <tabstops>
    <tabstop>ssidEdit</tabstop>
 -  <tabstop>idstrEdit</tabstop>
    <tabstop>authSelect</tabstop>
    <tabstop>encrSelect</tabstop>
    <tabstop>pskEdit</tabstop>
-@@ -360,6 +385,8 @@
+@@ -361,6 +386,8 @@
    <tabstop>wep2Edit</tabstop>
    <tabstop>wep3Radio</tabstop>
    <tabstop>wep3Edit</tabstop>