Hello community, here is the log from the commit of package plasma-framework for openSUSE:Factory checked in at 2018-10-15 09:17:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-framework (Old) and /work/SRC/openSUSE:Factory/.plasma-framework.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-framework" Mon Oct 15 09:17:08 2018 rev:66 rq:641278 version:5.50.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-framework/plasma-framework.changes 2018-10-01 08:11:00.686205437 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-framework.new/plasma-framework.changes 2018-10-15 09:17:10.668836325 +0200 @@ -1,0 +2,6 @@ +Thu Oct 11 13:59:40 UTC 2018 - fab...@ritter-vogt.de + +- Add patch to workaround use of Frameworks 5.51 features in Plasma 5.14: + * 0001-Support-button-icons-when-present.patch (kde#398626) + +------------------------------------------------------------------- New: ---- 0001-Support-button-icons-when-present.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-framework.spec ++++++ --- /var/tmp/diff_new_pack.RgA75k/_old 2018-10-15 09:17:11.288835741 +0200 +++ /var/tmp/diff_new_pack.RgA75k/_new 2018-10-15 09:17:11.292835737 +0200 @@ -32,6 +32,8 @@ URL: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch1: 0001-Support-button-icons-when-present.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kactivities5-devel >= 5.19.0 @@ -129,6 +131,7 @@ %prep %setup -q +%autopatch -p1 %build %cmake_kf5 -d build ++++++ 0001-Support-button-icons-when-present.patch ++++++ >From 2353f2fcf155429ebca5ce9c538f3879cc41283f Mon Sep 17 00:00:00 2001 From: Marco Martin <notm...@gmail.com> Date: Thu, 6 Sep 2018 14:06:34 +0200 Subject: [PATCH] Support button icons when present Summary: support button icons. if there is no icon or is Qt 5.9, the iconItem will stay invisible Test Plan: tested with ported mediacontroller to PlasmaComponents3 Reviewers: #plasma Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D15164 --- .../plasmacomponents3/Button.qml | 26 +++++++++++++------ .../plasmacomponents3/ToolButton.qml | 26 +++++++++++++------ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/src/declarativeimports/plasmacomponents3/Button.qml b/src/declarativeimports/plasmacomponents3/Button.qml index c30648887..3bf58cdde 100644 --- a/src/declarativeimports/plasmacomponents3/Button.qml +++ b/src/declarativeimports/plasmacomponents3/Button.qml @@ -18,6 +18,7 @@ */ import QtQuick 2.6 +import QtQuick.Layouts 1.2 import QtQuick.Templates @QQC2_VERSION@ as T import org.kde.plasma.core 2.0 as PlasmaCore import "private" as Private @@ -36,14 +37,23 @@ T.Button { hoverEnabled: true //Qt.styleHints.useHoverEffects TODO: how to make this work in 5.7? - contentItem: Label { - text: control.text - font: control.font - opacity: enabled || control.highlighted || control.checked ? 1 : 0.4 - color: theme.buttonTextColor - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight + contentItem: RowLayout { + PlasmaCore.IconItem { + Layout.fillWidth: true + Layout.fillHeight: true + visible: source.length > 0 + source: control.icon ? (control.icon.name || control.icon.source) : "" + } + Label { + visible: text.length > 0 + text: control.text + font: control.font + opacity: enabled || control.highlighted || control.checked ? 1 : 0.4 + color: theme.buttonTextColor + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } } background: Item { diff --git a/src/declarativeimports/plasmacomponents3/ToolButton.qml b/src/declarativeimports/plasmacomponents3/ToolButton.qml index 6a1399e89..2ecf09a03 100644 --- a/src/declarativeimports/plasmacomponents3/ToolButton.qml +++ b/src/declarativeimports/plasmacomponents3/ToolButton.qml @@ -18,6 +18,7 @@ */ import QtQuick 2.6 +import QtQuick.Layouts 1.2 import QtQuick.Templates @QQC2_VERSION@ as T import org.kde.plasma.core 2.0 as PlasmaCore import "private" as Private @@ -38,14 +39,23 @@ T.ToolButton { flat: true - contentItem: Label { - text: control.text - font: control.font - opacity: enabled || control.highlighted || control.checked ? 1 : 0.4 - color: theme.buttonTextColor - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight + contentItem: RowLayout { + PlasmaCore.IconItem { + Layout.fillWidth: true + Layout.fillHeight: true + visible: source.length > 0 + source: control.icon ? (control.icon.name || control.icon.source) : "" + } + Label { + visible: text.length > 0 + text: control.text + font: control.font + opacity: enabled || control.highlighted || control.checked ? 1 : 0.4 + color: theme.buttonTextColor + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } } background: Item { -- 2.18.0
