[Ttssh2-commit] [6956] Additional Settings ダイアログでタイムスタンプの種類を設定できるようにした。

scmno****@osdn***** scmno****@osdn*****
2017年 10月 24日 (火) 18:40:46 JST


Revision: 6956
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6956
Author:   doda
Date:     2017-10-24 18:40:46 +0900 (Tue, 24 Oct 2017)
Log Message:
-----------
Additional Settings ダイアログでタイムスタンプの種類を設定できるようにした。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/menu/setup-additional.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/menu/setup-additional.html
    trunk/teraterm/common/tt_res.h
    trunk/teraterm/teraterm/addsetting.cpp
    trunk/teraterm/teraterm/ttermpro.rc

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-10-24 09:40:43 UTC (rev 6955)
+++ trunk/doc/en/html/about/history.html	2017-10-24 09:40:46 UTC (rev 6956)
@@ -36,6 +36,12 @@
   <li>Changes
     <ul>
       <li>The response of DA2 request is changed.</li>
+      <li>added configuration of timestamp type at the start of log file's line.
+        <ul>
+          <li>added "Elapsed Time (Logging)" and "Elapsed Time (Connection)" as timestamp type.</li>
+          <li>The timestamp type can be changed on <a href="../menu/file-log.html#Timestamp">Log dialog</a> and <a href="../menu/setup-additional.html#LogTimestamp">Additional settings dialog</a>.</li>
+          <li>The <a href="../setup/teraterm-misc.html#LogTimestampUTC">LogTimestampUTC</a> setting is obsolete, use the timestamp type setting instead.</li>
+        </ul></li>
     </ul>
   </li>
 

Modified: trunk/doc/en/html/menu/setup-additional.html
===================================================================
--- trunk/doc/en/html/menu/setup-additional.html	2017-10-24 09:40:43 UTC (rev 6955)
+++ trunk/doc/en/html/menu/setup-additional.html	2017-10-24 09:40:46 UTC (rev 6956)
@@ -398,12 +398,6 @@
 	    NOTE: When the Binary option is enabled, this option can not be checked and the value will be disabled.
 	  </dd>
 
-	  <dt id="LogTimestamp">Timestamp</dt>
-	  <dd>
-	    If you select this option, a timestamp is added on top of each log line. The timestamp is added when the first character of the line appears.<br>
-	    NOTE: When the Binary option is enabled, this option can not be checked and the value will be disabled.
-	  </dd>
-
 	  <dt id="LogHideDialog">Hide dialog</dt>
 	  <dd>
 	    If you select this option, "Log" dialog box is not displayed.
@@ -413,9 +407,38 @@
 	  <dd>
 	    If you select this option, the logging starts after current all buffer is written into a log file.
 	  </dd>
+
+	  <dt id="LogTimestamp">Timestamp</dt>
+	  <dd>
+	    If you select this option, a timestamp is added on top of each log line. The timestamp is added when the first character of the line appears.<br>
+	    The timestamp type can be selected from following.
+	    <dl id="LogTimestampType">
+	      <dt>Local Time</dt>
+	      <dd>
+		Record the time in local time.
+	      </dd>
+
+	      <dt>UTC</dt>
+	      <dd>
+		Record the time in UTC.
+	      </dd>
+
+	      <dt>Elapsed Time (Logging)</dt>
+	      <dd>
+		Record the elapsed time from the start of logging.
+	      </dd>
+
+	      <dt>Elapsed Time (Connection)</dt>
+	      <dd>
+		Record the elapsed time from the start of connection.
+	      </dd>
+	    </dl>
+	    The timestamp format is specified with <a href="../setup/teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a> when the timestamp type is "Local Time" and "UTC".<br>
+	    The LogTimestampFormat is ignored when the timestamp type is "Elapsed Time (Logging)" or "Elapsed Time (Connection)".<br>
+	    NOTE: When the Binary option is enabled, this option can not be checked and the value will be disabled.
+	  </dd>
 	</dl>
       </dd>
