From 5f7f6d898f36d748cbbb58f0681a4ebad65b084d Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 15 Aug 2016 21:02:59 +0200 Subject: [PATCH] Fix some buggs when refactored. --- src/gui/settings/settingsfeedsmessages.cpp | 1 + src/miscellaneous/application.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gui/settings/settingsfeedsmessages.cpp b/src/gui/settings/settingsfeedsmessages.cpp index 70f068225..a33871c89 100755 --- a/src/gui/settings/settingsfeedsmessages.cpp +++ b/src/gui/settings/settingsfeedsmessages.cpp @@ -41,6 +41,7 @@ SettingsFeedsMessages::SettingsFeedsMessages(Settings *settings, QWidget *parent connect(m_ui->m_checkUpdateAllFeedsOnStartup, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings); connect(m_ui->m_spinAutoUpdateInterval, static_cast(&QDoubleSpinBox::valueChanged), this, &SettingsFeedsMessages::dirtifySettings); + connect(m_ui->m_checkAutoUpdate, &QCheckBox::toggled, m_ui->m_spinAutoUpdateInterval, &TimeSpinBox::setEnabled); connect(m_ui->m_spinFeedUpdateTimeout, static_cast(&QSpinBox::valueChanged), this, &SettingsFeedsMessages::dirtifySettings); connect(m_ui->m_cmbMessagesDateTimeFormat, static_cast(&QComboBox::currentIndexChanged), this, &SettingsFeedsMessages::dirtifySettings); connect(m_ui->m_cmbCountsFeedList, &QComboBox::currentTextChanged, this, &SettingsFeedsMessages::dirtifySettings); diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp index 3c523ab2f..ac475e2b7 100755 --- a/src/miscellaneous/application.cpp +++ b/src/miscellaneous/application.cpp @@ -230,8 +230,8 @@ void Application::processExecutionMessage(const QString &message) { if (messages.contains(APP_QUIT_INSTANCE)) { quit(); } - else { - foreach (const QString &msg, message.split(ARGUMENTS_LIST_SEPARATOR)) { + else if (!m_runMinimalWithoutGui) { + foreach (const QString &msg, messages) { if (msg == APP_IS_RUNNING) { showGuiMessage(APP_NAME, tr("Application is already running."), QSystemTrayIcon::Information); mainForm()->display(); @@ -284,7 +284,10 @@ void Application::showGuiMessage(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon message_type, QWidget *parent, bool show_at_least_msgbox, QObject *invokation_target, const char *invokation_slot) { - if (SystemTrayIcon::areNotificationsEnabled() && SystemTrayIcon::isSystemTrayActivated()) { + if (m_runMinimalWithoutGui) { + qDebug("Silencing GUI message: '%s'.", qPrintable(message)); + } + else if (SystemTrayIcon::areNotificationsEnabled() && SystemTrayIcon::isSystemTrayActivated()) { trayIcon()->showMessage(title, message, message_type, TRAY_ICON_BUBBLE_TIMEOUT, invokation_target, invokation_slot); } else if (show_at_least_msgbox) {