Develop and Download Open Source Software

Browse Subversion Repository

Diff of /trunk/teraterm/teraterm/filesys_log.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 8863 by zmatsuo, Sat Jul 25 16:00:58 2020 UTC revision 8866 by zmatsuo, Wed Jul 29 14:39:44 2020 UTC
# Line 55  Line 55 
55  #include "layer_for_unicode_crt.h"  #include "layer_for_unicode_crt.h"
56  #include "codeconv.h"  #include "codeconv.h"
57    
 #include "filesys.h"  
 //#include "tt_res.h"  
58  #include "filesys_log_res.h"  #include "filesys_log_res.h"
59    
60    #include "filesys.h"
61    
62  #define FS_BRACKET_NONE  0  #define FS_BRACKET_NONE  0
63  #define FS_BRACKET_START 1  #define FS_BRACKET_START 1
64  #define FS_BRACKET_END   2  #define FS_BRACKET_END   2
# Line 491  static void SetLogFlags(HWND Dialog) Line 491  static void SetLogFlags(HWND Dialog)
491          GetRB(Dialog, &BinFlag, IDC_FOPTBIN, IDC_FOPTBIN);          GetRB(Dialog, &BinFlag, IDC_FOPTBIN, IDC_FOPTBIN);
492          ts.LogBinary = BinFlag;          ts.LogBinary = BinFlag;
493    
494          GetRB(Dialog, &val, IDC_FOPTAPPEND, IDC_FOPTAPPEND);          GetRB(Dialog, &val, IDC_APPEND, IDC_APPEND);
495          ts.Append = val;          ts.Append = val;
496    
497          if (!BinFlag) {          if (!BinFlag) {
# Line 568  static void ArrangeControls(HWND Dialog, Line 568  static void ArrangeControls(HWND Dialog,
568  {  {
569          if (work->file_exist) {          if (work->file_exist) {
570                  EnableWindow(GetDlgItem(Dialog, IDC_APPEND), TRUE);                  EnableWindow(GetDlgItem(Dialog, IDC_APPEND), TRUE);
571                    if (work->pts->Append > 0) {
572                            CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND, IDC_APPEND);
573                    }
574          }          }
575          else {          else {
576                  // ファイルがない -> 新規                  // ファイルがない -> 新規
# Line 605  static void ArrangeControls(HWND Dialog, Line 608  static void ArrangeControls(HWND Dialog,
608                  }                  }
609          }          }
610          else {          else {
611                  // ファイルがない、新規                  // ファイルがない 又は appendではない(上書き)
612                  CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND, IDC_NEW_OVERWRITE);                  CheckRadioButton(Dialog, IDC_NEW_OVERWRITE, IDC_APPEND, IDC_NEW_OVERWRITE);
613                  CheckDlgButton(Dialog, IDC_BOM, BST_CHECKED);                  CheckDlgButton(Dialog, IDC_BOM, BST_CHECKED);
614                  SendDlgItemMessage(Dialog, IDC_TEXTCODING_DROPDOWN, CB_SETCURSEL, 0, 0);                  SendDlgItemMessage(Dialog, IDC_TEXTCODING_DROPDOWN, CB_SETCURSEL, 0, 0);
# Line 630  static INT_PTR CALLBACK LogFnHook(HWND D Line 633  static INT_PTR CALLBACK LogFnHook(HWND D
633          static const DlgTextInfo TextInfos[] = {          static const DlgTextInfo TextInfos[] = {
634                  { 0, "DLG_TABSHEET_TITLE_LOG" },                  { 0, "DLG_TABSHEET_TITLE_LOG" },
635                  { IDC_FOPTBIN, "DLG_FOPT_BINARY" },                  { IDC_FOPTBIN, "DLG_FOPT_BINARY" },
636  //              { IDC_FOPTAPPEND, "DLG_FOPT_APPEND" },                  { IDC_APPEND, "DLG_FOPT_APPEND" },
637                  { IDC_PLAINTEXT, "DLG_FOPT_PLAIN" },                  { IDC_PLAINTEXT, "DLG_FOPT_PLAIN" },
638                  { IDC_HIDEDIALOG, "DLG_FOPT_HIDEDIALOG" },                  { IDC_HIDEDIALOG, "DLG_FOPT_HIDEDIALOG" },
639                  { IDC_ALLBUFF_INFIRST, "DLG_FOPT_ALLBUFFINFIRST" },                  { IDC_ALLBUFF_INFIRST, "DLG_FOPT_ALLBUFFINFIRST" },
# Line 726  static INT_PTR CALLBACK LogFnHook(HWND D Line 729  static INT_PTR CALLBACK LogFnHook(HWND D
729                          wchar_t filename[MAX_PATH];                          wchar_t filename[MAX_PATH];
730                          _GetDlgItemTextW(Dialog, IDC_FOPT_FILENAME_EDIT, filename, _countof(filename));                          _GetDlgItemTextW(Dialog, IDC_FOPT_FILENAME_EDIT, filename, _countof(filename));
731                          work->info->filename = _wcsdup(filename);                          work->info->filename = _wcsdup(filename);
732                          work->info->append = IsDlgButtonChecked(Dialog, IDC_FOPTAPPEND) == BST_CHECKED;                          work->info->append = IsDlgButtonChecked(Dialog, IDC_APPEND) == BST_CHECKED;
733                          work->info->bom = IsDlgButtonChecked(Dialog, IDC_BOM) == BST_CHECKED;                          work->info->bom = IsDlgButtonChecked(Dialog, IDC_BOM) == BST_CHECKED;
734                          work->info->code = (int)SendDlgItemMessageA(Dialog, IDC_TEXTCODING_DROPDOWN, CB_GETCURSEL, 0, 0);                          work->info->code = (int)SendDlgItemMessageA(Dialog, IDC_TEXTCODING_DROPDOWN, CB_GETCURSEL, 0, 0);
735                          SetLogFlags(Dialog);                          SetLogFlags(Dialog);

Legend:
Removed from v.8863  
changed lines
  Added in v.8866

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26