Contact lists:

- all common options moved to the Clist namespace;
- fixes #2281 (Add option to not clear "NotOnList" group at start);

12 files changed, 58 insertions, 68 deletions

diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index a286dff11b..bbb59d7968 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -299,28 +299,23 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "Hide offline users",IDC_HIDEOFFLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,124,10

-    CONTROL         "Hide empty groups",IDC_HIDEEMPTYGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,37,124,10

-    CONTROL         "Disable groups",IDC_DISABLEGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,124,10

-    CONTROL         "Ask before deleting contacts",IDC_CONFIRMDELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,61,124,10

+    GROUPBOX        "Contact list sorting",IDC_STATIC,2,8,294,84,WS_GROUP

     CONTROL         "Don't move offline user to bottom",IDC_NOOFFLINEMOVE,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,77,141,10

-    GROUPBOX        "Contact list",IDC_STCLISTGROUP,2,8,142,84

-    GROUPBOX        "Contact list sorting",IDC_STATIC,146,8,154,84,WS_GROUP

-    LTEXT           "1st:",IDC_STATIC,153,19,14,8

-    LTEXT           "2nd:",IDC_STATIC,153,35,14,8

-    LTEXT           "3rd:",IDC_STATIC,153,49,14,8

-    COMBOBOX        IDC_CLSORT1,169,18,125,146,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    COMBOBOX        IDC_CLSORT2,169,33,125,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    COMBOBOX        IDC_CLSORT3,169,48,125,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,77,281,10

+    LTEXT           "1st:",IDC_STATIC,15,19,14,8

+    LTEXT           "2nd:",IDC_STATIC,15,35,14,8

+    LTEXT           "3rd:",IDC_STATIC,15,49,14,8

+    COMBOBOX        IDC_CLSORT1,31,18,125,146,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    COMBOBOX        IDC_CLSORT2,31,33,125,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    COMBOBOX        IDC_CLSORT3,31,48,125,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     CONTROL         "Place offline users out of groups",IDC_OFFLINETOROOT,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,64,141,10

-    CONTROL         "Gamma correction",IDC_GAMMACORRECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,180,124,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,64,276,10

+    GROUPBOX        "Selection mode",IDC_STATIC,2,95,294,101

     CONTROL         "Default",IDC_HILIGHTMODE4,"Button",BS_AUTORADIOBUTTON,12,115,119,10

     CONTROL         "Full selection",IDC_HILIGHTMODE1,"Button",BS_AUTORADIOBUTTON,12,131,119,10

     CONTROL         "Less selection",IDC_HILIGHTMODE2,"Button",BS_AUTORADIOBUTTON,12,147,119,10

     CONTROL         "No selection",IDC_HILIGHTMODE3,"Button",BS_AUTORADIOBUTTON,12,163,119,10

-    GROUPBOX        "Selection mode",IDC_STATIC,2,101,142,95

+    CONTROL         "Gamma correction",IDC_GAMMACORRECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,179,124,10

 END

 

 IDD_OPT_CLUI_2 DIALOGEX 0, 0, 291, 224

@@ -824,6 +819,10 @@ BEGIN
     BEGIN

     END

 

+    IDD_OPT_CLIST, DIALOG

+    BEGIN

+    END

+

     IDD_OPT_CLUI_2, DIALOG

     BEGIN

         RIGHTMARGIN, 285

@@ -848,6 +847,11 @@ BEGIN
     0

 END

 

+IDD_OPT_CLIST AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

 #endif    // Russian (Russia) resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 35fe88811f..72f00bc572 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1646,9 +1646,9 @@ HRESULT ClcLoadModule()
 int ClcUnloadModule()

 {

 	if (g_CluiData.bOldUseGroups != (BYTE)-1)

-		g_plugin.setByte("UseGroups", (BYTE)g_CluiData.bOldUseGroups);

+		Clist::UseGroups = g_CluiData.bOldUseGroups;

 	if (g_CluiData.boldHideOffline != (BYTE)-1)

-		g_plugin.setByte("HideOffline", (BYTE)g_CluiData.boldHideOffline);

+		Clist::HideOffline = g_CluiData.boldHideOffline;

 

 	return 0;

 }

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 2cbf993321..8048ac070b 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -40,7 +40,7 @@ void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup)
 	cont->subcontacts = (ClcContact *)mir_calloc(sizeof(ClcContact) * subcount);

 	cont->iSubAllocated = subcount;

 	int i = 0;

-	int bHideOffline = g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT);

