summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/IgnoreState/res/ignore.rc45
-rw-r--r--plugins/IgnoreState/src/main.cpp8
-rw-r--r--plugins/IgnoreState/src/options.cpp11
-rw-r--r--plugins/IgnoreState/src/resource.h14
4 files changed, 23 insertions, 55 deletions
diff --git a/plugins/IgnoreState/res/ignore.rc b/plugins/IgnoreState/res/ignore.rc
index 9ee105b653..aad44a7619 100644
--- a/plugins/IgnoreState/res/ignore.rc
+++ b/plugins/IgnoreState/res/ignore.rc
@@ -15,12 +15,6 @@
/////////////////////////////////////////////////////////////////////////////
// Russian resources
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -36,13 +30,11 @@ IDI_IMESS ICON "ignore_message.ico"
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// Английский (США) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -75,24 +67,15 @@ END
// Dialog
//
-IDD_RATE_OPT DIALOGEX 0, 0, 314, 240
+IDD_IGNORE_OPT DIALOGEX 0, 0, 292, 174
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- COMBOBOX IDC_ADVICON,84,33,102,81,CBS_DROPDOWNLIST | WS_VSCROLL |
- WS_TABSTOP,WS_EX_CLIENTEDGE
- GROUPBOX "Plugin settings",IDC_STATIC,17,17,278,207
- RTEXT "Use",IDC_STATIC,28,33,49,8
- LTEXT "slot to draw the icon",IDC_STATIC,192,33,92,8
- LTEXT "Warning: classic contact list plugin doesn`t have ability to use extraicons",
- IDC_NOTICE,54,51,230,20,NOT WS_VISIBLE
- LTEXT "Filtered events:",IDC_STATIC,54,70,113,10
- CONTROL "",IDC_FILTER,"SysTreeView32",TVS_DISABLEDRAGDROP |
- TVS_NOTOOLTIPS | TVS_CHECKBOXES | WS_BORDER | WS_TABSTOP,
- 84,85,102,90
- CONTROL "Use Miranda ignore settings for All Contacts",
- IDC_IGNORE_IGNOREALL,"Button",BS_AUTOCHECKBOX | BS_TOP |
- BS_MULTILINE | WS_TABSTOP,84,182,200,25
+ GROUPBOX "Plugin settings",IDC_STATIC,7,7,278,159
+ LTEXT "Filtered events:",IDC_STATIC,44,19,113,10
+ CONTROL "",IDC_FILTER,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_CHECKBOXES | WS_BORDER | WS_HSCROLL | WS_TABSTOP,74,34,102,90
+ CONTROL "Use Miranda ignore settings for All Contacts",IDC_IGNORE_IGNOREALL,
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,74,131,200,25
END
@@ -102,32 +85,32 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
- IDD_RATE_OPT, DIALOG
+ IDD_IGNORE_OPT, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 307
+ RIGHTMARGIN, 285
VERTGUIDE, 17
VERTGUIDE, 54
VERTGUIDE, 84
VERTGUIDE, 186
VERTGUIDE, 192
VERTGUIDE, 284
- VERTGUIDE, 295
TOPMARGIN, 7
- BOTTOMMARGIN, 233
+ BOTTOMMARGIN, 167
HORZGUIDE, 17
HORZGUIDE, 33
HORZGUIDE, 70
- HORZGUIDE, 224
END
END
#endif // APSTUDIO_INVOKED
-#endif // English (U.S.) resources
+#endif // Английский (США) resources
/////////////////////////////////////////////////////////////////////////////
+
+
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/IgnoreState/src/main.cpp b/plugins/IgnoreState/src/main.cpp
index e81da8b9dc..3ab11864dd 100644
--- a/plugins/IgnoreState/src/main.cpp
+++ b/plugins/IgnoreState/src/main.cpp
@@ -57,8 +57,8 @@ PLUGININFOEX pluginInfo={
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
- {0xa6872bcd, 0xf2a1, 0x41b8, {0xb2, 0xf1, 0xdd, 0x7c, 0xec, 0x05, 0x57, 0x34}}
// a6872bcd-f2a1-41b8-b2f1-dd7cec055734
+ {0xa6872bcd, 0xf2a1, 0x41b8, {0xb2, 0xf1, 0xdd, 0x7c, 0xec, 0x05, 0x57, 0x34}}
};
extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
@@ -157,11 +157,11 @@ int onContactSettingChanged(WPARAM wParam,LPARAM lParam)
DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
HANDLE hContact = (HANDLE)wParam;
- if ( !lstrcmpA(cws->szModule,"Ignore") && !lstrcmpA(cws->szSetting,"Mask1"))
+ if ( !lstrcmpA(cws->szModule, "Ignore") && !lstrcmpA(cws->szSetting, "Mask1"))
applyExtraImage(hContact);
else if (hContact == 0) {
- if (( !lstrcmpA(cws->szModule,MODULENAME) && !lstrcmpA(cws->szSetting,"Filter")) ||
- (bUseMirandaSettings && !lstrcmpA(cws->szModule,"Ignore") && !lstrcmpA(cws->szSetting,"Default1")))
+ if (( !lstrcmpA(cws->szModule, MODULENAME) && !lstrcmpA(cws->szSetting, "Filter")) ||
+ (bUseMirandaSettings && !lstrcmpA(cws->szModule, "Ignore") && !lstrcmpA(cws->szSetting, "Default1")))
{
fill_filter();
}
diff --git a/plugins/IgnoreState/src/options.cpp b/plugins/IgnoreState/src/options.cpp
index 778f50a520..2be312018c 100644
--- a/plugins/IgnoreState/src/options.cpp
+++ b/plugins/IgnoreState/src/options.cpp
@@ -35,10 +35,6 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
bInitializing = true;
fill_filter();
- SendDlgItemMessage(hwndDlg,IDC_NOTICE, WM_SETTEXT,0,(LPARAM)TranslateT("Extraicons plugin is used, use Contact list > Extraicons for customize."));
- ShowWindow(GetDlgItem(hwndDlg, IDC_NOTICE), SW_SHOW);
- EnableWindow(GetDlgItem(hwndDlg, IDC_ADVICON), 0);
-
SetWindowLongPtr(hTree,GWL_STYLE,GetWindowLongPtr(hTree,GWL_STYLE)|TVS_NOHSCROLL);
HIMAGELIST himlButtonIcons = ImageList_Create(GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),ILC_COLOR32|ILC_MASK,2,2);
@@ -66,11 +62,6 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
case WM_COMMAND:
switch (LOWORD(wParam)) {
- case IDC_ADVICON:
- if ((HIWORD(wParam) == EN_CHANGE) && (!bInitializing) || (HIWORD(wParam) == CBN_SELENDOK))
- SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
- break;
-
case IDC_IGNORE_IGNOREALL:
EnableWindow(GetDlgItem(hwndDlg, IDC_FILTER), !IsDlgButtonChecked(hwndDlg,IDC_IGNORE_IGNOREALL));
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
@@ -118,7 +109,7 @@ int onOptInitialise(WPARAM wParam, LPARAM lParam)
odp.hInstance = g_hInst;
odp.flags = ODPF_BOLDGROUPS;
odp.pszGroup = LPGEN("Icons");
- odp.pszTemplate = MAKEINTRESOURCEA(IDD_RATE_OPT);
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_IGNORE_OPT);
odp.pszTitle = MODULENAME;
odp.pfnDlgProc = DlgProcOptions;
Options_AddPage(wParam, &odp);
diff --git a/plugins/IgnoreState/src/resource.h b/plugins/IgnoreState/src/resource.h
index 810522778e..937f970095 100644
--- a/plugins/IgnoreState/src/resource.h
+++ b/plugins/IgnoreState/src/resource.h
@@ -2,18 +2,12 @@
// Microsoft Visual C++ generated include file.
// Used by ignore.rc
//
-#define IDD_RATE_OPT 9
+#define IDD_IGNORE_OPT 9
#define IDI_IFULL 101
#define IDI_IPART 102
#define IDI_IMESS 103
-#define IDC_ADVICON 1001
-#define IDC_NOTMODERN_WARNING 1010
-#define IDC_NOTICE 1010
-#define IDC_USED_CLIST 1011
-#define IDC_FILTER 1012
-#define IDC_TREE1 1016
-#define IDC_CHECK1 1019
-#define IDC_IGNORE_IGNOREALL 1019
+#define IDC_FILTER 1010
+#define IDC_IGNORE_IGNOREALL 1011
// Next default values for new objects
//
@@ -21,7 +15,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 104
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1020
+#define _APS_NEXT_CONTROL_VALUE 1012
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 06:22:19 +0000