fix(*): Specify trayicon as the icon in the resource file, without using the theme icon.
- 指定 trayicon 为资源文件中图标,不使用主题图标。防止部分系统有差异
This commit is contained in:
parent
c036ac4930
commit
fc22990a21
@ -0,0 +1,32 @@
|
||||
From e66ba013a3d58e47859f2ea2e81659667a82421e Mon Sep 17 00:00:00 2001
|
||||
From: youzhengcai <youzhengcai@kylinsec.com.cn>
|
||||
Date: Mon, 15 Apr 2024 15:19:34 +0800
|
||||
Subject: [PATCH] fix(*): Specify trayicon as the icon in the resource file,
|
||||
without using the theme icon.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 指定 trayicon 为资源文件中图标,不使用主题图标。防止部分系统有差异
|
||||
|
||||
#35052
|
||||
---
|
||||
src/core/controller.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/core/controller.cpp b/src/core/controller.cpp
|
||||
index 36abfbf..60e0228 100644
|
||||
--- a/src/core/controller.cpp
|
||||
+++ b/src/core/controller.cpp
|
||||
@@ -254,7 +254,7 @@ void Controller::enableTrayIcon() {
|
||||
m_trayIcon = new QSystemTrayIcon();
|
||||
m_trayIcon->setToolTip(tr("click to take screenshot"));
|
||||
m_trayIcon->setContextMenu(trayIconMenu);
|
||||
- QIcon trayicon = QIcon::fromTheme("flameshot-tray", QIcon(":img/app/kiran128x128.png"));
|
||||
+ QIcon trayicon = QIcon(":img/app/kiran128x128.png");
|
||||
m_trayIcon->setIcon(trayicon);
|
||||
|
||||
connect(m_trayIcon,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: kiran-flameshot
|
||||
Version: 2.2.4
|
||||
Release: 1
|
||||
Release: 2%{?dist}
|
||||
|
||||
# Main code: GPLv3
|
||||
# Logo: Free Art License v1.3
|
||||
@ -15,6 +15,7 @@ Summary: Powerful and simple to use screenshot software
|
||||
URL: https://github.com/lupoDharkael/flameshot
|
||||
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch0000: 0000-fix-Specify-trayicon-as-the-icon-in-the-resource-fil.patch
|
||||
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
BuildRequires: pkgconfig(Qt5Network)
|
||||
@ -77,6 +78,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/*.*
|
||||
|
||||
%changelog
|
||||
* Apr Mon 15 2024 youzhengcai <youzhengcai@kylinsec.om.cn> - 2.2.4-2
|
||||
- KYOS-F: Specify trayicon as the icon in the resource file. (#35052)
|
||||
|
||||
* Fri Nov 24 2023 luoqing <luoqing@kylinsec.om.cn> - 2.2.4-1
|
||||
- rebuild
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user