[pkg-wpa-devel] r1115 - in /wpasupplicant/trunk/debian: ./ patches/

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Thu Feb 7 05:18:04 UTC 2008


Author: kelmo-guest
Date: Thu Feb  7 05:18:03 2008
New Revision: 1115

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1115
Log:
* Reimpliment 70_wpa_gui_qt4_wpagui_scroll_follow_eventhistory.patch in the
  form of three patch series for resubmission to upstream.
  - debian/patches/30_wpa_gui_qt4_eventhistoryui_rework.patch
  - debian/patches/31_wpa_gui_qt4_eventhistoryui_autoscroll_checkbox.patch
  - debian/patches/32_wpa_gui_qt4_eventhistory_autoscroll.patch

Added:
    wpasupplicant/trunk/debian/patches/30_wpa_gui_qt4_eventhistoryui_rework.patch
    wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistoryui_autoscroll_checkbox.patch
    wpasupplicant/trunk/debian/patches/32_wpa_gui_qt4_eventhistory_autoscroll.patch
Removed:
    wpasupplicant/trunk/debian/patches/70_wpa_gui_qt4_wpagui_scroll_follow_eventhistory.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=1115&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Feb  7 05:18:03 2008
@@ -16,8 +16,13 @@
   * wpa_gui should depend on the wpa_supplicant binary from the same build,
     therefore set versioned dependency of wpasupplicant (= ${binary:Version})
     for the wpagui package. [debian/control]
-
- -- Kel Modderman <kel at otaku42.de>  Wed, 06 Feb 2008 22:17:57 +1000
+  * Reimpliment 70_wpa_gui_qt4_wpagui_scroll_follow_eventhistory.patch in the
+    form of three patch series for resubmission to upstream.
+    - debian/patches/30_wpa_gui_qt4_eventhistoryui_rework.patch
+    - debian/patches/31_wpa_gui_qt4_eventhistoryui_autoscroll_checkbox.patch
+    - debian/patches/32_wpa_gui_qt4_eventhistory_autoscroll.patch
+
+ -- Kel Modderman <kel at otaku42.de>  Thu, 07 Feb 2008 15:17:23 +1000
 
 wpasupplicant (0.6.2+git20080202.gde6ccd7-1) unstable; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/30_wpa_gui_qt4_eventhistoryui_rework.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/30_wpa_gui_qt4_eventhistoryui_rework.patch?rev=1115&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/30_wpa_gui_qt4_eventhistoryui_rework.patch (added)
