From 765a95050dea3df8d1b155fbbef85ac6d06aafb7 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Fri, 27 Jan 2023 20:08:58 -0500 Subject: [PATCH] Replace deprecated usage of iconName with icon.name --- src/qml/Component/UserInfo.qml | 2 +- src/qml/Menu/ShareAction.qml | 2 +- src/qml/Page/ImageEditorPage.qml | 16 ++++++++-------- src/qml/Settings/DevicesPage.qml | 6 +++--- src/qml/Settings/SettingsPage.qml | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qml/Component/UserInfo.qml b/src/qml/Component/UserInfo.qml index 36c114b03..b78720f2d 100644 --- a/src/qml/Component/UserInfo.qml +++ b/src/qml/Component/UserInfo.qml @@ -138,7 +138,7 @@ QQC2.ToolBar { name: Controller.activeConnection.localUser.displayName ?? Controller.activeConnection.localUser.id actions.main: Kirigami.Action { text: i18n("Edit this account") - iconName: "document-edit" + icon.name: "document-edit" onTriggered: pageStack.pushDialogLayer(Qt.resolvedUrl('./AccountEditorPage.qml'), { connection: Controller.activeConnection }, { diff --git a/src/qml/Menu/ShareAction.qml b/src/qml/Menu/ShareAction.qml index 7cc21f870..a92e6dbbc 100644 --- a/src/qml/Menu/ShareAction.qml +++ b/src/qml/Menu/ShareAction.qml @@ -15,7 +15,7 @@ import org.kde.kirigami 2.14 as Kirigami */ Kirigami.Action { id: shareAction - iconName: "emblem-shared-symbolic" + icon.name: "emblem-shared-symbolic" text: i18n("Share") tooltip: i18n("Share the selected media") diff --git a/src/qml/Page/ImageEditorPage.qml b/src/qml/Page/ImageEditorPage.qml index 988ab89ee..da05d036e 100644 --- a/src/qml/Page/ImageEditorPage.qml +++ b/src/qml/Page/ImageEditorPage.qml @@ -34,14 +34,14 @@ Kirigami.Page { left: Kirigami.Action { id: undoAction text: i18nc("@action:button Undo modification", "Undo") - iconName: "edit-undo" + icon.name: "edit-undo" onTriggered: imageDoc.undo(); visible: imageDoc.edited } main: Kirigami.Action { id: okAction text: i18nc("@action:button Accept image modification", "Accept") - iconName: "dialog-ok" + icon.name: "dialog-ok" onTriggered: { let newPath = Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/" + (new Date()).getTime() + "." + imagePath.split('.').pop(); if (imageDoc.saveAs(newPath)) {; @@ -121,7 +121,7 @@ Kirigami.Page { display: QQC2.Button.TextBesideIcon actions: [ Kirigami.Action { - iconName: rootEditorView.resizing ? "dialog-cancel" : "transform-crop" + icon.name: rootEditorView.resizing ? "dialog-cancel" : "transform-crop" text: rootEditorView.resizing ? i18n("Cancel") : i18nc("@action:button Crop an image", "Crop"); onTriggered: { resizeRectangle.width = editImage.paintedWidth @@ -137,31 +137,31 @@ Kirigami.Page { } }, Kirigami.Action { - iconName: "dialog-ok" + icon.name: "dialog-ok" visible: rootEditorView.resizing text: i18nc("@action:button Crop an image", "Crop"); onTriggered: rootEditorView.crop(); }, Kirigami.Action { - iconName: "object-rotate-left" + icon.name: "object-rotate-left" text: i18nc("@action:button Rotate an image to the left", "Rotate left"); onTriggered: imageDoc.rotate(-90); visible: !rootEditorView.resizing }, Kirigami.Action { - iconName: "object-rotate-right" + icon.name: "object-rotate-right" text: i18nc("@action:button Rotate an image to the right", "Rotate right"); onTriggered: imageDoc.rotate(90); visible: !rootEditorView.resizing }, Kirigami.Action { - iconName: "object-flip-vertical" + icon.name: "object-flip-vertical" text: i18nc("@action:button Mirror an image vertically", "Flip"); onTriggered: imageDoc.mirror(false, true); visible: !rootEditorView.resizing }, Kirigami.Action { - iconName: "object-flip-horizontal" + icon.name: "object-flip-horizontal" text: i18nc("@action:button Mirror an image horizontally", "Mirror"); onTriggered: imageDoc.mirror(true, false); visible: !rootEditorView.resizing diff --git a/src/qml/Settings/DevicesPage.qml b/src/qml/Settings/DevicesPage.qml index 71a9d950f..c10932539 100644 --- a/src/qml/Settings/DevicesPage.qml +++ b/src/qml/Settings/DevicesPage.qml @@ -115,7 +115,7 @@ Kirigami.ScrollablePage { action: Kirigami.Action { id: editDeviceAction text: i18n("Edit device name") - iconName: "document-edit" + icon.name: "document-edit" onTriggered: deviceDelegate.editDeviceName = true } QQC2.ToolTip { @@ -129,7 +129,7 @@ Kirigami.ScrollablePage { action: Kirigami.Action { id: verifyDeviceAction text: i18n("Verify device") - iconName: "security-low-symbolic" + icon.name: "security-low-symbolic" onTriggered: { devices.connection.startKeyVerificationSession(devices.connection.localUserId, model.id) } @@ -144,7 +144,7 @@ Kirigami.ScrollablePage { action: Kirigami.Action { id: logoutDeviceAction text: i18n("Logout device") - iconName: "edit-delete-remove" + icon.name: "edit-delete-remove" onTriggered: { passwordSheet.index = index passwordSheet.open() diff --git a/src/qml/Settings/SettingsPage.qml b/src/qml/Settings/SettingsPage.qml index 7e94a0dd7..4c06b17cc 100644 --- a/src/qml/Settings/SettingsPage.qml +++ b/src/qml/Settings/SettingsPage.qml @@ -35,18 +35,18 @@ Kirigami.CategorizedSettings { }, Kirigami.SettingAction { text: i18n("Spell Checking") - iconName: "tools-check-spelling" + icon.name: "tools-check-spelling" page: Qt.resolvedUrl("SonnetConfigPage.qml") visible: Qt.platform.os !== "android" }, Kirigami.SettingAction { text: i18n("Network Proxy") - iconName: "network-connect" + icon.name: "network-connect" page: Qt.resolvedUrl("NetworkProxyPage.qml") }, Kirigami.SettingAction { text: i18n("Devices") - iconName: "computer" + icon.name: "computer" page: Qt.resolvedUrl("DevicesPage.qml") }, Kirigami.SettingAction {