summaryrefslogtreecommitdiff
path: root/plugins/Popup/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Popup/src')
-rw-r--r--plugins/Popup/src/actions.cpp16
-rw-r--r--plugins/Popup/src/avatars.cpp2
-rw-r--r--plugins/Popup/src/config.cpp2
-rw-r--r--plugins/Popup/src/font.h2
-rw-r--r--plugins/Popup/src/history.cpp6
-rw-r--r--plugins/Popup/src/icons.cpp6
-rw-r--r--plugins/Popup/src/main.cpp16
-rw-r--r--plugins/Popup/src/opt_adv.cpp72
-rw-r--r--plugins/Popup/src/opt_contacts.cpp4
-rw-r--r--plugins/Popup/src/opt_gen.cpp82
-rw-r--r--plugins/Popup/src/opt_skins.cpp28
-rw-r--r--plugins/Popup/src/popup_thread.cpp2
-rw-r--r--plugins/Popup/src/services.cpp6
-rw-r--r--plugins/Popup/src/skin.cpp6
-rw-r--r--plugins/Popup/src/srmm_menu.cpp14
-rw-r--r--plugins/Popup/src/stdafx.h10
16 files changed, 138 insertions, 136 deletions
diff --git a/plugins/Popup/src/actions.cpp b/plugins/Popup/src/actions.cpp
index 480c2ac5be..5839b0c752 100644
--- a/plugins/Popup/src/actions.cpp
+++ b/plugins/Popup/src/actions.cpp
@@ -138,13 +138,13 @@ DWORD MouseOverride(HWND hCombo, int number)
void LoadOption_Actions()
{
- PopupOptions.actions = db_get_dw(NULL, MODULNAME, "Actions",
+ PopupOptions.actions = db_get_dw(NULL, MODULENAME, "Actions",
ACT_ENABLE | ACT_RIGHTICONS | ACT_DEF_KEEPWND | ACT_DEF_IMONLY |
ACT_DEF_NOGLOBAL | ACT_DEF_MESSAGE | ACT_DEF_DETAILS | ACT_DEF_MENU |
ACT_DEF_ADD | ACT_DEF_DISMISS | ACT_DEF_PIN);
- PopupOptions.overrideLeft = db_get_dw(NULL, MODULNAME, "OverrideLeft", 0);
- PopupOptions.overrideMiddle = db_get_dw(NULL, MODULNAME, "OverrideMiddle", 0);
- PopupOptions.overrideRight = db_get_dw(NULL, MODULNAME, "OverrideRight", 0);
+ PopupOptions.overrideLeft = db_get_dw(NULL, MODULENAME, "OverrideLeft", 0);
+ PopupOptions.overrideMiddle = db_get_dw(NULL, MODULENAME, "OverrideMiddle", 0);
+ PopupOptions.overrideRight = db_get_dw(NULL, MODULENAME, "OverrideRight", 0);
}
static UINT controls[] =
@@ -340,7 +340,7 @@ INT_PTR CALLBACK DlgProcPopupActions(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
break;
case PSN_APPLY:
- db_set_dw(NULL, MODULNAME, "Actions", PopupOptions.actions);
+ db_set_dw(NULL, MODULENAME, "Actions", PopupOptions.actions);
HWND hwndList = GetDlgItem(hwnd, IDC_ACTIONS);
for (int i = 0; i < gActions.getCount(); ++i) {
@@ -349,9 +349,9 @@ INT_PTR CALLBACK DlgProcPopupActions(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
}
// overrideActions
- db_set_dw(NULL, MODULNAME, "OverrideLeft", PopupOptions.overrideLeft);
- db_set_dw(NULL, MODULNAME, "OverrideMiddle", PopupOptions.overrideMiddle);
- db_set_dw(NULL, MODULNAME, "OverrideRight", PopupOptions.overrideRight);
+ db_set_dw(NULL, MODULENAME, "OverrideLeft", PopupOptions.overrideLeft);
+ db_set_dw(NULL, MODULENAME, "OverrideMiddle", PopupOptions.overrideMiddle);
+ db_set_dw(NULL, MODULENAME, "OverrideRight", PopupOptions.overrideRight);
}
break;
diff --git a/plugins/Popup/src/avatars.cpp b/plugins/Popup/src/avatars.cpp
index d099ddbd73..e3e531fcfb 100644
--- a/plugins/Popup/src/avatars.cpp
+++ b/plugins/Popup/src/avatars.cpp
@@ -30,7 +30,7 @@ PopupAvatar *PopupAvatar::create(MCONTACT hContact)
AVATARCACHEENTRY *av = (AVATARCACHEENTRY*)CallService(MS_AV_GETAVATARBITMAP, hContact, 0);
if (av && (mir_wstrlen(av->szFilename) > 4))
if (!mir_wstrcmpi(av->szFilename + mir_wstrlen(av->szFilename) - 4, L".gif"))
- if (db_get_b(NULL, MODULNAME, "EnableGifAnimation", 1) && GDIPlus_IsAnimatedGIF(av->szFilename))
+ if (db_get_b(NULL, MODULENAME, "EnableGifAnimation", 1) && GDIPlus_IsAnimatedGIF(av->szFilename))
return new GifAvatar(hContact);
}
}
diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp
index dc5e5dfdae..6abf66ddd5 100644
--- a/plugins/Popup/src/config.cpp
+++ b/plugins/Popup/src/config.cpp
@@ -46,7 +46,7 @@ void LoadOptions()
{
memset(&PopupOptions, 0, sizeof(PopupOptions));
#if defined(_DEBUG)
- PopupOptions.debug = db_get_b(NULL, MODULNAME, "debug", FALSE);
+ PopupOptions.debug = db_get_b(NULL, MODULENAME, "debug", FALSE);
#endif
// Load Popup Options
diff --git a/plugins/Popup/src/font.h b/plugins/Popup/src/font.h
index 3975a53c88..6b2b473499 100644
--- a/plugins/Popup/src/font.h
+++ b/plugins/Popup/src/font.h
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//basic constants for all popup plugins
#define PU_FNT_AND_COLOR LPGEN("Popups") //common main group for customice\font&color
-#define PU_FNT_AND_COLOR_DB MODULNAME //use eg mir_strcpy(fid.dbSettingsGroup, PU_FNT_GROUP_DB);
+#define PU_FNT_AND_COLOR_DB MODULENAME //use eg mir_strcpy(fid.dbSettingsGroup, PU_FNT_GROUP_DB);
#define PU_FNT_PREFIX "fnt%s" //use eg mir_snprintf(fid.prefix, _countof(fid.prefix), PU_FNT_PREFIX, PU_FNT_NAME_....);
#define PU_FNT_NAME_TITLE LPGEN("Title")
diff --git a/plugins/Popup/src/history.cpp b/plugins/Popup/src/history.cpp
index 5c191b2d7c..683ed6ec23 100644
--- a/plugins/Popup/src/history.cpp
+++ b/plugins/Popup/src/history.cpp
@@ -56,7 +56,7 @@ void PopupHistoryResize()
void PopupHistoryLoad()
{
- popupHistoryBuffer = db_get_w(NULL, MODULNAME, "HistorySize", SETTING_HISTORYSIZE_DEFAULT);
+ popupHistoryBuffer = db_get_w(NULL, MODULENAME, "HistorySize", SETTING_HISTORYSIZE_DEFAULT);
}
void PopupHistoryUnload()
@@ -209,7 +209,7 @@ static INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM, LPARAM lPara
ShowWindow(hwndLog, SW_SHOW);
}
- Utils_RestoreWindowPosition(hwnd, NULL, MODULNAME, "popupHistory_");
+ Utils_RestoreWindowPosition(hwnd, NULL, MODULENAME, "popupHistory_");
if (logType == LOG_DEFAULT) {
SendMessage(hwnd, UM_RESIZELIST, 0, 0);
@@ -396,7 +396,7 @@ static INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM, LPARAM lPara
return TRUE;
case WM_CLOSE:
- Utils_SaveWindowPosition(hwnd, NULL, MODULNAME, "popupHistory_");
+ Utils_SaveWindowPosition(hwnd, NULL, MODULENAME, "popupHistory_");
DestroyWindow(hwnd);
hwndHistory = nullptr;
return TRUE;
diff --git a/plugins/Popup/src/icons.cpp b/plugins/Popup/src/icons.cpp
index 77d01cc3a8..de1de4b60f 100644
--- a/plugins/Popup/src/icons.cpp
+++ b/plugins/Popup/src/icons.cpp
@@ -68,9 +68,9 @@ static IconItem iconList3[] =
void InitIcons()
{
- g_plugin.registerIcon(SECT_POPUP, iconList1, MODULNAME);
- g_plugin.registerIcon(SECT_POPUP SECT_POPUP_OPT, iconList2, MODULNAME);
- g_plugin.registerIcon(SECT_POPUP SECT_POPUP_ACT, iconList3, MODULNAME);
+ g_plugin.registerIcon(SECT_POPUP, iconList1, MODULENAME);
+ g_plugin.registerIcon(SECT_POPUP SECT_POPUP_OPT, iconList2, MODULENAME);
+ g_plugin.registerIcon(SECT_POPUP SECT_POPUP_ACT, iconList3, MODULENAME);
}
HICON LoadIconEx(int iconId, bool big)
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index ad6cfe6336..3e6756c3ba 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -247,7 +247,7 @@ static int ModulesLoaded(WPARAM, LPARAM)
// Uninstalling purposes
if (ServiceExists("PluginSweeper/Add"))
- CallService("PluginSweeper/Add", (WPARAM)Translate(MODULNAME), (LPARAM)MODULNAME);
+ CallService("PluginSweeper/Add", (WPARAM)Translate(MODULENAME), (LPARAM)MODULENAME);
// load fonts / create hook
InitFonts();
@@ -298,12 +298,19 @@ PLUGININFOEX pluginInfoEx =
{ 0x26a9125d, 0x7863, 0x4e01, { 0xaf, 0xe, 0xd1, 0x4e, 0xf9, 0x5c, 0x50, 0x54 } }
};
+CMPlugin::CMPlugin() :
+ PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)
+{}
+
MIRAPI PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
return &pluginInfoEx;
}
-// called before the app goes into shutdown routine to make sure everyone is happy to exit
+//===== Load ============================================================================
+// Initializes the services provided and the link to those needed
+// Called when the plugin is loaded into Miranda
+
static int OkToExit(WPARAM, LPARAM)
{
closing = TRUE;
@@ -318,9 +325,6 @@ static int OnShutdown(WPARAM, LPARAM)
return 0;
}
-//===== Load ============================================================================
-// Initializes the services provided and the link to those needed
-// Called when the plugin is loaded into Miranda
MIRAPI int Load(void)
{
mir_getLP(&pluginInfoEx);
@@ -329,7 +333,7 @@ MIRAPI int Load(void)
CreateServiceFunction(MS_POPUP_GETSTATUS, GetStatus);
#if defined(_DEBUG)
- PopupOptions.debug = db_get_b(NULL, MODULNAME, "debug", FALSE);
+ PopupOptions.debug = db_get_b(NULL, MODULENAME, "debug", FALSE);
#else
PopupOptions.debug = false;
#endif
diff --git a/plugins/Popup/src/opt_adv.cpp b/plugins/Popup/src/opt_adv.cpp
index ff66767b68..235e60833a 100644
--- a/plugins/Popup/src/opt_adv.cpp
+++ b/plugins/Popup/src/opt_adv.cpp
@@ -46,34 +46,34 @@ void OptAdv_UnregisterVfx()
void LoadOption_AdvOpts()
{
// History
- PopupOptions.EnableHistory = db_get_b(NULL, MODULNAME, "EnableHistory", TRUE);
- PopupOptions.HistorySize = db_get_w(NULL, MODULNAME, "HistorySize", SETTING_HISTORYSIZE_DEFAULT);
- PopupOptions.UseHppHistoryLog = db_get_b(NULL, MODULNAME, "UseHppHistoryLog", TRUE);
+ PopupOptions.EnableHistory = db_get_b(NULL, MODULENAME, "EnableHistory", TRUE);
+ PopupOptions.HistorySize = db_get_w(NULL, MODULENAME, "HistorySize", SETTING_HISTORYSIZE_DEFAULT);
+ PopupOptions.UseHppHistoryLog = db_get_b(NULL, MODULENAME, "UseHppHistoryLog", TRUE);
// Avatars
- PopupOptions.avatarBorders = db_get_b(NULL, MODULNAME, "AvatarBorders", TRUE);
- PopupOptions.avatarPNGBorders = db_get_b(NULL, MODULNAME, "AvatarPNGBorders", FALSE);
- PopupOptions.avatarRadius = db_get_b(NULL, MODULNAME, "AvatarRadius", 2);
- PopupOptions.avatarSize = db_get_w(NULL, MODULNAME, "AvatarSize", SETTING_AVTSIZE_DEFAULT);
- PopupOptions.EnableAvatarUpdates = db_get_b(NULL, MODULNAME, "EnableAvatarUpdates", FALSE);
+ PopupOptions.avatarBorders = db_get_b(NULL, MODULENAME, "AvatarBorders", TRUE);
+ PopupOptions.avatarPNGBorders = db_get_b(NULL, MODULENAME, "AvatarPNGBorders", FALSE);
+ PopupOptions.avatarRadius = db_get_b(NULL, MODULENAME, "AvatarRadius", 2);
+ PopupOptions.avatarSize = db_get_w(NULL, MODULENAME, "AvatarSize", SETTING_AVTSIZE_DEFAULT);
+ PopupOptions.EnableAvatarUpdates = db_get_b(NULL, MODULENAME, "EnableAvatarUpdates", FALSE);
// Monitor
- PopupOptions.Monitor = db_get_b(NULL, MODULNAME, "Monitor", SETTING_MONITOR_DEFAULT);
+ PopupOptions.Monitor = db_get_b(NULL, MODULENAME, "Monitor", SETTING_MONITOR_DEFAULT);
// Transparency
- PopupOptions.UseTransparency = db_get_b(NULL, MODULNAME, "UseTransparency", TRUE);
- PopupOptions.Alpha = db_get_b(NULL, MODULNAME, "Alpha", SETTING_ALPHA_DEFAULT);
- PopupOptions.OpaqueOnHover = db_get_b(NULL, MODULNAME, "OpaqueOnHover", TRUE);
+ PopupOptions.UseTransparency = db_get_b(NULL, MODULENAME, "UseTransparency", TRUE);
+ PopupOptions.Alpha = db_get_b(NULL, MODULENAME, "Alpha", SETTING_ALPHA_DEFAULT);
+ PopupOptions.OpaqueOnHover = db_get_b(NULL, MODULENAME, "OpaqueOnHover", TRUE);
// Effects
- PopupOptions.UseAnimations = db_get_b(NULL, MODULNAME, "UseAnimations", TRUE);
- PopupOptions.UseEffect = db_get_b(NULL, MODULNAME, "Fade", TRUE);
- PopupOptions.Effect = (LPTSTR)DBGetContactSettingStringX(NULL, MODULNAME, "Effect", "", DBVT_WCHAR);
- PopupOptions.FadeIn = db_get_dw(NULL, MODULNAME, "FadeInTime", SETTING_FADEINTIME_DEFAULT);
- PopupOptions.FadeOut = db_get_dw(NULL, MODULNAME, "FadeOutTime", SETTING_FADEOUTTIME_DEFAULT);
+ PopupOptions.UseAnimations = db_get_b(NULL, MODULENAME, "UseAnimations", TRUE);
+ PopupOptions.UseEffect = db_get_b(NULL, MODULENAME, "Fade", TRUE);
+ PopupOptions.Effect = (LPTSTR)DBGetContactSettingStringX(NULL, MODULENAME, "Effect", "", DBVT_WCHAR);
+ PopupOptions.FadeIn = db_get_dw(NULL, MODULENAME, "FadeInTime", SETTING_FADEINTIME_DEFAULT);
+ PopupOptions.FadeOut = db_get_dw(NULL, MODULENAME, "FadeOutTime", SETTING_FADEOUTTIME_DEFAULT);
// other old stuff
- PopupOptions.MaxPopups = db_get_w(NULL, MODULNAME, "MaxPopups", 20);
+ PopupOptions.MaxPopups = db_get_w(NULL, MODULENAME, "MaxPopups", 20);
}
INT_PTR CALLBACK DlgProcPopupAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -492,31 +492,31 @@ INT_PTR CALLBACK DlgProcPopupAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
case PSN_APPLY:
// History
- db_set_b(NULL, MODULNAME, "EnableHistory", (BYTE)PopupOptions.EnableHistory);
- db_set_w(NULL, MODULNAME, "HistorySize", PopupOptions.HistorySize);
+ db_set_b(NULL, MODULENAME, "EnableHistory", (BYTE)PopupOptions.EnableHistory);
+ db_set_w(NULL, MODULENAME, "HistorySize", PopupOptions.HistorySize);
PopupHistoryResize();
- db_set_b(NULL, MODULNAME, "UseHppHistoryLog", PopupOptions.UseHppHistoryLog);
+ db_set_b(NULL, MODULENAME, "UseHppHistoryLog", PopupOptions.UseHppHistoryLog);
// Avatars
- db_set_b(NULL, MODULNAME, "AvatarBorders", PopupOptions.avatarBorders);
- db_set_b(NULL, MODULNAME, "AvatarPNGBorders", PopupOptions.avatarPNGBorders);
- db_set_b(NULL, MODULNAME, "AvatarRadius", PopupOptions.avatarRadius);
- db_set_w(NULL, MODULNAME, "AvatarSize", PopupOptions.avatarSize);
- db_set_b(NULL, MODULNAME, "EnableAvatarUpdates", PopupOptions.EnableAvatarUpdates);
+ db_set_b(NULL, MODULENAME, "AvatarBorders", PopupOptions.avatarBorders);
+ db_set_b(NULL, MODULENAME, "AvatarPNGBorders", PopupOptions.avatarPNGBorders);
+ db_set_b(NULL, MODULENAME, "AvatarRadius", PopupOptions.avatarRadius);
+ db_set_w(NULL, MODULENAME, "AvatarSize", PopupOptions.avatarSize);
+ db_set_b(NULL, MODULENAME, "EnableAvatarUpdates", PopupOptions.EnableAvatarUpdates);
// Monitor
- db_set_b(NULL, MODULNAME, "Monitor", PopupOptions.Monitor);
+ db_set_b(NULL, MODULENAME, "Monitor", PopupOptions.Monitor);
// Transparency
- db_set_b(NULL, MODULNAME, "UseTransparency", PopupOptions.UseTransparency);
- db_set_b(NULL, MODULNAME, "Alpha", PopupOptions.Alpha);
- db_set_b(NULL, MODULNAME, "OpaqueOnHover", PopupOptions.OpaqueOnHover);
+ db_set_b(NULL, MODULENAME, "UseTransparency", PopupOptions.UseTransparency);
+ db_set_b(NULL, MODULENAME, "Alpha", PopupOptions.Alpha);
+ db_set_b(NULL, MODULENAME, "OpaqueOnHover", PopupOptions.OpaqueOnHover);
// Effects
- db_set_b(NULL, MODULNAME, "UseAnimations", PopupOptions.UseAnimations);
- db_set_b(NULL, MODULNAME, "Fade", PopupOptions.UseEffect);
- db_set_ws(NULL, MODULNAME, "Effect", PopupOptions.Effect);
- db_set_dw(NULL, MODULNAME, "FadeInTime", PopupOptions.FadeIn);
- db_set_dw(NULL, MODULNAME, "FadeOutTime", PopupOptions.FadeOut);
+ db_set_b(NULL, MODULENAME, "UseAnimations", PopupOptions.UseAnimations);
+ db_set_b(NULL, MODULENAME, "Fade", PopupOptions.UseEffect);
+ db_set_ws(NULL, MODULENAME, "Effect", PopupOptions.Effect);
+ db_set_dw(NULL, MODULENAME, "FadeInTime", PopupOptions.FadeIn);
+ db_set_dw(NULL, MODULENAME, "FadeOutTime", PopupOptions.FadeOut);
// other old stuff
- db_set_w(NULL, MODULNAME, "MaxPopups", (BYTE)PopupOptions.MaxPopups);
+ db_set_w(NULL, MODULENAME, "MaxPopups", (BYTE)PopupOptions.MaxPopups);
}
return TRUE;
}
diff --git a/plugins/Popup/src/opt_contacts.cpp b/plugins/Popup/src/opt_contacts.cpp
index d9315e2f16..cfca450f13 100644
--- a/plugins/Popup/src/opt_contacts.cpp
+++ b/plugins/Popup/src/opt_contacts.cpp
@@ -32,7 +32,7 @@ static void sttSetAllContactIcons(HWND hwndList)
{
for (auto &hContact : Contacts()) {
HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0);
- DWORD dwMode = db_get_b(hContact, MODULNAME, "ShowMode", 0);
+ DWORD dwMode = db_get_b(hContact, MODULENAME, "ShowMode", 0);
for (int i = 0; i < 4 /*_countof(sttIcons)*/; ++i)
// hIml element [0] = SKINICON_OTHER_SMALLDOT
// hIml element [1..5] = IcoLib_GetIcon(....) ~ old sttIcons
@@ -103,7 +103,7 @@ INT_PTR CALLBACK DlgProcContactOpts(HWND hwnd, UINT msg, WPARAM, LPARAM lParam)
HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0);
for (int i = 0; i < 4 /*_countof(sttIcons)*/; ++i) {
if (SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, 0))) {
- db_set_b(hContact, MODULNAME, "ShowMode", i);
+ db_set_b(hContact, MODULENAME, "ShowMode", i);
break;
}
}
diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp
index 0b7cdeadca..c77cae67e9 100644
--- a/plugins/Popup/src/opt_gen.cpp
+++ b/plugins/Popup/src/opt_gen.cpp
@@ -89,40 +89,40 @@ int AddStatusModes(OPTTREE_OPTION *options, int pos, LPTSTR prefix, DWORD flags)
void LoadOption_General()
{
// Seconds
- PopupOptions.InfiniteDelay = db_get_b(NULL, MODULNAME, "InfiniteDelay", FALSE);
+ PopupOptions.InfiniteDelay = db_get_b(NULL, MODULENAME, "InfiniteDelay", FALSE);
PopupOptions.Seconds =
- DBGetContactSettingRangedWord(NULL, MODULNAME, "Seconds", SETTING_LIFETIME_DEFAULT, SETTING_LIFETIME_MIN, SETTING_LIFETIME_MAX);
- PopupOptions.LeaveHovered = db_get_b(NULL, MODULNAME, "LeaveHovered", TRUE);
+ DBGetContactSettingRangedWord(NULL, MODULENAME, "Seconds", SETTING_LIFETIME_DEFAULT, SETTING_LIFETIME_MIN, SETTING_LIFETIME_MAX);
+ PopupOptions.LeaveHovered = db_get_b(NULL, MODULENAME, "LeaveHovered", TRUE);
// Dynamic Resize
- PopupOptions.DynamicResize = db_get_b(NULL, MODULNAME, "DynamicResize", FALSE);
- PopupOptions.UseMinimumWidth = db_get_b(NULL, MODULNAME, "UseMinimumWidth", TRUE);
- PopupOptions.MinimumWidth = db_get_w(NULL, MODULNAME, "MinimumWidth", 160);
- PopupOptions.UseMaximumWidth = db_get_b(NULL, MODULNAME, "UseMaximumWidth", TRUE);
- PopupOptions.MaximumWidth = db_get_w(NULL, MODULNAME, "MaximumWidth", 300);
+ PopupOptions.DynamicResize = db_get_b(NULL, MODULENAME, "DynamicResize", FALSE);
+ PopupOptions.UseMinimumWidth = db_get_b(NULL, MODULENAME, "UseMinimumWidth", TRUE);
+ PopupOptions.MinimumWidth = db_get_w(NULL, MODULENAME, "MinimumWidth", 160);
+ PopupOptions.UseMaximumWidth = db_get_b(NULL, MODULENAME, "UseMaximumWidth", TRUE);
+ PopupOptions.MaximumWidth = db_get_w(NULL, MODULENAME, "MaximumWidth", 300);
// Position
PopupOptions.Position =
- DBGetContactSettingRangedByte(NULL, MODULNAME, "Position", POS_LOWERRIGHT, POS_MINVALUE, POS_MAXVALUE);
+ DBGetContactSettingRangedByte(NULL, MODULENAME, "Position", POS_LOWERRIGHT, POS_MINVALUE, POS_MAXVALUE);
// Configure popup area
- PopupOptions.gapTop = db_get_w(NULL, MODULNAME, "gapTop", 5);
- PopupOptions.gapBottom = db_get_w(NULL, MODULNAME, "gapBottom", 5);
- PopupOptions.gapLeft = db_get_w(NULL, MODULNAME, "gapLeft", 5);
- PopupOptions.gapRight = db_get_w(NULL, MODULNAME, "gapRight", 5);
- PopupOptions.spacing = db_get_w(NULL, MODULNAME, "spacing", 5);
+ PopupOptions.gapTop = db_get_w(NULL, MODULENAME, "gapTop", 5);
+ PopupOptions.gapBottom = db_get_w(NULL, MODULENAME, "gapBottom", 5);
+ PopupOptions.gapLeft = db_get_w(NULL, MODULENAME, "gapLeft", 5);
+ PopupOptions.gapRight = db_get_w(NULL, MODULENAME, "gapRight", 5);
+ PopupOptions.spacing = db_get_w(NULL, MODULENAME, "spacing", 5);
// Spreading
PopupOptions.Spreading =
- DBGetContactSettingRangedByte(NULL, MODULNAME, "Spreading", SPREADING_VERTICAL, SPREADING_MINVALUE, SPREADING_MAXVALUE);
+ DBGetContactSettingRangedByte(NULL, MODULENAME, "Spreading", SPREADING_VERTICAL, SPREADING_MINVALUE, SPREADING_MAXVALUE);
// miscellaneous
- PopupOptions.ReorderPopups = db_get_b(NULL, MODULNAME, "ReorderPopups", TRUE);
- PopupOptions.ReorderPopupsWarning = db_get_b(NULL, MODULNAME, "ReorderPopupsWarning", TRUE);
+ PopupOptions.ReorderPopups = db_get_b(NULL, MODULENAME, "ReorderPopups", TRUE);
+ PopupOptions.ReorderPopupsWarning = db_get_b(NULL, MODULENAME, "ReorderPopupsWarning", TRUE);
// disable When
PopupOptions.ModuleIsEnabled = db_get_b(NULL, "Popup", "ModuleIsEnabled", TRUE);
- PopupOptions.DisableWhenFullscreen = db_get_b(NULL, MODULNAME, "DisableWhenFullscreen", TRUE);
+ PopupOptions.DisableWhenFullscreen = db_get_b(NULL, MODULENAME, "DisableWhenFullscreen", TRUE);
}
INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -243,10 +243,10 @@ INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
wchar_t pszSettingName[256];
mir_snwprintf(pszSettingName, LPGENW("Protocol Status")L"/%s", pa->tszAccountName);
- OptTree_SetOptions(hwnd, IDC_STATUSES, statusOptions, statusOptionsCount, db_get_dw(NULL, MODULNAME, prefix, 0), pszSettingName);
+ OptTree_SetOptions(hwnd, IDC_STATUSES, statusOptions, statusOptionsCount, db_get_dw(NULL, MODULENAME, prefix, 0), pszSettingName);
}
}
- OptTree_SetOptions(hwnd, IDC_STATUSES, statusOptions, statusOptionsCount, db_get_dw(NULL, MODULNAME, "Global Status", 0), LPGENW("Global Status"));
+ OptTree_SetOptions(hwnd, IDC_STATUSES, statusOptions, statusOptionsCount, db_get_dw(NULL, MODULENAME, "Global Status", 0), LPGENW("Global Status"));
}
TranslateDialogDefault(hwnd); // do it on end of WM_INITDIALOG
@@ -335,7 +335,7 @@ INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
case IDC_REORDERPOPUPS:
PopupOptions.ReorderPopups = !PopupOptions.ReorderPopups;
- PopupOptions.ReorderPopupsWarning = PopupOptions.ReorderPopups ? db_get_b(NULL, MODULNAME, "ReorderPopupsWarning", TRUE) : TRUE;
+ PopupOptions.ReorderPopupsWarning = PopupOptions.ReorderPopups ? db_get_b(NULL, MODULENAME, "ReorderPopupsWarning", TRUE) : TRUE;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
@@ -485,35 +485,35 @@ INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
case PSN_APPLY:
// Seconds
- db_set_b(NULL, MODULNAME, "InfiniteDelay", PopupOptions.InfiniteDelay);
- db_set_w(NULL, MODULNAME, "Seconds", (WORD)PopupOptions.Seconds);
- db_set_b(NULL, MODULNAME, "LeaveHovered", PopupOptions.LeaveHovered);
+ db_set_b(NULL, MODULENAME, "InfiniteDelay", PopupOptions.InfiniteDelay);
+ db_set_w(NULL, MODULENAME, "Seconds", (WORD)PopupOptions.Seconds);
+ db_set_b(NULL, MODULENAME, "LeaveHovered", PopupOptions.LeaveHovered);
// Dynamic Resize
- db_set_b(NULL, MODULNAME, "DynamicResize", PopupOptions.DynamicResize);
- db_set_b(NULL, MODULNAME, "UseMinimumWidth", PopupOptions.UseMinimumWidth);
- db_set_w(NULL, MODULNAME, "MinimumWidth", PopupOptions.MinimumWidth);
- db_set_b(NULL, MODULNAME, "UseMaximumWidth", PopupOptions.UseMaximumWidth);
- db_set_w(NULL, MODULNAME, "MaximumWidth", PopupOptions.MaximumWidth);
+ db_set_b(NULL, MODULENAME, "DynamicResize", PopupOptions.DynamicResize);
+ db_set_b(NULL, MODULENAME, "UseMinimumWidth", PopupOptions.UseMinimumWidth);
+ db_set_w(NULL, MODULENAME, "MinimumWidth", PopupOptions.MinimumWidth);
+ db_set_b(NULL, MODULENAME, "UseMaximumWidth", PopupOptions.UseMaximumWidth);
+ db_set_w(NULL, MODULENAME, "MaximumWidth", PopupOptions.MaximumWidth);
// Position
- db_set_b(NULL, MODULNAME, "Position", (BYTE)PopupOptions.Position);
+ db_set_b(NULL, MODULENAME, "Position", (BYTE)PopupOptions.Position);
// Configure popup area
- db_set_w(NULL, MODULNAME, "gapTop", (WORD)PopupOptions.gapTop);
- db_set_w(NULL, MODULNAME, "gapBottom", (WORD)PopupOptions.gapBottom);
- db_set_w(NULL, MODULNAME, "gapLeft", (WORD)PopupOptions.gapLeft);
- db_set_w(NULL, MODULNAME, "gapRight", (WORD)PopupOptions.gapRight);
- db_set_w(NULL, MODULNAME, "spacing", (WORD)PopupOptions.spacing);
+ db_set_w(NULL, MODULENAME, "gapTop", (WORD)PopupOptions.gapTop);
+ db_set_w(NULL, MODULENAME, "gapBottom", (WORD)PopupOptions.gapBottom);
+ db_set_w(NULL, MODULENAME, "gapLeft", (WORD)PopupOptions.gapLeft);
+ db_set_w(NULL, MODULENAME, "gapRight", (WORD)PopupOptions.gapRight);
+ db_set_w(NULL, MODULENAME, "spacing", (WORD)PopupOptions.spacing);
// Spreading
- db_set_b(NULL, MODULNAME, "Spreading", (BYTE)PopupOptions.Spreading);
+ db_set_b(NULL, MODULENAME, "Spreading", (BYTE)PopupOptions.Spreading);
// miscellaneous
Check_ReorderPopups(hwnd); // this save also PopupOptions.ReorderPopups
// disable When
- db_set_b(NULL, MODULNAME, "DisableWhenFullscreen", PopupOptions.DisableWhenFullscreen);
+ db_set_b(NULL, MODULENAME, "DisableWhenFullscreen", PopupOptions.DisableWhenFullscreen);
// new status options
for (auto &pa : Accounts())
@@ -523,10 +523,10 @@ INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
wchar_t pszSettingName[256];
mir_snwprintf(pszSettingName, L"Protocol Status/%s", pa->tszAccountName);
- db_set_dw(NULL, MODULNAME, prefix, OptTree_GetOptions(hwnd, IDC_STATUSES, statusOptions, statusOptionsCount, pszSettingName));
+ db_set_dw(NULL, MODULENAME, prefix, OptTree_GetOptions(hwnd, IDC_STATUSES, statusOptions, statusOptionsCount, pszSettingName));
}
- db_set_dw(NULL, MODULNAME, "Global Status", OptTree_GetOptions(hwnd, IDC_STATUSES, statusOptions, statusOptionsCount, L"Global Status"));
+ db_set_dw(NULL, MODULENAME, "Global Status", OptTree_GetOptions(hwnd, IDC_STATUSES, statusOptions, statusOptionsCount, L"Global Status"));
return TRUE;
}
break;
@@ -598,8 +598,8 @@ void Check_ReorderPopups(HWND hwnd)
return;
}
}
- db_set_b(NULL, MODULNAME, "ReorderPopups", PopupOptions.ReorderPopups);
- db_set_b(NULL, MODULNAME, "ReorderPopupsWarning", PopupOptions.ReorderPopupsWarning);
+ db_set_b(NULL, MODULENAME, "ReorderPopups", PopupOptions.ReorderPopups);
+ db_set_b(NULL, MODULENAME, "ReorderPopupsWarning", PopupOptions.ReorderPopupsWarning);
if (hwnd) CheckDlgButton(hwnd, IDC_REORDERPOPUPS, PopupOptions.ReorderPopups ? BST_CHECKED : BST_UNCHECKED);
}
diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp
index 5dd0146177..c2c02423c2 100644
--- a/plugins/Popup/src/opt_skins.cpp
+++ b/plugins/Popup/src/opt_skins.cpp
@@ -282,7 +282,7 @@ bool SkinOptionList_Update(OPTTREE_OPTION* &options, int *OptionsCount, HWND hwn
char prefix[128];
mir_snprintf(prefix, "skin.%S", PopupOptions.SkinPack);
OptTree_SetOptions(hwndDlg, IDC_SKIN_LIST_OPT, options, *OptionsCount,
- db_get_dw(NULL, MODULNAME, prefix, dwSkinOptions), L"Skin options");
+ db_get_dw(NULL, MODULENAME, prefix, dwSkinOptions), L"Skin options");
// check "Global Settings"
OptTree_SetOptions(hwndDlg, IDC_SKIN_LIST_OPT, options, *OptionsCount,
@@ -293,14 +293,14 @@ bool SkinOptionList_Update(OPTTREE_OPTION* &options, int *OptionsCount, HWND hwn
void LoadOption_Skins() {
// skin pack
- PopupOptions.SkinPack = (LPTSTR)DBGetContactSettingStringX(NULL, MODULNAME, "SkinPack", "* Popup Classic", DBVT_WCHAR);
+ PopupOptions.SkinPack = (LPTSTR)DBGetContactSettingStringX(NULL, MODULENAME, "SkinPack", "* Popup Classic", DBVT_WCHAR);
// more Skin options
- PopupOptions.DisplayTime = db_get_b(NULL, MODULNAME, "DisplayTime", TRUE);
- PopupOptions.DropShadow = db_get_b(NULL, MODULNAME, "DropShadow", TRUE);
- PopupOptions.EnableFreeformShadows = db_get_b(NULL, MODULNAME, "EnableShadowRegion", 1);
- PopupOptions.EnableAeroGlass = db_get_b(NULL, MODULNAME, "EnableAeroGlass", 1);
- PopupOptions.UseWinColors = db_get_b(NULL, MODULNAME, "UseWinColors", FALSE);
- PopupOptions.UseMText = db_get_b(NULL, MODULNAME, "UseMText", TRUE);
+ PopupOptions.DisplayTime = db_get_b(NULL, MODULENAME, "DisplayTime", TRUE);
+ PopupOptions.DropShadow = db_get_b(NULL, MODULENAME, "DropShadow", TRUE);
+ PopupOptions.EnableFreeformShadows = db_get_b(NULL, MODULENAME, "EnableShadowRegion", 1);
+ PopupOptions.EnableAeroGlass = db_get_b(NULL, MODULENAME, "EnableAeroGlass", 1);
+ PopupOptions.UseWinColors = db_get_b(NULL, MODULENAME, "UseWinColors", FALSE);
+ PopupOptions.UseMText = db_get_b(NULL, MODULENAME, "UseMText", TRUE);
}
INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -477,18 +477,18 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
case PSN_APPLY:
{
// skin pack
- db_set_ws(NULL, MODULNAME, "SkinPack", PopupOptions.SkinPack);
+ db_set_ws(NULL, MODULENAME, "SkinPack", PopupOptions.SkinPack);
// skin options
const PopupSkin *skin = nullptr;
if (skin = skins.getSkin(PopupOptions.SkinPack))
skin->saveOpts();
skins.freeAllButActive();
// more Skin options
- db_set_b(NULL, MODULNAME, "DisplayTime", PopupOptions.DisplayTime);
- db_set_b(NULL, MODULNAME, "DropShadow", PopupOptions.DropShadow);
- db_set_b(NULL, MODULNAME, "EnableShadowRegion", PopupOptions.EnableFreeformShadows);
- db_set_b(NULL, MODULNAME, "EnableAeroGlass", PopupOptions.EnableAeroGlass);
- db_set_b(NULL, MODULNAME, "UseMText", PopupOptions.UseMText);
+ db_set_b(NULL, MODULENAME, "DisplayTime", PopupOptions.DisplayTime);
+ db_set_b(NULL, MODULENAME, "DropShadow", PopupOptions.DropShadow);
+ db_set_b(NULL, MODULENAME, "EnableShadowRegion", PopupOptions.EnableFreeformShadows);
+ db_set_b(NULL, MODULENAME, "EnableAeroGlass", PopupOptions.EnableAeroGlass);
+ db_set_b(NULL, MODULENAME, "UseMText", PopupOptions.UseMText);
}// end PSN_APPLY:
return TRUE;
}// switch (((LPNMHDR)lParam)->code)
diff --git a/plugins/Popup/src/popup_thread.cpp b/plugins/Popup/src/popup_thread.cpp
index 0363613fa0..3aa0a05167 100644
--- a/plugins/Popup/src/popup_thread.cpp
+++ b/plugins/Popup/src/popup_thread.cpp
@@ -152,7 +152,7 @@ static LRESULT CALLBACK PopupThreadManagerWndProc(HWND hwnd, UINT message, WPARA
switch (message) {
case UTM_STOP_THREAD:
gTerminating = true;
- if (db_get_b(NULL, MODULNAME, "FastExit", 0))
+ if (db_get_b(NULL, MODULENAME, "FastExit", 0))
for (auto &it : popupList)
PUDeletePopup(it->getHwnd());
PostQuitMessage(0);
diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp
index fab7339724..1e25a01b6e 100644
--- a/plugins/Popup/src/services.cpp
+++ b/plugins/Popup/src/services.cpp
@@ -126,7 +126,7 @@ INT_PTR Popup_AddPopup2(WPARAM wParam, LPARAM lParam)
if (ppd->lchContact)
proto = GetContactProto(ppd->lchContact);
- BYTE bShowMode = proto ? db_get_b(ppd->lchContact, MODULNAME, "ShowMode", PU_SHOWMODE_AUTO) : PU_SHOWMODE_AUTO;
+ BYTE bShowMode = proto ? db_get_b(ppd->lchContact, MODULENAME, "ShowMode", PU_SHOWMODE_AUTO) : PU_SHOWMODE_AUTO;
if (bShowMode == PU_SHOWMODE_BLOCK)
return -1;
@@ -138,7 +138,7 @@ INT_PTR Popup_AddPopup2(WPARAM wParam, LPARAM lParam)
if (PopupOptions.DisableWhenFullscreen && (bShowMode != PU_SHOWMODE_FULLSCREEN) && IsFullScreen())
return -1;
- if (db_get_dw(NULL, MODULNAME, LPGEN("Global Status"), 0) & Proto_Status2Flag_My(CallService(MS_CLIST_GETSTATUSMODE, 0, 0)))
+ if (db_get_dw(NULL, MODULENAME, LPGEN("Global Status"), 0) & Proto_Status2Flag_My(CallService(MS_CLIST_GETSTATUSMODE, 0, 0)))
return -1;
if ((disableWhen & 0x0000FFFF) & Proto_Status2Flag_My(CallService(MS_CLIST_GETSTATUSMODE, 0, 0)))
@@ -147,7 +147,7 @@ INT_PTR Popup_AddPopup2(WPARAM wParam, LPARAM lParam)
if (proto) {
char prefix[128];
mir_snprintf(prefix, LPGEN("Protocol Status") "/%s", GetContactProto(ppd->lchContact));
- if (db_get_dw(NULL, MODULNAME, prefix, 0) & Proto_Status2Flag_My(Proto_GetStatus(proto)))
+ if (db_get_dw(NULL, MODULENAME, prefix, 0) & Proto_Status2Flag_My(Proto_GetStatus(proto)))
return -1;
if (((disableWhen >> 16) & 0xFFFF0000) & Proto_Status2Flag_My(Proto_GetStatus(proto)))
return -1;
diff --git a/plugins/Popup/src/skin.cpp b/plugins/Popup/src/skin.cpp
index bef54628c8..34ef0665df 100644
--- a/plugins/Popup/src/skin.cpp
+++ b/plugins/Popup/src/skin.cpp
@@ -518,7 +518,7 @@ void PopupSkin::display(MyBitmap *bmp, PopupWnd2 *wnd, POPUPOPTIONS *options, DW
if (textAreaWidth <= 0) textAreaWidth = wnd->getRenderInfo()->realtextw;
drawActionBar(bmp, wnd,
- db_get_b(NULL, MODULNAME, "CenterActions", 0) ?
+ db_get_b(NULL, MODULENAME, "CenterActions", 0) ?
(pt.x + (textAreaWidth - wnd->getRenderInfo()->actw) / 2) :
(PopupOptions.actions & ACT_RIGHTICONS) ?
(pt.x + textAreaWidth - wnd->getRenderInfo()->actw) :
@@ -1040,14 +1040,14 @@ void PopupSkin::saveOpts() const
{
char buf[128];
mir_snprintf(buf, "skin.%.120S", m_name);
- db_set_dw(NULL, MODULNAME, buf, m_flags);
+ db_set_dw(NULL, MODULENAME, buf, m_flags);
}
void PopupSkin::loadOpts() const
{
char buf[128];
mir_snprintf(buf, "skin.%.120S", m_name);
- m_flags = db_get_dw(NULL, MODULNAME, buf, m_flags);
+ m_flags = db_get_dw(NULL, MODULENAME, buf, m_flags);
}
// Skins
diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp
index fa4c6bf244..abee0ec5bd 100644
--- a/plugins/Popup/src/srmm_menu.cpp
+++ b/plugins/Popup/src/srmm_menu.cpp
@@ -36,10 +36,10 @@ static void SrmmMenu_UpdateIcon(MCONTACT hContact)
if (!hContact)
return;
- int mode = db_get_b(hContact, MODULNAME, "ShowMode", PU_SHOWMODE_AUTO);
+ int mode = db_get_b(hContact, MODULENAME, "ShowMode", PU_SHOWMODE_AUTO);
StatusIconData sid = {};
- sid.szModule = MODULNAME;
+ sid.szModule = MODULENAME;
for (int i = 0; i < 4; i++) {
sid.dwId = i;
@@ -70,13 +70,13 @@ static int SrmmMenu_ProcessEvent(WPARAM, LPARAM lParam)
static int SrmmMenu_ProcessIconClick(WPARAM hContact, LPARAM lParam)
{
StatusIconClickData *sicd = (StatusIconClickData *)lParam;
- if (mir_strcmp(sicd->szModule, MODULNAME))
+ if (mir_strcmp(sicd->szModule, MODULENAME))
return 0;
if (!hContact)
return 0;
- int mode = db_get_b(hContact, MODULNAME, "ShowMode", PU_SHOWMODE_AUTO);
+ int mode = db_get_b(hContact, MODULENAME, "ShowMode", PU_SHOWMODE_AUTO);
if (sicd->flags & MBCF_RIGHTBUTTON) {
HMENU hMenu = CreatePopupMenu();
@@ -90,12 +90,12 @@ static int SrmmMenu_ProcessIconClick(WPARAM hContact, LPARAM lParam)
mode = TrackPopupMenu(hMenu, TPM_RETURNCMD, sicd->clickLocation.x, sicd->clickLocation.y, 0, WindowList_Find(hDialogsList, hContact), nullptr);
if (mode) {
- db_set_b(hContact, MODULNAME, "ShowMode", mode - 1);
+ db_set_b(hContact, MODULENAME, "ShowMode", mode - 1);
SrmmMenu_UpdateIcon(hContact);
}
}
else {
- db_set_b(hContact, MODULNAME, "ShowMode", (mode == PU_SHOWMODE_AUTO) ? PU_SHOWMODE_BLOCK : PU_SHOWMODE_AUTO);
+ db_set_b(hContact, MODULENAME, "ShowMode", (mode == PU_SHOWMODE_AUTO) ? PU_SHOWMODE_BLOCK : PU_SHOWMODE_AUTO);
SrmmMenu_UpdateIcon(hContact);
}
@@ -105,7 +105,7 @@ static int SrmmMenu_ProcessIconClick(WPARAM hContact, LPARAM lParam)
void SrmmMenu_Load()
{
StatusIconData sid = {};
- sid.szModule = MODULNAME;
+ sid.szModule = MODULENAME;
sid.dwId = 0;
sid.szTooltip = LPGEN("Popup Mode: Auto");
diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h
index ea91428de0..3ac1fe44e3 100644
--- a/plugins/Popup/src/stdafx.h
+++ b/plugins/Popup/src/stdafx.h
@@ -96,17 +96,15 @@ https://miranda-ng.org/distr/
#include <m_toptoolbar.h>
#include <m_hpp.h>
-#define PU_MODULCLASS "PopupCLASS" // temp DB modul for this plugin
-#define MODULNAME "Popup"
+#define PU_MODULCLASS "PopupCLASS" // temp DB modul for this plugin
+#define MODULENAME "Popup"
#define MODULNAME_LONG L"Popup Plus"
-#define MODULNAME_PLU "Popups"
+#define MODULNAME_PLU "Popups"
#define MODULNAME_PLUW L"Popups"
struct CMPlugin : public PLUGIN<CMPlugin>
{
- CMPlugin() :
- PLUGIN<CMPlugin>(MODULNAME)
- {}
+ CMPlugin();
};
#include "resource.h"