Castopod
/
kasts
mirror of https://github.com/KDE/kasts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-enable icons for gpodder and nextcloud 

Only this time we use the icons that are already part of breeze-icons
instead of rolling our own.  This avoids reuse license issues in kasts.
This commit is contained in:
Bart De Vries 2022-01-27 21:02:32 +01:00
parent 080669c283
commit 4483046904
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/qml/Settings/SynchronizationSettingsPage.qml
View File

@ -60,14 +60,13 @@ Kirigami.ScrollablePage {
Component.onCompleted: { Component.onCompleted: {
providerModel.append({"name": i18n("gpodder.net"), providerModel.append({"name": i18n("gpodder.net"),
"subtitle": i18n("Synchronize with official gpodder.net server"), "subtitle": i18n("Synchronize with official gpodder.net server"),
//"icon": "qrc:/gpoddernet.svg", "icon": "gpodder",
"provider": Sync.GPodderNet}); "provider": Sync.GPodderNet});
providerModel.append({"name": i18n("GPodder Nextcloud"), providerModel.append({"name": i18n("GPodder Nextcloud"),
"subtitle": i18n("Synchronize with GPodder Nextcloud app"), "subtitle": i18n("Synchronize with GPodder Nextcloud app"),
//"icon": "qrc:/nextcloud-icon.svg", "icon": "kaccounts-nextcloud",
"provider": Sync.GPodderNextcloud}); "provider": Sync.GPodderNextcloud});
} }
delegate: Kirigami.BasicListItem { delegate: Kirigami.BasicListItem {
label: model.name label: model.name
subtitle: model.subtitle subtitle: model.subtitle
@ -99,13 +98,11 @@ Kirigami.ScrollablePage {
RowLayout { RowLayout {
width: parent.width width: parent.width
spacing: Kirigami.Units.largeSpacing spacing: Kirigami.Units.largeSpacing
// Disable images until licensing has been sorted out Kirigami.Icon {
// Image { Layout.preferredHeight: Kirigami.Units.gridUnit * 4
// sourceSize.height: Kirigami.Units.gridUnit * 4 Layout.preferredWidth: Kirigami.Units.gridUnit * 4
// sourceSize.width: Kirigami.Units.gridUnit * 4 source: Sync.provider === Sync.GPodderNextcloud ? "kaccounts-nextcloud" : "gpodder"
// fillMode: Image.PreserveAspectFit }
// source: Sync.provider === Sync.GPodderNextcloud ? "qrc:/nextcloud-icon.svg" : "qrc:/gpoddernet.svg"
// }
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
@ -319,13 +316,11 @@ Kirigami.ScrollablePage {
contentItem: RowLayout { contentItem: RowLayout {
Layout.preferredWidth: Kirigami.Units.gridUnit * 25 Layout.preferredWidth: Kirigami.Units.gridUnit * 25
spacing: Kirigami.Units.largeSpacing spacing: Kirigami.Units.largeSpacing
// Disable images until licensing has been sorted out Kirigami.Icon {
// Image { Layout.preferredHeight: Kirigami.Units.gridUnit * 4
// sourceSize.height: Kirigami.Units.gridUnit * 4 Layout.preferredWidth: Kirigami.Units.gridUnit * 4
// sourceSize.width: Kirigami.Units.gridUnit * 4 source: "gpodder"
// fillMode: Image.PreserveAspectFit }
// source: "qrc:/gpoddernet.svg"
// }
TextEdit { TextEdit {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
@ -367,13 +362,11 @@ Kirigami.ScrollablePage {
contentItem: RowLayout { contentItem: RowLayout {
Layout.preferredWidth: Kirigami.Units.gridUnit * 2 Layout.preferredWidth: Kirigami.Units.gridUnit * 2
spacing: Kirigami.Units.largeSpacing spacing: Kirigami.Units.largeSpacing
// Disable images until licensing has been sorted out Kirigami.Icon {
// Image { Layout.preferredHeight: Kirigami.Units.gridUnit * 4
// sourceSize.height: Kirigami.Units.gridUnit * 4 Layout.preferredWidth: Kirigami.Units.gridUnit * 4
// sourceSize.width: Kirigami.Units.gridUnit * 4 source: Sync.provider === Sync.GPodderNextcloud ? "kaccounts-nextcloud" : "gpodder"
// fillMode: Image.PreserveAspectFit }
// source: Sync.provider === Sync.GPodderNextcloud ? "qrc:/nextcloud-icon.svg" : "qrc:/gpoddernet.svg"
// }
TextEdit { TextEdit {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true