D14971: Combine display OSD icon files and move to plasma icon theme
This revision was automatically updated to reflect the committed changes. Closed by commit R242:32e0f7867758: Combine display OSD icon files and move to plasma icon theme (authored by pstefan, committed by ngraham). REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D14971?vs=40157=41477 REVISION DETAIL https://phabricator.kde.org/D14971 AFFECTED FILES src/desktoptheme/breeze/icons/osd.svgz src/desktoptheme/breeze/icons/video.svgz To: pstefan, ngraham, #vdg, broulik Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
ngraham accepted this revision. ngraham added a comment. This revision is now accepted and ready to land. Nah, I'll land this now, and bump `X-KDE-PluginInfo-Version` in `src/desktoptheme/breeze/metadata.desktop` before Frameworks 5.51 tagging. Thanks so much for your work here, Phil! I know it's been a long road, but I'm going to land this now. For your next patch, for all the icons that currently have a desktop-looking screen, could you make additional versions that have a laptop instead? Then we can patch KScreen for Plasma 5.15 to dynamically show one set or other other depending on whether you're on a laptop or a desktop. That'll be totally awesome. REPOSITORY R242 Plasma Framework (Library) BRANCH master REVISION DETAIL https://phabricator.kde.org/D14971 To: pstefan, ngraham, #vdg, broulik Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
ngraham edited the summary of this revision. REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14971 To: pstefan, ngraham, #vdg, broulik Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
ngraham added a comment. Ah, that did it. So should we bump the version in this patch, then? REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14971 To: pstefan, ngraham, #vdg, broulik Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
broulik added a comment. Did you nuke the plasma icon cache? `~/.cache/plasma*` (We need to bump the theme version number before frameworks tagging, then this will work automatically) REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14971 To: pstefan, ngraham, #vdg, broulik Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
ngraham added a comment. When I apply this patch and compile and deploy plasma-framework to `/usr/` and then delete the Breeze icons versions, I still don't see the new icons in the switcher. What am I doing wrong? REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14971 To: pstefan, ngraham, #vdg, broulik Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
broulik accepted this revision. REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14971 To: pstefan, ngraham, #vdg, broulik Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
pstefan updated this revision to Diff 40157. pstefan added a comment. - changed osd-sbs-right to osd-sbs-sright REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D14971?vs=40156=40157 BRANCH master REVISION DETAIL https://phabricator.kde.org/D14971 AFFECTED FILES src/desktoptheme/breeze/icons/osd.svgz src/desktoptheme/breeze/icons/video.svgz To: pstefan, ngraham, #vdg, broulik Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
pstefan updated this revision to Diff 40156. pstefan added a comment. - Modes OSD files out of video.svgz into osd.svgz. Removed the 64-64- prefix. REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D14971?vs=40154=40156 BRANCH master REVISION DETAIL https://phabricator.kde.org/D14971 AFFECTED FILES src/desktoptheme/breeze/icons/osd.svgz src/desktoptheme/breeze/icons/video.svgz To: pstefan, ngraham, #vdg, broulik Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
broulik requested changes to this revision. broulik added a comment. This revision now requires changes to proceed. File looking good, not really a fan of the new thin lined icon style, but the file must be named `osd.svgz` (Plasma always uses the part before the first hyphen for lookup) REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14971 To: pstefan, ngraham, #vdg, broulik Cc: broulik, kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
pstefan updated this revision to Diff 40154. pstefan added a comment. - Reverse name change REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D14971?vs=40143=40154 BRANCH master REVISION DETAIL https://phabricator.kde.org/D14971 AFFECTED FILES src/desktoptheme/breeze/icons/video.svgz To: pstefan, ngraham, #vdg Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
ngraham requested changes to this revision. ngraham added a comment. This revision now requires changes to proceed. If we rename the icons, we will need to correspondingly change the OSD code itself to use the new names: https://cgit.kde.org/kscreen.git/tree/kded/qml/OsdSelector.qml#n51 Unfortunately, that code lives in `KScreen`, which uses the Plasma release schedule rather than the Frameworks schedule. Therefore we cannot guarantee that people will be using the right combination of the two pieces of code; it's perfectly possible for a distro to ship KDE Frameworks 5.50 (with the renamed files) but KDE Plasma 5.13.5 (which would use the old names). If these lived on-disk, I'd suggest just making a symlink. Can we do that here internally? Is there any way to give one image two names in the svgz file? Either way, that should be done in a separate commit. Please revert the name change and we'll do that later. It's important to keep patches as small as possible to keep the git history clean, and also make it easy to revert any individual change that caused problems. REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14971 To: pstefan, ngraham, #vdg Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
pstefan updated this revision to Diff 40143. pstefan added a comment. - Moved all OSD icons into video.svgz and renamed some of them. REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D14971?vs=40135=40143 BRANCH master REVISION DETAIL https://phabricator.kde.org/D14971 AFFECTED FILES src/desktoptheme/breeze/icons/video.svgz To: pstefan, ngraham, #vdg Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14971: Combine display OSD icon files and move to plasma icon theme
pstefan retitled this revision from "Combine display OSD icon files and mobe to plasma icon theme" to "Combine display OSD icon files and move to plasma icon theme". REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14971 To: pstefan, ngraham, #vdg Cc: kde-frameworks-devel, michaelh, ngraham, bruns