+++ wpasupplicant/trunk/debian/patches/30_wpa_gui_qt4_eventhistoryui_rework.patch Thu Feb  7 05:18:03 2008
@@ -1,0 +1,171 @@
+--- a/wpa_supplicant/wpa_gui-qt4/eventhistory.ui
++++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.ui
+@@ -1,93 +1,77 @@
+-<ui version="4.0" stdsetdef="1" >
+-  <author></author>
+-  <comment></comment>
+-  <exportmacro></exportmacro>
+-  <class>EventHistory</class>
+-  <widget class="QDialog" name="EventHistory" >
+-    <property name="geometry" >
+-      <rect>
+-        <x>0</x>
+-        <y>0</y>
+-        <width>533</width>
+-        <height>285</height>
+-      </rect>
+-    </property>
+-    <property name="windowTitle" >
+-      <string>Event history</string>
+-    </property>
+-    <layout class="QVBoxLayout" >
+-      <item>
+-        <widget class="QTreeView" name="eventListView" >
+-          <property name="sizePolicy" >
+-            <sizepolicy>
+-              <hsizetype>7</hsizetype>
+-              <vsizetype>7</vsizetype>
+-              <horstretch>0</horstretch>
+-              <verstretch>0</verstretch>
+-            </sizepolicy>
+-          </property>
+-          <property name="selectionMode" >
+-            <enum>QAbstractItemView::NoSelection</enum>
+-          </property>
+-          <column>
+-            <property name="text" >
+-              <string>Timestamp</string>
+-            </property>
+-            <property name="clickable" >
+-              <bool>true</bool>
+-            </property>
+-            <property name="resizable" >
+-              <bool>true</bool>
+-            </property>
+-          </column>
+-          <column>
+-            <property name="text" >
+-              <string>Message</string>
+-            </property>
+-            <property name="clickable" >
+-              <bool>true</bool>
+-            </property>
+-            <property name="resizable" >
+-              <bool>true</bool>
+-            </property>
+-          </column>
+-        </widget>
+-      </item>
+-      <item>
+-        <layout class="QHBoxLayout" >
+-          <property name="margin" >
+-            <number>0</number>
+-          </property>
+-          <item>
+-            <spacer name="spacer3" >
+-              <property name="sizeHint" >
+-                <size>
+-                  <width>20</width>
+-                  <height>20</height>
+-                </size>
+-              </property>
+-              <property name="sizeType" >
+-                <enum>Expanding</enum>
+-              </property>
+-              <property name="orientation" >
+-                <enum>Horizontal</enum>
+-              </property>
+-            </spacer>
+-          </item>
+-          <item>
+-            <widget class="QPushButton" name="closeButton" >
+-              <property name="text" >
+-                <string>Close</string>
+-              </property>
+-            </widget>
+-          </item>
+-        </layout>
+-      </item>
++<ui version="4.0" >
++ <class>EventHistory</class>
++ <widget class="QDialog" name="EventHistory" >
++  <property name="geometry" >
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>533</width>
++    <height>285</height>
++   </rect>
++  </property>
++  <property name="windowTitle" >
++   <string>Event history</string>
++  </property>
++  <layout class="QVBoxLayout" >
++   <item>
++    <widget class="QTreeView" name="eventListView" >
++     <property name="sizePolicy" >
++      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
++       <horstretch>0</horstretch>
++       <verstretch>0</verstretch>
++      </sizepolicy>
++     </property>
++     <property name="selectionMode" >
++      <enum>QAbstractItemView::NoSelection</enum>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <layout class="QHBoxLayout" >
++     <property name="leftMargin" >
++      <number>0</number>
++     </property>
++     <property name="topMargin" >
++      <number>0</number>
++     </property>
++     <property name="rightMargin" >
++      <number>0</number>
++     </property>
++     <property name="bottomMargin" >
++      <number>0</number>
++     </property>
++     <item>
++      <spacer>
++       <property name="orientation" >
++        <enum>Qt::Vertical</enum>
++       </property>
++       <property name="sizeType" >
++        <enum>QSizePolicy::Expanding</enum>
++       </property>
++       <property name="sizeHint" >
++        <size>
++         <width>20</width>
++         <height>20</height>
++        </size>
++       </property>
++      </spacer>
++     </item>
++     <item>
++      <widget class="QPushButton" name="closeButton" >
++       <property name="text" >
++        <string>Close</string>
++       </property>
++      </widget>
++     </item>
+     </layout>
+-  </widget>
+-  <layoutdefault spacing="6" margin="11" />
+-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+-  <includes>
+-    <include location="local" >wpamsg.h</include>
+-  </includes>
++   </item>
++  </layout>
++ </widget>
++ <layoutdefault spacing="6" margin="11" />
++ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
++ <includes>
++  <include location="local" >wpamsg.h</include>
++ </includes>
++ <resources/>
++ <connections/>
+ </ui>

