"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/core/controller.cpp" between
flameshot-0.8.4.tar.gz and flameshot-0.8.5.tar.gz

About: Flameshot is a screenshot software (with markup tools).

controller.cpp  (flameshot-0.8.4):controller.cpp  (flameshot-0.8.5)
skipping to change at line 227 skipping to change at line 227
trayIconMenu->addAction(launcherAction); trayIconMenu->addAction(launcherAction);
trayIconMenu->addSeparator(); trayIconMenu->addSeparator();
trayIconMenu->addAction(configAction); trayIconMenu->addAction(configAction);
trayIconMenu->addAction(infoAction); trayIconMenu->addAction(infoAction);
trayIconMenu->addSeparator(); trayIconMenu->addSeparator();
trayIconMenu->addAction(quitAction); trayIconMenu->addAction(quitAction);
m_trayIcon = new QSystemTrayIcon(); m_trayIcon = new QSystemTrayIcon();
m_trayIcon->setToolTip(QStringLiteral("Flameshot")); m_trayIcon->setToolTip(QStringLiteral("Flameshot"));
m_trayIcon->setContextMenu(trayIconMenu); m_trayIcon->setContextMenu(trayIconMenu);
QIcon trayicon = QIcon::fromTheme( QIcon trayicon =
"flameshot-tray", QIcon(":img/app/org.flameshot.Flameshot.png")); QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png"));
m_trayIcon->setIcon(trayicon); m_trayIcon->setIcon(trayicon);
auto trayIconActivated = [this](QSystemTrayIcon::ActivationReason r) { auto trayIconActivated = [this](QSystemTrayIcon::ActivationReason r) {
if (r == QSystemTrayIcon::Trigger) { if (r == QSystemTrayIcon::Trigger) {
startVisualCapture(); startVisualCapture();
} }
}; };
connect(m_trayIcon, &QSystemTrayIcon::activated, this, trayIconActivated); connect(m_trayIcon, &QSystemTrayIcon::activated, this, trayIconActivated);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
skipping to change at line 263 skipping to change at line 263
ConfigHandler().setDisabledTrayIcon(true); ConfigHandler().setDisabledTrayIcon(true);
#endif #endif
} }
void Controller::sendTrayNotification(const QString& text, void Controller::sendTrayNotification(const QString& text,
const QString& title, const QString& title,
const int timeout) const int timeout)
{ {
if (m_trayIcon) { if (m_trayIcon) {
m_trayIcon->showMessage( m_trayIcon->showMessage(
title, text, QIcon(":img/app/org.flameshot.Flameshot.svg"), timeout); title, text, QIcon(":img/app/flameshot.svg"), timeout);
} }
} }
void Controller::updateConfigComponents() void Controller::updateConfigComponents()
{ {
if (m_configWindow) { if (m_configWindow) {
m_configWindow->updateChildren(); m_configWindow->updateChildren();
} }
} }
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)