-
     </dl>
 
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2017-10-24 09:40:43 UTC (rev 6955)
+++ trunk/doc/ja/html/about/history.html	2017-10-24 09:40:46 UTC (rev 6956)
@@ -36,6 +36,12 @@
   <li>\x95ύX
     <ul>
       <li>DA2 \x97v\x8B\x81\x82ւ̉\x9E\x93\x9A\x93\xE0\x97e\x82\xF0\x95ύX\x82\xB5\x82\xBD\x81B</li>
+      <li>\x83\x8D\x83O\x82̍s\x93\xAA\x82ɒlj\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82̎\xED\x97ނ\xF0\x90ݒ\xE8\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B
+        <ul>
+          <li>\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82̎\xED\x97ނƂƂ\xB5\x82\xC4 "Elapsed Time (Logging)" \x82\xC6 "Elapsed Time (Connection)" \x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
+          <li><a href="../menu/file-log.html#Timestamp">Log \x83_\x83C\x83A\x83\x8D\x83O</a>\x81A\x82\xA8\x82\xE6\x82\xD1 <a href="../menu/setup-additional.html#LogTimestamp">Additional settings \x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC Log \x83^\x83u\x82ŁA\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82̎\xED\x97ނ\xF0\x90ݒ\xE8\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+          <li><a href="../setup/teraterm-misc.html#LogTimestampUTC">LogTimestampUTC</a> \x90ݒ\xE8\x82͔񐄏\xA7\x82ƂȂ\xE8\x82܂\xB5\x82\xBD\x81B\x91\xE3\x82\xED\x82\xE8\x82Ƀ^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82̎\xED\x97ނ\xC9 UTC \x82\xF0\x90ݒ肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B</li>
+        </ul></li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/menu/setup-additional.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional.html	2017-10-24 09:40:43 UTC (rev 6955)
+++ trunk/doc/ja/html/menu/setup-additional.html	2017-10-24 09:40:46 UTC (rev 6956)
@@ -391,12 +391,6 @@
 	    \x81\xA6Binary \x83I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x97L\x8C\xF8\x82̏ꍇ\x82͑I\x91\xF0\x95s\x89‚ł\xA0\x82\xE8\x81A\x90ݒ\xE8\x82͖\xB3\x8C\x{27B0B3}\x82\xEA\x82܂\xB7\x81B
 	  </dd>
 
-	  <dt id="LogTimestamp">Timestamp</dt>
-	  <dd>
-	    \x83\x8D\x83O\x82̍s\x93\xAA\x82Ɏ\x9E\x8D\x8F\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x82\xA2\x8Fꍇ\x82͑I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B\x8Ds\x82̍ŏ\x89\x82̕\xB6\x8E\x9A\x82\xAA\x8Fo\x97͂\xB3\x82ꂽ\x8E\x9E\x8D\x8F\x82\xAA\x92lj\xC1\x82\xB3\x82\xEA\x82܂\xB7\x81B<br>
-	    \x81\xA6Binary \x83I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x97L\x8C\xF8\x82̏ꍇ\x82͑I\x91\xF0\x95s\x89‚ł\xA0\x82\xE8\x81A\x90ݒ\xE8\x82͖\xB3\x8C\x{27B0B3}\x82\xEA\x82܂\xB7\x81B
-	  </dd>
-
 	  <dt id="LogHideDialog">Hide dialog</dt>
 	  <dd>
 	    \x83\x8D\x83O\x93]\x91\x97\x82̃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82\xBD\x82\xAD\x82Ȃ\xA2\x8Fꍇ\x82͑I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