+	int bHideOffline = Clist::HideOffline;

 	for (int j = 0; j < subcount; j++) {

 		MCONTACT hsub = db_mc_getSub(cont->hContact, j);

 		if (hsub == -1)

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 2c12815ff5..e090ed6601 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -30,25 +30,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

-#define FONTF_NORMAL	0

-#define FONTF_BOLD		1

-#define FONTF_ITALIC	2

-#define FONTF_UNDERLINE	4

-

-#define CLCGROUP			LPGENW("Contact list") L"/" LPGENW("Contact names")

-#define CLCLINESGROUP		LPGENW("Contact list") L"/" LPGENW("Row items")

-#define CLCFRAMESGROUP		LPGENW("Contact list") L"/" LPGENW("Frame texts")

-#define CLCCOLOURSGROUP		LPGENW("Contact list") L"/" LPGENW("Special colors")

+#define FONTF_NORMAL       0

+#define FONTF_BOLD         1

+#define FONTF_ITALIC       2

+#define FONTF_UNDERLINE    4

+							      

+#define CLCGROUP           LPGENW("Contact list") L"/" LPGENW("Contact names")

+#define CLCLINESGROUP      LPGENW("Contact list") L"/" LPGENW("Row items")

+#define CLCFRAMESGROUP     LPGENW("Contact list") L"/" LPGENW("Frame texts")

+#define CLCCOLOURSGROUP    LPGENW("Contact list") L"/" LPGENW("Special colors")

 

 #define DEFAULT_COLOUR		RGB(0, 0, 0)

 #define DEFAULT_GREYCOLOUR	RGB(128, 128, 128)

 #define DEFAULT_BACKCOLOUR	RGB(255, 255, 255)

 

-#define DEFAULT_FAMILY		L"Arial"

-#define DEFAULT_EFFECT		{ 0, 0x00000000, 0x00000000 }

+#define DEFAULT_FAMILY     L"Arial"

+#define DEFAULT_EFFECT     { 0, 0x00000000, 0x00000000 }

 

-#define DEFAULT_SIZE		-11

-#define DEFAULT_SMALLSIZE	-8

+#define DEFAULT_SIZE       -11

+#define DEFAULT_SMALLSIZE  -8

 

 struct

 {

@@ -476,7 +476,18 @@ static int _GetNetVisibleProtoCount()
 	return netProtoCount;

 }

 

-static wchar_t* sortby[] = { LPGENW("Name"), LPGENW("Name (use locale settings)"), LPGENW("Status"), LPGENW("Last message time"), LPGENW("Account name"), LPGENW("Rate"), LPGENW("Last online"), LPGENW("-Nothing-") };

+static wchar_t* sortby[] = 

+{

+	LPGENW("Name"), 

+	LPGENW("Name (use locale settings)"), 

+	LPGENW("Status"), 

+	LPGENW("Last message time"), 

+	LPGENW("Account name"), 

+	LPGENW("Rate"), 

+	LPGENW("Last online"), 

+	LPGENW("-Nothing-")

+};

+

 static int sortbyValue[] = { SORTBY_NAME, SORTBY_NAME_LOCALE, SORTBY_STATUS, SORTBY_LASTMSG, SORTBY_PROTO, SORTBY_RATE, SORTBY_LAST_ONLINE, SORTBY_NOTHING };

 

 static INT_PTR CALLBACK DlgProcClistOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

@@ -485,11 +496,6 @@ static INT_PTR CALLBACK DlgProcClistOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 

-		CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, g_plugin.getByte("HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, g_plugin.getByte("UseGroups", SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED);

-		CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE, g_plugin.getByte("ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-

 		CheckDlgButton(hwndDlg, IDC_GAMMACORRECT, db_get_b(0, "CLC", "GammaCorrect", CLCDEFAULT_GAMMACORRECT) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_HILIGHTMODE4, db_get_b(0, "CLC", "HiLightMode", SETTING_HILIGHTMODE_DEFAULT) == 0 ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_HILIGHTMODE1, db_get_b(0, "CLC", "HiLightMode", SETTING_HILIGHTMODE_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED);

@@ -534,11 +540,6 @@ static INT_PTR CALLBACK DlgProcClistOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 		case 0:

 			switch (((LPNMHDR)lParam)->code) {

 			case PSN_APPLY:

-				g_plugin.setByte("HideOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE));

-				g_plugin.setByte("HideEmptyGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS));

-				g_plugin.setByte("UseGroups", (BYTE)BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS));

-				g_plugin.setByte("ConfirmDelete", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE));

-

 				db_set_b(0, "CLC", "GammaCorrect", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_GAMMACORRECT));

 				int hil = 0;

 				if (IsDlgButtonChecked(hwndDlg, IDC_HILIGHTMODE1))  hil = 1;

diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp
index 0eb7645f1a..3332536da5 100644
--- a/plugins/Clist_modern/src/modern_clistopts.cpp
+++ b/plugins/Clist_modern/src/modern_clistopts.cpp
@@ -913,7 +913,6 @@ int CListOptInit(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = {};

 	odp.position = -200000000;

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ITEMS);

 	odp.szGroup.a = LPGEN("Contact list");

 	odp.szTitle.a = LPGEN("Row items");

 	odp.flags = ODPF_BOLDGROUPS;

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 1705568ee5..62cde0a7fb 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -270,10 +270,10 @@ m_hDwmapiDll(nullptr)
 	LoadCLUIFramesModule();

 

 	g_CluiData.boldHideOffline = -1;

-	bOldHideOffline = g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT);

+	bOldHideOffline = Clist::HideOffline;

 

 	g_CluiData.bOldUseGroups = -1;

-	bOldUseGroups = g_plugin.getByte("UseGroups", SETTING_USEGROUPS_DEFAULT);

+	bOldUseGroups = Clist::UseGroups;

 }

 

 CLUI::~CLUI()

@@ -332,11 +332,7 @@ HRESULT CLUI::RegisterAvatarMenu()
 HRESULT CLUI::CreateCLCWindow(const HWND hwndClui)

 {

 	g_clistApi.hwndContactTree = CreateWindow(CLISTCONTROL_CLASSW, L"",

-		WS_CHILD | WS_CLIPCHILDREN | CLS_CONTACTLIST

-		| (g_plugin.getByte("UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0)

-		| (g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? CLS_HIDEOFFLINE : 0)

-		| (g_plugin.getByte("HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? CLS_HIDEEMPTYGROUPS : 0

-		| CLS_MULTICOLUMN),

+		WS_CHILD | WS_CLIPCHILDREN | CLS_CONTACTLIST | (Clist::UseGroups ? CLS_USEGROUPS : 0) | (Clist::HideOffline ? CLS_HIDEOFFLINE : 0) | (Clist::HideEmptyGroups ? CLS_HIDEEMPTYGROUPS : 0 | CLS_MULTICOLUMN),

 		0, 0, 0, 0, hwndClui, nullptr, g_plugin.getInst(), nullptr);

 

 	return S_OK;

@@ -2494,7 +2490,6 @@ LRESULT CLUI::OnDestroy(UINT, WPARAM, LPARAM)
 	if (state == SETTING_STATE_NORMAL)

 		CLUI_ShowWindowMod(m_hWnd, SW_HIDE);

 	UnLoadContactListModule();

-	ClcUnloadModule();

 

 	RemoveMenu(g_clistApi.hMenuMain, 0, MF_BYPOSITION);

 	RemoveMenu(g_clistApi.hMenuMain, 0, MF_BYPOSITION);

diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp
index 3535f28e70..53a4ba2e22 100644
--- a/plugins/Clist_modern/src/modern_contact.cpp
+++ b/plugins/Clist_modern/src/modern_contact.cpp
@@ -161,7 +161,7 @@ INT_PTR SetUseGroups(WPARAM wParam, LPARAM)
 		if (!newVal == (int)wParam) return 0;

 		newVal = wParam;

 	}

-	g_plugin.setByte("UseGroups", (BYTE)newVal);

+	Clist::UseGroups = newVal;

 	SendMessage(g_clistApi.hwndContactTree, CLM_SETUSEGROUPS, newVal, 0);

 	return 0;

 }

diff --git a/plugins/Clist_modern/src/modern_defsettings.h b/plugins/Clist_modern/src/modern_defsettings.h
index cd0eba1616..979baa5aee 100644
--- a/plugins/Clist_modern/src/modern_defsettings.h
+++ b/plugins/Clist_modern/src/modern_defsettings.h
@@ -33,9 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define SETTING_TOOLWINDOW_DEFAULT                1 

 #define SETTING_ONTOP_DEFAULT                     1 

 #define SETTING_MIN2TRAY_DEFAULT                  1 

-#define SETTING_HIDEOFFLINE_DEFAULT               0 

-#define SETTING_HIDEEMPTYGROUPS_DEFAULT           0 

-#define SETTING_USEGROUPS_DEFAULT                 1 

 #define SETTING_PLACEOFFLINETOROOT_DEFAULT        0 

 #define SETTING_DISABLETRAYFLASH_DEFAULT          0 

 #define SETTING_ICONFLASHTIME_DEFAULT           550 

@@ -198,7 +195,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define SETTING_TRANSPARENT_DEFAULT               0 

 #define SETTING_AUTOALPHA_DEFAULT               150 

-#define SETTING_CONFIRMDELETE_DEFAULT             1 

 #define SETTING_AUTOHIDE_DEFAULT                  0 

 #define SETTING_HIDETIME_DEFAULT                 30 

 #define SETTING_CYCLETIME_DEFAULT                 4 

diff --git a/plugins/Clist_modern/src/modern_static_clui.h b/plugins/Clist_modern/src/modern_static_clui.h
index ca1640adcf..3f43e68804 100644
--- a/plugins/Clist_modern/src/modern_static_clui.h
+++ b/plugins/Clist_modern/src/modern_static_clui.h
@@ -54,7 +54,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /* Declaration of prototypes in other modules */
 
-int ClcUnloadModule();
 int ClcEnterDragToScroll(HWND hwnd, int Y);
 
 int CListMod_ContactListShutdownProc(WPARAM wParam, LPARAM lParam);
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index 69d26cc069..e62ca8db61 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -85,8 +85,8 @@ void Modern_InitButtons()
 		BTNS[i].hButton = g_plugin.addTTB(&tbb);

 	}

 

-	SetButtonPressed(3, g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT));

-	SetButtonPressed(6, g_plugin.getByte("UseGroups", SETTING_USEGROUPS_DEFAULT));

+	SetButtonPressed(3, Clist::HideOffline);

+	SetButtonPressed(6, Clist::UseGroups);

 	SetButtonPressed(7, db_get_b(0, "Skin", "UseSound", SETTING_ENABLESOUNDS_DEFAULT));

 }

 

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 91d6f2e114..5f52895231 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -1312,7 +1312,7 @@ void ApplyViewMode(const char *szName, bool onlySelector)
 

 			if (g_CluiData.bFilterEffective & CLVM_FILTER_STATUS) {

 				if (g_CluiData.boldHideOffline == (BYTE)-1)

-					g_CluiData.boldHideOffline = g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT);

+					g_CluiData.boldHideOffline = Clist::HideOffline;

 

 				g_clistApi.pfnSetHideOffline(false);

 			}

