ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Kirigami LoadingPlaceholder everywhere

Browse Source 
Replace the custom Placeholder + BusyIndicator with the new LoadingPlaceholder component.

Also remove the "Loading…" page title on first load, as that is redundant to the existing front-and-center "Loading…" message and hence doesn't look nice.
This commit is contained in:
Bharadwaj Raju
2022-09-12 19:51:24 +05:30
parent 76edc858aa
commit e3ff50bbe8
3 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
imports/NeoChat/Page/LoadingPage.qml
View File

@@ -3,18 +3,11 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12 as QQC2 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 { Kirigami.Page {
title: i18n("Loading…") Kirigami.LoadingPlaceholder {
Kirigami.PlaceholderMessage {
id: loadingIndicator id: loadingIndicator
anchors.centerIn: parent anchors.centerIn: parent
text: i18n("Loading…")
QQC2.BusyIndicator {
running: false
Layout.alignment: Qt.AlignHCenter
}
} }
} }

9
imports/NeoChat/Page/RoomPage.qml
View File

@@ -8,7 +8,7 @@ import QtQuick.Layouts 1.15
import Qt.labs.platform 1.1 as Platform import Qt.labs.platform 1.1 as Platform
import Qt.labs.qmlmodels 1.0 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.kitemmodels 1.0
import org.kde.neochat 1.0 import org.kde.neochat 1.0
@@ -144,15 +144,10 @@ Kirigami.ScrollablePage {
} }
} }
Kirigami.PlaceholderMessage { Kirigami.LoadingPlaceholder {
id: loadingIndicator id: loadingIndicator
anchors.centerIn: parent anchors.centerIn: parent
visible: loading visible: loading
text: i18n("Loading…")
QQC2.BusyIndicator {
running: loadingIndicator.visible
Layout.alignment: Qt.AlignHCenter
}
} }
focus: true focus: true

8
imports/NeoChat/Settings/DevicesPage.qml
View File

@@ -5,7 +5,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.15 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 import org.kde.neochat 1.0
@@ -19,13 +19,9 @@ Kirigami.ScrollablePage {
anchors.fill: parent anchors.fill: parent
Kirigami.PlaceholderMessage { Kirigami.LoadingPlaceholder {
visible: parent.count === 0 // We can assume 0 means loading since there is at least one device visible: parent.count === 0 // We can assume 0 means loading since there is at least one device
anchors.centerIn: parent anchors.centerIn: parent
text: i18n("Loading…")
Controls.BusyIndicator {
running: parent.visible
}
} }
delegate: Kirigami.BasicListItem { delegate: Kirigami.BasicListItem {