OSDN -- Develop and Download Open Source Software

[ttssh2-commit] [11016] ログダイアログが開くときデフォルト設定が反映されていなかったので修正

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2023年 10月 20日 (金) 22:27:47 JST 

Revision: 11016
          https://osdn.net/projects/ttssh2/scm/svn/commits/11016
Author:   zmatsuo
Date:     2023-10-20 22:27:46 +0900 (Fri, 20 Oct 2023)
Log Message:
-----------
ログダイアログが開くときデフォルト設定が反映されていなかったので修正

- 次の設定が反映されていなかった
  - 新規(上書き)/追記
  - テキスト/バイナリ
- ログダイアログのヘルプにデフォルト設定へのリンクを追加

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/menu/file-log.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/menu/file-log.html
    trunk/teraterm/teraterm/logdlg.cpp

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2023-10-20 13:27:35 UTC (rev 11015)
+++ trunk/doc/en/html/about/history.html	2023-10-20 13:27:46 UTC (rev 11016)
@@ -42,6 +42,7 @@
     <ul>
       <li>MACRO: <a href="../macro/command/strjoin.html">strjoin</a> command set concatenated string to the wrong variable.</li>
       <li>Fixed when F1 key is pressed in VT window, configured sequence is not sent and dialog that can't open open HTML help file shows.</li>
+      <li>Fixed default values were not set in the log dialog.</li>
     </ul>
   </li>
 

Modified: trunk/doc/en/html/menu/file-log.html
===================================================================
--- trunk/doc/en/html/menu/file-log.html	2023-10-20 13:27:35 UTC (rev 11015)
+++ trunk/doc/en/html/menu/file-log.html	2023-10-20 13:27:46 UTC (rev 11016)
@@ -11,7 +11,9 @@
   <body>
     <h1>Log ([File] menu)</h1>
     <p>
-      Logs received characters to a file.
+      Logs received characters to a file.<br>
+      Default values can be set in <a href="setup-additional-log.html">
+        [Setup] Menu / Additional settings / "Log" Tab</a>
     </p>
 
     <h2 id="LogStart">"Log" dialog box (to input the log file name)</h2>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2023-10-20 13:27:35 UTC (rev 11015)
