From 1ccac1e14585a5a2b76b3cd3245338548acade41 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 1 Jul 2021 18:25:39 +0200 Subject: [PATCH] plasmoid: Use `data-error` icon instead of the old `emblem-important` Loading the icon for the button from resources ceased to work (maybe when switching to `PlasmaComponents3.ToolButton`). This change works around the problem and the old icon no longer needs to be bundled. --- .../package/contents/ui/DirectoriesPage.qml | 2 +- plasmoid/package/contents/ui/main.qml | 4 +--- .../scalable/emblems/emblem-important-old.svg | 19 ------------------- widgets/resources/syncthingwidgetsicons.qrc | 1 - 4 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 widgets/resources/icons/hicolor/scalable/emblems/emblem-important-old.svg diff --git a/plasmoid/package/contents/ui/DirectoriesPage.qml b/plasmoid/package/contents/ui/DirectoriesPage.qml index 4e5c95d..4d9307a 100644 --- a/plasmoid/package/contents/ui/DirectoriesPage.qml +++ b/plasmoid/package/contents/ui/DirectoriesPage.qml @@ -67,7 +67,7 @@ ColumnLayout { } TinyButton { id: errorsButton - icon.source: ":/icons/hicolor/scalable/emblems/emblem-important-old.svg" + icon.name: "data-error" tooltip: qsTr("Show errors") visible: pullErrorCount > 0 onClicked: { diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index d35ed51..e7f87e1 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -68,9 +68,7 @@ Item { ":/icons/hicolor/scalable/status/syncthing-default.svg") plasmoid.setAction("showSettings", qsTr("Settings"), "configure") plasmoid.setAction("showLog", qsTr("Log"), "text-x-generic") - plasmoid.setAction( - "showErrors", qsTr("Internal errors"), - ":/icons/hicolor/scalable/emblems/emblem-important-old.svg") + plasmoid.setAction("showErrors", qsTr("Internal errors"), "data-error") plasmoid.setAction("rescanAllDirs", qsTr("Rescan all directories"), "folder-sync") plasmoid.setAction("restartSyncthing", qsTr("Restart Syncthing"), diff --git a/widgets/resources/icons/hicolor/scalable/emblems/emblem-important-old.svg b/widgets/resources/icons/hicolor/scalable/emblems/emblem-important-old.svg deleted file mode 100644 index db57ef6..0000000 --- a/widgets/resources/icons/hicolor/scalable/emblems/emblem-important-old.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/widgets/resources/syncthingwidgetsicons.qrc b/widgets/resources/syncthingwidgetsicons.qrc index 9fdff0e..3066ac4 100644 --- a/widgets/resources/syncthingwidgetsicons.qrc +++ b/widgets/resources/syncthingwidgetsicons.qrc @@ -11,7 +11,6 @@ icons/hicolor/scalable/app/syncthingtray.svg icons/hicolor/scalable/actions/globe.svg icons/hicolor/scalable/places/user-home.svg - icons/hicolor/scalable/emblems/emblem-important-old.svg icons/hicolor/scalable/actions/edit-undo.svg icons/hicolor/scalable/actions/document-open.svg icons/hicolor/scalable/actions/go-down.svg