[Ttssh2-commit] [5613] チケット #33912

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2014年 6月 21日 (土) 21:30:00 JST


Revision: 5613
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5613
Author:   yutakapon
Date:     2014-06-21 21:29:59 +0900 (Sat, 21 Jun 2014)
Log Message:
-----------
チケット #33912
「TeraTerm:その他の設定」画面の「ログ」タブに、手動ログ採取時に選択できる
下記オプション群を設定できるようにした。
 ・バイナリ
 ・追記
 ・プレーンテキスト
 ・タイムスタンプ
 ・ダイアログを非表示
 ・現在バッファを含む

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/33912

Modified Paths:
--------------
    trunk/teraterm/common/tt_res.h
    trunk/teraterm/teraterm/addsetting.cpp
    trunk/teraterm/teraterm/ttermpro.rc

-------------- next part --------------
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2014-06-21 09:48:22 UTC (rev 5612)
+++ trunk/teraterm/common/tt_res.h	2014-06-21 12:29:59 UTC (rev 5613)
@@ -169,6 +169,14 @@
 #define IDC_ROTATE_STEP_TEXT            2531
 #define IDC_ROTATE_SIZE_TEXT            2532
 #define IDC_ROTATE_GROUP                2533
+#define IDC_LOG_OPTION_GROUP            2534
+#define IDC_OPT_BINARY                  2535
+#define IDC_OPT_APPEND                  2536
+#define IDC_OPT_PLAINTEXT               2537
+#define IDC_OPT_TIMESTAMP               2538
+#define IDC_OPT_HIDEDLG                 2539
+#define IDC_CHECK7                      2540
+#define IDC_OPT_INCBUF                  2540
 #define ID_ACC_SENDBREAK                50001
 #define ID_ACC_COPY                     50002
 #define ID_ACC_NEWCONNECTION            50003
@@ -263,7 +271,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        123
 #define _APS_NEXT_COMMAND_VALUE         52031
-#define _APS_NEXT_CONTROL_VALUE         2534
+#define _APS_NEXT_CONTROL_VALUE         2541
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2014-06-21 09:48:22 UTC (rev 5612)
+++ trunk/teraterm/teraterm/addsetting.cpp	2014-06-21 12:29:59 UTC (rev 5613)
@@ -1284,6 +1284,15 @@
 		SendDlgItemMessage(IDC_ROTATE_SIZE_TYPE, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_ROTATE_STEP_TEXT, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_ROTATE_STEP, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
+
+		// Log options
+		SendDlgItemMessage(IDC_LOG_OPTION_GROUP, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_OPT_BINARY, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_OPT_APPEND, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_OPT_PLAINTEXT, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_OPT_TIMESTAMP, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_OPT_HIDEDLG, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_OPT_INCBUF, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
 	}
 	else {
 		DlgLogFont = NULL;
@@ -1311,6 +1320,29 @@
 	GetDlgItemText(IDC_ROTATE_STEP_TEXT, uimsg, sizeof(uimsg));
 	get_lang_msg("IDC_ROTATE_STEP_TEXT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_ROTATE_STEP_TEXT, ts.UIMsg);
+	// Log options
+	// FIXME: \x83\x81\x83b\x83Z\x81[\x83W\x83J\x83^\x83\x8D\x83O\x82͊\xF9\x91\xB6\x82̃\x8D\x83O\x83I\x83v\x83V\x83\x87\x83\x93\x82̂\xE0\x82̂𗬗p\x82\xB5\x82\xBD\x82\xAA\x81A\x83A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x83L\x81[\x82\xAA\x8Fd\x95\xA1\x82\xB7\x82邩\x82\xE0\x82\xB5\x82\xEA\x82Ȃ\xA2\x81B
+	GetDlgItemText(IDC_LOG_OPTION_GROUP, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_FOPT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_LOG_OPTION_GROUP, ts.UIMsg);
+	GetDlgItemText(IDC_OPT_BINARY, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_FOPT_BINARY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_OPT_BINARY, ts.UIMsg);
+	GetDlgItemText(IDC_OPT_APPEND, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_FOPT_APPEND", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_OPT_APPEND, ts.UIMsg);
+	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);
+	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);
 
 
 	// Viewlog Editor path (2005.1.29 yutaka)
@@ -1352,7 +1384,28 @@
 		GetDlgItem(IDC_ROTATE_STEP)->EnableWindow(TRUE);
 	}
 
+	// Log options
+	btn = (CButton *)GetDlgItem(IDC_OPT_BINARY);
+	btn->SetCheck(ts.LogBinary != 0);
+	if (ts.LogBinary) {
+		GetDlgItem(IDC_OPT_PLAINTEXT)->EnableWindow(FALSE);
+		GetDlgItem(IDC_OPT_TIMESTAMP)->EnableWindow(FALSE);
+	} else {
+		GetDlgItem(IDC_OPT_PLAINTEXT)->EnableWindow(TRUE);
+		GetDlgItem(IDC_OPT_TIMESTAMP)->EnableWindow(TRUE);
+	}
+	btn = (CButton *)GetDlgItem(IDC_OPT_APPEND);
+	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);
 
