From fa8e2da414f2c8f2c6f3cf605bc9d6b69f316045 Mon Sep 17 00:00:00 2001 From: Bart De Vries Date: Wed, 1 Feb 2023 22:53:44 +0100 Subject: [PATCH] Port from deprecated iconName to icon.name --- src/qml/DownloadListPage.qml | 2 +- src/qml/EpisodeListPage.qml | 6 +++--- src/qml/ErrorListOverlay.qml | 2 +- src/qml/FeedDetailsPage.qml | 6 +++--- src/qml/FeedListDelegate.qml | 4 ++-- src/qml/FeedListPage.qml | 18 +++++++++--------- src/qml/GenericEntryListView.qml | 4 ++-- src/qml/Mobile/BottomToolbar.qml | 8 ++++---- src/qml/QueuePage.qml | 2 +- src/qml/SleepTimerDialog.qml | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/qml/DownloadListPage.qml b/src/qml/DownloadListPage.qml index b7fb37db..42785e6d 100644 --- a/src/qml/DownloadListPage.qml +++ b/src/qml/DownloadListPage.qml @@ -27,7 +27,7 @@ Kirigami.ScrollablePage { } actions.main: Kirigami.Action { - iconName: "view-refresh" + icon.name: "view-refresh" text: i18n("Refresh All Podcasts") onTriggered: refreshing = true } diff --git a/src/qml/EpisodeListPage.qml b/src/qml/EpisodeListPage.qml index 840456e6..aa8e8061 100644 --- a/src/qml/EpisodeListPage.qml +++ b/src/qml/EpisodeListPage.qml @@ -29,7 +29,7 @@ Kirigami.ScrollablePage { } actions.main: Kirigami.Action { - iconName: "download" + icon.name: "download" text: i18n("Downloads") onTriggered: { pushPage("DownloadListPage") @@ -39,13 +39,13 @@ Kirigami.ScrollablePage { } actions.left: Kirigami.Action { - iconName: "view-filter" + icon.name: "view-filter" text: i18n("Filter") onTriggered: filterTypeOverlay.open(); } actions.right: Kirigami.Action { - iconName: "view-refresh" + icon.name: "view-refresh" text: i18n("Refresh All Podcasts") onTriggered: refreshing = true visible: episodeProxyModel.filterType == EpisodeProxyModel.NoFilter diff --git a/src/qml/ErrorListOverlay.qml b/src/qml/ErrorListOverlay.qml index c83b107b..df8a41ab 100644 --- a/src/qml/ErrorListOverlay.qml +++ b/src/qml/ErrorListOverlay.qml @@ -25,7 +25,7 @@ Kirigami.Dialog { customFooterActions: Kirigami.Action { text: i18nc("@action:button", "Clear All Errors") - iconName: "edit-clear-all" + icon.name: "edit-clear-all" onTriggered: ErrorLogModel.clearAll() enabled: errorList.count > 0 } diff --git a/src/qml/FeedDetailsPage.qml b/src/qml/FeedDetailsPage.qml index e9980ae9..b2021600 100644 --- a/src/qml/FeedDetailsPage.qml +++ b/src/qml/FeedDetailsPage.qml @@ -133,12 +133,12 @@ Kirigami.ScrollablePage { actions: [ Kirigami.Action { visible: isSubscribed - iconName: "view-refresh" + icon.name: "view-refresh" text: i18n("Refresh Podcast") onTriggered: page.refreshing = true }, Kirigami.Action { - iconName: "kt-add-feeds" + icon.name: "kt-add-feeds" text: enabled ? i18n("Subscribe") : i18n("Subscribed") enabled: !DataManager.feedExists(feed.url) visible: !isSubscribed @@ -152,7 +152,7 @@ Kirigami.ScrollablePage { } }, Kirigami.Action { - iconName: "documentinfo" + icon.name: "documentinfo" text: i18n("Show Details") checkable: true checked: showMoreInfo diff --git a/src/qml/FeedListDelegate.qml b/src/qml/FeedListDelegate.qml index e1299309..754ada1e 100644 --- a/src/qml/FeedListDelegate.qml +++ b/src/qml/FeedListDelegate.qml @@ -253,7 +253,7 @@ Controls.ItemDelegate { pageStack.push("qrc:/FeedDetailsPage.qml", {"feed": feed}); actionOverlay.close(); } - iconName: "documentinfo" + icon.name: "documentinfo" text: i18n("Podcast Details") }, Kirigami.Action { @@ -264,7 +264,7 @@ Controls.ItemDelegate { DataManager.removeFeed(feed) actionOverlay.close(); } - iconName: "delete" + icon.name: "delete" text: i18n("Remove Podcast") } ] diff --git a/src/qml/FeedListPage.qml b/src/qml/FeedListPage.qml index adc5ee00..c4ff3be8 100644 --- a/src/qml/FeedListPage.qml +++ b/src/qml/FeedListPage.qml @@ -38,7 +38,7 @@ Kirigami.ScrollablePage { actions.main: Kirigami.Action { visible: Kirigami.Settings.isMobile text: i18n("Discover") - iconName: "search" + icon.name: "search" onTriggered: { applicationWindow().pageStack.push("qrc:/DiscoverPage.qml"); } @@ -47,25 +47,25 @@ Kirigami.ScrollablePage { contextualActions: [ Kirigami.Action { text: i18n("Refresh All Podcasts") - iconName: "view-refresh" + icon.name: "view-refresh" onTriggered: refreshing = true }, Kirigami.Action { text: i18n("Add Podcast") - iconName: "list-add" + icon.name: "list-add" onTriggered: { addSheet.open() } }, Kirigami.Action { text: i18n("Import Podcasts...") - iconName: "document-import" + icon.name: "document-import" displayHint: Kirigami.DisplayHint.AlwaysHide onTriggered: importDialog.open() }, Kirigami.Action { text: i18n("Export Podcasts...") - iconName: "document-export" + icon.name: "document-export" displayHint: Kirigami.DisplayHint.AlwaysHide onTriggered: exportDialog.open() } @@ -241,7 +241,7 @@ Kirigami.ScrollablePage { // For lack of a better place, we put generic entry list actions here so // they can be re-used across the different ListViews. property var selectAllAction: Kirigami.Action { - iconName: "edit-select-all" + icon.name: "edit-select-all" text: i18n("Select All") visible: true onTriggered: { @@ -250,7 +250,7 @@ Kirigami.ScrollablePage { } property var selectNoneAction: Kirigami.Action { - iconName: "edit-select-none" + icon.name: "edit-select-none" text: i18n("Deselect All") visible: feedList.selectionModel.hasSelection onTriggered: { @@ -259,7 +259,7 @@ Kirigami.ScrollablePage { } property var deleteFeedAction: Kirigami.Action { - iconName: "delete" + icon.name: "delete" text: i18ncp("context menu action", "Remove Podcast", "Remove Podcasts", feedList.selectionForContextMenu.length) visible: feedList.selectionModel.hasSelection onTriggered: { @@ -282,7 +282,7 @@ Kirigami.ScrollablePage { } property var feedDetailsAction: Kirigami.Action { - iconName: "documentinfo" + icon.name: "documentinfo" text: i18n("Podcast Details") visible: feedList.selectionModel.hasSelection && (feedList.selectionForContextMenu.length == 1) onTriggered: { diff --git a/src/qml/GenericEntryListView.qml b/src/qml/GenericEntryListView.qml index a73e2786..fb3b1e49 100644 --- a/src/qml/GenericEntryListView.qml +++ b/src/qml/GenericEntryListView.qml @@ -124,7 +124,7 @@ ListView { // For lack of a better place, we put generic entry list actions here so // they can be re-used across the different ListViews. property var selectAllAction: Kirigami.Action { - iconName: "edit-select-all" + icon.name: "edit-select-all" text: i18n("Select All") visible: true onTriggered: { @@ -133,7 +133,7 @@ ListView { } property var selectNoneAction: Kirigami.Action { - iconName: "edit-select-none" + icon.name: "edit-select-none" text: i18n("Deselect All") visible: listView.selectionModel.hasSelection onTriggered: { diff --git a/src/qml/Mobile/BottomToolbar.qml b/src/qml/Mobile/BottomToolbar.qml index c039fa21..ec1d2370 100644 --- a/src/qml/Mobile/BottomToolbar.qml +++ b/src/qml/Mobile/BottomToolbar.qml @@ -21,7 +21,7 @@ Kirigami.NavigationTabBar { actions: [ Kirigami.Action { - iconName: "view-media-playlist" + icon.name: "view-media-playlist" text: i18n("Queue") checked: "QueuePage" === SettingsManager.lastOpenedPage onTriggered: { @@ -31,7 +31,7 @@ Kirigami.NavigationTabBar { } }, Kirigami.Action { - iconName: "bookmarks" + icon.name: "bookmarks" text: i18n("Subscriptions") checked: "FeedListPage" === SettingsManager.lastOpenedPage onTriggered: { @@ -41,7 +41,7 @@ Kirigami.NavigationTabBar { } }, Kirigami.Action { - iconName: "rss" + icon.name: "rss" text: i18n("Episodes") checked: "EpisodeListPage" === SettingsManager.lastOpenedPage onTriggered: { @@ -51,7 +51,7 @@ Kirigami.NavigationTabBar { } }, Kirigami.Action { - iconName: "settings-configure" + icon.name: "settings-configure" text: i18n("Settings") checked: "SettingsPage" === SettingsManager.lastOpenedPage onTriggered: { diff --git a/src/qml/QueuePage.qml b/src/qml/QueuePage.qml index c9969636..9f6ca384 100644 --- a/src/qml/QueuePage.qml +++ b/src/qml/QueuePage.qml @@ -33,7 +33,7 @@ Kirigami.ScrollablePage { } actions.main: Kirigami.Action { - iconName: "view-refresh" + icon.name: "view-refresh" text: i18nc("@action:intoolbar", "Refresh All Podcasts") onTriggered: refreshing = true } diff --git a/src/qml/SleepTimerDialog.qml b/src/qml/SleepTimerDialog.qml index 609f6862..3bd5c8fe 100644 --- a/src/qml/SleepTimerDialog.qml +++ b/src/qml/SleepTimerDialog.qml @@ -24,7 +24,7 @@ Kirigami.Dialog { Kirigami.Action { enabled: !timerActive text: i18n("Start") - iconName: "dialog-ok" + icon.name: "dialog-ok" onTriggered: { sleepTimerDialog.close(); var sleepTimeSeconds = sleepTimerValueBox.value * sleepTimerUnitsBox.model[sleepTimerUnitsBox.currentIndex]["secs"]; @@ -39,7 +39,7 @@ Kirigami.Dialog { Kirigami.Action { enabled: timerActive text: i18n("Stop") - iconName: "dialog-cancel" + icon.name: "dialog-cancel" onTriggered: { sleepTimerDialog.close(); AudioManager.sleepTime = undefined; // make use of RESET