Added: wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistoryui_autoscroll_checkbox.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistoryui_autoscroll_checkbox.patch?rev=1115&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistoryui_autoscroll_checkbox.patch (added)
+++ wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistoryui_autoscroll_checkbox.patch Thu Feb  7 05:18:03 2008
@@ -1,0 +1,90 @@
+--- a/wpa_supplicant/wpa_gui-qt4/eventhistory.ui
++++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.ui
+@@ -12,8 +12,8 @@
+   <property name="windowTitle" >
+    <string>Event history</string>
+   </property>
+-  <layout class="QVBoxLayout" >
+-   <item>
++  <layout class="QGridLayout" >
++   <item row="0" column="0" colspan="3" >
+     <widget class="QTreeView" name="eventListView" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+@@ -26,44 +26,38 @@
+      </property>
+     </widget>
+    </item>
+-   <item>
+-    <layout class="QHBoxLayout" >
+-     <property name="leftMargin" >
+-      <number>0</number>
+-     </property>
+-     <property name="topMargin" >
+-      <number>0</number>
+-     </property>
+-     <property name="rightMargin" >
+-      <number>0</number>
+-     </property>
+-     <property name="bottomMargin" >
+-      <number>0</number>
+-     </property>
+-     <item>
+-      <spacer>
+-       <property name="orientation" >
+-        <enum>Qt::Vertical</enum>
+-       </property>
+-       <property name="sizeType" >
+-        <enum>QSizePolicy::Expanding</enum>
+-       </property>
+-       <property name="sizeHint" >
+-        <size>
+-         <width>20</width>
+-         <height>20</height>
+-        </size>
+-       </property>
+-      </spacer>
+-     </item>
+-     <item>
+-      <widget class="QPushButton" name="closeButton" >
+-       <property name="text" >
+-        <string>Close</string>
+-       </property>
+-      </widget>
+-     </item>
+-    </layout>
++   <item row="1" column="0" >
++    <spacer>
++     <property name="orientation" >
++      <enum>Qt::Vertical</enum>
++     </property>
++     <property name="sizeType" >
++      <enum>QSizePolicy::Expanding</enum>
++     </property>
++     <property name="sizeHint" >
++      <size>
++       <width>121</width>
++       <height>67</height>
++      </size>
++     </property>
++    </spacer>
++   </item>
++   <item row="1" column="1" >
++    <widget class="QCheckBox" name="autoScrollCheckBox" >
++     <property name="text" >
++      <string>Auto Scroll</string>
++     </property>
++     <property name="checked" >
++      <bool>true</bool>
++     </property>
++    </widget>
++   </item>
++   <item row="1" column="2" >
++    <widget class="QPushButton" name="closeButton" >
++     <property name="text" >
++      <string>Close</string>
++     </property>
++    </widget>
+    </item>
+   </layout>
+  </widget>

Added: wpasupplicant/trunk/debian/patches/32_wpa_gui_qt4_eventhistory_autoscroll.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/32_wpa_gui_qt4_eventhistory_autoscroll.patch?rev=1115&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/32_wpa_gui_qt4_eventhistory_autoscroll.patch (added)
+++ wpasupplicant/trunk/debian/patches/32_wpa_gui_qt4_eventhistory_autoscroll.patch Thu Feb  7 05:18:03 2008
@@ -1,0 +1,10 @@
+--- a/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
+@@ -117,4 +117,7 @@
+ {
+ 	elm->addEvent(msg.getTimestamp().toString("yyyy-MM-dd hh:mm:ss.zzz"),
+ 		      msg.getMsg());
++
++	if (autoScrollCheckBox->isChecked())
++		eventListView->scrollToBottom();
+ }

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1115&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Thu Feb  7 05:18:03 2008
@@ -6,4 +6,6 @@
 05_qmake_version_makefile.patch
 20_madwifi_headers.patch
 21_config_driver_madwifi.patch
-70_wpa_gui_qt4_wpagui_scroll_follow_eventhistory.patch
+30_wpa_gui_qt4_eventhistoryui_rework.patch
+31_wpa_gui_qt4_eventhistoryui_autoscroll_checkbox.patch
+32_wpa_gui_qt4_eventhistory_autoscroll.patch




More information about the Pkg-wpa-devel mailing list