summaryrefslogtreecommitdiff
path: root/plugins/StartupSilence/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/StartupSilence/src')
-rw-r--r--plugins/StartupSilence/src/main.cpp88
-rw-r--r--plugins/StartupSilence/src/stdafx.h6
2 files changed, 48 insertions, 46 deletions
diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp
index 3382ad8a5d..9dc2d008e2 100644
--- a/plugins/StartupSilence/src/main.cpp
+++ b/plugins/StartupSilence/src/main.cpp
@@ -63,7 +63,7 @@ static LIST<void> ttbButtons(1);
/////////////////////////////////////////////////////////////////////////////////////////
-PLUGININFOEX pluginInfo =
+PLUGININFOEX pluginInfoEx =
{
sizeof(PLUGININFOEX),
__PLUGIN_NAME,
@@ -77,9 +77,13 @@ PLUGININFOEX pluginInfo =
{ 0x7b856b6a, 0xd48f, 0x4f54, { 0xb8, 0xd6, 0xc8, 0xd8, 0x6d, 0x2, 0xff, 0xc2 }}
};
+CMPlugin::CMPlugin() :
+ PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)
+{}
+
extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
- return &pluginInfo;
+ return &pluginInfoEx;
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -165,7 +169,7 @@ void InitSettings()
mir_snprintf(NonStatusAllowComp, "%s_NonStatusAllow", hostname);
}
//first run on the host, initial setting
- if (!(delay = db_get_dw(NULL, MODULE_NAME, DelayComp, 0)))
+ if (!(delay = db_get_dw(NULL, MODULENAME, DelayComp, 0)))
DefSettings();
//or load host settings
else LoadSettings();
@@ -173,31 +177,31 @@ void InitSettings()
void DefSettings()
{
- db_set_dw(NULL, MODULE_NAME, DelayComp, 20);
- db_set_b(NULL, MODULE_NAME, EnabledComp, 1);
- db_set_b(NULL, MODULE_NAME, PopUpComp, 1);
- db_set_dw(NULL, MODULE_NAME, PopUpTimeComp, 5);
- db_set_b(NULL, MODULE_NAME, MenuitemComp, 1);
- db_set_b(NULL, MODULE_NAME, TTBButtonsComp, 0);
- db_set_b(NULL, MODULE_NAME, DefSoundComp, 1);
- db_set_b(NULL, MODULE_NAME, DefPopupComp, 0);
- db_set_b(NULL, MODULE_NAME, DefEnabledComp, 0);
- db_set_b(NULL, MODULE_NAME, NonStatusAllowComp, 1);
+ db_set_dw(NULL, MODULENAME, DelayComp, 20);
+ db_set_b(NULL, MODULENAME, EnabledComp, 1);
+ db_set_b(NULL, MODULENAME, PopUpComp, 1);
+ db_set_dw(NULL, MODULENAME, PopUpTimeComp, 5);
+ db_set_b(NULL, MODULENAME, MenuitemComp, 1);
+ db_set_b(NULL, MODULENAME, TTBButtonsComp, 0);
+ db_set_b(NULL, MODULENAME, DefSoundComp, 1);
+ db_set_b(NULL, MODULENAME, DefPopupComp, 0);
+ db_set_b(NULL, MODULENAME, DefEnabledComp, 0);
+ db_set_b(NULL, MODULENAME, NonStatusAllowComp, 1);
LoadSettings();
}
void LoadSettings()
{
- Enabled = db_get_b(NULL, MODULE_NAME, EnabledComp, 0);
- delay = db_get_dw(NULL, MODULE_NAME, DelayComp, 0);
- PopUp = db_get_b(NULL, MODULE_NAME, PopUpComp, 0);
- PopUpTime = db_get_dw(NULL, MODULE_NAME, PopUpTimeComp, 0);
- MenuItem = db_get_b(NULL, MODULE_NAME, MenuitemComp, 0);
- TTBButtons = db_get_b(NULL, MODULE_NAME, TTBButtonsComp, 0);
- DefSound = db_get_b(NULL, MODULE_NAME, DefSoundComp, 0);
- DefPopup = db_get_b(NULL, MODULE_NAME, DefPopupComp, 0);
- DefEnabled = db_get_b(NULL, MODULE_NAME, DefEnabledComp, 0);
- NonStatusAllow = db_get_b(NULL, MODULE_NAME, NonStatusAllowComp, 0);
+ Enabled = db_get_b(NULL, MODULENAME, EnabledComp, 0);
+ delay = db_get_dw(NULL, MODULENAME, DelayComp, 0);
+ PopUp = db_get_b(NULL, MODULENAME, PopUpComp, 0);
+ PopUpTime = db_get_dw(NULL, MODULENAME, PopUpTimeComp, 0);
+ MenuItem = db_get_b(NULL, MODULENAME, MenuitemComp, 0);
+ TTBButtons = db_get_b(NULL, MODULENAME, TTBButtonsComp, 0);
+ DefSound = db_get_b(NULL, MODULENAME, DefSoundComp, 0);
+ DefPopup = db_get_b(NULL, MODULENAME, DefPopupComp, 0);
+ DefEnabled = db_get_b(NULL, MODULENAME, DefEnabledComp, 0);
+ NonStatusAllow = db_get_b(NULL, MODULENAME, NonStatusAllowComp, 0);
if (PopUpTime < 1)
PopUpTime = (DWORD)1;
if (PopUpTime > 30)
@@ -206,15 +210,15 @@ void LoadSettings()
delay = (DWORD)10;
if (delay > 300)
delay = (DWORD)300;
- db_set_dw(NULL, MODULE_NAME, DelayComp, delay);
- db_set_dw(NULL, MODULE_NAME, PopUpTimeComp, PopUpTime);
+ db_set_dw(NULL, MODULENAME, DelayComp, delay);
+ db_set_dw(NULL, MODULENAME, PopUpTimeComp, PopUpTime);
}
/////////////////////////////////////////////////////////////////////////////////////////
static INT_PTR StartupSilenceEnabled(WPARAM, LPARAM)
{
- db_set_b(NULL, MODULE_NAME, EnabledComp, !Enabled);
+ db_set_b(NULL, MODULENAME, EnabledComp, !Enabled);
LoadSettings();
if (MenuItem == 1)
UpdateMenu();
@@ -336,7 +340,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP
min = GetDlgItemInt(hwndDlg, IDC_SSTIME, nullptr, FALSE);
if (min == 0 && GetWindowTextLength(GetDlgItem(hwndDlg, IDC_SSTIME)))
SendDlgItemMessage(hwndDlg, IDC_SSSPIN, UDM_SETPOS, 0, MAKELONG((short)1, 0));
- delay = (DWORD)db_set_dw(NULL, MODULE_NAME, DelayComp, (DWORD)(SendDlgItemMessage(hwndDlg, IDC_SSSPIN, UDM_GETPOS, 0, 0)));
+ delay = (DWORD)db_set_dw(NULL, MODULENAME, DelayComp, (DWORD)(SendDlgItemMessage(hwndDlg, IDC_SSSPIN, UDM_GETPOS, 0, 0)));
break;
case IDC_SSPOPUPTIME:
@@ -344,7 +348,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP
min = GetDlgItemInt(hwndDlg, IDC_SSPOPUPTIME, nullptr, FALSE);
if (min == 0 && GetWindowTextLength(GetDlgItem(hwndDlg, IDC_SSPOPUPTIME)))
SendDlgItemMessage(hwndDlg, IDC_SSSPIN2, UDM_SETPOS, 0, MAKELONG((short)1, 0));
- PopUpTime = (DWORD)db_set_dw(NULL, MODULE_NAME, PopUpTimeComp, (DWORD)(SendDlgItemMessage(hwndDlg, IDC_SSSPIN2, UDM_GETPOS, 0, 0)));
+ PopUpTime = (DWORD)db_set_dw(NULL, MODULENAME, PopUpTimeComp, (DWORD)(SendDlgItemMessage(hwndDlg, IDC_SSSPIN2, UDM_GETPOS, 0, 0)));
break;
case IDC_DELAY:
@@ -355,42 +359,42 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP
if (!ServiceExists(MS_POPUP_QUERY)) {
MessageBox(nullptr, NEEDPOPUP, NOTICE, MB_OK);
CheckDlgButton(hwndDlg, IDC_DELAY2, BST_UNCHECKED);
- PopUp = (BYTE)db_set_b(NULL, MODULE_NAME, PopUpComp, 0);
+ PopUp = (BYTE)db_set_b(NULL, MODULENAME, PopUpComp, 0);
}
- else PopUp = (BYTE)db_set_b(NULL, MODULE_NAME, PopUpComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DELAY2) == BST_CHECKED ? 1 : 0));
+ else PopUp = (BYTE)db_set_b(NULL, MODULENAME, PopUpComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DELAY2) == BST_CHECKED ? 1 : 0));
break;
case IDC_MENU:
- MenuItem = (BYTE)db_set_b(NULL, MODULE_NAME, MenuitemComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_MENU) == BST_CHECKED ? 1 : 0));
+ MenuItem = (BYTE)db_set_b(NULL, MODULENAME, MenuitemComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_MENU) == BST_CHECKED ? 1 : 0));
break;
case IDC_TTB:
if (!hTTBarloaded) {
MessageBox(nullptr, NEEDTTBMOD, NOTICE, MB_OK);
CheckDlgButton(hwndDlg, IDC_TTB, BST_UNCHECKED);
- TTBButtons = (BYTE)db_set_b(NULL, MODULE_NAME, TTBButtonsComp, 0);
+ TTBButtons = (BYTE)db_set_b(NULL, MODULENAME, TTBButtonsComp, 0);
}
- else TTBButtons = (BYTE)db_set_b(NULL, MODULE_NAME, TTBButtonsComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_TTB) == BST_CHECKED ? 1 : 0));
+ else TTBButtons = (BYTE)db_set_b(NULL, MODULENAME, TTBButtonsComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_TTB) == BST_CHECKED ? 1 : 0));
break;
case IDC_DEFPOPUP:
- db_set_b(NULL, MODULE_NAME, DefPopupComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DEFPOPUP) == BST_CHECKED ? 1 : 0));
- DefPopup = db_get_b(NULL, MODULE_NAME, DefPopupComp, 0);
+ db_set_b(NULL, MODULENAME, DefPopupComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DEFPOPUP) == BST_CHECKED ? 1 : 0));
+ DefPopup = db_get_b(NULL, MODULENAME, DefPopupComp, 0);
break;
case IDC_DEFSOUNDS:
- db_set_b(NULL, MODULE_NAME, DefSoundComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DEFSOUNDS) == BST_CHECKED ? 1 : 0));
- DefSound = db_get_b(NULL, MODULE_NAME, DefSoundComp, 0);
+ db_set_b(NULL, MODULENAME, DefSoundComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DEFSOUNDS) == BST_CHECKED ? 1 : 0));
+ DefSound = db_get_b(NULL, MODULENAME, DefSoundComp, 0);
break;
case IDC_RESTORE:
- db_set_b(NULL, MODULE_NAME, DefEnabledComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_RESTORE) == BST_CHECKED ? 1 : 0));
- DefEnabled = db_get_b(NULL, MODULE_NAME, DefEnabledComp, 0);
+ db_set_b(NULL, MODULENAME, DefEnabledComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_RESTORE) == BST_CHECKED ? 1 : 0));
+ DefEnabled = db_get_b(NULL, MODULENAME, DefEnabledComp, 0);
break;
case IDC_NONSTATUSES:
- db_set_b(NULL, MODULE_NAME, NonStatusAllowComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_NONSTATUSES) == BST_CHECKED ? 1 : 0));
- NonStatusAllow = db_get_b(NULL, MODULE_NAME, NonStatusAllowComp, 0);
+ db_set_b(NULL, MODULENAME, NonStatusAllowComp, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_NONSTATUSES) == BST_CHECKED ? 1 : 0));
+ NonStatusAllow = db_get_b(NULL, MODULENAME, NonStatusAllowComp, 0);
break;
case IDC_RESETDEFAULT:
@@ -441,7 +445,7 @@ int ModulesLoaded(WPARAM, LPARAM)
extern "C" __declspec(dllexport) int Load(void)
{
- mir_getLP(&pluginInfo);
+ mir_getLP(&pluginInfoEx);
InitSettings();
diff --git a/plugins/StartupSilence/src/stdafx.h b/plugins/StartupSilence/src/stdafx.h
index 285f6c400f..3b8206ae8f 100644
--- a/plugins/StartupSilence/src/stdafx.h
+++ b/plugins/StartupSilence/src/stdafx.h
@@ -29,13 +29,11 @@ void DefSettings();
void UpdateMenu();
void UpdateTTB();
-#define MODULE_NAME "StartupSilence"
+#define MODULENAME "StartupSilence"
struct CMPlugin : public PLUGIN<CMPlugin>
{
- CMPlugin() :
- PLUGIN<CMPlugin>(MODULE_NAME)
- {}
+ CMPlugin();
};
#define SS_SERVICE_NAME "StartupSilence/ToggleEnabled"