From: gandf Date: Thu, 16 May 2019 21:19:11 +0000 (+0200) Subject: Update Merge.rc X-Git-Tag: 2.16.5~331 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0729739e49eb37503c4086536556ddfa81256ef9;p=winmerge-jp%2Fwinmerge-jp.git Update Merge.rc Size of combobox on "option codepage" not allow to view content. --- diff --git a/Src/Merge.rc b/Src/Merge.rc index 821e951b1..0205c8674 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -1354,22 +1354,22 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,205,195,50,14 END -IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 255, 138 +IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 255, 210 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Default Codepage",IDC_STATIC,7,7,241,81 + GROUPBOX "Default Codepage",IDC_STATIC,7,7,241,93 LTEXT "Select the default codepage assumed when loading non-Unicode files:",IDC_STATIC,14,18,228,20 CONTROL "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session",IDC_DETECT_CODEPAGE, - "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,90,230,30 + "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,105,230,30 CONTROL "Detect codepage for text files using mlang.dll\nneed to restart session",IDC_DETECT_CODEPAGE2, - "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,124,230,34 - COMBOBOX IDC_DETECT_AUTODETECTTYPE,23,160,125,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,139,230,34 + COMBOBOX IDC_DETECT_AUTODETECTTYPE,23,175,125,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "System codepage",IDC_CP_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,42,230,10 CONTROL "According to WinMerge User Interface",IDC_CP_UI,"Button",BS_AUTORADIOBUTTON,13,55,230,10 CONTROL "Custom codepage:",IDC_CP_CUSTOM,"Button",BS_AUTORADIOBUTTON,13,68,120,10 - COMBOBOX IDC_CUSTOM_CP_NUMBER,136,67,102,130,CBS_DROPDOWN | WS_VSCROLL | WS_GROUP | WS_TABSTOP + COMBOBOX IDC_CUSTOM_CP_NUMBER,12,80,229,130,CBS_DROPDOWN | WS_VSCROLL | WS_GROUP | WS_TABSTOP END IDD_PREFERENCES DIALOGEX 0, 0, 372, 280