From a2eb47d7e4c3606fb9968ff6ecdd80e9d35812a3 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 3 Nov 2021 22:17:01 +0100 Subject: [PATCH] fixes for disabling notification feature --- src/gui/qt-daemon/application/mainwindow.cpp | 10 +++++++--- src/gui/qt-daemon/application/mainwindow.h | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gui/qt-daemon/application/mainwindow.cpp b/src/gui/qt-daemon/application/mainwindow.cpp index 5f0347e4..4313ca65 100644 --- a/src/gui/qt-daemon/application/mainwindow.cpp +++ b/src/gui/qt-daemon/application/mainwindow.cpp @@ -865,6 +865,10 @@ bool MainWindow::money_transfer(const view::transfer_event_info& tei) LOG_PRINT_L0(get_wallet_log_prefix(tei.wallet_id) + "SENDING SIGNAL -> [money_transfer]" << std::endl << json_str); //this->money_transfer(json_str.c_str()); QMetaObject::invokeMethod(this, "money_transfer", Qt::QueuedConnection, Q_ARG(QString, json_str.c_str())); + if (m_config.disable_notifications) + return true; + + if (!m_tray_icon) return true; if (!tei.ti.is_income) @@ -883,7 +887,7 @@ bool MainWindow::money_transfer(const view::transfer_event_info& tei) return true; } - auto amount_str = currency::print_money(tei.ti.amount); + auto amount_str = currency::print_money_brief(tei.ti.amount); std::string title, msg; if (tei.ti.height == 0) // unconfirmed trx { @@ -900,8 +904,8 @@ bool MainWindow::money_transfer(const view::transfer_event_info& tei) else if (tei.ti.unlock_time) msg += m_localization[localization_id_locked]; - if(!m_config.disable_notifications) - show_notification(title, msg); + + show_notification(title, msg); return true; CATCH_ENTRY2(false); diff --git a/src/gui/qt-daemon/application/mainwindow.h b/src/gui/qt-daemon/application/mainwindow.h index 58bcb4ff..3c67b509 100644 --- a/src/gui/qt-daemon/application/mainwindow.h +++ b/src/gui/qt-daemon/application/mainwindow.h @@ -181,6 +181,7 @@ signals: void do_dispatch(const QString status, const QString params); //general function void on_core_event(const QString method_name); //general function void set_options(const QString str); //general function + void get_wallet_name(); private: //-------------------- i_core_event_handler -------------------- @@ -259,7 +260,7 @@ private: enum localization_string_indices { - // order is surprizingly important here! (see also updateLocalisation in AppController.js) + // order is surprisingly important here! (see also updateLocalisation in AppController.js) localization_id_quit = 0, localization_id_is_received, localization_id_is_confirmed,