From f9faa94ccc8f977809feb586434bc5f613809a46 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Thu, 23 Apr 2020 14:16:24 -0600
Subject: [PATCH] [kcmkwin/kwinrules] Port placeholder message to
 Kirigami.PlaceholderMessage

Summary: Depends on D29152

Test Plan:
{F8256396}

{F8257685}

Reviewers: iasensio, #kwin, zzag

Reviewed By: iasensio, #kwin, zzag

Subscribers: kwin

Tags: #kwin

Maniphest Tasks: T13021

Differential Revision: https://phabricator.kde.org/D29141
---
 CMakeLists.txt                                        | 2 +-
 kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml | 9 ++++-----
 kcmkwin/kwinrules/package/contents/ui/RulesList.qml   | 9 ++-------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bfd9f5edf..ec7aadc5ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(PROJECT_VERSION "5.18.80")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.14.0")
-set(KF5_MIN_VERSION "5.68.0")
+set(KF5_MIN_VERSION "5.70.0")
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 
diff --git a/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml b/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml
index ed9765f8ae..b86f5d5ed5 100644
--- a/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml
+++ b/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml
@@ -21,7 +21,7 @@
 import QtQuick 2.14
 import QtQuick.Layouts 1.14
 import QtQuick.Controls 2.14 as QQC2
-import org.kde.kirigami 2.10 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 import org.kde.kcm 1.2
 import org.kde.kitemmodels 1.0
 import org.kde.kcms.kwinrules 1.0
@@ -45,7 +45,7 @@ ScrollViewKCM {
             delegate: Kirigami.ListSectionHeader { label: section }
         }
 
-        Item {
+        Kirigami.PlaceholderMessage {
             id: hintArea
             visible: rulesView.count <= 4
             anchors {
@@ -54,11 +54,10 @@ ScrollViewKCM {
                 right: parent.right
                 bottom: parent.bottom
             }
-            QQC2.Button {
-                anchors.centerIn: parent
+            helpfulAction: QQC2.Action {
                 text: i18n("Add Properties...")
                 icon.name: "list-add-symbolic"
-                onClicked: {
+                onTriggered: {
                     propertySheet.open();
                 }
             }
diff --git a/kcmkwin/kwinrules/package/contents/ui/RulesList.qml b/kcmkwin/kwinrules/package/contents/ui/RulesList.qml
index d2f3dd6bd2..ca4709c4e9 100644
--- a/kcmkwin/kwinrules/package/contents/ui/RulesList.qml
+++ b/kcmkwin/kwinrules/package/contents/ui/RulesList.qml
@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.14
 import QtQuick.Controls 2.14 as QQC2
 import QtQml.Models 2.14
 import org.kde.kcm 1.2
-import org.kde.kirigami 2.5 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 
 ScrollViewKCM {
     id: rulesListKCM
@@ -66,14 +66,9 @@ ScrollViewKCM {
             NumberAnimation { properties: "y"; duration: Kirigami.Units.longDuration }
         }
 
-        Kirigami.Heading {
-            level: 3
-            enabled: false
+        Kirigami.PlaceholderMessage {
             visible: ruleBookView.count == 0
             anchors.fill: parent
-            horizontalAlignment: Qt.AlignHCenter
-            verticalAlignment: Qt.AlignVCenter
-            wrapMode: Text.WordWrap
             text: i18n("No rules for specific windows are currently set");
         }
     }