Tera TermRevision: 8866
https://osdn.net/projects/ttssh2/scm/svn/commits/8866
Author: zmatsuo
Date: 2020-07-29 23:39:44 +0900 (Wed, 29 Jul 2020)
Log Message:
-----------
Appendラジオボタンの動作を修正
- IDを誤っていた
- ファイル選択ダイアログ拡張用リソース IDD_FOPT を削除
Modified Paths:
--------------
trunk/teraterm/common/tt_res.h
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/filesys_log.rc
trunk/teraterm/teraterm/filesys_log_res.h
-------------- next part --------------
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h 2020-07-29 14:39:32 UTC (rev 8865)
+++ trunk/teraterm/common/tt_res.h 2020-07-29 14:39:44 UTC (rev 8866)
@@ -10,9 +10,11 @@
#define IDI_TTERM_CLASSIC 103
#define IDI_VT_CLASSIC 104
#define IDI_CYGTERM 105
+#define IDD_COMMENT_DIALOG 110
#define IDD_EXTERNAL_SETUP 111
#define IDD_TABSHEET_GENERAL 111
#define IDD_BROADCAST_DIALOG 112
+#define IDD_LOGDLG 115
#define IDD_TABSHEET_VISUAL 116
#define IDD_TABSHEET_LOG 117
#define IDD_TABSHEET_CYGWIN 118
@@ -350,7 +352,7 @@
#define ID_FILE_TERATERMMENU 52006
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2020-07-29 14:39:32 UTC (rev 8865)
+++ trunk/teraterm/teraterm/filesys.cpp 2020-07-29 14:39:44 UTC (rev 8866)
@@ -55,10 +55,10 @@
#include "layer_for_unicode_crt.h"
#include "codeconv.h"
-#include "filesys.h"
-//#include "tt_res.h"
#include "filesys_log_res.h"
+#include "filesys.h"
+
#define FS_BRACKET_NONE 0
#define FS_BRACKET_START 1
#define FS_BRACKET_END 2
@@ -491,7 +491,7 @@
GetRB(Dialog, &BinFlag, IDC_FOPTBIN, IDC_FOPTBIN);
ts.LogBinary = BinFlag;
- GetRB(Dialog, &val, IDC_FOPTAPPEND, IDC_FOPTAPPEND);
+ GetRB(Dialog, &val, IDC_APPEND, IDC_APPEND);
ts.Append = val;
if (!BinFlag) {
@@ -568,6 +568,9 @@
{
if (work->file_exist) {
EnableWindow(GetDlgItem(Dialog, IDC_APPEND), TRUE);
+ if (work->pts->Append > 0) {
+ CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND, IDC_APPEND);
+ }
}
else {
// \x83t\x83@\x83C\x83\x8B\x82\xAA\x82Ȃ\xA2 -> \x90V\x8BK
@@ -605,7 +608,7 @@
}
}
else {
- // \x83t\x83@\x83C\x83\x8B\x82\xAA\x82Ȃ\xA2\x81A\x90V\x8BK
+ // \x83t\x83@\x83C\x83\x8B\x82\xAA\x82Ȃ\xA2 \x96\x94\x82\xCD append\x82ł͂Ȃ\xA2(\x8F㏑\x82\xAB)
CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND, IDC_NEW_OVERWRITE);
CheckDlgButton(Dialog, IDC_BOM, BST_CHECKED);
SendDlgItemMessage(Dialog, IDC_TEXTCODING_DROPDOWN, CB_SETCURSEL, 0, 0);
@@ -630,7 +633,7 @@
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_TABSHEET_TITLE_LOG" },
{ IDC_FOPTBIN, "DLG_FOPT_BINARY" },
-// { IDC_FOPTAPPEND, "DLG_FOPT_APPEND" },
+ { IDC_APPEND, "DLG_FOPT_APPEND" },
{ IDC_PLAINTEXT, "DLG_FOPT_PLAIN" },
{ IDC_HIDEDIALOG, "DLG_FOPT_HIDEDIALOG" },
{ IDC_ALLBUFF_INFIRST, "DLG_FOPT_ALLBUFFINFIRST" },
@@ -726,7 +729,7 @@
wchar_t filename[MAX_PATH];
_GetDlgItemTextW(Dialog, IDC_FOPT_FILENAME_EDIT, filename, _countof(filename));
work->info->filename = _wcsdup(filename);
- work->info->append = IsDlgButtonChecked(Dialog, IDC_FOPTAPPEND) == BST_CHECKED;
+ work->info->append = IsDlgButtonChecked(Dialog, IDC_APPEND) == BST_CHECKED;
work->info->bom = IsDlgButtonChecked(Dialog, IDC_BOM) == BST_CHECKED;
work->info->code = (int)SendDlgItemMessageA(Dialog, IDC_TEXTCODING_DROPDOWN, CB_GETCURSEL, 0, 0);
SetLogFlags(Dialog);
Modified: trunk/teraterm/teraterm/filesys_log.rc
===================================================================
--- trunk/teraterm/teraterm/filesys_log.rc 2020-07-29 14:39:32 UTC (rev 8865)
+++ trunk/teraterm/teraterm/filesys_log.rc 2020-07-29 14:39:44 UTC (rev 8866)
@@ -84,20 +84,6 @@
PUSHBUTTON "Help",IDHELP,101,221,50,14
END
-IDD_FOPT DIALOGEX 0, 0, 300, 67
-STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS
-FONT 8, "Tahoma", 0, 0, 0x0
-BEGIN
- GROUPBOX "Option",IDC_FOPT,5,2,290,59
- CONTROL "Bina&ry",IDC_FOPTBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,10,60,16
- CONTROL "&Append",IDC_FOPTAPPEND,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,100,10,60,16
- CONTROL "&Plain text",IDC_PLAINTEXT,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,179,10,80,16
- CONTROL "Hide &dialog",IDC_HIDEDIALOG,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,10,24,88,16
- CONTROL "In&clude screen buffer",IDC_ALLBUFF_INFIRST,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,100,24,96,16
- CONTROL "&Timestamp",IDC_TIMESTAMP,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,10,38,80,16
- COMBOBOX IDC_TIMESTAMPTYPE,90,40,120,60,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
-END
-
IDD_COMMENT_DIALOG DIALOGEX 0, 0, 239, 19
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Comment to Log"
@@ -125,10 +111,6 @@
BOTTOMMARGIN, 235
END
- IDD_FOPT, DIALOG
- BEGIN
- END
-
IDD_COMMENT_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
Modified: trunk/teraterm/teraterm/filesys_log_res.h
===================================================================
--- trunk/teraterm/teraterm/filesys_log_res.h 2020-07-29 14:39:32 UTC (rev 8865)
+++ trunk/teraterm/teraterm/filesys_log_res.h 2020-07-29 14:39:44 UTC (rev 8866)
@@ -2,10 +2,12 @@
// Microsoft Visual C++ \x82Ő\xB6\x90\xAC\x82\xB3\x82ꂽ\x83C\x83\x93\x83N\x83\x8B\x81[\x83h \x83t\x83@\x83C\x83\x8B\x81B
// filesys_log.rc \x82Ŏg\x97p
//
+// IDD_COMMENT_DIALOG \x82\xC6 IDD_LOGDLG \x82\xCD
+// common/tt_res.h \x82Ɠ\xAF\x82\xB6\x92l\x82ɂ\xB7\x82邱\x82\xC6
+//
#define IDD_COMMENT_DIALOG 110
#define IDD_LOGDLG 115
#define IDC_EDIT_COMMENT 1000
-#define IDC_FOPTAPPEND 1002
#define IDC_PLAINTEXT 1003
#define IDC_TIMESTAMP 1004
#define IDC_HIDEDIALOG 1005
@@ -12,21 +14,17 @@
#define IDC_ALLBUFF_INFIRST 1006
#define IDC_TIMESTAMPTYPE 1007
#define IDC_BOM 1008
-#define IDD_GETFNDLG 2000
#define IDC_FOPT_FILENAME_BUTTON 2596
#define IDC_SENDFILE_FILENAME_TITLE 2598
#define IDC_FOPT_FILENAME_EDIT 2599
#define IDC_TEXTCODING_DROPDOWN 2601
-#define IDD_FOPT 2606
#define IDC_FOPTBIN 2608
#define IDC_FOPTTEXT 2609
#define IDC_NEW_OVERWRITE 2612
#define IDC_APPEND 2613
-#define IDC_FOPT 65535
-#define IDC_FILENAME 65535
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1