@@ -1329,7 +1329,7 @@ void ApplyViewMode(const char *szName, bool onlySelector)
 

 			if (bUseGroups != -1) {

 				if (g_CluiData.bOldUseGroups == (BYTE)-1)

-					g_CluiData.bOldUseGroups = g_plugin.getByte("UseGroups", SETTING_USEGROUPS_DEFAULT);

+					g_CluiData.bOldUseGroups = Clist::UseGroups;

 

 				CallService(MS_CLIST_SETUSEGROUPS, bUseGroups, 0);

 			}

diff --git a/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h
index ddaf7b5b40..527d5a1309 100644
--- a/plugins/Clist_modern/src/resource.h
+++ b/plugins/Clist_modern/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by ..\res\resource.rc

+// Used by w:\miranda-ng\plugins\Clist_modern\res\resource.rc

 //

 #define IDC_ALWAYS_VISIBLEICON          0

 #define IDC_APPLY                       3

@@ -114,14 +114,10 @@
 #define IDC_TOOLWND                     1097

 #define IDC_ONECLK                      1098

 #define IDC_SHOWCAPTION                 1098

-#define IDC_HIDEOFFLINE                 1099

-#define IDC_HIDEEMPTYGROUPS             1100

 #define IDC_FADEINOUT                   1101

 #define IDC_AUTOSIZE                    1102

-#define IDC_DISABLEGROUPS               1102

 #define IDC_AUTOSIZEUPWARD              1103

 #define IDC_ALWAYSSTATUS                1103

-#define IDC_CONFIRMDELETE               1104

 #define IDC_LOCKSIZING                  1111

 #define IDC_TRANSPARENT                 1124

 #define IDC_TRANSINACTIVE               1126

@@ -496,7 +492,7 @@
 // 

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        511

+#define _APS_NEXT_RESOURCE_VALUE        512

 #define _APS_NEXT_COMMAND_VALUE         40022

 #define _APS_NEXT_CONTROL_VALUE         2025

 #define _APS_NEXT_SYMED_VALUE           101