49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
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
|
|
|