@@ -406,9 +400,38 @@
 	  <dd>
 	    \x8C\xBB\x8D݂̒[\x96\x96\x83o\x83b\x83t\x83@\x82\xF0\x82\xB7\x82ׂă\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82ɏ\x91\x82\xAB\x8Fo\x82\xB5\x82Ă\xA9\x82\xE7\x81A\x83\x8D\x83O\x8D̎\xE6\x82\xF0\x8AJ\x8En\x82\xB5\x82܂\xB7\x81B
 	  </dd>
+
+	  <dt id="LogTimestamp">Timestamp</dt>
+	  <dd>
+	    \x83\x8D\x83O\x82̍s\x93\xAA\x82Ɏ\x9E\x8D\x8F\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x82\xA2\x8Fꍇ\x82͑I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B\x8Ds\x82̍ŏ\x89\x82̕\xB6\x8E\x9A\x82\xAA\x8Fo\x97͂\xB3\x82ꂽ\x8E\x9E\x8D\x8F\x82\xAA\x92lj\xC1\x82\xB3\x82\xEA\x82܂\xB7\x81B<br>
+	    \x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82̎\xED\x95ʂƂ\xB5\x82Ĉȉ\xBA\x82\xAA\x91I\x91\xF0\x82ł\xAB\x82܂\xB7\x81B
+	    <dl id="LogTimestampType">
+	      <dt>Local Time</dt>
+	      <dd>
+		\x83\x8D\x81[\x83J\x83\x8B\x83^\x83C\x83\x80\x82ł̓\xFA\x8E\x9E\x82\xF0\x8BL\x98^\x82\xB5\x82܂\xB7\x81B
+	      </dd>
+
+	      <dt>UTC</dt>
+	      <dd>
+		UTC \x82ł̓\xFA\x8E\x9E\x82\xF0\x8BL\x98^\x82\xB5\x82܂\xB7\x81B
+	      </dd>
+
+	      <dt>Elapsed Time (Logging)</dt>
+	      <dd>
+		\x83\x8D\x83O\x8E擾\x8AJ\x8En\x82\xA9\x82\xE7\x82̌o\x89ߎ\x9E\x8AԂ\xF0\x8BL\x98^\x82\xB5\x82܂\xB7\x81B
+	      </dd>
+
+	      <dt>Elapsed Time (Connection)</dt>
+	      <dd>
+		\x90ڑ\xB1\x8AJ\x8En\x82\xA9\x82\xE7\x82̌o\x89ߎ\x9E\x8AԂ\xF0\x8BL\x98^\x82\xB5\x82܂\xB7\x81B
+	      </dd>
+	    </dl>
+	    Local Time, UTC \x82ł̓\xFA\x8E\x9E\x82̃t\x83H\x81[\x83}\x83b\x83g\x82\xCD <a href="../setup/teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a> \x82̐ݒ\xE8\x82ɏ]\x82\xA2\x82܂\xB7\x81B<br>
+	    Elapsed Time (Logging), Elapsed Time (Connection) \x82ł\xCD LogTimestampFormat \x82̐ݒ\xE8\x82͖\xB3\x8E\x8B\x82\xB3\x82\xEA\x82܂\xB7\x81B<br>
+	    \x81\xA6Binary \x83I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x97L\x8C\xF8\x82̏ꍇ\x82͑I\x91\xF0\x95s\x89‚ł\xA0\x82\xE8\x81A\x90ݒ\xE8\x82͖\xB3\x8C\x{27B0B3}\x82\xEA\x82܂\xB7\x81B
+	  </dd>
 	</dl>
       </dd>
-
     </dl>
 
 

Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2017-10-24 09:40:43 UTC (rev 6955)
+++ trunk/teraterm/common/tt_res.h	2017-10-24 09:40:46 UTC (rev 6956)
@@ -190,6 +190,7 @@
 #define IDC_CHECK7                      2540
 #define IDC_OPT_INCBUF                  2540
 #define IDC_INI_SETUPDIR_STATIC         2541
+#define IDC_OPT_TIMESTAMP_TYPE          2541
 #define IDC_KEYCNF_SETUPDIR_STATIC      2542
 #define IDC_CYGTERM_SETUPDIR_STATIC     2543
 #define IDC_SSH_SETUPDIR_STATIC         2547

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2017-10-24 09:40:43 UTC (rev 6955)
+++ trunk/teraterm/teraterm/addsetting.cpp	2017-10-24 09:40:46 UTC (rev 6956)
@@ -1473,9 +1473,6 @@
 	GetDlgItemText(IDC_OPT_PLAINTEXT, uimsg, sizeof(uimsg));
 	get_lang_msg("DLG_FOPT_PLAIN", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_OPT_PLAINTEXT, ts.UIMsg);
-	GetDlgItemText(IDC_OPT_TIMESTAMP, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FOPT_TIMESTAMP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_OPT_TIMESTAMP, ts.UIMsg);
 	GetDlgItemText(IDC_OPT_HIDEDLG, uimsg, sizeof(uimsg));
 	get_lang_msg("DLG_FOPT_HIDEDIALOG", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_OPT_HIDEDLG, ts.UIMsg);
@@ -1482,8 +1479,20 @@
 	GetDlgItemText(IDC_OPT_INCBUF, uimsg, sizeof(uimsg));
 	get_lang_msg("DLG_FOPT_ALLBUFFINFIRST", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_OPT_INCBUF, ts.UIMsg);
+	GetDlgItemText(IDC_OPT_TIMESTAMP, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_FOPT_TIMESTAMP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_OPT_TIMESTAMP, ts.UIMsg);
 
+	get_lang_msg("DLG_FOPT_TIMESTAMP_LOCAL", ts.UIMsg, sizeof(ts.UIMsg), "Local Time", ts.UILanguageFile);
+	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+	get_lang_msg("DLG_FOPT_TIMESTAMP_UTC", ts.UIMsg, sizeof(ts.UIMsg), "UTC", ts.UILanguageFile);
+	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+	get_lang_msg("DLG_FOPT_TIMESTAMP_ELAPSED_LOGGING", ts.UIMsg, sizeof(ts.UIMsg), "Elapsed Time (Logging)", ts.UILanguageFile);
+	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+	get_lang_msg("DLG_FOPT_TIMESTAMP_ELAPSED_CONNECTION", ts.UIMsg, sizeof(ts.UIMsg), "Elapsed Time (Connection)", ts.UILanguageFile);
+	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
 
+
 	// Viewlog Editor path (2005.1.29 yutaka)
 	SetDlgItemText(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor);
 
@@ -1540,13 +1549,37 @@
 	btn->SetCheck(ts.Append != 0);
 	btn = (CButton *)GetDlgItem(IDC_OPT_PLAINTEXT);
 	btn->SetCheck(ts.LogTypePlainText != 0);
-	btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
-	btn->SetCheck(ts.LogTimestamp != 0);
 	btn = (CButton *)GetDlgItem(IDC_OPT_HIDEDLG);
 	btn->SetCheck(ts.LogHideDialog != 0);
 	btn = (CButton *)GetDlgItem(IDC_OPT_INCBUF);
 	btn->SetCheck(ts.LogAllBuffIncludedInFirst != 0);
+	btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
+	btn->SetCheck(ts.LogTimestamp != 0);
 
+	combo = (CComboBox *)GetDlgItem(IDC_OPT_TIMESTAMP_TYPE);
+	combo->SetCurSel(ts.LogTimestampType);
+	if (ts.LogBinary || !ts.LogTimestamp) {
+		GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(FALSE);
+	}
+	else {
+		GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(TRUE);
+	}
+/*
+	switch (ts.LogTimestampType) {
+		case CSF_CBRW:
+			cmb->SetCurSel(3);
+			break;
+		case CSF_CBREAD:
+			cmb->SetCurSel(2);
+			break;
+		case CSF_CBWRITE:
+			cmb->SetCurSel(1);
+			break;
+		default: // off
+			cmb->SetCurSel(0);
+			break;
+	}
+*/
 
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_VIEWLOG_EDITOR));
@@ -1621,12 +1654,30 @@
 				if (btn->GetCheck()) {
 					GetDlgItem(IDC_OPT_PLAINTEXT)->EnableWindow(FALSE);
 					GetDlgItem(IDC_OPT_TIMESTAMP)->EnableWindow(FALSE);
+					GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(FALSE);
 				} else {
 					GetDlgItem(IDC_OPT_PLAINTEXT)->EnableWindow(TRUE);
 					GetDlgItem(IDC_OPT_TIMESTAMP)->EnableWindow(TRUE);
+
+					btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
+					if (btn->GetCheck()) {
+						GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(TRUE);
+					}
 				}
 			}
 			return TRUE;
