OSDN -- Develop and Download Open Source Software

[ttssh2-commit] [9894] ファイルドロップダイアログの Binary チェックの状態を記憶できるようにした

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2022年 4月 27日 (水) 22:33:25 JST 

Revision: 9894
          https://osdn.net/projects/ttssh2/scm/svn/commits/9894
Author:   zmatsuo
Date:     2022-04-27 22:33:25 +0900 (Wed, 27 Apr 2022)
Log Message:
-----------
ファイルドロップダイアログの Binary チェックの状態を記憶できるようにした

- Send file の Binary チェック
- Binary チェックの状態をおおむね記憶できるようにした
- ini ファイルの TransBin設定を反映

ticket #44442

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/44442

Modified Paths:
--------------
    branches/4-stable/doc/en/html/about/history.html
    branches/4-stable/doc/ja/html/about/history.html
    branches/4-stable/teraterm/teraterm/dnddlg.cpp
    branches/4-stable/teraterm/teraterm/dnddlg.h
    branches/4-stable/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: branches/4-stable/doc/en/html/about/history.html
===================================================================
--- branches/4-stable/doc/en/html/about/history.html	2022-04-26 15:59:34 UTC (rev 9893)
+++ branches/4-stable/doc/en/html/about/history.html	2022-04-27 13:33:25 UTC (rev 9894)
@@ -37,6 +37,11 @@
     <ul>
       <li>XMODEM: Fix to check all received datas and process correctly, even if received datas are accumulated.</li>
       <li>YMODEM: ignore continuous 'C' when waiting for sending.</li>
+      <!--li>\x83t\x83@\x83C\x83\x8B\x83h\x83\x8D\x83b\x83v\x83_\x83C\x83A\x83\x8D\x83O\x82\xCC Send file \x82\xCC Binary \x82̃`\x83F\x83b\x83N\x83{\x83b\x83N\x83X
+        <ul>
+          <li>\x83f\x83t\x83H\x83\x8B\x83g\x82ɁAini \x83t\x83@\x83C\x83\x8B\x82\xCC TransBin\x90ݒ\xE8\x82𔽉f\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+          <li>"\x8E\x9F\x82̃h\x83\x8D\x83b\x83v\x8E\x9E\x81A\x93\xAF\x82\xB6\x8F\x88\x97\x9D\x82\xF0\x8Ds\x82\xA4"\x83`\x83F\x83b\x83N\x8E\x9E\x82ɁA\x8BL\x89\xAF\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      </ul></li-->
     </ul>
   </li>
 