+
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_VIEWLOG_EDITOR));
 
@@ -1416,6 +1469,88 @@
 
 			}
 			return TRUE;
+
+		case IDC_OPT_BINARY | (BN_CLICKED << 16):
+			{
+				CButton *btn;
+				// \x83o\x83C\x83i\x83\x8A\x83I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x97L\x8C\xF8\x82̏ꍇ\x81AFixLogOption() \x82Ŗ\xB3\x8C\x{27B0B5}\x82Ă\xA2\x82\xE9
+				// \x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x81A\x82\xB1\x82\xB1\x82ł\xE0\x96\xB3\x8C\xF8\x82ɂ\xB5\x82Ȃ\xAF\x82\xEA\x82΂Ȃ\xE7\x82Ȃ\xA2\x81B
+				btn = (CButton *)GetDlgItem(IDC_OPT_BINARY);
+				if (btn->GetCheck()) {
+					ts.LogBinary = 1;
+
+					ts.LogTypePlainText = 0;
+					ts.LogTimestamp = 0;
+					GetDlgItem(IDC_OPT_PLAINTEXT)->EnableWindow(FALSE);
+					GetDlgItem(IDC_OPT_TIMESTAMP)->EnableWindow(FALSE);
+				} else {
+					ts.LogBinary = 0;
+
+					GetDlgItem(IDC_OPT_PLAINTEXT)->EnableWindow(TRUE);
+					GetDlgItem(IDC_OPT_TIMESTAMP)->EnableWindow(TRUE);
+				}
+			}
+			return TRUE;
+
+		case IDC_OPT_APPEND | (BN_CLICKED << 16):
+			{
+				CButton *btn;
+				btn = (CButton *)GetDlgItem(IDC_OPT_APPEND);
+				if (btn->GetCheck()) {
+					ts.Append = 1;
+				} else {
+					ts.Append = 0;
+				}
+			}
+			return TRUE;
+
+		case IDC_OPT_PLAINTEXT | (BN_CLICKED << 16):
+			{
+				CButton *btn;
+				btn = (CButton *)GetDlgItem(IDC_OPT_PLAINTEXT);
+				if (btn->GetCheck()) {
+					ts.LogTypePlainText = 1;
+				} else {
+					ts.LogTypePlainText = 0;
+				}
+			}
+			return TRUE;
+
+		case IDC_OPT_TIMESTAMP | (BN_CLICKED << 16):
+			{
+				CButton *btn;
+				btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
+				if (btn->GetCheck()) {
+					ts.LogTimestamp = 1;
+				} else {
+					ts.LogTimestamp = 0;
+				}
+			}
+			return TRUE;
+
+		case IDC_OPT_HIDEDLG | (BN_CLICKED << 16):
+			{
+				CButton *btn;
+				btn = (CButton *)GetDlgItem(IDC_OPT_HIDEDLG);
+				if (btn->GetCheck()) {
+					ts.LogHideDialog = 1;
+				} else {
+					ts.LogHideDialog = 0;
+				}
+			}
+			return TRUE;
+
+		case IDC_OPT_INCBUF | (BN_CLICKED << 16):
+			{
+				CButton *btn;
+				btn = (CButton *)GetDlgItem(IDC_OPT_INCBUF);
+				if (btn->GetCheck()) {
+					ts.LogAllBuffIncludedInFirst = 1;
+				} else {
+					ts.LogAllBuffIncludedInFirst = 0;
+				}
+			}
+			return TRUE;
 	}
 
 	return CPropertyPage::OnCommand(wParam, lParam);

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2014-06-21 09:48:22 UTC (rev 5612)
+++ trunk/teraterm/teraterm/ttermpro.rc	2014-06-21 12:29:59 UTC (rev 5613)
@@ -48,7 +48,7 @@
     EDITTEXT        IDC_EDIT_COMMENT,6,3,189,12,ES_AUTOHSCROLL
 END
 
-IDD_TABSHEET_GENERAL DIALOGEX 0, 0, 242, 158
+IDD_TABSHEET_GENERAL DIALOGEX 0, 0, 258, 158
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -66,7 +66,7 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,220,10
 END
 
-IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 242, 158
+IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 258, 158
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -85,7 +85,7 @@
     COMBOBOX        IDC_CLIPBOARD_ACCESS,162,114,45,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 242, 158
+IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 258, 158
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -108,7 +108,7 @@
     LTEXT           "ms",IDC_PASTEDELAY_LABEL2,123,130,23,10
 END
 
-IDD_TABSHEET_VISUAL DIALOGEX 0, 0, 242, 158
+IDD_TABSHEET_VISUAL DIALOGEX 0, 0, 258, 158
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -141,19 +141,19 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,110,105,12
     CONTROL         "Enable A&NSI color",IDC_ENABLE_ANSI_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,122,105,12
     CONTROL         "Un&derline URL string",IDC_URL_UNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,134,105,12
-    LTEXT           "(*)Need to Save setup and restart Tera Term",IDC_RESTART,5,147,231,8
+    LTEXT           "(*)Need to Save setup and restart Tera Term",IDC_RESTART,5,147,247,8
 END
 
-IDD_TABSHEET_LOG DIALOGEX 0, 0, 242, 158
+IDD_TABSHEET_LOG DIALOGEX 0, 0, 258, 158
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
     LTEXT           "View log &editor",IDC_VIEWLOG_LABEL,10,10,66,8
     EDITTEXT        IDC_VIEWLOG_EDITOR,11,21,120,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_VIEWLOG_PATH,135,22,13,10
-    LTEXT           "Default log &file name(strftime format)",IDC_DEFAULTNAME_LABEL,10,41,175,8
+    LTEXT           "Default log &file name(strftime format)",IDC_DEFAULTNAME_LABEL,10,41,139,8
     EDITTEXT        IDC_DEFAULTNAME_EDITOR,11,52,120,12,ES_AUTOHSCROLL
-    LTEXT           "Default log &save folder",IDC_DEFAULTPATH_LABEL,10,72,175,8
+    LTEXT           "Default log &save folder",IDC_DEFAULTPATH_LABEL,10,72,139,8
     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
@@ -164,9 +164,16 @@
     LTEXT           "Rotate",IDC_ROTATE_STEP_TEXT,165,138,27,8
     LTEXT           "Size",IDC_ROTATE_SIZE_TEXT,27,137,28,8
     GROUPBOX        "",IDC_ROTATE_GROUP,19,112,214,39
+    GROUPBOX        "Log option",IDC_LOG_OPTION_GROUP,157,10,95,91
+    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,51,86,10
+    CONTROL         "Timestamp",IDC_OPT_TIMESTAMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,64,86,10
+    CONTROL         "Hide dialog",IDC_OPT_HIDEDLG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,76,86,10
+    CONTROL         "Include screen buffer",IDC_OPT_INCBUF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,88,86,10
 END
 
-IDD_TABSHEET_CYGWIN DIALOGEX 0, 0, 242, 158
+IDD_TABSHEET_CYGWIN DIALOGEX 0, 0, 258, 158
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -296,7 +303,7 @@
     IDD_TABSHEET_GENERAL, DIALOG
     BEGIN
         LEFTMARGIN, 5
-        RIGHTMARGIN, 236
+        RIGHTMARGIN, 252
         TOPMARGIN, 5
         BOTTOMMARGIN, 155
     END
@@ -304,7 +311,7 @@
     IDD_TABSHEET_SEQUENCE, DIALOG
     BEGIN
         LEFTMARGIN, 5
-        RIGHTMARGIN, 236
+        RIGHTMARGIN, 252
         TOPMARGIN, 5
         BOTTOMMARGIN, 155
     END
@@ -312,7 +319,7 @@
     IDD_TABSHEET_COPYPASTE, DIALOG
     BEGIN
         LEFTMARGIN, 5
-        RIGHTMARGIN, 236
+        RIGHTMARGIN, 252
         TOPMARGIN, 5
         BOTTOMMARGIN, 155
     END
@@ -320,7 +327,7 @@
     IDD_TABSHEET_VISUAL, DIALOG
     BEGIN
         LEFTMARGIN, 5
-        RIGHTMARGIN, 236
+        RIGHTMARGIN, 252
         TOPMARGIN, 5
         BOTTOMMARGIN, 155
     END
@@ -328,7 +335,7 @@
     IDD_TABSHEET_LOG, DIALOG
     BEGIN
         LEFTMARGIN, 5
-        RIGHTMARGIN, 236
+        RIGHTMARGIN, 252
         TOPMARGIN, 5
         BOTTOMMARGIN, 155
     END
@@ -336,7 +343,7 @@
     IDD_TABSHEET_CYGWIN, DIALOG
     BEGIN
         LEFTMARGIN, 5
-        RIGHTMARGIN, 236
+        RIGHTMARGIN, 252
         TOPMARGIN, 5
         BOTTOMMARGIN, 155
     END



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