+++ trunk/doc/ja/html/about/history.html	2023-10-20 13:27:46 UTC (rev 11016)
@@ -42,6 +42,7 @@
     <ul>
       <li><a href="../macro/command/strjoin.html">strjoin</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x98A\x8C\x8B\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8C\xEB\x82\xC1\x82\xBD\x95ϐ\x94\x82փZ\x83b\x83g\x82\xB5\x82Ă\xA2\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>VT \x83E\x83B\x83\x93\x83h\x83E\x82\xC5F1\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x82Ƃ\xAB\x81A\x90ݒ肵\x82\xBD\x83V\x81[\x83P\x83\x93\x83X\x82\xAA\x91\x97\x90M\x82\xB3\x82ꂸ\x81A\x83w\x83\x8B\x83v\x82\xAA\x8AJ\x82\xAF\x82Ȃ\xA2\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x8Fo\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x83\x8D\x83O\x83_\x83C\x83A\x83\x8D\x83O\x82Ńf\x83t\x83H\x83\x8B\x83g\x92l\x82\xAA\x83Z\x83b\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA9\x82\xC1\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/menu/file-log.html
===================================================================
--- trunk/doc/ja/html/menu/file-log.html	2023-10-20 13:27:35 UTC (rev 11015)
+++ trunk/doc/ja/html/menu/file-log.html	2023-10-20 13:27:46 UTC (rev 11016)
@@ -11,7 +11,10 @@
   <body>
     <h1>Log ([File] \x83\x81\x83j\x83\x85\x81[)</h1>
     <p>
-      \x83z\x83X\x83g\x82\xA9\x82\xE7\x8E\xF3\x90M\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x82\xF0\x83t\x83@\x83C\x83\x8B\x82ɏ\x91\x82\xAB\x8D\x9E\x82݂܂\xB7\x81B
+      \x83z\x83X\x83g\x82\xA9\x82\xE7\x8E\xF3\x90M\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x82\xF0\x83t\x83@\x83C\x83\x8B\x82ɏ\x91\x82\xAB\x8D\x9E\x82݂܂\xB7\x81B<br>
+      <a href="setup-additional-log.html">
+        [Setup] \x83\x81\x83j\x83\x85\x81[ / Additional settings / "Log" \x83^\x83u</a>
+      \x82Ńf\x83t\x83H\x83\x8B\x83g\x92l\x82\xF0\x90ݒ\xE8\x82ł\xAB\x82܂\xB7\x81B
     </p>
 
     <h2 id="LogStart">"Log" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X(\x83t\x83@\x83C\x83\x8B\x96\xBC\x8Ew\x92\xE8)</h2>

Modified: trunk/teraterm/teraterm/logdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/logdlg.cpp	2023-10-20 13:27:35 UTC (rev 11015)
+++ trunk/teraterm/teraterm/logdlg.cpp	2023-10-20 13:27:46 UTC (rev 11016)
@@ -159,33 +159,21 @@
  */
 static void ArrangeControls(HWND Dialog, LogDlgWork_t *work)
 {
-	WORD Append, LogBinary;
-
-	GetRB(Dialog, &Append, IDC_APPEND, IDC_APPEND);
-	GetRB(Dialog, &LogBinary, IDC_FOPTBIN, IDC_FOPTBIN);
-
 	// Append \x83\x89\x83W\x83I\x83{\x83^\x83\x93
 	if (work->file_exist) {
 		// \x8Ew\x92肳\x82ꂽ\x83t\x83@\x83C\x83\x8B\x82\xAA\x91\xB6\x8D݂\xB7\x82\xE9\x8Fꍇ\x82\xCD Enable
 		EnableWindow(GetDlgItem(Dialog, IDC_APPEND), TRUE);
-
-		if (Append > 0) {
-			CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND, IDC_APPEND);
-		}
-		else {
-			CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND, IDC_NEW_OVERWRITE);
-		}
 	}
 	else {
 		// \x8Ew\x92肳\x82ꂽ\x83t\x83@\x83C\x83\x8B\x82\xAA\x91\xB6\x8D݂\xB5\x82Ȃ\xA2\x8Fꍇ\x82\xCD Disable
 		EnableWindow(GetDlgItem(Dialog, IDC_APPEND), FALSE);
-
-		// \x83t\x83@\x83C\x83\x8B\x82\xAA\x82Ȃ\xA2 -> \x90V\x8BK
-		CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND, IDC_NEW_OVERWRITE);
 	}
 
+	const bool log_binary = IsDlgButtonChecked(Dialog, IDC_FOPTBIN) == BST_CHECKED;
+	const bool new_overwrite = IsDlgButtonChecked(Dialog, IDC_NEW_OVERWRITE) == BST_CHECKED;
+
 	// BOM, Encoding
-	if (!LogBinary && !Append) {
+	if (!log_binary && new_overwrite) {
 		// Text \x82\xA9\x82\xC2 New/Overwrite \x82̏ꍇ\x82\xC9 Enable
 		EnableWindow(GetDlgItem(Dialog, IDC_BOM), TRUE);
 		EnableWindow(GetDlgItem(Dialog, IDC_TEXTCODING_DROPDOWN), TRUE);
@@ -200,10 +188,8 @@
 	}
 
 	// Plain Text, Timestamp, Timestamp \x8E\xED\x95\xCA
-	if (LogBinary) {
+	if (log_binary) {
 		// Binary \x82̏ꍇ\x82\xCD Disable
-		CheckRadioButton(Dialog, IDC_FOPTBIN, IDC_FOPTTEXT, IDC_FOPTBIN);
-
 		DisableDlgItem(Dialog, IDC_PLAINTEXT, IDC_PLAINTEXT);
 		DisableDlgItem(Dialog, IDC_TIMESTAMP, IDC_TIMESTAMP);
 		DisableDlgItem(Dialog, IDC_TIMESTAMPTYPE, IDC_TIMESTAMPTYPE);
@@ -210,8 +196,6 @@
 	}
 	else {
 		// Text \x82̏ꍇ\x82\xCD Enable
-		CheckRadioButton(Dialog, IDC_FOPTBIN, IDC_FOPTTEXT, IDC_FOPTTEXT);
-
 		EnableDlgItem(Dialog, IDC_PLAINTEXT, IDC_PLAINTEXT);
 		EnableDlgItem(Dialog, IDC_TIMESTAMP, IDC_TIMESTAMP);
 
@@ -225,7 +209,7 @@
 		}
 	}
 
-	if (work->file_exist && Append) {
+	if (work->file_exist && !new_overwrite) {
 		// \x8A\xF9\x91\xB6\x83t\x83@\x83C\x83\x8B\x82̃G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x82𔽉f\x82\xB7\x82\xE9
 		int bom = work->current_bom;
 		int cur =
@@ -297,6 +281,10 @@
 		SendDlgItemMessageA(Dialog, IDC_TEXTCODING_DROPDOWN, CB_ADDSTRING, 0, (LPARAM)"UTF-16BE");
 		SendDlgItemMessageA(Dialog, IDC_TEXTCODING_DROPDOWN, CB_SETCURSEL, 0, 0);
 
+		// new(overwrite)/append radio button
+		CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND,
+						 pts->Append == 0 ? IDC_NEW_OVERWRITE : IDC_APPEND);
+
 		// \x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x90ݒ肷\x82\xE9
 		//   \x83t\x83@\x83C\x83\x8B\x82̃`\x83F\x83b\x83N\x81A\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82̐ݒ\xE8\x82\xE0\x8Ds\x82\xED\x82\xEA\x82\xE9
 		//		WM_COMMAND, EN_CHANGE \x82\xAA\x94\xAD\x90\xB6\x82\xB7\x82\xE9
@@ -331,6 +319,9 @@
 			SetRB(Dialog, 1, IDC_ALLBUFF_INFIRST, IDC_ALLBUFF_INFIRST);
 		}
 
+		// text/binary radio button
+		CheckRadioButton(Dialog, IDC_FOPTBIN, IDC_FOPTTEXT, pts->LogBinary == 0 ? IDC_FOPTTEXT : IDC_FOPTBIN);
+
 		CenterWindow(Dialog, GetParent(Dialog));
 
 		SetFocus(GetDlgItem(Dialog, IDC_FOPT_FILENAME_EDIT));
@@ -410,8 +401,20 @@
 			if (HIWORD(wParam) == EN_CHANGE){
 				wchar_t *filename;
 				hGetDlgItemTextW(Dialog, IDC_FOPT_FILENAME_EDIT, &filename);
+				const BOOL file_exist_prev = work->file_exist;
 				CheckLogFile(filename, work);
 				free(filename);
+				if (file_exist_prev != work->file_exist) {
+					if (work->file_exist) {
+						// \x83t\x83@\x83C\x83\x8B\x82\xAA\x91\xB6\x8D݂\xB7\x82\xE9\x81A\x90ݒ\xE8\x82ɍ\x87\x82킹\x82ĐV\x8BK(\x8F㏑\x82\xAB)/\x92NjL\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9
+						CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND,
+										 work->pts->Append == 0 ? IDC_NEW_OVERWRITE : IDC_APPEND);
+					}
+					else {
+						// \x83t\x83@\x83C\x83\x8B\x82\xAA\x91\xB6\x8D݂\xB5\x82Ȃ\xA2\x81A\x90V\x8BK\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9
+						CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND, IDC_NEW_OVERWRITE);
+					}
+				}
 				ArrangeControls(Dialog, work);
 			}
 			break;

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