[pkg-wpa-devel] r1116 - in /wpasupplicant/trunk/debian: ./ patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Thu Feb 7 06:55:59 UTC 2008
Author: kelmo-guest
Date: Thu Feb 7 06:55:55 2008
New Revision: 1116
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1116
Log:
- debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch
- debian/patches/32_wpa_gui_qt4_eventhistory_scroll_with_events.patch
Added:
wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch
wpasupplicant/trunk/debian/patches/32_wpa_gui_qt4_eventhistory_scroll_with_events.patch
Removed:
wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistoryui_autoscroll_checkbox.patch
wpasupplicant/trunk/debian/patches/32_wpa_gui_qt4_eventhistory_autoscroll.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=1116&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Feb 7 06:55:55 2008
@@ -19,10 +19,10 @@
* 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
+ - debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch
+ - debian/patches/32_wpa_gui_qt4_eventhistory_scroll_with_events.patch
+
+ -- Kel Modderman <kel at otaku42.de> Thu, 07 Feb 2008 16:54:44 +1000
wpasupplicant (0.6.2+git20080202.gde6ccd7-1) unstable; urgency=low
Added: wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch?rev=1116&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch (added)
+++ wpasupplicant/trunk/debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch Thu Feb 7 06:55:55 2008
@@ -1,0 +1,85 @@
+--- 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="2" >
+ <widget class="QTreeView" name="eventListView" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+@@ -21,49 +21,33 @@
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
++ <property name="verticalScrollBarPolicy" >
++ <enum>Qt::ScrollBarAlwaysOn</enum>
++ </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>
++ <item row="1" column="0" >
++ <spacer>
++ <property name="orientation" >
++ <enum>Qt::Horizontal</enum>
++ </property>
++ <property name="sizeHint" >
++ <size>
++ <width>40</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </item>
++ <item row="1" column="1" >
++ <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_scroll_with_events.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/32_wpa_gui_qt4_eventhistory_scroll_with_events.patch?rev=1116&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/32_wpa_gui_qt4_eventhistory_scroll_with_events.patch (added)
+++ wpasupplicant/trunk/debian/patches/32_wpa_gui_qt4_eventhistory_scroll_with_events.patch Thu Feb 7 06:55:55 2008
@@ -1,0 +1,26 @@
+--- a/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
+@@ -13,6 +13,7 @@
+ */
+
+ #include <QHeaderView>
++#include <QScrollBar>
+
+ #include "eventhistory.h"
+
+@@ -115,6 +116,15 @@
+
+ void EventHistory::addEvent(WpaMsg msg)
+ {
++ bool scroll = true;
++
++ if (eventListView->verticalScrollBar()->value() <
++ eventListView->verticalScrollBar()->maximum())
++ scroll = false;
++
+ elm->addEvent(msg.getTimestamp().toString("yyyy-MM-dd hh:mm:ss.zzz"),
+ msg.getMsg());
++
++ if (scroll)
++ eventListView->scrollToBottom();
+ }
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1116&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Thu Feb 7 06:55:55 2008
@@ -7,5 +7,5 @@
20_madwifi_headers.patch
21_config_driver_madwifi.patch
30_wpa_gui_qt4_eventhistoryui_rework.patch
-31_wpa_gui_qt4_eventhistoryui_autoscroll_checkbox.patch
-32_wpa_gui_qt4_eventhistory_autoscroll.patch
+31_wpa_gui_qt4_eventhistory_always_scrollbar.patch
+32_wpa_gui_qt4_eventhistory_scroll_with_events.patch
More information about the Pkg-wpa-devel
mailing list