[SCM] plasma-desktop packaging branch, kubuntu_stable, updated. 97b3a6c583b1872b6e881ce8a6f62ee1115396d0

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=97b3a6c

The following commit has been merged in the kubuntu_stable branch:
commit 97b3a6c583b1872b6e881ce8a6f62ee1115396d0
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Apr 2 15:43:34 2015 +0200

    Add upstream_kfontinst-header-alignment.diff from upstream to fix headers in kfontinst kcm
---
 debian/changelog                                   |  7 +++
 debian/patches/series                              |  1 +
 .../upstream_kfontinst-header-alignment.diff       | 59 ++++++++++++++++++++++
 3 files changed, 67 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cf67247..100c061 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plasma-desktop (4:5.2.2-0ubuntu3) vivid; urgency=medium
+
+  * Add upstream_kfontinst-header-alignment.diff from upstream to fix
+    headers in kfontinst kcm
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Apr 2015 15:43:04 +0200
+
 plasma-desktop (4:5.2.2-0ubuntu2) vivid; urgency=medium
 
   * Add upstream_Hide-pager-when-there-s-only-one-virtual-desktop.patch
diff --git a/debian/patches/series b/debian/patches/series
index a685a23..54a2e1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 upstream_Hide-pager-when-there-s-only-one-virtual-desktop.patch
+upstream_kfontinst-header-alignment.diff
diff --git a/debian/patches/upstream_kfontinst-header-alignment.diff b/debian/patches/upstream_kfontinst-header-alignment.diff
new file mode 100644
index 0000000..8971ecb
--- /dev/null
+++ b/debian/patches/upstream_kfontinst-header-alignment.diff
@@ -0,0 +1,59 @@
+commit a385460fc2a2ccec70f00bcc5ab51d4d648904e1
+Author: Dan Vrátil <dvratil at redhat.com>
+Date:   Thu Apr 2 11:48:10 2015 +0200
+
+    KFontInst: fix font list view header alignment and item sizehint
+    
+    REVIEW: 123220
+
+diff --git a/kcms/kfontinst/kcmfontinst/FontList.cpp b/kcms/kfontinst/kcmfontinst/FontList.cpp
+index 802b383..9eb8c9b 100644
+--- a/kcms/kfontinst/kcmfontinst/FontList.cpp
++++ b/kcms/kfontinst/kcmfontinst/FontList.cpp
+@@ -615,7 +615,7 @@ QVariant CFontList::headerData(int section, Qt::Orientation orientation,
+ //                     return SmallIcon("fontstatus");
+ //                 break;
+             case Qt::TextAlignmentRole:
+-                return Qt::AlignLeft;
++                return QVariant(Qt::AlignLeft | Qt::AlignVCenter);
+             case Qt::ToolTipRole:
+                 if(COL_STATUS==section)
+                     return i18n("This column shows the status of the font family, and of the "
+@@ -1107,8 +1107,10 @@ QVariant CFontListSortFilterProxy::data(const QModelIndex &idx, int role) const
+                                   ? "dialog-ok" : "dialog-cancel", 10);
+             break;
+         case Qt::SizeHintRole:
+-            if(mi->isFamily())
+-                return SmallIcon("dialog-ok").size()+QSize(0, 4);
++            if(mi->isFamily()) {
++                const int s = KIconLoader::global()->currentSize(KIconLoader::Small);
++                return QSize(s, s + 4);
++            }
+         default:
+             break;
+     }
+diff --git a/kcms/kfontinst/kcmfontinst/GroupList.cpp b/kcms/kfontinst/kcmfontinst/GroupList.cpp
+index 4532c0d..d369f4e 100644
+--- a/kcms/kfontinst/kcmfontinst/GroupList.cpp
++++ b/kcms/kfontinst/kcmfontinst/GroupList.cpp
+@@ -286,7 +286,10 @@ QVariant CGroupList::data(const QModelIndex &index, int role) const
+                         }
+                         break;
+                     case Qt::SizeHintRole:
+-                        return SmallIcon("dialog-ok").size()+QSize(0, 4);
++                    {
++                        const int s = KIconLoader::global()->currentSize(KIconLoader::Small);
++                        return QSize(s, s + 4);
++                    }
+                     case Qt::EditRole:
+                     case Qt::DisplayRole:
+                         return grp->name();
+@@ -380,7 +383,7 @@ QVariant CGroupList::headerData(int section, Qt::Orientation orientation, int ro
+             case Qt::DisplayRole:
+                 return i18n("Group");
+             case Qt::TextAlignmentRole:
+-                return Qt::AlignLeft;
++                return QVariant(Qt::AlignLeft | Qt::AlignVCenter);
+             case Qt::WhatsThisRole:
+                 return whatsThis();
+             default:

-- 
plasma-desktop packaging