benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'flameshot-org-master' into bugfix/memory-leak

Browse Source 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	data/graphics.qrc
#	src/config/configwindow.cpp
#	src/tools/imgur/imguruploader.cpp
This commit is contained in:
Yuriy Puchkov
2020-10-11 20:49:15 +03:00
parent a472648263 ac7142c4df
commit c92f8e3014
26 changed files with 153 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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/flameshot.png"));
QIcon trayicon = QIcon::fromTheme(
"flameshot-tray", QIcon(":img/app/org.flameshot.Flameshot.png"));
m_trayIcon->setIcon(trayicon);
auto trayIconActivated = [this](QSystemTrayIcon::ActivationReason r) {
@@ -249,6 +249,13 @@ void Controller::enableTrayIcon()
}
};
connect(m_trayIcon, &QSystemTrayIcon::activated, this, trayIconActivated);
#ifdef Q_OS_WIN
// Ensure proper removal of tray icon when program quits on Windows.
connect(
qApp, &QCoreApplication::aboutToQuit, m_trayIcon, &QSystemTrayIcon::hide);
#endif
m_trayIcon->show();
if (ConfigHandler().showStartupLaunchMessage()) {
m_trayIcon->showMessage(
@@ -277,7 +284,7 @@ void Controller::sendTrayNotification(const QString& text,
{
if (m_trayIcon) {
m_trayIcon->showMessage(
title, text, QIcon(":img/app/flameshot.svg"), timeout);
title, text, QIcon(":img/app/org.flameshot.Flameshot.svg"), timeout);
}
}