From c559a18ca21a2a1fa3199c4bb60bcd031ec17134 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 11 Jan 2014 16:23:36 +0000 Subject: MS_UTILS_ENTERSTRING moved from Jabber to the core, cause it's very handy git-svn-id: http://svn.miranda-ng.org/main/trunk@7593 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/commonheaders.h | 1 + src/miranda32_10.vcxproj | 3 +++ src/miranda32_10.vcxproj.filters | 3 +++ src/miranda32_11.vcxproj | 3 +++ src/miranda32_11.vcxproj.filters | 3 +++ src/miranda32_12.vcxproj | 3 +++ src/miranda32_12.vcxproj.filters | 9 ++++++--- src/modules/utils/utils.cpp | 3 +++ src/resource.h | 7 ++++++- src/resource.rc | 12 ++++++++++++ 10 files changed, 43 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h index 5cb9c620a2..57aa90dc68 100644 --- a/src/core/commonheaders.h +++ b/src/core/commonheaders.h @@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include +#include #ifdef _DEBUG #include diff --git a/src/miranda32_10.vcxproj b/src/miranda32_10.vcxproj index 8a3ec29ec3..dd742ec9ec 100644 --- a/src/miranda32_10.vcxproj +++ b/src/miranda32_10.vcxproj @@ -452,6 +452,9 @@ ..\..\core\commonheaders.h + + ..\..\core\commonheaders.h + ..\..\core\commonheaders.h diff --git a/src/miranda32_10.vcxproj.filters b/src/miranda32_10.vcxproj.filters index e8d729352c..4ef4ea036f 100644 --- a/src/miranda32_10.vcxproj.filters +++ b/src/miranda32_10.vcxproj.filters @@ -554,6 +554,9 @@ Modules\srmm + + Modules\utils + diff --git a/src/miranda32_11.vcxproj b/src/miranda32_11.vcxproj index 01945ac124..4eed34ef0c 100644 --- a/src/miranda32_11.vcxproj +++ b/src/miranda32_11.vcxproj @@ -455,6 +455,9 @@ ..\..\core\commonheaders.h + + ..\..\core\commonheaders.h + ..\..\core\commonheaders.h diff --git a/src/miranda32_11.vcxproj.filters b/src/miranda32_11.vcxproj.filters index e9e02aaa72..4cc2fe9de8 100644 --- a/src/miranda32_11.vcxproj.filters +++ b/src/miranda32_11.vcxproj.filters @@ -554,6 +554,9 @@ Modules\srmm + + Modules\utils + diff --git a/src/miranda32_12.vcxproj b/src/miranda32_12.vcxproj index caca6170ca..cd679e6818 100644 --- a/src/miranda32_12.vcxproj +++ b/src/miranda32_12.vcxproj @@ -456,6 +456,9 @@ ..\..\core\commonheaders.h + + ..\..\core\commonheaders.h + ..\..\core\commonheaders.h diff --git a/src/miranda32_12.vcxproj.filters b/src/miranda32_12.vcxproj.filters index e9e02aaa72..7bb84c760a 100644 --- a/src/miranda32_12.vcxproj.filters +++ b/src/miranda32_12.vcxproj.filters @@ -156,9 +156,6 @@ SDK - - SDK - SDK @@ -252,6 +249,9 @@ Modules\extraicons + + Modules\utils + @@ -554,6 +554,9 @@ Modules\srmm + + Modules\utils + diff --git a/src/modules/utils/utils.cpp b/src/modules/utils/utils.cpp index 823b981721..8bcb4a1fa7 100644 --- a/src/modules/utils/utils.cpp +++ b/src/modules/utils/utils.cpp @@ -43,6 +43,8 @@ void InitTimeZones(void); int InitCrypt(void); void UninitCrypt(void); +INT_PTR __cdecl svcEnterString(WPARAM, LPARAM lParam); + static BOOL bModuleInitialized = FALSE; static CountryListEntry countries[] = { @@ -470,6 +472,7 @@ int LoadUtilsModule(void) CreateServiceFunction(MS_UTILS_GETCOUNTRYBYISOCODE, GetCountryByISOCode); CreateServiceFunction(MS_UTILS_GETCOUNTRYLIST, GetCountryList); CreateServiceFunction(MS_UTILS_GETRANDOM, GenerateRandom); + CreateServiceFunction(MS_UTILS_ENTERSTRING, svcEnterString); CreateServiceFunction(MS_SYSTEM_RESTART, RestartMiranda); InitOpenUrl(); diff --git a/src/resource.h b/src/resource.h index e21bd019cb..131d866515 100644 --- a/src/resource.h +++ b/src/resource.h @@ -21,6 +21,7 @@ #define IDI_LOADED_GRAY 113 #define IDI_NOTLOADED_GRAY 114 #define IDD_ADDED 115 +#define IDD_ENTER_STRING 116 #define IDD_URLSEND 119 #define IDD_URLRECV 120 #define IDD_AUTHREQ 121 @@ -232,6 +233,10 @@ #define IDC_GENMENU_DEFAULT 1089 #define IDC_CANVAS 1094 #define IDC_CANVAS2 1095 +#define IDC_TXT_MULTILINE 1096 +#define IDC_TXT_PASSWORD 1097 +#define IDC_TXT_COMBO 1098 +#define IDC_TXT_RICHEDIT 1099 #define IDC_BUILDTIME 1108 #define IDC_CREDITSFILE 1109 #define IDC_NUMBER 1113 @@ -537,7 +542,7 @@ #define ID_UNGROUP 40067 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 328 diff --git a/src/resource.rc b/src/resource.rc index 9395c2ee0f..52e895917e 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -723,6 +723,18 @@ BEGIN LTEXT "You can group/ungroup icons by selecting them (CTRL+left click) and using the popup menu (right click)",IDC_STATIC,1,208,274,20 END +IDD_ENTER_STRING DIALOGEX 0, 0, 242, 42 +STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + EDITTEXT IDC_TXT_MULTILINE,6,6,230,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | NOT WS_VISIBLE | WS_VSCROLL + EDITTEXT IDC_TXT_PASSWORD,6,6,230,12,ES_AUTOHSCROLL | NOT WS_VISIBLE | ES_PASSWORD + COMBOBOX IDC_TXT_COMBO,6,6,230,92,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_TXT_RICHEDIT,"RichEdit20W",NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1004,6,6,230,12 + DEFPUSHBUTTON "OK",IDOK,131,23,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,23,50,14 +END ///////////////////////////////////////////////////////////////////////////// // -- cgit v1.2.3