From 476ba9e792b12b547b26343de787c2f4af722c93 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 2 Mar 2022 19:39:35 +0300 Subject: NewXstatusNotify: fix for background popup colors --- plugins/NewXstatusNotify/res/resource.rc | 4 ++-- plugins/NewXstatusNotify/src/options.cpp | 7 +++++++ plugins/NewXstatusNotify/src/options.h | 17 +++++++++++++---- plugins/NewXstatusNotify/src/resource.h | 24 ++++++++++++++---------- 4 files changed, 36 insertions(+), 16 deletions(-) (limited to 'plugins/NewXstatusNotify') diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc index d4793b9347..3c9cced358 100644 --- a/plugins/NewXstatusNotify/res/resource.rc +++ b/plugins/NewXstatusNotify/res/resource.rc @@ -128,7 +128,7 @@ BEGIN LTEXT "Free for chat",IDC_STATIC,10,118,56,8 CONTROL "",IDC_FREEFORCHAT_BG,"ColourPicker",WS_TABSTOP,73,116,24,12 CONTROL "",IDC_FREEFORCHAT_TX,"ColourPicker",WS_TABSTOP,106,116,24,12 - CONTROL "",IDC_INVISIBLE_BG,"ColourPicker",WS_TABSTOP,73,131,24,12 + CONTROL "",IDC_INVISIBLE_BG,"ColourPicker",WS_TABSTOP,73,131,24,12 CONTROL "",IDC_INVISIBLE_TX,"ColourPicker",WS_TABSTOP,106,131,24,12 LTEXT "Invisible",IDC_STATIC,10,133,56,8 LTEXT "Extra status",IDC_STATIC,10,178,56,8 @@ -220,7 +220,7 @@ BEGIN LTEXT "Disable when my status is:",IDC_STATIC,157,36,116,8 CONTROL "Online",IDC_CHK_ONLINE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,50,116,10 CONTROL "Invisible",IDC_CHK_INVISIBLE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,60,116,10 - CONTROL "Free for chat",IDC_CHK_FREECHAT2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,70,116,10 + CONTROL "Free for chat",IDC_CHK_FREECHAT2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,70,116,10 CONTROL "Away",IDC_CHK_AWAY2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,80,116,10 CONTROL "Not available",IDC_CHK_NA2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,90,116,10 CONTROL "Occupied",IDC_CHK_OCCUPIED2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,100,116,10 diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index ca81fac8ba..5852d4cbc9 100644 --- a/plugins/NewXstatusNotify/src/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp @@ -65,11 +65,13 @@ void LoadOptions() opt.PopupConnectionTimeout = g_plugin.getDword("PopupConnectionTimeout", 15); opt.LeftClickAction = g_plugin.getByte("LeftClickAction", 5); opt.RightClickAction = g_plugin.getByte("RightClickAction", 1); + // IDD_OPT_XPOPUP opt.PXOnConnect = g_plugin.getByte("PXOnConnect", 0); opt.PXDisableForMusic = g_plugin.getByte("PXDisableForMusic", 1); opt.PXMsgTruncate = g_plugin.getByte("PXMsgTruncate", 0); opt.PXMsgLen = g_plugin.getDword("PXMsgLen", 64); + // IDD_OPT_GENERAL opt.FromOffline = g_plugin.getByte("FromOffline", 1); opt.AutoDisable = g_plugin.getByte("AutoDisable", 0); @@ -79,10 +81,12 @@ void LoadOptions() opt.BlinkIcon_Status = g_plugin.getByte("BlinkIcon_Status", 0); opt.BlinkIcon_ForMsgs = g_plugin.getByte("BlinkIcon_ForMsgs", 0); DBGetStringDefault(0, "LogFilePath", opt.LogFilePath, MAX_PATH, L""); + // IDD_AUTODISABLE opt.OnlyGlobalChanges = g_plugin.getByte("OnlyGlobalChanges", 0); opt.DisablePopupGlobally = g_plugin.getByte("DisablePopupGlobally", 0); opt.DisableSoundGlobally = g_plugin.getByte("DisableSoundGlobally", 0); + // IDD_OPT_LOG opt.LogToFile = g_plugin.getByte("LogToFile", 0); opt.LogToDB = g_plugin.getByte("LogToDB", 0); @@ -93,16 +97,19 @@ void LoadOptions() opt.SMsgLogToDB = g_plugin.getByte("SMsgLogToDB", 0); opt.SMsgLogToDB_WinOpen = g_plugin.getByte("SMsgLogToDB_WinOpen", 1); opt.SMsgLogToDB_Remove = g_plugin.getByte("SMsgLogToDB_Remove", 0); + // IDD_OPT_XLOG opt.XLogToFile = g_plugin.getByte("XLogToFile", 0); opt.XLogToDB = g_plugin.getByte("XLogToDB", 0); opt.XLogToDB_WinOpen = g_plugin.getByte("XLogToDB_WinOpen", 1); opt.XLogToDB_Remove = g_plugin.getByte("XLogToDB_Remove", 0); opt.XLogDisableForMusic = g_plugin.getByte("XLogDisableForMusic", 1); + // IDD_OPT_SMPOPUP opt.PSMsgOnConnect = g_plugin.getByte("PSMsgOnConnect", 0); opt.PSMsgTruncate = g_plugin.getByte("PSMsgTruncate", 0); opt.PSMsgLen = g_plugin.getDword("PSMsgLen", 64); + // OTHER opt.TempDisabled = g_plugin.getByte("TempDisable", 0); opt.EnableLastSeen = g_plugin.getByte("EnableLastSeen", 0); diff --git a/plugins/NewXstatusNotify/src/options.h b/plugins/NewXstatusNotify/src/options.h index 1becf69abf..2355b7602f 100644 --- a/plugins/NewXstatusNotify/src/options.h +++ b/plugins/NewXstatusNotify/src/options.h @@ -24,7 +24,8 @@ #define DEFAULT_LOGFILE "NewStatusNotify.log" -typedef struct tagOPTIONS { +struct OPTIONS +{ // IDD_OPT_POPUP uint8_t Colors; uint8_t ShowGroup; @@ -36,11 +37,13 @@ typedef struct tagOPTIONS { UINT PopupConnectionTimeout; uint8_t LeftClickAction; uint8_t RightClickAction; + // IDD_OPT_XPOPUP uint8_t PXOnConnect; uint8_t PXDisableForMusic; uint8_t PXMsgTruncate; uint32_t PXMsgLen; + // IDD_OPT_GENERAL uint8_t FromOffline; uint8_t AutoDisable; @@ -50,10 +53,12 @@ typedef struct tagOPTIONS { uint8_t BlinkIcon_Status; uint8_t BlinkIcon_ForMsgs; wchar_t LogFilePath[MAX_PATH]; + // IDD_AUTODISABLE uint8_t OnlyGlobalChanges; uint8_t DisableSoundGlobally; uint8_t DisablePopupGlobally; + // IDD_OPT_LOG uint8_t LogToFile; uint8_t LogToDB; @@ -64,24 +69,28 @@ typedef struct tagOPTIONS { uint8_t SMsgLogToDB; uint8_t SMsgLogToDB_WinOpen; uint8_t SMsgLogToDB_Remove; + // IDD_OPT_XLOG uint8_t XLogToFile; uint8_t XLogToDB; uint8_t XLogToDB_WinOpen; uint8_t XLogToDB_Remove; uint8_t XLogDisableForMusic; + // IDD_OPT_SMPOPUP uint8_t PSMsgOnConnect; uint8_t PSMsgTruncate; uint32_t PSMsgLen; + // OTHER uint8_t TempDisabled; uint8_t PopupAutoDisabled; uint8_t SoundAutoDisabled; uint8_t EnableLastSeen; -} OPTIONS; +}; -typedef struct tagTEMPLATES { +struct TEMPLATES +{ uint8_t PopupXFlags; uint8_t PopupSMsgFlags; uint8_t LogXFlags; @@ -98,7 +107,7 @@ typedef struct tagTEMPLATES { wchar_t LogSMsgChanged[256]; wchar_t LogSMsgRemoved[256]; wchar_t LogSMsgOpening[256]; -} TEMPLATES; +}; int OptionsInitialize(WPARAM wParam, LPARAM lParam); void LoadOptions(); diff --git a/plugins/NewXstatusNotify/src/resource.h b/plugins/NewXstatusNotify/src/resource.h index a9c756c42e..4b3b9784f4 100644 --- a/plugins/NewXstatusNotify/src/resource.h +++ b/plugins/NewXstatusNotify/src/resource.h @@ -140,6 +140,8 @@ #define IDC_XLOGTODB_WINOPEN 2039 #define IDC_CHK_PREVENTIDENTICAL 2040 #define IDC_XLOGTODB 2040 +#define IDC_CHK_FROMOFFLINE 2041 + #define IDC_CHK_OFFLINE 40071 #define IDC_CHK_ONLINE 40072 #define IDC_CHK_AWAY 40073 @@ -150,7 +152,7 @@ #define IDC_CHK_INVISIBLE 40078 #define IDC_CHK_XSTATUS 40081 #define IDC_CHK_STATUS_MESSAGE 40082 -#define IDC_CHK_FROMOFFLINE 40083 + #define IDC_OFFLINE_TX 41071 #define IDC_ONLINE_TX 41072 #define IDC_AWAY_TX 41073 @@ -161,23 +163,25 @@ #define IDC_INVISIBLE_TX 41078 #define IDC_XSTATUS_TX 41081 #define IDC_STATUSMSG_TX 41082 + +#define IDC_CHK_ONLINE2 42072 +#define IDC_CHK_AWAY2 42073 +#define IDC_CHK_DND2 42074 +#define IDC_CHK_NA2 42075 +#define IDC_CHK_OCCUPIED2 42076 +#define IDC_CHK_FREECHAT2 42077 +#define IDC_CHK_INVISIBLE2 42078 + #define IDC_OFFLINE_BG 42071 #define IDC_ONLINE_BG 42072 -#define IDC_CHK_ONLINE2 42072 #define IDC_AWAY_BG 42073 -#define IDC_CHK_AWAY2 42073 #define IDC_DND_BG 42074 -#define IDC_CHK_DND2 42074 #define IDC_NA_BG 42075 -#define IDC_CHK_NA2 42075 #define IDC_OCCUPIED_BG 42076 -#define IDC_CHK_OCCUPIED2 42076 #define IDC_FREEFORCHAT_BG 42077 -#define IDC_CHK_FREECHAT2 42077 #define IDC_INVISIBLE_BG 42078 -#define IDC_CHK_INVISIBLE2 42078 -#define IDC_XSTATUS_BG 42079 -#define IDC_STATUSMSG_BG 42080 +#define IDC_XSTATUS_BG 42081 +#define IDC_STATUSMSG_BG 42082 // Next default values for new objects // -- cgit v1.2.3