diff options
| author | George Hazan <ghazan@miranda.im> | 2023-03-20 13:40:01 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-03-20 13:40:01 +0300 |
| commit | 54b2cd28874a94509275206e8869d0d26eabd451 (patch) | |
| tree | 57730f7a26ab56a8f62bcadd66a88c96f2bff68a /include | |
| parent | 43eaa430b1e56d4465bfbbbb9f8540f14bc2bae2 (diff) | |
fixes #3439 (Scriver/StdMsg: unified popup & tray icon settings with the same default values)
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_chat.h | 7 | ||||
| -rw-r--r-- | include/m_chat_int.h | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/include/m_chat.h b/include/m_chat.h index 49a636f220..1c628bf8d6 100644 --- a/include/m_chat.h +++ b/include/m_chat.h @@ -345,9 +345,10 @@ MIR_APP_DLL(struct SESSION_INFO*) Chat_NewSession( // Error messages
#define GC_EVENT_ERROR 2 // An internal error occurred.
-#define GC_EVENT_ALL (GC_EVENT_ACTION | GC_EVENT_MESSAGE | GC_EVENT_NICK | GC_EVENT_JOIN | \
- GC_EVENT_PART | GC_EVENT_TOPIC | GC_EVENT_ADDSTATUS | GC_EVENT_INFORMATION | GC_EVENT_QUIT | \
- GC_EVENT_KICK | GC_EVENT_NOTICE)
+// By default users see only those events
+#define GC_EVENT_FILTERED (GC_EVENT_ACTION | GC_EVENT_INFORMATION | GC_EVENT_TOPIC | GC_EVENT_MESSAGE | GC_EVENT_NOTICE)
+
+#define GC_EVENT_ALL (GC_EVENT_FILTERED | GC_EVENT_NICK | GC_EVENT_JOIN | GC_EVENT_PART | GC_EVENT_ADDSTATUS | GC_EVENT_QUIT | GC_EVENT_KICK)
// The GCEVENT structure
diff --git a/include/m_chat_int.h b/include/m_chat_int.h index 8d5fa8a393..f5d86317ca 100644 --- a/include/m_chat_int.h +++ b/include/m_chat_int.h @@ -154,7 +154,7 @@ struct MIR_APP_EXPORT SESSION_INFO : public MZeroedObject, public MNonCopyable int iType;
int iEventCount;
int iStatusCount;
- int iLogTrayFlags, iLogPopupFlags;
+ int iTrayFlags, iPopupFlags;
uint16_t wStatus;
uint16_t wState;
@@ -218,8 +218,6 @@ struct GlobalLogSettingsBase bool bShowContactStatus;
bool bContactStatusFirst;
uint32_t dwIconFlags;
- uint32_t dwTrayIconFlags;
- uint32_t dwPopupFlags;
int LogIconSize;
int LogTextIndent;
int LoggingLimit;
@@ -412,6 +410,13 @@ namespace Chat bLogIndentEnabled,
bLogLimitNames,
bStripFormat;
+
+ extern MIR_APP_EXPORT CMOption<uint32_t>
+ iPopupFlags,
+ iSoundFlags,
+ iFilterFlags,
+ iDiskLogFlags,
+ iTrayIconFlags;
};
#endif // M_CHAT_INT_H__
|