+
+		case IDC_OPT_TIMESTAMP | (BN_CLICKED << 16):
+			{
+				CButton *btn;
+				btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
+				if (btn->GetCheck()) {
+					GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(TRUE);
+				} else {
+					GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(FALSE);
+				}
+			}
+			return TRUE;
 	}
 
 	return CPropertyPage::OnCommand(wParam, lParam);
@@ -1640,6 +1691,7 @@
 	char uimsg[MAX_UIMSG];
 	CButton *btn;
 	CString str;
+	CComboBox *cmb;
 	int i;
 
 	// Viewlog Editor path (2005.1.29 yutaka)
@@ -1731,14 +1783,6 @@
 		ts.LogTypePlainText = 0;
 	}
 
-	btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
-	if (btn->GetCheck()) {
-		ts.LogTimestamp = 1;
-	}
-	else {
-		ts.LogTimestamp = 0;
-	}
-
 	btn = (CButton *)GetDlgItem(IDC_OPT_HIDEDLG);
 	if (btn->GetCheck()) {
 		ts.LogHideDialog = 1;
@@ -1754,6 +1798,17 @@
 	else {
 		ts.LogAllBuffIncludedInFirst = 0;
 	}
+
+	btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
+	if (btn->GetCheck()) {
+		ts.LogTimestamp = 1;
+	}
+	else {
+		ts.LogTimestamp = 0;
+	}
+
+	cmb = (CComboBox *)GetDlgItem(IDC_OPT_TIMESTAMP_TYPE);
+	ts.LogTimestampType = cmb->GetCurSel();
 }
 
 

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2017-10-24 09:40:43 UTC (rev 6955)
+++ trunk/teraterm/teraterm/ttermpro.rc	2017-10-24 09:40:46 UTC (rev 6956)
@@ -168,20 +168,21 @@
     EDITTEXT        IDC_DEFAULTPATH_EDITOR,11,83,120,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_DEFAULTPATH_PUSH,135,84,13,10
     CONTROL         "A&uto start logging",IDC_AUTOSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,102,124,10