Modified: branches/4-stable/doc/ja/html/about/history.html
===================================================================
--- branches/4-stable/doc/ja/html/about/history.html	2022-04-26 15:59:34 UTC (rev 9893)
+++ branches/4-stable/doc/ja/html/about/history.html	2022-04-27 13:33:25 UTC (rev 9894)
@@ -37,6 +37,11 @@
     <ul>
       <li>XMODEM \x8E\xF3\x90M\x83f\x81[\x83^\x82\xAA\x92~\x90ς\xB5\x82Ă\xE0\x91S\x91̂𒲂ׂĐ\xB3\x82\xB5\x82\xAD\x8F\x88\x97\x9D\x82\xB7\x82\xE9\x82悤\x82ɏC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>YMODEM \x91\x97\x90M\x91҂\xBF\x82̎\x9E\x81A\x98A\x91\xB1\x82\xB5\x82\xBD 'C' \x82𖳎\x8B\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li>\x83t\x83@\x83C\x83\x8B\x83h\x83\x8D\x83b\x83v\x83_\x83C\x83A\x83\x8D\x83O\x82\xCC Send file \x82\xCC Binary \x82̃`\x83F\x83b\x83N\x83{\x83b\x83N\x83X
+        <ul>
+          <li>\x83f\x83t\x83H\x83\x8B\x83g\x82ɁAini \x83t\x83@\x83C\x83\x8B\x82\xCC TransBin\x90ݒ\xE8\x82𔽉f\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+          <li>"\x8E\x9F\x82̃h\x83\x8D\x83b\x83v\x8E\x9E\x81A\x93\xAF\x82\xB6\x8F\x88\x97\x9D\x82\xF0\x8Ds\x82\xA4"\x83`\x83F\x83b\x83N\x8E\x9E\x82ɁA\x8BL\x89\xAF\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      </ul></li>
     </ul>
   </li>
 
@@ -45,8 +50,8 @@
       <li>TELNET.LOG\x82̃t\x83@\x83C\x83\x8B\x83n\x83\x93\x83h\x83\x8B\x82\xAA\x83N\x83\x8D\x81[\x83Y\x82ł\xAB\x82Ă\xA2\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>telnet(cygterm)\x90ڑ\xB1\x8E\x9E\x81ANAWS(Negotiate About Window Size)\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x82Ƃ\xAB\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8C\xEB\x82\xC1\x82Đݒ肷\x82\xE9\x89”\\x90\xAB\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82̂ŏC\x90\xB3\x81B</li>
       <li><a href="../macro/command/filecreate.html">filecreate</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ō쐬\x82\xB5\x82\xBD\x83t\x83@\x83C\x83\x8B\x82\xF0fileclose\x82\xB9\x82\xB8\x82ɓǂݍ\x9E\x82݂\xAA\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82̂ŏC\x90\xB3\x81B4.102\x82ŃG\x83\x93\x83o\x83O\x81B</li>
-      <li>\x83\x8D\x83O\x8E擾\x92\x86\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82郍\x83O\x83_\x83C\x83A\x83\x8D\x83O\x82̃w\x83\x8B\x83v\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB7\x82\xC6 Send File \x82̃w\x83\x8B\x83v\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD</li>
-      <li>SSH\x90ڑ\xB1\x8E\x9E\x81A\x83t\x83@\x83C\x83\x8B\x83h\x83\x8D\x83b\x83v\x8E\x9E\x82̏\x88\x97\x9D\x82\xF0\x8E\x9F\x89\xF1\x82\xE0\x8Ds\x82\xA4\x82悤\x8Ew\x92肵\x82Ă\xE0\x81ASCP\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82\xE9</li>
+      <li>\x83\x8D\x83O\x8E擾\x92\x86\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82郍\x83O\x83_\x83C\x83A\x83\x8D\x83O\x82̃w\x83\x8B\x83v\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB7\x82\xC6 Send File \x82̃w\x83\x8B\x83v\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>SSH\x90ڑ\xB1\x8E\x9E\x81A\x83t\x83@\x83C\x83\x8B\x83h\x83\x8D\x83b\x83v\x8E\x9E\x82̏\x88\x97\x9D\x82\xF0\x8E\x9F\x89\xF1\x82\xE0\x8Ds\x82\xA4\x82悤\x8Ew\x92肵\x82Ă\xE0\x81ASCP\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: branches/4-stable/teraterm/teraterm/dnddlg.cpp
===================================================================
--- branches/4-stable/teraterm/teraterm/dnddlg.cpp	2022-04-26 15:59:34 UTC (rev 9893)
+++ branches/4-stable/teraterm/teraterm/dnddlg.cpp	2022-04-27 13:33:25 UTC (rev 9894)
@@ -46,6 +46,7 @@
 	char *ScpSendDirPtr;
 	int ScpSendDirSize;
 	bool SendfileEnable;
+	bool SendfileBinaryCheck;
 	bool PasteNewlineEnable;
 	int RemaingFileCount;
 	bool DoSameProcess;
@@ -113,7 +114,7 @@
 		SetEditboxSubclass(hDlgWnd, IDC_SCP_PATH, FALSE);
 
 		// Send File
-		if (Param->DropType == DROP_TYPE_SEND_FILE_BINARY) {
+		if (Param->DropType == DROP_TYPE_SEND_FILE_BINARY || Param->SendfileBinaryCheck) {
 			SendMessage(GetDlgItem(hDlgWnd, IDC_BINARY_CHECK), BM_SETCHECK, BST_CHECKED, 0);
 		}
 		if (!Param->SendfileEnable) {
@@ -248,6 +249,7 @@
 	int RemaingFileCount,
 	bool EnableSCP,
 	bool EnableSendFile,
+	bool SendFileBinaryCheck,
 	TTTSet *pts,
 	unsigned char *DropTypePaste,
 	bool *DoSameProcess,
@@ -260,6 +262,7 @@
 	Param.DropTypePaste = *DropTypePaste;
 	Param.ScpEnable = EnableSCP;
 	Param.SendfileEnable = EnableSendFile;
+	Param.SendfileBinaryCheck = SendFileBinaryCheck;
 	Param.PasteNewlineEnable = true;
 	Param.RemaingFileCount = RemaingFileCount;
 	Param.DoNotShowDialog = *DoNotShowDialog;

Modified: branches/4-stable/teraterm/teraterm/dnddlg.h
===================================================================
--- branches/4-stable/teraterm/teraterm/dnddlg.h	2022-04-26 15:59:34 UTC (rev 9893)
+++ branches/4-stable/teraterm/teraterm/dnddlg.h	2022-04-27 13:33:25 UTC (rev 9894)
@@ -47,6 +47,7 @@
 	int RemaingFileCount,
 	bool EnableSCP,
 	bool EnableSendFile,
+	bool SendFileCheck,
 	TTTSet *pts,
 	unsigned char *DropTypePaste,
 	bool *DoSameProcess,

Modified: branches/4-stable/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/4-stable/teraterm/teraterm/vtwin.cpp	2022-04-26 15:59:34 UTC (rev 9893)
+++ branches/4-stable/teraterm/teraterm/vtwin.cpp	2022-04-27 13:33:25 UTC (rev 9894)
@@ -2054,6 +2054,7 @@
 	static enum drop_type DefaultDropType = DROP_TYPE_CANCEL;
 	static unsigned char DefaultDropTypePaste = DROP_TYPE_PASTE_ESCAPE;
 	static bool DefaultShowDialog = ts.ConfirmFileDragAndDrop ? true : false;
+	static bool TransBin;
 
 	int FileCount = 0;
 	int DirectoryCount = 0;
@@ -2075,6 +2076,7 @@
 	unsigned char DropTypePaste = DROP_TYPE_PASTE_ESCAPE;
 	if (DefaultDropType == DROP_TYPE_CANCEL) {
 		// default is not set
+		TransBin = ts.TransBin == 0 ? false : true;
 		if (!ShowDialog) {
 			if (FileCount == 1 && DirectoryCount == 0) {
 				if (ts.ConfirmFileDragAndDrop) {
@@ -2120,7 +2122,7 @@
 			}
 			DoSameProcess = false;
 		}
-		if (DropType == DROP_TYPE_SEND_FILE && ts.TransBin) {
+		if (DropType == DROP_TYPE_SEND_FILE && TransBin) {
 			DropType = DROP_TYPE_SEND_FILE_BINARY;
 		}
 	} else {
@@ -2153,6 +2155,7 @@
 								  DropListCount - i,
 								  (DirectoryCount == 0 && isSSH) ? true : false,
 								  DirectoryCount == 0 ? true : false,
+								  TransBin,
 								  &ts,
 								  &DropTypePaste,
 								  &DoSameProcess,
@@ -2164,6 +2167,12 @@
 			if (DoSameProcessNextDrop) {
 				DefaultDropType = DropType;
 				DefaultDropTypePaste = DropTypePaste;
+				if (DropType == DROP_TYPE_SEND_FILE) {
+					TransBin = false;
+				}
+				if (DropType == DROP_TYPE_SEND_FILE_BINARY) {
+					TransBin = true;
+				}
 			}
 			if (!ts.ConfirmFileDragAndDrop) {
 				DefaultShowDialog = !DoNotShowDialog;
@@ -4822,12 +4831,12 @@
 	FreeTTDLG();
 
 	if (Ok && ts.ComPort > 0) {
-		/* 
+		/*
 		 * TCP/IP\x82ɂ\xE6\x82\xE9\x90ڑ\xB1\x92\x86\x82̏ꍇ\x82͐V\x8BK\x83v\x83\x8D\x83Z\x83X\x82Ƃ\xB5\x82ċN\x93\xAE\x82\xB7\x82\xE9\x81B
 		 * New connection\x82\xA9\x82\xE7\x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xB7\x82铮\x8D\xEC\x82Ɗ\xEE\x96{\x93I\x82ɓ\xAF\x82\xB6\x93\xAE\x8D\xEC\x82ƂȂ\xE9\x81B
 		 */
 		if ( cv.Ready && (cv.PortType != IdSerial) ) {
-			_snprintf_s(Command, sizeof(Command), 
+			_snprintf_s(Command, sizeof(Command),
 				"ttermpro /C=%u /SPEED=%lu /CDELAYPERCHAR=%u /CDELAYPERLINE=%u ",
 				ts.ComPort, ts.Baud, ts.DelayPerChar, ts.DelayPerLine);

ttssh2-commit メーリングリストの案内
Back to archive index