scmno****@osdn*****
scmno****@osdn*****
2017年 10月 24日 (火) 18:40:43 JST
Tera TermRevision: 6955
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6955
Author: doda
Date: 2017-10-24 18:40:43 +0900 (Tue, 24 Oct 2017)
Log Message:
-----------
Additional Settings ダイアログでの Log Option 設定関連のバグを修正。
・ダイアログをキャンセルしても Log Option の変更が反映されるのを修正
・以下の手順を行った時、Timestamp / Plain Text のチェックボックスと
実際に反映される設定が食い違うのを修正。
1. Binary を off にする
2. Timestamp / Plain Text を on にする
3. Binary を on にする
4. Binary を off にする
5. OK を押す
LogStart() 時に FixLogOption() でログオプション間の整合性が取られるので、
このダイアログでの設定時点では整合性を取らないようにした。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/addsetting.cpp
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2017-10-24 09:40:39 UTC (rev 6954)
+++ trunk/doc/en/html/about/history.html 2017-10-24 09:40:43 UTC (rev 6955)
@@ -43,6 +43,11 @@
<ul>
<li>The response of DECRQSS control sequence was invalid.</li>
<li>When the [View Log] on the <a href="../menu/file.html">[File]</a> is called, the editor does not invoked.</li>
+ <li>Fix the problem of the log option settings on the Log tab of <a href="../menu/setup-additional.html#LogOption">Additional settings dialog</a>
+ <ul>
+ <li>PlainText and Timestamp setting is not applied.</li>
+ <li>Changes to the log option settings are applied when the dialog is cancelled.</li>
+ </ul></li>
</ul>
</li>
</ul>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2017-10-24 09:40:39 UTC (rev 6954)
+++ trunk/doc/ja/html/about/history.html 2017-10-24 09:40:43 UTC (rev 6955)
@@ -43,6 +43,11 @@
<ul>
<li>DECRQSS \x90\xA7\x8C\xE4\x83V\x81[\x83P\x83\x93\x83X\x82ւ̉\x9E\x93\x9A\x82\xAA\x8AԈ\xE1\x82\xC1\x82Ă\xA2\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
<li><a href="../menu/file.html">[File]</a> \x83\x81\x83j\x83\x85\x81[\x82\xCC [View Log] \x82ŃG\x83f\x83B\x83^\x82\xAA\x8BN\x93\xAE\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ <li><a href="../menu/setup-additional.html#LogOption">Additional settings \x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC Log \x83^\x83u\x82ŁALog Option \x90ݒ\xE8\x82Ɋւ\xB7\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
+ <ul>
+ <li>PlainText, Timestamp \x90ݒ肪\x90\xB3\x82\xB5\x82\xAD\x94\xBD\x89f\x82\xB3\x82\xEA\x82Ȃ\xA2\x8E\x96\x82\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ <li>\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB5\x82\xBD\x8E\x9E\x82ɁALog Option \x90ݒ\xE8\x82̕ύX\x82\xAA\x94\xBD\x89f\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ </ul></li>
</ul>
</li>
</ul>
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2017-10-24 09:40:39 UTC (rev 6954)
+++ trunk/teraterm/teraterm/addsetting.cpp 2017-10-24 09:40:43 UTC (rev 6955)
@@ -1617,84 +1617,16 @@
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);
@@ -1774,10 +1706,57 @@
/* \x8Ec\x82\xE8\x82̃\x81\x83\x93\x83o\x81[\x82͈Ӑ}\x93I\x82ɐݒ\xE8\x82\xF0\x8Ec\x82\xB7\x81B*/
}
+ // Log Options
+ btn = (CButton *)GetDlgItem(IDC_OPT_BINARY);
+ if (btn->GetCheck()) {
+ ts.LogBinary = 1;
+ }
+ else {
+ ts.LogBinary = 0;
+ }
+
+ btn = (CButton *)GetDlgItem(IDC_OPT_APPEND);
+ if (btn->GetCheck()) {
+ ts.Append = 1;
+ }
+ else {
+ ts.Append = 0;
+ }
+
+ btn = (CButton *)GetDlgItem(IDC_OPT_PLAINTEXT);
+ if (btn->GetCheck()) {
+ ts.LogTypePlainText = 1;
+ }
+ else {
+ 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;
+ }
+ else {
+ ts.LogHideDialog = 0;
+ }
+
+ btn = (CButton *)GetDlgItem(IDC_OPT_INCBUF);
+ if (btn->GetCheck()) {
+ ts.LogAllBuffIncludedInFirst = 1;
+ }
+ else {
+ ts.LogAllBuffIncludedInFirst = 0;
+ }
}
-
// CCygwinPropPageDlg \x83_\x83C\x83A\x83\x8D\x83O
IMPLEMENT_DYNAMIC(CCygwinPropPageDlg, CPropertyPage)