Tera TermRevision: 8459
https://osdn.net/projects/ttssh2/scm/svn/commits/8459
Author: zmatsuo
Date: 2020-01-10 22:12:35 +0900 (Fri, 10 Jan 2020)
Log Message:
-----------
クリップボードからのペースト時、改行を常に正規化する
- 設定など削除
- lng ファイルの DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK を削除
- iniファイルのNormalizeLineBreakOnPasteを削除
- CPF_NORMALIZE_LINEBREAK 削除
- リソース IDD_TABSHEET_COPYPASTE
- Normalize line break when pasting チェックボックスを削除
- レイアウト調整
Modified Paths:
--------------
trunk/doc/en/html/setup/teraterm-ini.html
trunk/doc/ja/html/setup/teraterm-ini.html
trunk/installer/release/TERATERM.INI
trunk/installer/release/lang_utf8/French.lng
trunk/installer/release/lang_utf8/German.lng
trunk/installer/release/lang_utf8/Japanese.lng
trunk/installer/release/lang_utf8/Korean.lng
trunk/installer/release/lang_utf8/Russian.lng
trunk/installer/release/lang_utf8/Simplified Chinese.lng
trunk/installer/release/lang_utf8/Traditional Chinese.lng
trunk/installer/release/lang_utf8/english.lng
trunk/teraterm/common/tt_res.h
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/addsetting.cpp
trunk/teraterm/teraterm/clipboar.c
trunk/teraterm/teraterm/sendmem.cpp
trunk/teraterm/teraterm/ttermpro.rc
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/doc/en/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-ini.html 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/doc/en/html/setup/teraterm-ini.html 2020-01-10 13:12:35 UTC (rev 8459)
@@ -944,12 +944,6 @@
<td></td>
</tr>
<tr>
- <td id="NormalizeLineBreakOnPaste"><a href="../menu/setup-additional.html#NormalizeLineBreak">NormalizeLineBreakOnPaste</a></td>
- <td style="width:250px;">off</td>
- <td style="width:250px;"><-</td>
- <td></td>
- </tr>
- <tr>
<td id="NotifyClipboardAccess"><a href="../menu/setup-additional.html#NotifyClipboardAccess">NotifyClipboardAccess</a></td>
<td style="width:250px;">on</td>
<td style="width:250px;"><-</td>
Modified: trunk/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-ini.html 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/doc/ja/html/setup/teraterm-ini.html 2020-01-10 13:12:35 UTC (rev 8459)
@@ -950,12 +950,6 @@
<td></td>
</tr>
<tr>
- <td id="NormalizeLineBreakOnPaste"><a href="../menu/setup-additional.html#NormalizeLineBreak">NormalizeLineBreakOnPaste</a></td>
- <td style="width:250px;">off</td>
- <td style="width:250px;"><-</td>
- <td></td>
- </tr>
- <tr>
<td id="NotifyClipboardAccess"><a href="../menu/setup-additional.html#NotifyClipboardAccess">NotifyClipboardAccess</a></td>
<td style="width:250px;">on</td>
<td style="width:250px;"><-</td>
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/installer/release/TERATERM.INI 2020-01-10 13:12:35 UTC (rev 8459)
@@ -591,9 +591,6 @@
; Nonblinking cursor
NonblinkingCursor=off
-; Normalize line break when pasting
-NormalizeLineBreakOnPaste=off
-
; Notify Clipboard access from remote
NotifyClipboardAccess=on
Modified: trunk/installer/release/lang_utf8/French.lng
===================================================================
--- trunk/installer/release/lang_utf8/French.lng 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/installer/release/lang_utf8/French.lng 2020-01-10 13:12:35 UTC (rev 8459)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-11-22)
+; Updated by TeraTerm Project (2020-01-09)
; Last translated (French language) by Francois MOCQ (2010-07-21)
[Tera Term]
@@ -223,7 +223,6 @@
DLG_TAB_COPYPASTE_MOUSEPASTEM=Interdire coller avec molette
DLG_TAB_COPYPASTE_SELECTLBUTTON=Selection seulement avec bouton G
DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
-DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=Confirmer changer coller
DLG_TAB_COPYPASTE_STRINGFILE=Fichier chaîne
DLG_TAB_COPYPASTE_DELIMITER=Caractères délimiteurs
Modified: trunk/installer/release/lang_utf8/German.lng
===================================================================
--- trunk/installer/release/lang_utf8/German.lng 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/installer/release/lang_utf8/German.lng 2020-01-10 13:12:35 UTC (rev 8459)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-11-22)
+; Updated by TeraTerm Project (2020-01-09)
; Last translated (German language) by Frederik Schwarzer (2010-05-17)
[Tera Term]
@@ -223,7 +223,6 @@
DLG_TAB_COPYPASTE_MOUSEPASTEM=Einfügen mit mittlerer Maustaste ein
DLG_TAB_COPYPASTE_SELECTLBUTTON=&Auswahl nur über Button
DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
-DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=Confirm change &paste
DLG_TAB_COPYPASTE_STRINGFILE=&String file
DLG_TAB_COPYPASTE_DELIMITER=&Begrenzungszeichen
Modified: trunk/installer/release/lang_utf8/Japanese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Japanese.lng 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/installer/release/lang_utf8/Japanese.lng 2020-01-10 13:12:35 UTC (rev 8459)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-11-22)
+; Updated by TeraTerm Project (2020-01-09)
[Tera Term]
DLG_SYSTEM_FONT=ＭＳ Ｐゴシック,12,128
@@ -222,7 +222,6 @@
DLG_TAB_COPYPASTE_MOUSEPASTEM=中クリックでの貼り付けを無効にする(&M)
DLG_TAB_COPYPASTE_SELECTLBUTTON=左クリックでのみ選択を開始する(&O)
DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=貼り付け時に末尾の改行を削除する(&T)
-DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=貼り付け時に改行を正規化する(&N)
DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=危険なクリップボードの貼り付けを確認する(&P)
DLG_TAB_COPYPASTE_STRINGFILE=キーワードファイル(&S)
DLG_TAB_COPYPASTE_DELIMITER=区切り文字(&I)
Modified: trunk/installer/release/lang_utf8/Korean.lng
===================================================================
--- trunk/installer/release/lang_utf8/Korean.lng 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/installer/release/lang_utf8/Korean.lng 2020-01-10 13:12:35 UTC (rev 8459)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-11-22)
+; Updated by TeraTerm Project (2020-01-09)
; Last translated (Korean language) by Daehong Kim (2013-07-25)
[Tera Term]
@@ -223,7 +223,6 @@
DLG_TAB_COPYPASTE_MOUSEPASTEM=마우스 가운데 버튼 붙여넣기 비활성화(&M)
DLG_TAB_COPYPASTE_SELECTLBUTTON=마우스 왼쪽 버튼에 의해서만 선택(&O)
DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
-DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=변경-붙여넣기 확인(&P)
DLG_TAB_COPYPASTE_STRINGFILE=문자열 파일(&S)
DLG_TAB_COPYPASTE_DELIMITER=구분자 문자(&I)
Modified: trunk/installer/release/lang_utf8/Russian.lng
===================================================================
--- trunk/installer/release/lang_utf8/Russian.lng 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/installer/release/lang_utf8/Russian.lng 2020-01-10 13:12:35 UTC (rev 8459)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-11-22)
+; Updated by TeraTerm Project (2020-01-09)
; Last translated (Russian language) by Ryumik Sergey (2017-07-19)
[Tera Term]
@@ -223,7 +223,6 @@
DLG_TAB_COPYPASTE_MOUSEPASTEM=&Отключить вставку средней кнопкой мыши
DLG_TAB_COPYPASTE_SELECTLBUTTON=&Использовать только левую кнопку мыши
DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Удалить символ новой строки при вставке
-DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Разрешить возврат строки при вставке
DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=&Разрешить вставку изменения
DLG_TAB_COPYPASTE_STRINGFILE=&Текстовый файл
DLG_TAB_COPYPASTE_DELIMITER=&Разделитель символов
Modified: trunk/installer/release/lang_utf8/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Simplified Chinese.lng 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/installer/release/lang_utf8/Simplified Chinese.lng 2020-01-10 13:12:35 UTC (rev 8459)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-11-22)
+; Updated by TeraTerm Project (2020-01-09)
; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11)
[Tera Term]
@@ -223,7 +223,6 @@
DLG_TAB_COPYPASTE_MOUSEPASTEM=禁用中键单击粘贴(&M)
DLG_TAB_COPYPASTE_SELECTLBUTTON=仅用鼠标左键(&O)
DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=粘贴时修剪换行符(&T)
-DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=粘贴时规范化换行符(&N)
DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=“危险粘贴剪贴板”确认(&P)
DLG_TAB_COPYPASTE_STRINGFILE=关键字文件(&S)
DLG_TAB_COPYPASTE_DELIMITER=分隔符(&I)
Modified: trunk/installer/release/lang_utf8/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Traditional Chinese.lng 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/installer/release/lang_utf8/Traditional Chinese.lng 2020-01-10 13:12:35 UTC (rev 8459)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-11-22)
+; Updated by TeraTerm Project (2020-01-09)
; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20)
[Tera Term]
@@ -223,7 +223,6 @@
DLG_TAB_COPYPASTE_MOUSEPASTEM=禁用中鍵單擊貼上(&M)
DLG_TAB_COPYPASTE_SELECTLBUTTON=僅用滑鼠左鍵(&O)
DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
-DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=「警告貼上剪貼簿」確認(&P)
DLG_TAB_COPYPASTE_STRINGFILE=關鍵字文件(&S)
DLG_TAB_COPYPASTE_DELIMITER=分隔符(&I)
Modified: trunk/installer/release/lang_utf8/english.lng
===================================================================
--- trunk/installer/release/lang_utf8/english.lng 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/installer/release/lang_utf8/english.lng 2020-01-10 13:12:35 UTC (rev 8459)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-11-22)
+; Updated by TeraTerm Project (2020-01-09)
[Tera Term]
DLG_SYSTEM_FONT=System,14,0
@@ -222,7 +222,6 @@
DLG_TAB_COPYPASTE_MOUSEPASTEM=Disable mouse &M button paste
DLG_TAB_COPYPASTE_SELECTLBUTTON=Select &only by L button
DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
-DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=Confirm change &paste
DLG_TAB_COPYPASTE_STRINGFILE=&String file
DLG_TAB_COPYPASTE_DELIMITER=Del&imiter characters
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/teraterm/common/tt_res.h 2020-01-10 13:12:35 UTC (rev 8459)
@@ -216,7 +216,6 @@
#define IDC_SSH_SETUPDIR_STATIC_VSTORE 2562
#define IDC_SSH_SETUPDIR_EDIT_VSTORE 2563
#define IDC_TRIMNLCHAR 2564
-#define IDC_NORMALIZE_LINEBREAK 2565
#define IDC_CLIPBOARD_NOTIFY 2566
#define IDC_LIST_HIDDEN_FONTS 2567
#define IDC_TITLEFMT_GROUP 2568
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/teraterm/common/tttypes.h 2020-01-10 13:12:35 UTC (rev 8459)
@@ -379,7 +379,6 @@
#define CPF_CONFIRM_CHANGEPASTE 0x0010
#define CPF_CONFIRM_CHANGEPASTE_CR 0x0020
#define CPF_TRIM_TRAILING_NL 0x0100
-#define CPF_NORMALIZE_LINEBREAK 0x0200
// Title Reporting Type
#define IdTitleReportIgnore 0
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/teraterm/teraterm/addsetting.cpp 2020-01-10 13:12:35 UTC (rev 8459)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2019 TeraTerm Project
+ * Copyright (C) 2008-2020 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -435,7 +435,6 @@
{ IDC_DISABLE_PASTE_MBUTTON, "DLG_TAB_COPYPASTE_MOUSEPASTEM" },
{ IDC_SELECT_LBUTTON, "DLG_TAB_COPYPASTE_SELECTLBUTTON" },
{ IDC_TRIMNLCHAR, "DLG_TAB_COPYPASTE_TRIM_TRAILING_NL" },
- { IDC_NORMALIZE_LINEBREAK, "DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK" },
{ IDC_CONFIRM_CHANGE_PASTE, "DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE" },
{ IDC_CONFIRM_STRING_FILE_LABEL, "DLG_TAB_COPYPASTE_STRINGFILE" },
{ IDC_DELIMITER, "DLG_TAB_COPYPASTE_DELIMITER" },
@@ -469,10 +468,7 @@
// (6)TrimTrailingNLonPaste
SetCheck(IDC_TRIMNLCHAR, (ts.PasteFlag & CPF_TRIM_TRAILING_NL)?BST_CHECKED:BST_UNCHECKED);
- // (7)NormalizeLineBreak
- SetCheck(IDC_NORMALIZE_LINEBREAK, (ts.PasteFlag & CPF_NORMALIZE_LINEBREAK)?BST_CHECKED:BST_UNCHECKED);
-
- // (8)ConfirmChangePaste
+ // (7)ConfirmChangePaste
SetCheck(IDC_CONFIRM_CHANGE_PASTE, (ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE)?BST_CHECKED:BST_UNCHECKED);
// \x83t\x83@\x83C\x83\x8B\x83p\x83X
@@ -485,15 +481,15 @@
EnableDlgItem(IDC_CONFIRM_STRING_FILE_PATH, FALSE);
}
- // (9)delimiter characters
+ // (8)delimiter characters
SetDlgItemTextA(IDC_DELIM_LIST, ts.DelimList);
- // (10)PasteDelayPerLine
+ // (9)PasteDelayPerLine
char buf[64];
_snprintf_s(buf, sizeof(buf), "%d", ts.PasteDelayPerLine);
SetDlgItemNum(IDC_PASTEDELAY_EDIT, ts.PasteDelayPerLine);
- // (11) SelectOnActivate
+ // (10) SelectOnActivate
SetCheck(IDC_SELECT_ON_ACTIVATE, ts.SelOnActive ? BST_CHECKED : BST_UNCHECKED);
// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82Ă\xE9
@@ -589,15 +585,7 @@
ts.PasteFlag &= ~CPF_TRIM_TRAILING_NL;
}
- // (7)
- if (GetCheck(IDC_NORMALIZE_LINEBREAK)) {
- ts.PasteFlag |= CPF_NORMALIZE_LINEBREAK;
- }
- else {
- ts.PasteFlag &= ~CPF_NORMALIZE_LINEBREAK;
- }
-
- // (8)IDC_CONFIRM_CHANGE_PASTE
+ // (7)IDC_CONFIRM_CHANGE_PASTE
if (GetCheck(IDC_CONFIRM_CHANGE_PASTE)) {
ts.PasteFlag |= CPF_CONFIRM_CHANGEPASTE;
}
@@ -606,10 +594,10 @@
}
GetDlgItemTextA(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile, sizeof(ts.ConfirmChangePasteStringFile));
- // (9)
+ // (8)
GetDlgItemTextA(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));
- // (10)
+ // (9)
GetDlgItemTextA(IDC_PASTEDELAY_EDIT, buf, sizeof(buf));
val = atoi(buf);
ts.PasteDelayPerLine =
@@ -616,7 +604,7 @@
(val < 0) ? 0 :
(val > 5000) ? 5000 : val;
- // (11) SelectOnActivate
+ // (10) SelectOnActivate
ts.SelOnActive = (GetCheck(IDC_SELECT_ON_ACTIVATE) == BST_CHECKED);
}
Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/teraterm/teraterm/clipboar.c 2020-01-10 13:12:35 UTC (rev 8459)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1994-1998 T. Teranishi
- * (C) 2006-2019 TeraTerm Project
+ * (C) 2006-2020 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -225,10 +225,6 @@
unsigned int len, need_len, alloc_len;
HGLOBAL TmpHandle;
- if (!(ts.PasteFlag & CPF_NORMALIZE_LINEBREAK)) {
- return TRUE;
- }
-
p = CBMemPtr;
// \x93\\x82\xE8\x95t\x82\xAF\x83f\x81[\x83^\x82̒\xB7\x82\xB3(len)\x81A\x82\xA8\x82\xE6\x82ѐ\xB3\x8BK\x89\xBB\x8C\xE3\x82̃f\x81[\x83^\x82̒\xB7\x82\xB3(need_len)\x82̃J\x83E\x83\x93\x83g
@@ -855,7 +851,7 @@
TrimTrailingNLW(str_w);
}
- if (!(ts.PasteFlag & CPF_NORMALIZE_LINEBREAK)) {
+ {
// \x89\xFC\x8Ds\x82𐳋K\x89\xBB
wchar_t *dest = NormalizeLineBreakW(str_w);
free(str_w);
Modified: trunk/teraterm/teraterm/sendmem.cpp
===================================================================
--- trunk/teraterm/teraterm/sendmem.cpp 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/teraterm/teraterm/sendmem.cpp 2020-01-10 13:12:35 UTC (rev 8459)
@@ -381,7 +381,7 @@
{
size_t src_len = *len;
if (src_len == 0) {
- return NULL;
+ src_len = wcslen(src) + 1;
}
wchar_t *dest_top = (wchar_t *)malloc(sizeof(wchar_t) * src_len);
if (dest_top == NULL) {
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/teraterm/teraterm/ttermpro.rc 2020-01-10 13:12:35 UTC (rev 8459)
@@ -117,7 +117,7 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,145,220,10
END
-IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 258, 194
+IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 258, 177
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
@@ -131,19 +131,17 @@
CONTROL "Select &only by L button",IDC_SELECT_LBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,70,200,10
CONTROL "&Trim trailing new line character when pasting",IDC_TRIMNLCHAR,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,200,10
- CONTROL "&Normalize line break when pasting",IDC_NORMALIZE_LINEBREAK,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,200,10
- CONTROL "Confirm change &paste",IDC_CONFIRM_CHANGE_PASTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,115,200,10
- LTEXT "&String file",IDC_CONFIRM_STRING_FILE_LABEL,22,130,68,8
- EDITTEXT IDC_CONFIRM_STRING_FILE,95,128,106,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_CONFIRM_STRING_FILE_PATH,206,128,13,12
- LTEXT "Del&imiter characters",IDC_DELIMITER,11,145,65,10
- EDITTEXT IDC_DELIM_LIST,95,143,130,12,ES_AUTOHSCROLL
- LTEXT "P&aste delay per line",IDC_PASTEDELAY_LABEL,11,160,70,10
- EDITTEXT IDC_PASTEDELAY_EDIT,95,158,24,12,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "ms",IDC_PASTEDELAY_LABEL2,123,160,23,10
+ CONTROL "Confirm change &paste",IDC_CONFIRM_CHANGE_PASTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,200,10
+ LTEXT "&String file",IDC_CONFIRM_STRING_FILE_LABEL,22,115,68,8
+ EDITTEXT IDC_CONFIRM_STRING_FILE,95,113,106,12,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_CONFIRM_STRING_FILE_PATH,206,113,13,12
+ LTEXT "Del&imiter characters",IDC_DELIMITER,11,128,65,10
+ EDITTEXT IDC_DELIM_LIST,95,126,130,12,ES_AUTOHSCROLL
+ LTEXT "P&aste delay per line",IDC_PASTEDELAY_LABEL,11,143,70,10
+ EDITTEXT IDC_PASTEDELAY_EDIT,95,141,24,12,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "ms",IDC_PASTEDELAY_LABEL2,123,143,23,10
CONTROL "Ena&bling text selection when the window is activated by mouse",IDC_SELECT_ON_ACTIVATE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,173,229,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,160,229,10
END
IDD_TABSHEET_VISUAL DIALOGEX 0, 0, 258, 188
@@ -414,7 +412,7 @@
LEFTMARGIN, 5
RIGHTMARGIN, 252
TOPMARGIN, 5
- BOTTOMMARGIN, 191
+ BOTTOMMARGIN, 172
END
IDD_TABSHEET_VISUAL, DIALOG
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2020-01-10 13:12:13 UTC (rev 8458)
+++ trunk/teraterm/ttpset/ttset.c 2020-01-10 13:12:35 UTC (rev 8459)
@@ -2146,10 +2146,6 @@
if (GetOnOff(Section, "TrimTrailingNLonPaste", FName, FALSE))
ts->PasteFlag |= CPF_TRIM_TRAILING_NL;
- // Normalize line break when pasting
- if (GetOnOff(Section, "NormalizeLineBreakOnPaste", FName, FALSE))
- ts->PasteFlag |= CPF_NORMALIZE_LINEBREAK;
-
// List Inactive Font
ts->ListHiddenFonts = GetOnOff(Section, "ListHiddenFonts", FName, FALSE);
@@ -3495,10 +3491,6 @@
WriteOnOff(Section, "TrimTrailingNLonPaste", FName,
(WORD) (ts->PasteFlag & CPF_TRIM_TRAILING_NL));
- // Normalize line break when pasting
- WriteOnOff(Section, "NormalizeLineBreakOnPaste", FName,
- (WORD) (ts->PasteFlag & CPF_NORMALIZE_LINEBREAK));
-
// List Inactive Font
WriteOnOff(Section, "ListHiddenFonts", FName, ts->ListHiddenFonts);