[SCM] kio packaging branch, master, updated. debian/5.28.0-1-14-g6a34213

Maximiliano Curia maxy at moszumanska.debian.org
Wed Apr 5 08:43:38 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=d66f859

The following commit has been merged in the master branch:
commit d66f8599f0c1f174ecf8a03cda6f2fb5edafe2a0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Apr 4 17:18:02 2017 +0200

    Add new upstream patches, to improve file dialog's list: Never-stretch-the-last-date-column-in-the-file-dialog.patch, Also-change-the-resize-mode-the-other-way.patch
---
 ...Also-change-the-resize-mode-the-other-way.patch | 21 ++++++++++++
 ...h-the-last-date-column-in-the-file-dialog.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 63 insertions(+)

diff --git a/debian/patches/Also-change-the-resize-mode-the-other-way.patch b/debian/patches/Also-change-the-resize-mode-the-other-way.patch
new file mode 100644
index 0000000..01837b1
--- /dev/null
+++ b/debian/patches/Also-change-the-resize-mode-the-other-way.patch
@@ -0,0 +1,21 @@
+From: Andreas Hartmetz <ahartmetz at gmail.com>
+Date: Sat, 12 Nov 2016 18:46:20 +0100
+Subject: Also change the resize mode the other way...
+
+---
+ src/filewidgets/kdiroperatordetailview.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/filewidgets/kdiroperatordetailview.cpp b/src/filewidgets/kdiroperatordetailview.cpp
+index 491aea57..32e82183 100644
+--- a/src/filewidgets/kdiroperatordetailview.cpp
++++ b/src/filewidgets/kdiroperatordetailview.cpp
+@@ -91,6 +91,8 @@ bool KDirOperatorDetailView::setViewMode(KFile::FileView viewMode)
+     // using KDirOperator in horizontally limited parts of an app.
+     if (tree && m_hideDetailColumns) {
+         header()->setSectionResizeMode(QHeaderView::ResizeToContents);
++    } else {
++        header()->setSectionResizeMode(QHeaderView::Interactive);
+     }
+ 
+     return true;
diff --git a/debian/patches/Never-stretch-the-last-date-column-in-the-file-dialog.patch b/debian/patches/Never-stretch-the-last-date-column-in-the-file-dialog.patch
new file mode 100644
index 0000000..b627107
--- /dev/null
+++ b/debian/patches/Never-stretch-the-last-date-column-in-the-file-dialog.patch
@@ -0,0 +1,40 @@
+From: Andreas Hartmetz <ahartmetz at gmail.com>
+Date: Sat, 12 Nov 2016 18:42:08 +0100
+Subject: Never stretch the last (=date) column in the file dialog.
+
+Stretching the date column makes it appear to need the excessive
+width when adding up non-name column widths in expandNameColumn().
+The name column consequently became too narrow.
+Now why could the date column expand if the names needed a lot of
+space? It probably has something to do with expandNameColumn()
+being called several times while the directory model is loading
+and the exact order in which things are updated. Needs a more
+detailed analysis if this change causes a regression or still
+doesn't completely fix the problem.
+
+BUG: 312747
+---
+ src/filewidgets/kdiroperatordetailview.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/filewidgets/kdiroperatordetailview.cpp b/src/filewidgets/kdiroperatordetailview.cpp
+index 247f97c3..491aea57 100644
+--- a/src/filewidgets/kdiroperatordetailview.cpp
++++ b/src/filewidgets/kdiroperatordetailview.cpp
+@@ -91,7 +91,6 @@ bool KDirOperatorDetailView::setViewMode(KFile::FileView viewMode)
+     // using KDirOperator in horizontally limited parts of an app.
+     if (tree && m_hideDetailColumns) {
+         header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+-        header()->setStretchLastSection(false);
+     }
+ 
+     return true;
+@@ -102,7 +101,7 @@ bool KDirOperatorDetailView::event(QEvent *event)
+     if (event->type() == QEvent::Polish) {
+         QHeaderView *headerView = header();
+         headerView->setSectionResizeMode(QHeaderView::Interactive);
+-        headerView->setStretchLastSection(true);
++        headerView->setStretchLastSection(false);
+         headerView->setSectionsMovable(false);
+ 
+         setColumnHidden(KDirModel::Size, m_hideDetailColumns);
diff --git a/debian/patches/series b/debian/patches/series
index 5d79514..a5e25ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ wait_for_a_bit_longer
 kubuntu_kdelibs4-docs-path.diff
 fix_kfreebsd_build
 fix_hurd_build.patch
+Never-stretch-the-last-date-column-in-the-file-dialog.patch
+Also-change-the-resize-mode-the-other-way.patch

-- 
kio packaging



More information about the pkg-kde-commits mailing list