From 5dd8452652544890fbc00501b2ba312cfd97beff Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 9 Dec 2023 15:34:29 +0300 Subject: DB::EventInfo.isAlertable - a helper to detect whether a SRMM window should be raised for an event or not --- include/m_database.h | 1 + libs/win32/mir_app.lib | Bin 275042 -> 275338 bytes libs/win64/mir_app.lib | Bin 274316 -> 274616 bytes src/mir_app/src/db_events.cpp | 13 +++++++++++++ src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 6 files changed, 16 insertions(+) diff --git a/include/m_database.h b/include/m_database.h index 9df09c881e..caf2546e42 100644 --- a/include/m_database.h +++ b/include/m_database.h @@ -694,6 +694,7 @@ namespace DB bool isSrmm() const; // could be displayed in a SRMM window bool isHistory() const; // could be displayed in a history window + bool isAlertable() const; // should raise SRMM window wchar_t* getString(const char *str) const; }; diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index da68ce9908..ad1c864412 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index 1775aa7f3d..b5d800acb8 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/src/mir_app/src/db_events.cpp b/src/mir_app/src/db_events.cpp index 7026fe8905..cee5015c96 100644 --- a/src/mir_app/src/db_events.cpp +++ b/src/mir_app/src/db_events.cpp @@ -301,6 +301,19 @@ bool DB::EventInfo::isHistory() const return et && et->flags & DETF_HISTORY; } +bool DB::EventInfo::isAlertable() const +{ + if (eventType == EVENTTYPE_MESSAGE) + return true; + + if (eventType == EVENTTYPE_FILE) { + DB::FILE_BLOB blob(*this); + return blob.isOffline(); + } + + return false; +} + wchar_t* DB::EventInfo::getString(const char *str) const { if (flags & DBEF_UTF) diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 070dbf3b52..c93fc79d87 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -916,3 +916,4 @@ Clist_GroupSaveExpanded @1003 NONAME ?onClick_CloseQuote@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @1034 NONAME ?fetch@EventInfo@DB@@QAE_NI_N@Z @1035 NONAME ?unload@EventInfo@DB@@QAEXXZ @1036 NONAME +?isAlertable@EventInfo@DB@@QBE_NXZ @1037 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index ea073ca0d2..0284e7cbcd 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -916,3 +916,4 @@ Clist_GroupSaveExpanded @1003 NONAME ?onClick_CloseQuote@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @1034 NONAME ?fetch@EventInfo@DB@@QEAA_NI_N@Z @1035 NONAME ?unload@EventInfo@DB@@QEAAXXZ @1036 NONAME +?isAlertable@EventInfo@DB@@QEBA_NXZ @1037 NONAME -- cgit v1.2.3