diff --git a/src/qml/Page/ImageEditorPage.qml b/src/qml/Page/ImageEditorPage.qml index ad3c9c402..355259fbd 100644 --- a/src/qml/Page/ImageEditorPage.qml +++ b/src/qml/Page/ImageEditorPage.qml @@ -31,15 +31,15 @@ Kirigami.Page { imageDoc.crop(selectionTool.selectionX / ratioX, selectionTool.selectionY / ratioY, selectionTool.selectionWidth / ratioX, selectionTool.selectionHeight / ratioY); } - actions { - left: Kirigami.Action { + actions: [ + Kirigami.Action { id: undoAction text: i18nc("@action:button Undo modification", "Undo") icon.name: "edit-undo" onTriggered: imageDoc.undo(); visible: imageDoc.edited - } - main: Kirigami.Action { + }, + Kirigami.Action { id: okAction text: i18nc("@action:button Accept image modification", "Accept") icon.name: "dialog-ok" @@ -54,7 +54,7 @@ Kirigami.Page { } } } - } + ] diff --git a/src/qml/Page/JoinRoomPage.qml b/src/qml/Page/JoinRoomPage.qml index f8b3086dd..6a82609a8 100644 --- a/src/qml/Page/JoinRoomPage.qml +++ b/src/qml/Page/JoinRoomPage.qml @@ -138,10 +138,10 @@ Kirigami.ScrollablePage { title: i18nc("@title:window", "Add server") - onSheetOpenChanged: if (!serverUrlField.isValidServer && !sheetOpen) { + onOpened: if (!serverUrlField.isValidServer && !opened) { serverField.currentIndex = 0 server = serverField.currentValue - } else if (sheetOpen) { + } else if (opened) { serverUrlField.forceActiveFocus() } diff --git a/src/qml/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml index 57cc9993e..d90a7e82a 100644 --- a/src/qml/Page/RoomPage.qml +++ b/src/qml/Page/RoomPage.qml @@ -27,13 +27,13 @@ Kirigami.Page { focus: true padding: 0 - actions { - main: Kirigami.Action { + actions: [ + Kirigami.Action { visible: Kirigami.Settings.isMobile || !applicationWindow().pageStack.wideMode icon.name: "view-right-new" onTriggered: applicationWindow().openRoomDrawer() } - } + ] KeyNavigation.left: pageStack.get(0) diff --git a/src/qml/RoomDrawer/RoomDrawerPage.qml b/src/qml/RoomDrawer/RoomDrawerPage.qml index c880dc918..974b9dae8 100644 --- a/src/qml/RoomDrawer/RoomDrawerPage.qml +++ b/src/qml/RoomDrawer/RoomDrawerPage.qml @@ -38,14 +38,14 @@ Kirigami.Page { Component.onCompleted: infoAction.toggle() - actions { - main: Kirigami.Action { + actions: [ + Kirigami.Action { displayHint: Kirigami.DisplayHint.IconOnly text: i18n("Settings") icon.name: "settings-configure" onTriggered: applicationWindow().pageStack.pushDialogLayer('qrc:/Categories.qml', {room: root.room}, { title: i18n("Room Settings") }) } - } + ] Loader { id: drawerItemLoader diff --git a/src/qml/RoomDrawer/RoomInformation.qml b/src/qml/RoomDrawer/RoomInformation.qml index abf2ee586..bb157235c 100644 --- a/src/qml/RoomDrawer/RoomInformation.qml +++ b/src/qml/RoomDrawer/RoomInformation.qml @@ -173,9 +173,9 @@ QQC2.ScrollView { room: root.room } - sortRole: "powerLevel" + sortRoleName: "powerLevel" sortOrder: Qt.DescendingOrder - filterRole: "name" + filterRoleName: "name" filterCaseSensitivity: Qt.CaseInsensitive }