From 078a38b1475fd7392a091235dfa2f1e45e7cfb4d Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Mon, 5 Feb 2018 19:20:38 -0600 Subject: [PATCH] plugin-volume: Use a specific icon for the panel. --- debian/changelog | 3 ++ debian/patches/series | 1 + debian/patches/use-specific-panel-icon.patch | 32 ++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 debian/patches/use-specific-panel-icon.patch diff --git a/debian/changelog b/debian/changelog index 3d9cab8..8041176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ lxqt-panel (0.12.0-8ubuntu1) UNRELEASED; urgency=medium - Fix wrongly positioned popups (LP: #1527013). + fix-wrongly-positioned-popups.patch + Upstream commit 7391172. + - plugin-volume: Use a specific icon for the panel. + + use-specific-panel-icon.patch + + Upstream commit eaa65e5. -- Simon Quigley Mon, 05 Feb 2018 19:00:18 -0600 diff --git a/debian/patches/series b/debian/patches/series index 77a0720..b008c2d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ plugin-volume-mixer.patch # Ubuntu-specific patches fix-wrongly-positioned-popups.patch +use-specific-panel-icon.patch diff --git a/debian/patches/use-specific-panel-icon.patch b/debian/patches/use-specific-panel-icon.patch new file mode 100644 index 0000000..c89c8e0 --- /dev/null +++ b/debian/patches/use-specific-panel-icon.patch @@ -0,0 +1,32 @@ +Description: plugin-volume: Use a specific icon for the panel + Some "modern" icon themes have a specific panel icon for volumes. + Arc, deepin, Faenza, Faience, Flattr, matefaenza, Menda-Circle, Numix, + Numix-Light, Numix-uTouch, Paper, Papirus and it's derivatives are examples + of that. +Author: Luís Pereira +Origin: backport +Bug: https://github.com/lxde/lxqt-panel/pull/441 +Applied-Upstream: commit:eaa65e5 +Reviewed-by: +Last-Update: 2018-02-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/plugin-volume/volumepopup.cpp ++++ b/plugin-volume/volumepopup.cpp +@@ -64,7 +64,7 @@ VolumePopup::VolumePopup(QWidget* parent + m_volumeSlider->installEventFilter(this); + + m_muteToggleButton = new QPushButton(this); +- m_muteToggleButton->setIcon(XdgIcon::fromTheme(QStringList() << "audio-volume-muted")); ++ m_muteToggleButton->setIcon(XdgIcon::fromTheme(QLatin1String("audio-volume-muted-panel"))); + m_muteToggleButton->setCheckable(true); + m_muteToggleButton->setAutoDefault(false); + +@@ -171,6 +171,7 @@ void VolumePopup::updateStockIcon() + else + iconName = "audio-volume-high"; + ++ iconName.append(QLatin1String("-panel")); + m_muteToggleButton->setIcon(XdgIcon::fromTheme(iconName)); + emit stockIconChanged(iconName); + }