From d41a10aafa58e0ae70efa685bdcbf80d68264870 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Thu, 5 Mar 2015 20:54:42 +0000 Subject: Tox: - translation fixes - resource cosmetics git-svn-id: http://svn.miranda-ng.org/main/trunk@12341 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Tox/res/resource.rc | 34 ++++++++++++++++------------------ protocols/Tox/src/tox_options.cpp | 14 ++++---------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc index 5a10f365e0..a93f1c333d 100644 --- a/protocols/Tox/res/resource.rc +++ b/protocols/Tox/res/resource.rc @@ -160,21 +160,21 @@ BEGIN PUSHBUTTON "Add",IDC_ADDNODE,253,213,50,14 END -IDD_NODE_EDITOR DIALOGEX 0, 0, 289, 97 +IDD_NODE_EDITOR DIALOGEX 0, 0, 213, 118 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CTEXT "IPv4",IDC_STATIC,7,4,69,8 - EDITTEXT IDC_IPV4,7,12,69,14,ES_AUTOHSCROLL - CTEXT "IPv6",IDC_STATIC,103,3,135,8 - EDITTEXT IDC_IPV6,81,12,157,14,ES_AUTOHSCROLL - CTEXT "Port",IDC_STATIC,232,4,50,8 - EDITTEXT IDC_PORT,243,12,39,14,ES_AUTOHSCROLL - CTEXT "Public key",IDC_STATIC,7,30,275,8 - EDITTEXT IDC_PKEY,7,39,275,23,ES_MULTILINE - DEFPUSHBUTTON "OK",IDOK,177,76,50,14 - PUSHBUTTON "Cancel",IDCANCEL,232,76,50,14 + CTEXT "IPv4 address/ Host",IDC_STATIC,7,4,199,8 + EDITTEXT IDC_IPV4,7,12,199,14,ES_AUTOHSCROLL + CTEXT "IPv6 address (optional)",IDC_STATIC,7,32,199,8 + EDITTEXT IDC_IPV6,7,40,155,14,ES_AUTOHSCROLL + CTEXT "Port",IDC_STATIC,167,32,39,8 + EDITTEXT IDC_PORT,167,40,39,14,ES_AUTOHSCROLL + CTEXT "Public key",IDC_STATIC,7,59,199,8 + EDITTEXT IDC_PKEY,7,67,199,21,ES_MULTILINE + DEFPUSHBUTTON "OK",IDOK,103,97,50,14 + PUSHBUTTON "Cancel",IDCANCEL,156,97,50,14 END IDD_OPTIONS_AV DIALOGEX 0, 0, 310, 230 @@ -266,14 +266,12 @@ BEGIN IDD_NODE_EDITOR, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 282 - VERTGUIDE, 76 - VERTGUIDE, 81 - VERTGUIDE, 238 - VERTGUIDE, 243 - BOTTOMMARGIN, 90 + RIGHTMARGIN, 206 + VERTGUIDE, 162 + BOTTOMMARGIN, 111 HORZGUIDE, 12 - HORZGUIDE, 39 + HORZGUIDE, 40 + HORZGUIDE, 67 END IDD_OPTIONS_AV, DIALOG diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 764d3d9469..f282c0cbd0 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -74,15 +74,9 @@ INT_PTR CToxProto::MainOptionsProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l case IDC_IMPORT_PROFILE: { - TCHAR *pFilter, filter[MAX_PATH] = { 0 }; - pFilter = &filter[0]; - mir_tstrcat(pFilter, TranslateT("Tox profile(*.tox)")); - pFilter += mir_tstrlen(pFilter) + 1; - mir_tstrcat(pFilter, _T("*.tox")); - pFilter += mir_tstrlen(pFilter) + 1; - mir_tstrcat(pFilter, TranslateT("All files(*.*)")); - pFilter += mir_tstrlen(pFilter) + 1; - mir_tstrcat(pFilter, _T("*.*")); + TCHAR filter[MAX_PATH]; + mir_sntprintf(filter, SIZEOF(filter), _T("%s(*.tox)%c*.tox%c%s(*.*)%c*.*%c%c"), + TranslateT("Tox profile"), 0, 0, TranslateT("All files"), 0, 0, 0); TCHAR profilePath[MAX_PATH] = { 0 }; @@ -241,7 +235,7 @@ INT_PTR CALLBACK EditNodeDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l itemInfo = (ItemInfo*)lParam; SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); - SendDlgItemMessage(hwndDlg, IDC_IPV4, EM_SETLIMITTEXT, 15, 0); + SendDlgItemMessage(hwndDlg, IDC_IPV4, EM_SETLIMITTEXT, MAX_PATH, 0); SendDlgItemMessage(hwndDlg, IDC_IPV6, EM_SETLIMITTEXT, 39, 0); SendDlgItemMessage(hwndDlg, IDC_PORT, EM_SETLIMITTEXT, 5, 0); SendDlgItemMessage(hwndDlg, IDC_PKEY, EM_SETLIMITTEXT, TOX_PUBLIC_KEY_SIZE * 2, 0); -- cgit v1.2.3