-    GROUPBOX        "Log option",IDC_LOG_OPTION_GROUP,157,10,95,98
+    GROUPBOX        "Log option",IDC_LOG_OPTION_GROUP,157,10,95,120
     CONTROL         "Binary",IDC_OPT_BINARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,24,86,10
     CONTROL         "Append",IDC_OPT_APPEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,38,86,10
     CONTROL         "Plain text",IDC_OPT_PLAINTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,52,86,10
-    CONTROL         "Timestamp",IDC_OPT_TIMESTAMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,66,86,10
-    CONTROL         "Hide dialog",IDC_OPT_HIDEDLG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,80,86,10
-    CONTROL         "Include screen buffer",IDC_OPT_INCBUF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,94,86,10
-    GROUPBOX        "",IDC_ROTATE_GROUP,19,112,214,39
-    CONTROL         "Log Rotate",IDC_LOG_ROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,26,120,127,10
-    LTEXT           "Size",IDC_ROTATE_SIZE_TEXT,27,137,28,8
-    EDITTEXT        IDC_ROTATE_SIZE,61,135,46,12,ES_AUTOHSCROLL
-    COMBOBOX        IDC_ROTATE_SIZE_TYPE,112,135,31,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Rotate",IDC_ROTATE_STEP_TEXT,165,138,27,8
-    EDITTEXT        IDC_ROTATE_STEP,195,135,30,12,ES_AUTOHSCROLL
+    CONTROL         "Hide dialog",IDC_OPT_HIDEDLG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,66,86,10
+    CONTROL         "Include screen buffer",IDC_OPT_INCBUF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,80,86,10
+    CONTROL         "Timestamp",IDC_OPT_TIMESTAMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,94,86,10
+    COMBOBOX        IDC_OPT_TIMESTAMP_TYPE,165,108,85,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "",IDC_ROTATE_GROUP,5,115,139,62
+    CONTROL         "Log Rotate",IDC_LOG_ROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,124,127,10
+    LTEXT           "Size",IDC_ROTATE_SIZE_TEXT,12,142,28,8
+    EDITTEXT        IDC_ROTATE_SIZE,48,139,46,12,ES_AUTOHSCROLL
+    COMBOBOX        IDC_ROTATE_SIZE_TYPE,99,139,31,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Rotate",IDC_ROTATE_STEP_TEXT,12,159,27,8
+    EDITTEXT        IDC_ROTATE_STEP,48,156,30,12,ES_AUTOHSCROLL
 END
 
 IDD_TABSHEET_CYGWIN DIALOGEX 0, 0, 258, 188



Ttssh2-commit メーリングリストの案内