diff --git a/imports/NeoChat/Page/LoadingPage.qml b/imports/NeoChat/Page/LoadingPage.qml index 9fd8e52db..545513173 100644 --- a/imports/NeoChat/Page/LoadingPage.qml +++ b/imports/NeoChat/Page/LoadingPage.qml @@ -3,18 +3,11 @@ import QtQuick.Layouts 1.15 import QtQuick.Controls 2.12 as QQC2 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami 2.19 as Kirigami Kirigami.Page { - title: i18n("Loading…") - - Kirigami.PlaceholderMessage { + Kirigami.LoadingPlaceholder { id: loadingIndicator anchors.centerIn: parent - text: i18n("Loading…") - QQC2.BusyIndicator { - running: false - Layout.alignment: Qt.AlignHCenter - } } } diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml index dcb86dc55..915ecba8b 100644 --- a/imports/NeoChat/Page/RoomPage.qml +++ b/imports/NeoChat/Page/RoomPage.qml @@ -8,7 +8,7 @@ import QtQuick.Layouts 1.15 import Qt.labs.platform 1.1 as Platform import Qt.labs.qmlmodels 1.0 -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami 2.19 as Kirigami import org.kde.kitemmodels 1.0 import org.kde.neochat 1.0 @@ -144,15 +144,10 @@ Kirigami.ScrollablePage { } } - Kirigami.PlaceholderMessage { + Kirigami.LoadingPlaceholder { id: loadingIndicator anchors.centerIn: parent visible: loading - text: i18n("Loading…") - QQC2.BusyIndicator { - running: loadingIndicator.visible - Layout.alignment: Qt.AlignHCenter - } } focus: true diff --git a/imports/NeoChat/Settings/DevicesPage.qml b/imports/NeoChat/Settings/DevicesPage.qml index ac5b1879c..645746bde 100644 --- a/imports/NeoChat/Settings/DevicesPage.qml +++ b/imports/NeoChat/Settings/DevicesPage.qml @@ -5,7 +5,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami 2.19 as Kirigami import org.kde.neochat 1.0 @@ -19,13 +19,9 @@ Kirigami.ScrollablePage { anchors.fill: parent - Kirigami.PlaceholderMessage { + Kirigami.LoadingPlaceholder { visible: parent.count === 0 // We can assume 0 means loading since there is at least one device anchors.centerIn: parent - text: i18n("Loading…") - Controls.BusyIndicator { - running: parent.visible - } } delegate: Kirigami.BasicListItem {