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

Improve QML types

Browse Source
This commit is contained in:
Tobias Fella
2023-06-06 21:06:58 +02:00
parent 72c85af407
commit 47c28ce9a2
30 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.cpp
View File

@@ -261,6 +261,7 @@ int main(int argc, char *argv[])
qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM"); qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM");
qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM"); qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
qmlRegisterUncreatableType<NeoChatUser>("org.kde.neochat", 1, 0, "NeoChatUser", {}); qmlRegisterUncreatableType<NeoChatUser>("org.kde.neochat", 1, 0, "NeoChatUser", {});
qmlRegisterUncreatableType<NeoChatRoom>("org.kde.neochat", 1, 0, "NeoChatRoom", {});
qRegisterMetaType<User *>("User*"); qRegisterMetaType<User *>("User*");
qRegisterMetaType<User *>("const User*"); qRegisterMetaType<User *>("const User*");

2
src/qml/Component/ChatBox/ChatBar.qml
View File

@@ -36,7 +36,7 @@ QQC2.Control {
/** /**
* @brief The current room that user is viewing. * @brief The current room that user is viewing.
*/ */
property var currentRoom property NeoChatRoom currentRoom
/** /**
* @brief The QQC2.TextArea object. * @brief The QQC2.TextArea object.

2
src/qml/Component/ChatBox/ChatBox.qml
View File

@@ -35,7 +35,7 @@ ColumnLayout {
/** /**
* @brief The current room that user is viewing. * @brief The current room that user is viewing.
*/ */
property var currentRoom property NeoChatRoom currentRoom
/** /**
* @brief The chatBar object * @brief The chatBar object

4
src/qml/Component/ChatBox/LocationChooser.qml
View File

@@ -11,10 +11,12 @@ import org.kde.kirigamiaddons.labs.components 1.0 as Components
import org.kde.kirigami 2.15 as Kirigami import org.kde.kirigami 2.15 as Kirigami
import org.kde.neochat 1.0
Components.AbstractMaximizeComponent { Components.AbstractMaximizeComponent {
id: root id: root
required property var room required property NeoChatRoom room
property var location property var location
title: i18n("Choose a Location") title: i18n("Choose a Location")

4
src/qml/Component/InvitationView.qml
View File

@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
Kirigami.PlaceholderMessage { Kirigami.PlaceholderMessage {
id: root id: root
required property var currentRoom required property NeoChatRoom currentRoom
text: i18n("Accept this invitation?") text: i18n("Accept this invitation?")
RowLayout { RowLayout {
@@ -32,4 +32,4 @@ Kirigami.PlaceholderMessage {
} }
} }
} }
} }

2
src/qml/Component/QuickSwitcher.qml
View File

@@ -89,7 +89,7 @@ QQC2.Dialog {
delegate: Kirigami.BasicListItem { delegate: Kirigami.BasicListItem {
id: roomListItem id: roomListItem
required property var currentRoom required property NeoChatRoom currentRoom
required property string displayName required property string displayName
required property int index required property int index
required property int notificationCount required property int notificationCount

2
src/qml/Component/Timeline/MessageEditComponent.qml
View File

@@ -11,7 +11,7 @@ import org.kde.neochat 1.0
QQC2.TextArea { QQC2.TextArea {
id: root id: root
property var room property NeoChatRoom room
onRoomChanged: room.chatBoxEditIdChanged.connect(updateEditText) onRoomChanged: room.chatBoxEditIdChanged.connect(updateEditText)
property string messageId property string messageId

2
src/qml/Component/TimelineView.qml
View File

@@ -15,7 +15,7 @@ import org.kde.neochat 1.0
QQC2.ScrollView { QQC2.ScrollView {
id: root id: root
required property var currentRoom required property NeoChatRoom currentRoom
readonly property bool isLoaded: root.width * root.height > 10 readonly property bool isLoaded: root.width * root.height > 10
readonly property bool atYEnd: messageListView.atYEnd readonly property bool atYEnd: messageListView.atYEnd

2
src/qml/Dialog/ConfirmEncryptionDialog.qml
View File

@@ -10,7 +10,7 @@ import org.kde.kirigami 2.15 as Kirigami
QQC2.Dialog { QQC2.Dialog {
id: confirmEncryptionDialog id: confirmEncryptionDialog
property var room property NeoChatRoom room
ColumnLayout { ColumnLayout {
Kirigami.Heading { Kirigami.Heading {

2
src/qml/Dialog/PowerLevelDialog.qml
View File

@@ -13,7 +13,7 @@ Kirigami.OverlaySheet {
id: root id: root
title: i18n("Edit user power level") title: i18n("Edit user power level")
property var room property NeoChatRoom room
property var userId property var userId
property int powerLevel property int powerLevel

2
src/qml/Dialog/UserDetailDialog.qml
View File

@@ -15,7 +15,7 @@ Kirigami.OverlaySheet {
signal closed() signal closed()
property var room property NeoChatRoom room
property var user property var user
parent: applicationWindow().overlay parent: applicationWindow().overlay

2
src/qml/Menu/Timeline/BanSheet.qml
View File

@@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami
Kirigami.Page { Kirigami.Page {
id: banSheet id: banSheet
property var room property NeoChatRoom room
property string userId property string userId
title: i18n("Ban User") title: i18n("Ban User")

2
src/qml/Menu/Timeline/RemoveSheet.qml
View File

@@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami
Kirigami.Page { Kirigami.Page {
id: deleteSheet id: deleteSheet
property var room property NeoChatRoom room
property string eventId property string eventId
property string userId: "" property string userId: ""

2
src/qml/Menu/Timeline/ReportSheet.qml
View File

@@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami
Kirigami.Page { Kirigami.Page {
id: reportSheet id: reportSheet
property var room property NeoChatRoom room
property string eventId property string eventId
title: i18n("Report Message") title: i18n("Report Message")

2
src/qml/Page/DevtoolsPage.qml
View File

@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
Kirigami.Page { Kirigami.Page {
id: devtoolsPage id: devtoolsPage
property var room property NeoChatRoom room
title: i18n("Developer Tools") title: i18n("Developer Tools")

2
src/qml/Page/InviteUserPage.qml
View File

@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {
id: root id: root
property var room property NeoChatRoom room
title: i18n("Invite a User") title: i18n("Invite a User")

2
src/qml/Page/JoinRoomPage.qml
View File

@@ -28,7 +28,7 @@ Kirigami.ScrollablePage {
Kirigami.SearchField { Kirigami.SearchField {
id: identifierField id: identifierField
property bool isRoomAlias: text.match(/#(.+):(.+)/g) property bool isRoomAlias: text.match(/#(.+):(.+)/g)
property var room: isRoomAlias ? connection.roomByAlias(text) : null property NeoChatRoom room: isRoomAlias ? connection.roomByAlias(text) : null
property bool isJoined: room != null property bool isJoined: room != null
Layout.fillWidth: true Layout.fillWidth: true

2
src/qml/Page/RoomList/CollapsedRoomDelegate.qml
View File

@@ -16,7 +16,7 @@ import './' as RoomList
QQC2.ItemDelegate { QQC2.ItemDelegate {
id: root id: root
required property var currentRoom required property NeoChatRoom currentRoom
required property bool categoryVisible required property bool categoryVisible
required property string filterText required property string filterText
required property string avatar required property string avatar

2
src/qml/Page/RoomList/ContextMenu.qml
View File

@@ -15,7 +15,7 @@ import org.kde.neochat 1.0
*/ */
Loader { Loader {
id: root id: root
property var room property NeoChatRoom room
signal closed() signal closed()
Component { Component {

2
src/qml/Page/RoomList/RoomDelegate.qml
View File

@@ -19,7 +19,7 @@ Kirigami.BasicListItem {
required property int index required property int index
required property int notificationCount required property int notificationCount
required property int highlightCount required property int highlightCount
required property var currentRoom required property NeoChatRoom currentRoom
required property bool categoryVisible required property bool categoryVisible
required property string filterText required property string filterText
required property string avatar required property string avatar

2
src/qml/Page/RoomList/SpaceListContextMenu.qml
View File

@@ -15,7 +15,7 @@ import org.kde.neochat 1.0
*/ */
Loader { Loader {
id: root id: root
property var room property NeoChatRoom room
signal closed() signal closed()
Component { Component {

2
src/qml/Page/RoomPage.qml
View File

@@ -16,7 +16,7 @@ Kirigami.Page {
id: root id: root
/// Not readonly because of the separate window view. /// Not readonly because of the separate window view.
property var currentRoom: RoomManager.currentRoom property NeoChatRoom currentRoom: RoomManager.currentRoom
property bool loading: !root.currentRoom || (root.currentRoom.timelineSize === 0 && !root.currentRoom.allHistoryLoaded) property bool loading: !root.currentRoom || (root.currentRoom.timelineSize === 0 && !root.currentRoom.allHistoryLoaded)
/// Used to determine if scrolling to the bottom should mark the message as unread /// Used to determine if scrolling to the bottom should mark the message as unread
property bool hasScrolledUpBefore: false; property bool hasScrolledUpBefore: false;

4
src/qml/Page/RoomWindow.qml
View File

@@ -7,9 +7,11 @@ import QtQuick.Layouts 1.15
import org.kde.kirigami 2.15 as Kirigami import org.kde.kirigami 2.15 as Kirigami
import org.kde.neochat 1.0
Kirigami.ApplicationWindow { Kirigami.ApplicationWindow {
id: window id: window
required property var currentRoom required property NeoChatRoom currentRoom
minimumWidth: Kirigami.Units.gridUnit * 10 minimumWidth: Kirigami.Units.gridUnit * 10
minimumHeight: Kirigami.Units.gridUnit * 15 minimumHeight: Kirigami.Units.gridUnit * 15

2
src/qml/Page/SearchPage.qml
View File

@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {
id: searchPage id: searchPage
property var currentRoom property NeoChatRoom currentRoom
title: i18nc("@action:title", "Search Messages") title: i18nc("@action:title", "Search Messages")

2
src/qml/Panel/RoomDrawer.qml
View File

@@ -13,7 +13,7 @@ import org.kde.neochat 1.0
Kirigami.OverlayDrawer { Kirigami.OverlayDrawer {
id: roomDrawer id: roomDrawer
readonly property var room: RoomManager.currentRoom readonly property NeoChatRoom room: RoomManager.currentRoom
width: actualWidth width: actualWidth

2
src/qml/RoomSettings/Categories.qml
View File

@@ -7,7 +7,7 @@ import QtQuick.Layouts 1.15
Kirigami.CategorizedSettings { Kirigami.CategorizedSettings {
id: root id: root
property var room property NeoChatRoom room
objectName: "settingsPage" objectName: "settingsPage"
actions: [ actions: [

2
src/qml/RoomSettings/General.qml
View File

@@ -15,7 +15,7 @@ import org.kde.neochat 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {
id: root id: root
property var room property NeoChatRoom room
title: i18n("General") title: i18n("General")

2
src/qml/RoomSettings/Permissions.qml
View File

@@ -14,7 +14,7 @@ import org.kde.neochat 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {
id: root id: root
property var room property NeoChatRoom room
title: i18nc('@title:window', 'Permissions') title: i18nc('@title:window', 'Permissions')

2
src/qml/RoomSettings/PushNotification.qml
View File

@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {
property var room property NeoChatRoom room
title: i18nc('@title:window', 'Notifications') title: i18nc('@title:window', 'Notifications')

2
src/qml/RoomSettings/Security.qml
View File

@@ -13,7 +13,7 @@ import org.kde.neochat 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {
id: root id: root
property var room property NeoChatRoom room
property string needUpgradeRoom: i18n("You need to upgrade this room to a newer version to enable this setting.") property string needUpgradeRoom: i18n("You need to upgrade this room to a newer version to enable this setting.")
title: i18n("Security") title: i18n("Security")