From c1cb7d69096ff2b3fbd20d1ceeb29fefb0a5bc4a Mon Sep 17 00:00:00 2001 From: mataes2007 Date: Mon, 16 May 2011 20:27:44 +0000 Subject: useactions: added patch from NightFox git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@116 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- useactions/UseActions.c | 88 +++++++++++++++++++++++++++++++++++++------- useactions/UseActions.h | 7 ++++ useactions/res/UseActions.rc | 60 ++++++++++++++++-------------- useactions/res/resource.h | 3 ++ useactions/res/version.h | 10 +++-- 5 files changed, 123 insertions(+), 45 deletions(-) diff --git a/useactions/UseActions.c b/useactions/UseActions.c index 71e4371..85de062 100644 --- a/useactions/UseActions.c +++ b/useactions/UseActions.c @@ -69,15 +69,15 @@ void DeleteIcolibIcon(MyActionItem* ActionItem); int AddCoreHotkey(MyActionItem* ActionItem); void DeleteCoreHotkey(MyActionItem* ActionItem); -static int ServiceCallWithLParam (WPARAM wParam, LPARAM lParam); -static int ServiceCallWithFParam (WPARAM wParam, LPARAM lParam, LPARAM fParam); +INT_PTR ServiceCallWithLParam (WPARAM wParam, LPARAM lParam); +INT_PTR ServiceCallWithFParam (WPARAM wParam, LPARAM lParam, LPARAM fParam); int ActionsChanged(WPARAM wParam, LPARAM lParam); void AddActionItem(TChain NewAction, int Index); void SetActionDesc(MyActionItem* ActionItem, TChain NewAction); void DeleteActionItem(MyActionItem* ActionItem, int ActionIndex); int OptInit(WPARAM wParam, LPARAM lParam); -BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); void FillListViewWithActions(); int OptActiveItem; HWND hListView; @@ -229,6 +229,8 @@ void DeleteActionItem(MyActionItem* ActionItem, int ActionIndex) { DBDeleteContactSetting(NULL, MODULE, text); strcpy(szDest, "MMenuName"); DBDeleteContactSetting(NULL, MODULE, text); + strcpy(szDest, "MMenuVarStr"); + DBDeleteContactSetting(NULL, MODULE, text); } // ContactMenu items @@ -295,7 +297,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { bVariablePresents = ServiceExists(MS_VARS_FORMATSTRING); bTrayMenuPresents = ServiceExists(MS_CLIST_ADDTRAYMENUITEM); - hServiceWithLParam = CreateServiceFunction(SERVICE_WITH_LPARAM_NAME,&ServiceCallWithLParam); + hServiceWithLParam = CreateServiceFunction(SERVICE_WITH_LPARAM_NAME, &ServiceCallWithLParam); for (i=0;itszMMenuShowWhenVars, dbv2.ptszVal); + DBFreeVariant(&dbv2); + result++; + } strcpy(szDest, "CMenuName"); if(!DBGetContactSettingTString(NULL, MODULE, text, &dbv)) { _tcscpy(ActionItem->tszCMenuNameVars, dbv.ptszVal); @@ -564,6 +572,11 @@ void WriteSetting(MyActionItem* ActionItem){ DBDeleteContactSetting(NULL, MODULE, text); else DBWriteContactSettingTString(NULL, MODULE, text, ActionItem->tszMMenuNameVars); + strcpy(szDest, "MMenuVarStr"); + if(ActionItem->tszMMenuShowWhenVars[0] == 0) + DBDeleteContactSetting(NULL, MODULE, text); + else + DBWriteContactSettingTString(NULL, MODULE, text, ActionItem->tszMMenuShowWhenVars); strcpy(szDest, "CMenuName"); if(ActionItem->tszCMenuNameVars[0] == 0) DBDeleteContactSetting(NULL, MODULE, text); @@ -649,6 +662,7 @@ void DeleteMainMenuItem(MyActionItem* ActionItem) { int PreBuildMainMenu(WPARAM wParam,LPARAM lParam){ int i; TCHAR* tszVarResult; + TCHAR tszVarResultCopy[MAX_ACT_DESC_LEN]; // HANDLE hContact = (HANDLE) wParam; // char* szProto = ( char* )CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); for (i=0; ihMainMenuItem) { CLISTMENUITEM clmi = {0}; clmi.cbSize = sizeof(clmi); - clmi.flags = CMIM_NAME | CMIF_TCHAR; - clmi.ptszName = ActItem->tszActDescr; + clmi.flags = CMIM_FLAGS | CMIF_HIDDEN; + if ( bVariablePresents && + (ActItem->wFlags & UAF_REGMMENU) && + (ActItem->wFlags & UAF_MMENU_VARS) && + (ActItem->tszMMenuShowWhenVars[0] != 0) ) { + tszVarResult = variables_parse(ActItem->tszMMenuShowWhenVars, (TCHAR *)NULL, (HANDLE) wParam); + if (_tcscmp(tszVarResult, _T("1")) == 0) { + //show menuitem + clmi.flags = CMIM_FLAGS; + } + variables_free(tszVarResult); + } + else if( (ActItem->wFlags & UAF_REGMMENU) && !(ActItem->wFlags & UAF_MMENU_VARS) ) { + //show menuitem + clmi.flags = CMIM_FLAGS; + } + + // Name through Vars if ( bVariablePresents && (ActItem->wFlags & UAF_REGMMENU) && (ActItem->tszMMenuNameVars[0] != 0) ) { tszVarResult = variables_parse(ActItem->tszMMenuNameVars, (TCHAR *)NULL, (HANDLE) wParam); - if (tszVarResult[0] != 0) - clmi.ptszName = tszVarResult; - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) ActItem->hMainMenuItem, (LPARAM)&clmi); + if (tszVarResult[0] != 0) { + _tcsncpy(tszVarResultCopy, tszVarResult, MAX_ACT_DESC_LEN); + clmi.ptszName = tszVarResultCopy; + } + else + clmi.ptszName = ActItem->tszActDescr; + clmi.flags |= CMIM_NAME | CMIF_TCHAR; variables_free(tszVarResult); - } } } + } + if (!_tcscmp(ActItem->tszMMenuNameVars, _T("-----"))) { + //clmi.flags |= CMIF_HIDDEN; + } + CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) ActItem->hMainMenuItem, (LPARAM)&clmi); + } + } return 0; } @@ -1084,7 +1124,7 @@ int OptInit(WPARAM wParam, LPARAM lParam) { return 0; } -BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { +INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { LOGFONT lf; HFONT hf; switch ( msg ) { @@ -1100,25 +1140,30 @@ BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) char *szTipInfo = (char *)CallService(MS_VARS_GETSKINITEM, 0, (LPARAM)VSI_HELPTIPTEXT); if (hIcon != NULL) { SendMessage(GetDlgItem(hwndDlg, IDC_BTMMNVARSHELP), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon); + SendMessage(GetDlgItem(hwndDlg, IDC_BTMMSVARSHELP), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon); SendMessage(GetDlgItem(hwndDlg, IDC_BTCMNVARSHELP), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon); SendMessage(GetDlgItem(hwndDlg, IDC_BTCMSVARSHELP), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon); } else { SetDlgItemText(hwndDlg, IDC_BTMMNVARSHELP, _T("V")); + SetDlgItemText(hwndDlg, IDC_BTMMSVARSHELP, _T("V")); SetDlgItemText(hwndDlg, IDC_BTCMNVARSHELP, _T("V")); SetDlgItemText(hwndDlg, IDC_BTCMSVARSHELP, _T("V")); } if (szTipInfo == NULL) { SendMessage(GetDlgItem(hwndDlg, IDC_BTMMNVARSHELP), BUTTONADDTOOLTIP, (WPARAM)Translate("Open string formatting help for MainMenuitem name"), 0); + SendMessage(GetDlgItem(hwndDlg, IDC_BTMMSVARSHELP), BUTTONADDTOOLTIP, (WPARAM)Translate("Open string formatting help for MainMenuitem showing"), 0); SendMessage(GetDlgItem(hwndDlg, IDC_BTCMNVARSHELP), BUTTONADDTOOLTIP, (WPARAM)Translate("Open string formatting help for ContactMenuitem name"), 0); SendMessage(GetDlgItem(hwndDlg, IDC_BTCMSVARSHELP), BUTTONADDTOOLTIP, (WPARAM)Translate("Open string formatting help for ContactMenuitem showing"), 0); } else { SendMessage(GetDlgItem(hwndDlg, IDC_BTMMNVARSHELP), BUTTONADDTOOLTIP, (WPARAM)szTipInfo, 0); + SendMessage(GetDlgItem(hwndDlg, IDC_BTMMSVARSHELP), BUTTONADDTOOLTIP, (WPARAM)szTipInfo, 0); SendMessage(GetDlgItem(hwndDlg, IDC_BTCMNVARSHELP), BUTTONADDTOOLTIP, (WPARAM)szTipInfo, 0); SendMessage(GetDlgItem(hwndDlg, IDC_BTCMSVARSHELP), BUTTONADDTOOLTIP, (WPARAM)szTipInfo, 0); } SendDlgItemMessage(hwndDlg, IDC_BTMMNVARSHELP, BUTTONSETASFLATBTN, 0, 0); + SendDlgItemMessage(hwndDlg, IDC_BTMMSVARSHELP, BUTTONSETASFLATBTN, 0, 0); SendDlgItemMessage(hwndDlg, IDC_BTCMNVARSHELP, BUTTONSETASFLATBTN, 0, 0); SendDlgItemMessage(hwndDlg, IDC_BTCMSVARSHELP, BUTTONSETASFLATBTN, 0, 0); } @@ -1176,9 +1221,16 @@ BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) if ((HIWORD(wParam) == EN_CHANGE) && !bRefreshing) GetDlgItemText(hwndDlg, IDC_EDCMENUPN, ActItem->tszCMenuPopup, MAX_ACT_DESC_LEN); break; + case IDC_CHBMMVARS: + ActItem->wFlags ^= UAF_MMENU_VARS; + break; case IDC_CHBCMVARS: ActItem->wFlags ^= UAF_CMENU_VARS; break; + case IDC_EDMMENUVARSTR: + if ((HIWORD(wParam) == EN_CHANGE) && !bRefreshing) + GetDlgItemText(hwndDlg, IDC_EDMMENUVARSTR, ActItem->tszMMenuShowWhenVars, MAX_VARSCRIPT_LEN); + break; case IDC_EDCMENUVARSTR: if ((HIWORD(wParam) == EN_CHANGE) && !bRefreshing) GetDlgItemText(hwndDlg, IDC_EDCMENUVARSTR, ActItem->tszCMenuShowWhenVars, MAX_VARSCRIPT_LEN); @@ -1196,6 +1248,9 @@ BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) case IDC_BTMMNVARSHELP: variables_showhelp(hwndDlg, IDC_EDMMENUN, VHF_FULLDLG|VHF_SETLASTSUBJECT, NULL, NULL); break; + case IDC_BTMMSVARSHELP: + variables_showhelp(hwndDlg, IDC_EDMMENUVARSTR, VHF_FULLDLG|VHF_SETLASTSUBJECT, NULL, NULL); + break; case IDC_BTCMNVARSHELP: variables_showhelp(hwndDlg, IDC_EDCMENUN, VHF_FULLDLG|VHF_SETLASTSUBJECT, NULL, NULL); break; @@ -1249,6 +1304,8 @@ BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) CheckDlgButton(hwndDlg, IDC_CHBCMENUITEM, (ActItem->wFlags & UAF_REGCMENU) ? BST_CHECKED : BST_UNCHECKED); SetDlgItemText(hwndDlg, IDC_EDCMENUN, ActItem->tszCMenuNameVars); SetDlgItemText(hwndDlg, IDC_EDCMENUPN, ActItem->tszCMenuPopup); + CheckDlgButton(hwndDlg, IDC_CHBMMVARS, (ActItem->wFlags & UAF_MMENU_VARS) ? BST_CHECKED : BST_UNCHECKED); + SetDlgItemText(hwndDlg, IDC_EDMMENUVARSTR, ActItem->tszMMenuShowWhenVars); CheckDlgButton(hwndDlg, IDC_CHBCMVARS, (ActItem->wFlags & UAF_CMENU_VARS) ? BST_CHECKED : BST_UNCHECKED); SetDlgItemText(hwndDlg, IDC_EDCMENUVARSTR, ActItem->tszCMenuShowWhenVars); @@ -1325,10 +1382,13 @@ void FillListViewWithActions() { ShowWindow(GetDlgItem(hDialogWIndow, IDC_BTMMNVARSHELP), ((ActionItemsList.realCount>0) && bVariablePresents)? SW_SHOW : SW_HIDE); EnableWindow(GetDlgItem(hDialogWIndow, IDC_BTCMNVARSHELP), (ActionItemsList.realCount>0) && bVariablePresents); + ShowWindow(GetDlgItem(hDialogWIndow, IDC_BTMMSVARSHELP), (ActionItemsList.realCount>0) && bVariablePresents); ShowWindow(GetDlgItem(hDialogWIndow, IDC_BTCMSVARSHELP), (ActionItemsList.realCount>0) && bVariablePresents); EnableWindow(GetDlgItem(hDialogWIndow, IDC_EDMMENUN), (ActionItemsList.realCount>0) && bVariablePresents); EnableWindow(GetDlgItem(hDialogWIndow, IDC_EDCMENUN), (ActionItemsList.realCount>0) && bVariablePresents); + EnableWindow(GetDlgItem(hDialogWIndow, IDC_EDMMENUVARSTR), (ActionItemsList.realCount>0) && bVariablePresents); EnableWindow(GetDlgItem(hDialogWIndow, IDC_EDCMENUVARSTR), (ActionItemsList.realCount>0) && bVariablePresents); + EnableWindow(GetDlgItem(hDialogWIndow, IDC_CHBMMVARS), (ActionItemsList.realCount>0) && bVariablePresents); EnableWindow(GetDlgItem(hDialogWIndow, IDC_CHBCMVARS), (ActionItemsList.realCount>0) && bVariablePresents); EnableWindow(GetDlgItem(hDialogWIndow, IDC_CHBTTBB), (ActionItemsList.realCount>0) && bTTBPresents); diff --git a/useactions/UseActions.h b/useactions/UseActions.h index 5d1e36a..f67f184 100644 --- a/useactions/UseActions.h +++ b/useactions/UseActions.h @@ -20,6 +20,7 @@ typedef struct tagMyActionItem{ TCHAR tszMMenuPopup[MAX_ACT_DESC_LEN]; TCHAR tszMMenuNameVars[MAX_VARSCRIPT_LEN]; HANDLE hMMenuRoot; + TCHAR tszMMenuShowWhenVars[MAX_VARSCRIPT_LEN]; HANDLE hContactMenuItem; TCHAR tszCMenuNameVars[MAX_VARSCRIPT_LEN]; TCHAR tszCMenuPopup[MAX_ACT_DESC_LEN]; @@ -42,7 +43,13 @@ typedef struct tagMyActionItem{ #define UAF_REGTABB (1<<5) // #define UAF_CMENU_CNTCT (1<<6) // #define UAF_CMENU_CHAT (1<<7) + +#define UAF_MMENU_VARS (1<<7) + #define UAF_CMENU_VARS (1<<8) + #define UAF_REGTMENU (1<<9) #define UAF_MMENUSEP (1<<10) #define UAF_CMENUSEP (1<<11) + +//#define UAF_MMENU_VARS (1<<12) diff --git a/useactions/res/UseActions.rc b/useactions/res/UseActions.rc index 849825f..fd2de9e 100644 --- a/useactions/res/UseActions.rc +++ b/useactions/res/UseActions.rc @@ -18,6 +18,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) #ifdef _WIN32 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(1251) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// @@ -25,42 +26,45 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Dialog // -IDD_OPTIONS DIALOGEX 0, 0, 312, 232 +IDD_OPTIONS DIALOGEX 0, 0, 308, 233 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "The way actions could be called",IDC_GB,7,2,297,226 - CONTROL "",IDC_ACTIONSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,15,12,115,210 + GROUPBOX "The way actions could be called",IDC_GB,6,2,297,226 + CONTROL "",IDC_ACTIONSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,12,12,118,210 CONTROL "CList_Modern",IDC_CHBMTBB,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,150,19,76,8 - CONTROL "Core Hotkey",IDC_CHBHOTKEY,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,150,208,146,8 - CONTROL "Enable",IDC_CHBMMENUITEM,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,150,54,50,8 - CONTROL "Enable",IDC_CHBCMENUITEM,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,150,106,50,8 + CONTROL "Core Hotkey",IDC_CHBHOTKEY,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,150,214,146,8 + CONTROL "Enable",IDC_CHBMMENUITEM,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,150,49,65,8 + CONTROL "Enable",IDC_CHBCMENUITEM,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,150,118,65,8 CONTROL "TopToolBar",IDC_CHBTTBB,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,150,28,68,8 - EDITTEXT IDC_EDMMENUPN,218,60,78,12,ES_AUTOHSCROLL | WS_GROUP - EDITTEXT IDC_EDCMENUPN,218,112,78,12,ES_AUTOHSCROLL | WS_GROUP - RTEXT "Root popup:",IDC_STMMIROOTPOPN,150,62,65,8 - RTEXT "Root popup:",IDC_STCMIROOTPOPN,150,114,65,8 - CONTROL "show only if variables return 1",IDC_CHBCMVARS,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP,162,142,134,8 - EDITTEXT IDC_EDCMENUVARSTR,162,151,120,12,ES_AUTOHSCROLL | WS_GROUP - CONTROL "",IDC_BTCMSVARSHELP,"MButtonClass",WS_TABSTOP,282,151,14,12 + EDITTEXT IDC_EDMMENUPN,218,56,78,12,ES_AUTOHSCROLL | WS_GROUP + EDITTEXT IDC_EDCMENUPN,218,125,78,12,ES_AUTOHSCROLL | WS_GROUP + RTEXT "Root popup:",IDC_STMMIROOTPOPN,132,58,83,8 + RTEXT "Root popup:",IDC_STCMIROOTPOPN,132,127,83,8 + CONTROL "show only if variables return 1",IDC_CHBCMVARS,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP,162,152,134,8 + EDITTEXT IDC_EDCMENUVARSTR,162,161,120,12,ES_AUTOHSCROLL | WS_GROUP + CONTROL "",IDC_BTCMSVARSHELP,"MButtonClass",WS_TABSTOP,282,161,14,12 LTEXT "Toolbar buttons",IDC_STTOOLBAR,140,10,145,8 - LTEXT "Main menu item",IDC_STMMI,140,44,156,8 - LTEXT "Contact menu item",IDC_STCMI,140,96,156,8 - LTEXT "Other",IDC_STOTHER,140,199,156,8 - LTEXT "Tray menu item",IDC_STTMI,140,169,156,8 - EDITTEXT IDC_EDTMENUPN,220,185,76,12,ES_AUTOHSCROLL | WS_GROUP - CONTROL "Enable",IDC_CHBTMENUITEM,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,150,178,50,8 - RTEXT "Root popup:",IDC_STTMIROOTPOPN,150,187,65,8 - EDITTEXT IDC_EDMMENUN,218,73,63,12,ES_AUTOHSCROLL | WS_GROUP - RTEXT "Name through vars:",IDC_STMMIVARNAME,150,75,65,8 - CONTROL "",IDC_BTMMNVARSHELP,"MButtonClass",WS_TABSTOP,282,73,14,12 - EDITTEXT IDC_EDCMENUN,218,125,63,12,ES_AUTOHSCROLL | WS_GROUP - RTEXT "Name through vars:",IDC_STCMIVARNAME,150,127,65,8 - CONTROL "",IDC_BTCMNVARSHELP,"MButtonClass",WS_TABSTOP,282,125,14,12 + LTEXT "Main menu item",IDC_STMMI,140,39,156,8 + LTEXT "Contact menu item",IDC_STCMI,140,107,156,8 + LTEXT "Other",IDC_STOTHER,140,204,156,8 + LTEXT "Tray menu item",IDC_STTMI,140,176,156,8 + EDITTEXT IDC_EDTMENUPN,220,194,76,12,ES_AUTOHSCROLL | WS_GROUP + CONTROL "Enable",IDC_CHBTMENUITEM,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,150,186,65,8 + RTEXT "Root popup:",IDC_STTMIROOTPOPN,150,195,65,8 + EDITTEXT IDC_EDMMENUN,218,69,64,12,ES_AUTOHSCROLL | WS_GROUP + RTEXT "Name through vars:",IDC_STMMIVARNAME,132,72,83,8 + CONTROL "",IDC_BTMMNVARSHELP,"MButtonClass",WS_TABSTOP,282,69,14,12 + EDITTEXT IDC_EDCMENUN,218,138,64,12,ES_AUTOHSCROLL | WS_GROUP + RTEXT "Name through vars:",IDC_STCMIVARNAME,132,139,83,8 + CONTROL "",IDC_BTCMNVARSHELP,"MButtonClass",WS_TABSTOP,282,138,14,12 CONTROL "TabButtonBar",IDC_CHBTABBB,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,228,19,68,8 - CONTROL "separated",IDC_CHBMMENUSEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,219,50,77,10 - CONTROL "separated",IDC_CHBCMENUSEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,219,102,77,10 + CONTROL "separated",IDC_CHBMMENUSEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,46,77,10 + CONTROL "separated",IDC_CHBCMENUSEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,115,77,10 + CONTROL "show only if variables return 1",IDC_CHBMMVARS,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP,162,83,134,8 + EDITTEXT IDC_EDMMENUVARSTR,162,92,120,12,ES_AUTOHSCROLL | WS_GROUP + CONTROL "",IDC_BTMMSVARSHELP,"MButtonClass",WS_TABSTOP,282,92,14,12 END IDD_ELEMOPTS DIALOGEX 0, 0, 316, 182 diff --git a/useactions/res/resource.h b/useactions/res/resource.h index 05d165e..063634b 100644 --- a/useactions/res/resource.h +++ b/useactions/res/resource.h @@ -36,6 +36,9 @@ #define IDC_BTCMNVARSHELP 1030 #define IDC_CHBMMENUSEP 1031 #define IDC_CHBCMENUSEP 1032 +#define IDC_CHBMMVARS 1033 +#define IDC_EDMMENUVARSTR 1034 +#define IDC_BTMMSVARSHELP 1035 // Next default values for new objects // diff --git a/useactions/res/version.h b/useactions/res/version.h index 94df319..c4698c8 100644 --- a/useactions/res/version.h +++ b/useactions/res/version.h @@ -8,7 +8,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 0 #define __RELEASE_NUM 0 -#define __BUILD_NUM 3 +#define __BUILD_NUM 4 // plugin SVN Revision number //#define __REV_NUM 5678 @@ -21,13 +21,17 @@ //#define __PROD_REV_NUM 1234 // stuff that will be used in PluginInfo section and in Version resource +#if defined (_UNICODE) +#define __PLUGIN_NAME "UseActions (Unicode)" +#else #define __PLUGIN_NAME "UseActions" +#endif #define __FILENAME "UseActions.dll" -#define __DESC "This plugin makes use of actions, serviced by Actions Manager plugin (ActMan, by Awkward)" +#define __DESC "This plugin makes use of actions, serviced by Actions Manager plugin (ActMan by Awkward)." #define __AUTHOR "Igor Abakumov" #define __AUTHOREMAIL "abakumoff@mail.ru" #define __AUTHORWEB "http://vasilich.org/blog" -#define __COPYRIGHT "© 2009 Igor Abakumov" +#define __COPYRIGHT "© 2010 Igor Abakumov" // other stuff for Version resource #define __STRINGIFY_IMPL(x) #x -- cgit v1.2.3