fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-22 17:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'flameshot-org-master' into merge-from-upstream

Browse Source 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	appveyor.yml
#	data/graphics.qrc
#	src/tools/imgur/imguruploader.cpp
This commit is contained in:
Yuriy Puchkov
2020-10-15 15:44:49 +03:00
parent b8617df258 376a6f2a9c
commit 654455e9ac
37 changed files with 225 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/controller.cpp
View File

@@ -239,8 +239,8 @@ void Controller::enableTrayIcon()
m_trayIcon = new QSystemTrayIcon();
m_trayIcon->setToolTip(QStringLiteral("Flameshot"));
m_trayIcon->setContextMenu(trayIconMenu);
QIcon trayicon = QIcon::fromTheme(
"flameshot-tray", QIcon(":img/app/org.flameshot.Flameshot.png"));
QIcon trayicon =
QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png"));
m_trayIcon->setIcon(trayicon);
auto trayIconActivated = [this](QSystemTrayIcon::ActivationReason r) {
@@ -284,7 +284,7 @@ void Controller::sendTrayNotification(const QString& text,
{
if (m_trayIcon) {
m_trayIcon->showMessage(
title, text, QIcon(":img/app/org.flameshot.Flameshot.svg"), timeout);
title, text, QIcon(":img/app/flameshot.svg"), timeout);
}
}