Compare commits
10 Commits
166694e76a
...
8ffad5b9d2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8ffad5b9d2 | ||
|
|
fc22990a21 | ||
|
|
c036ac4930 | ||
|
|
ec6f1b6620 | ||
|
|
a65ea599e1 | ||
|
|
5b581d5a33 | ||
|
|
d440644d08 | ||
|
|
e87edc6a81 | ||
|
|
af7bc6bac2 | ||
|
|
702fc456fd |
@ -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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
BIN
kiran-flameshot-2.2.4.tar.gz
Normal file
BIN
kiran-flameshot-2.2.4.tar.gz
Normal file
Binary file not shown.
@ -1,6 +1,6 @@
|
||||
Name: kiran-flameshot
|
||||
Version: 2.2.2
|
||||
Release: 3
|
||||
Version: 2.2.4
|
||||
Release: 2%{?dist}
|
||||
|
||||
# Main code: GPLv3
|
||||
# Logo: Free Art License v1.3
|
||||
@ -14,8 +14,8 @@ 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
|
||||
Patch0: 0001-fix-translate-add-some-translation.patch
|
||||
|
||||
Patch0000: 0000-fix-Specify-trayicon-as-the-icon-in-the-resource-fil.patch
|
||||
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
BuildRequires: pkgconfig(Qt5Network)
|
||||
@ -30,6 +30,7 @@ BuildRequires: qt5-linguist
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc
|
||||
BuildRequires: kiran-log-qt5-devel
|
||||
BuildRequires: qt5-qtx11extras-devel
|
||||
BuildRequires: kiran-qt5-integration-devel
|
||||
|
||||
Requires: kiran-qt5-integration
|
||||
@ -77,8 +78,21 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/*.*
|
||||
|
||||
%changelog
|
||||
* Mon Apr 10 2023 wangyucheng <wangyucheng@kylinsec.om.cn> - 2.2.2-2
|
||||
- KYOS-T: add some translation
|
||||
* 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
|
||||
|
||||
* Thu Nov 23 2023 luoqing <luoqing@kylinsec.om.cn> - 2.2.3-3
|
||||
- KYOS-F: Fix the autostart failure (#20621,#21058)
|
||||
|
||||
* Tue Oct 10 2023 wangyucheng <wangyucheng@kylinsec.om.cn> - 2.2.3-2
|
||||
- KYOS-F: fix(ButtonHandler): fix issue that program will stick when multi screen (#17107, #17108)
|
||||
|
||||
* Tue Aug 22 2023 yinhongchang <yinhongchang@kylinsec.com.cn> - 2.2.3-1
|
||||
- KYOS-F:add some translation(#67661)
|
||||
- KYOS-F:add windows capture mode
|
||||
|
||||
* Thu Aug 04 2022 luoqing <luoqing@kylinsec.com.cn> - 2.2.2-2
|
||||
- KYOS-F: Modify license
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user