packages/ukui-media
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix vol icon bug

Browse Source
This commit is contained in:
myshow 2020-12-07 15:53:56 +08:00
parent 104e64db0f
commit 686b60cd39
3 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
0001-fix-vol-icon-bug.patch Normal file
View File

@ -0,0 +1,48 @@
From e4350a375389f7a4484c890b1e1413bcd1a00b4a Mon Sep 17 00:00:00 2001
From: myshow <296570182@qq.com>
Date: Mon, 7 Dec 2020 15:50:18 +0800
Subject: [PATCH] fix-vol-icon-bug
---
.../ukmedia_device_volume_widget.cpp | 4 ++--
.../ukui-volume-control-applet-qt.pro | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ukui-volume-control-applet-qt/ukmedia_device_volume_widget.cpp b/ukui-volume-control-applet-qt/ukmedia_device_volume_widget.cpp
index 90ee766..94a01fb 100644
--- a/ukui-volume-control-applet-qt/ukmedia_device_volume_widget.cpp
+++ b/ukui-volume-control-applet-qt/ukmedia_device_volume_widget.cpp
@@ -82,7 +82,7 @@ void UkmediaDeviceWidget::noInputWidgetInit()
//设置输入输出音量图标
outputDeviceBtn->setFixedSize(iconSize);
outputDeviceBtn->setIconSize(iconSize);
-#if (QT_VERSION <= QT_VERSION_CHECK(5,6,1))
+#if (QT_VERSION <= QT_VERSION_CHECK(5,12,1))
outputDeviceBtn->setIcon(QIcon("/usr/share/icons/ukui-icon-theme-classical/scalable/devices/audio-card.svg"));
#elif (QT_VERSION > QT_VERSION_CHECK(5,6,1))
outputDeviceBtn->setIcon(QIcon("/usr/share/ukui-media/img/audiocard.svg"));
@@ -132,7 +132,7 @@ void UkmediaDeviceWidget::inputWidgetShow()
//设置输入输出音量图标
inputDeviceBtn->setFixedSize(iconSize);
inputDeviceBtn->setIconSize(iconSize);
-#if (QT_VERSION <= QT_VERSION_CHECK(5,6,1))
+#if (QT_VERSION <= QT_VERSION_CHECK(5,12,1))
inputDeviceBtn->setIcon(QIcon("/usr/share/icons/ukui-icon-theme-classical/scalable/devices/audio-input-microphone.svg"));
#elif (QT_VERSION > QT_VERSION_CHECK(5,6,1))
inputDeviceBtn->setIcon(QIcon("/usr/share/ukui-media/img/audio-input-microphone.svg"));
diff --git a/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro b/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
index edf8db9..728edd9 100644
--- a/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
+++ b/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
@@ -70,7 +70,7 @@ TRANSLATIONS += \
translations/tr.ts \
translations/bo.ts
-system("lrelease translations/*.ts")
+system("lrelease-qt5 translations/*.ts")
qm_file.files = translations/*.qm
qm_file.path = $${PREFIX}/translations/
--
2.29.2.windows.2

12
fix-ukui-media-translation.patch
View File

@ -1,12 +0,0 @@
diff -ur ukui-media-3.0.1/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro ukui-media-3.0.1~/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
--- ukui-media-3.0.1/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro 2020-08-25 21:26:30.000000000 +0800
+++ ukui-media-3.0.1~/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro 2020-10-26 14:56:13.217573360 +0800
@@ -70,7 +70,7 @@
translations/tr.ts \
translations/bo.ts
-system("lrelease translations/*.ts")
+system("lrelease-qt5 translations/*.ts")
qm_file.files = translations/*.qm
qm_file.path = $${PREFIX}/translations/

9
ukui-media.spec
View File

@ -1,6 +1,6 @@
Name: ukui-media
Version: 3.0.2
Release: 1
Release: 2
Summary: UKUI media utilities
License: GPL-2+ GPL-3+ LGPL-2+ BSD-3-Clause
URL: http://www.ukui.org
@ -32,7 +32,7 @@ Requires: ukui-media-common = %{version}
Recommends: alsa-utils sound-theme-freedesktop
patch0: fix-ukui-media-translation.patch
patch0: 0001-fix-vol-icon-bug.patch
%description
A simple and lightweight screensaver written by Qt5.
@ -91,7 +91,7 @@ set -e
glib-compile-schemas /usr/share/glib-2.0/schemas/
%files
%files
%doc debian/changelog debian/copyright
%{_bindir}/ukui-volume-control
%{_bindir}/ukui-volume-control-applet
@ -112,6 +112,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/
%{_datadir}/glib-2.0/
%changelog
* Mon Dec 7 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-2
- fix vol icon bug
* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.2-1
- update to upstream version 3.0.1-1+1026