[pkg-wpa-devel] r1060 - /wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch

Thu Jan 24 15:20:45 UTC 2008

Author: kelmo-guest
Date: Thu Jan 24 15:20:45 2008
New Revision: 1060

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1060
Log:
manually fix some leftover widgets that qt4-designer failed to remove, refresh debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch

Modified:
    wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch

Modified: 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=1060&op=diff
==============================================================================

--- wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch (original)
+++ wpasupplicant/trunk/debian/patches/51_wpa_gui_qt4_wpaguiui_new_layout.patch Thu Jan 24 15:20:45 2008
@@ -39,18 +39,22 @@
 +    </item>
 +    <item row="2" column="0" colspan="2" >
 +     <widget class="QPushButton" name="editNetworkButton" >
-+      <property name="text" >
+       <property name="text" >
+-       <string>Network:</string>
 +       <string>View/Edit</string>
-+      </property>
-+     </widget>
-+    </item>
+       </property>
+      </widget>
+     </item>
+-    <item row="1" column="2" colspan="2" >
+-     <widget class="QComboBox" name="networkSelect" />
 +    <item row="3" column="0" >
 +     <widget class="QPushButton" name="addNetworkButton" >
 +      <property name="text" >
 +       <string>Add</string>
 +      </property>
 +     </widget>
-+    </item>
+     </item>
+-    <item row="2" column="0" colspan="4" >
 +    <item row="3" column="1" >
 +     <widget class="QPushButton" name="removeNetworkButton" >
 +      <property name="text" >
@@ -60,14 +64,11 @@
 +    </item>
 +    <item row="4" column="0" >
 +     <widget class="QPushButton" name="enableNetworkButton" >
-       <property name="text" >
--       <string>Network:</string>
++      <property name="text" >
 +       <string>Enable</string>
-       </property>
-      </widget>
-     </item>
--    <item row="1" column="2" colspan="2" >
--     <widget class="QComboBox" name="networkSelect" />
++      </property>
++     </widget>
++    </item>
 +    <item row="4" column="1" >
 +     <widget class="QPushButton" name="disableNetworkButton" >
 +      <property name="text" >
@@ -81,8 +82,7 @@
 +       <string>Select Any Network</string>
 +      </property>
 +     </widget>
-     </item>
--    <item row="2" column="0" colspan="4" >
++    </item>
 +    <item row="6" column="0" colspan="2" >
       <widget class="QFrame" name="frame3" >
        <property name="frameShape" >
@@ -175,40 +175,38 @@
     <addaction name="helpMenu" />
    </widget>
    <action name="fileExitAction" >
-@@ -291,59 +318,40 @@
+@@ -291,59 +318,30 @@
      <string>fileEventHistoryAction</string>
     </property>
    </action>
 -  <action name="fileAdd_NetworkAction" >
+-   <property name="text" >
+-    <string>&amp;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" >
 +  <action name="fileSaveConfig" >
     <property name="text" >
--    <string>&amp;Add Network</string>
+-    <string>&amp;Edit Network</string>
 +    <string>&amp;Save Configuration</string>
     </property>
     <property name="iconText" >
--    <string>Add Network</string>
+-    <string>Edit Network</string>
 +    <string>Save Configuration</string>
     </property>
     <property name="name" stdset="0" >
--    <string>fileAdd_NetworkAction</string>
+-    <string>fileEdit_networkAction</string>
 +    <string>fileSaveConfig</string>
     </property>
    </action>
--  <action name="fileEdit_networkAction" >
-+  <action name="fileConnectAction" >
-    <property name="text" >
--    <string>&amp;Edit Network</string>
--   </property>
--   <property name="iconText" >
--    <string>Edit Network</string>
--   </property>
--   <property name="name" stdset="0" >
--    <string>fileEdit_networkAction</string>
-+    <string>&amp;Connect</string>
-    </property>
-   </action>
 -  <action name="fileEnableALLNetworksAction" >
-+  <action name="fileDisconnectAction" >
++  <action name="networksEnableAllAction" >
     <property name="text" >
 -    <string>E&amp;nable All Networks</string>
 -   </property>
@@ -217,11 +215,11 @@
 -   </property>
 -   <property name="name" stdset="0" >
 -    <string>fileEnableALLNetworksAction</string>
-+    <string>&amp;Disconnect</string>
++    <string>&amp;Enable all networks</string>
     </property>
    </action>
 -  <action name="fileDisableALLNetworksAction" >
-+  <action name="networksEnableAllAction" >
++  <action name="networksDisableAllAction" >
     <property name="text" >
 -    <string>&amp;Disable All Networks</string>
 -   </property>
@@ -230,23 +228,19 @@
 -   </property>
 -   <property name="name" stdset="0" >
 -    <string>fileDisableALLNetworksAction</string>
-+    <string>&amp;Enable all networks</string>
++    <string>&amp;Disable all networks</string>
     </property>
    </action>
 -  <action name="fileSaveConfig" >
-+  <action name="networksDisableAllAction" >
++  <action name="networksRemoveAllAction" >
     <property name="text" >
 -    <string>&amp;Save Configuration</string>
-+    <string>&amp;Disable all networks</string>
-    </property>
+-   </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>&amp;Remove all networks</string>
     </property>
    </action>


