Diff of /trunk/teraterm/teraterm/addsetting.cpp

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/trunk/teraterm/teraterm/addsetting.cpp




Diff of /trunk/teraterm/teraterm/addsetting.cpp



 Parent Directory

|  Revision Log



|  Patch














revision 8458 by doda,
Tue Dec 17 12:15:31 2019 UTC




revision 8459 by zmatsuo,
Fri Jan 10 13:12:35 2020 UTC






#

Line 1 



Line 1 













1
 /*
 /*















2


  * Copyright (C) 2008-2019 TeraTerm Project


  * Copyright (C) 2008-2020 TeraTerm Project















3
  * All rights reserved.
  * All rights reserved.

















4
  *
  *

















5
  * Redistribution and use in source and binary forms, with or without
  * Redistribution and use in source and binary forms, with or without











#

Line 435 
 void CCopypastePropPageDlg::OnInitDialog


Line 435 
 void CCopypastePropPageDlg::OnInitDialog












435
                 { IDC_DISABLE_PASTE_MBUTTON, "DLG_TAB_COPYPASTE_MOUSEPASTEM" },
                 { IDC_DISABLE_PASTE_MBUTTON, "DLG_TAB_COPYPASTE_MOUSEPASTEM" },

















436
                 { IDC_SELECT_LBUTTON, "DLG_TAB_COPYPASTE_SELECTLBUTTON" },
                 { IDC_SELECT_LBUTTON, "DLG_TAB_COPYPASTE_SELECTLBUTTON" },

















437
                 { IDC_TRIMNLCHAR, "DLG_TAB_COPYPASTE_TRIM_TRAILING_NL" },
                 { IDC_TRIMNLCHAR, "DLG_TAB_COPYPASTE_TRIM_TRAILING_NL" },














                 { IDC_NORMALIZE_LINEBREAK, "DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK" },
 













438
                 { IDC_CONFIRM_CHANGE_PASTE, "DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE" },
                 { IDC_CONFIRM_CHANGE_PASTE, "DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE" },

















439
                 { IDC_CONFIRM_STRING_FILE_LABEL, "DLG_TAB_COPYPASTE_STRINGFILE" },
                 { IDC_CONFIRM_STRING_FILE_LABEL, "DLG_TAB_COPYPASTE_STRINGFILE" },

















440
                 { IDC_DELIMITER, "DLG_TAB_COPYPASTE_DELIMITER" },
                 { IDC_DELIMITER, "DLG_TAB_COPYPASTE_DELIMITER" },











#

Line 469 
 void CCopypastePropPageDlg::OnInitDialog


Line 468 
 void CCopypastePropPageDlg::OnInitDialog












468
         // (6)TrimTrailingNLonPaste
         // (6)TrimTrailingNLonPaste

















469
         SetCheck(IDC_TRIMNLCHAR, (ts.PasteFlag & CPF_TRIM_TRAILING_NL)?BST_CHECKED:BST_UNCHECKED);
         SetCheck(IDC_TRIMNLCHAR, (ts.PasteFlag & CPF_TRIM_TRAILING_NL)?BST_CHECKED:BST_UNCHECKED);

















470
 
 















471


         // (7)NormalizeLineBreak


         // (7)ConfirmChangePaste
















         SetCheck(IDC_NORMALIZE_LINEBREAK, (ts.PasteFlag & CPF_NORMALIZE_LINEBREAK)?BST_CHECKED:BST_UNCHECKED);


 
















 


 
















         // (8)ConfirmChangePaste


 















472
         SetCheck(IDC_CONFIRM_CHANGE_PASTE, (ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE)?BST_CHECKED:BST_UNCHECKED);
         SetCheck(IDC_CONFIRM_CHANGE_PASTE, (ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE)?BST_CHECKED:BST_UNCHECKED);

















473
 
 

















474
         // ファイルパス
         // ファイルパス











#

Line 485 
 void CCopypastePropPageDlg::OnInitDialog


Line 481 
 void CCopypastePropPageDlg::OnInitDialog












481
                 EnableDlgItem(IDC_CONFIRM_STRING_FILE_PATH, FALSE);
                 EnableDlgItem(IDC_CONFIRM_STRING_FILE_PATH, FALSE);

















482
         }
         }

















483
 
 















484


         // (9)delimiter characters


         // (8)delimiter characters















485
         SetDlgItemTextA(IDC_DELIM_LIST, ts.DelimList);
         SetDlgItemTextA(IDC_DELIM_LIST, ts.DelimList);

















486
 
 















487


         // (10)PasteDelayPerLine


         // (9)PasteDelayPerLine















488
         char buf[64];
         char buf[64];

















489
         _snprintf_s(buf, sizeof(buf), "%d", ts.PasteDelayPerLine);
         _snprintf_s(buf, sizeof(buf), "%d", ts.PasteDelayPerLine);

















490
         SetDlgItemNum(IDC_PASTEDELAY_EDIT, ts.PasteDelayPerLine);
         SetDlgItemNum(IDC_PASTEDELAY_EDIT, ts.PasteDelayPerLine);

















491
 
 















492


         // (11) SelectOnActivate


         // (10) SelectOnActivate















493
         SetCheck(IDC_SELECT_ON_ACTIVATE, ts.SelOnActive ? BST_CHECKED : BST_UNCHECKED);
         SetCheck(IDC_SELECT_ON_ACTIVATE, ts.SelOnActive ? BST_CHECKED : BST_UNCHECKED);

















494
 
 

















495
         // ダイアログにフォーカスを当てる
         // ダイアログにフォーカスを当てる











#

Line 589 
 void CCopypastePropPageDlg::OnOK()


Line 585 
 void CCopypastePropPageDlg::OnOK()












585
                 ts.PasteFlag &= ~CPF_TRIM_TRAILING_NL;
                 ts.PasteFlag &= ~CPF_TRIM_TRAILING_NL;

















586
         }
         }

















587
 
 















588


         // (7)


         // (7)IDC_CONFIRM_CHANGE_PASTE
















         if (GetCheck(IDC_NORMALIZE_LINEBREAK)) {


 
















                 ts.PasteFlag |= CPF_NORMALIZE_LINEBREAK;


 
















         }


 
















         else {


 
















                 ts.PasteFlag &= ~CPF_NORMALIZE_LINEBREAK;


 
















         }


 
















 


 
















         // (8)IDC_CONFIRM_CHANGE_PASTE


 















589
         if (GetCheck(IDC_CONFIRM_CHANGE_PASTE)) {
         if (GetCheck(IDC_CONFIRM_CHANGE_PASTE)) {

















590
                 ts.PasteFlag |= CPF_CONFIRM_CHANGEPASTE;
                 ts.PasteFlag |= CPF_CONFIRM_CHANGEPASTE;

















591
         }
         }











#

Line 606 
 void CCopypastePropPageDlg::OnOK()


Line 594 
 void CCopypastePropPageDlg::OnOK()












594
         }
         }

















595
         GetDlgItemTextA(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile, sizeof(ts.ConfirmChangePasteStringFile));
         GetDlgItemTextA(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile, sizeof(ts.ConfirmChangePasteStringFile));

















596
 
 















597


         // (9)


         // (8)















598
         GetDlgItemTextA(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));
         GetDlgItemTextA(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));

















599
 
 















600


         // (10)


         // (9)















601
         GetDlgItemTextA(IDC_PASTEDELAY_EDIT, buf, sizeof(buf));
         GetDlgItemTextA(IDC_PASTEDELAY_EDIT, buf, sizeof(buf));

















602
         val = atoi(buf);
         val = atoi(buf);

















603
         ts.PasteDelayPerLine =
         ts.PasteDelayPerLine =

















604
                 (val < 0) ? 0 :
                 (val < 0) ? 0 :

















605
                 (val > 5000) ? 5000 : val;
                 (val > 5000) ? 5000 : val;

















606
 
 















607


         // (11) SelectOnActivate


         // (10) SelectOnActivate















608
         ts.SelOnActive = (GetCheck(IDC_SELECT_ON_ACTIVATE) == BST_CHECKED);
         ts.SelOnActive = (GetCheck(IDC_SELECT_ON_ACTIVATE) == BST_CHECKED);

















609
 }
 }

















610
 
 





























Legend:



Removed from v.8458
 


changed lines


 
Added in v.8459













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/trunk/teraterm/teraterm/addsetting.cpp
-revision 8458 by doda,
Tue Dec 17 12:15:31 2019 UTC
+revision 8459 by zmatsuo,
Fri Jan 10 13:12:35 2020 UTC
 Line 1
  /*
-  * Copyright (C) 2008-2019 TeraTerm Project
+  * Copyright (C) 2008-2020 TeraTerm Project
   * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
 Line 435 
 void CCopypastePropPageDlg::OnInitDialog
                  { IDC_DISABLE_PASTE_MBUTTON, "DLG_TAB_COPYPASTE_MOUSEPASTEM" },
                  { IDC_SELECT_LBUTTON, "DLG_TAB_COPYPASTE_SELECTLBUTTON" },
                  { IDC_TRIMNLCHAR, "DLG_TAB_COPYPASTE_TRIM_TRAILING_NL" },
-                 { IDC_NORMALIZE_LINEBREAK, "DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK" },
                  { IDC_CONFIRM_CHANGE_PASTE, "DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE" },
                  { IDC_CONFIRM_STRING_FILE_LABEL, "DLG_TAB_COPYPASTE_STRINGFILE" },
                  { IDC_DELIMITER, "DLG_TAB_COPYPASTE_DELIMITER" },
-Line 469 
 void CCopypastePropPageDlg::OnInitDialog
+Line 468 
 void CCopypastePropPageDlg::OnInitDialog
          // (6)TrimTrailingNLonPaste
          SetCheck(IDC_TRIMNLCHAR, (ts.PasteFlag & CPF_TRIM_TRAILING_NL)?BST_CHECKED:BST_UNCHECKED);
-         // (7)NormalizeLineBreak
+         // (7)ConfirmChangePaste
-         SetCheck(IDC_NORMALIZE_LINEBREAK, (ts.PasteFlag & CPF_NORMALIZE_LINEBREAK)?BST_CHECKED:BST_UNCHECKED);
-         // (8)ConfirmChangePaste
          SetCheck(IDC_CONFIRM_CHANGE_PASTE, (ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE)?BST_CHECKED:BST_UNCHECKED);
          // ファイルパス
-Line 485 
 void CCopypastePropPageDlg::OnInitDialog
+Line 481 
 void CCopypastePropPageDlg::OnInitDialog
                  EnableDlgItem(IDC_CONFIRM_STRING_FILE_PATH, FALSE);
          }
-         // (9)delimiter characters
+         // (8)delimiter characters
          SetDlgItemTextA(IDC_DELIM_LIST, ts.DelimList);
-         // (10)PasteDelayPerLine
+         // (9)PasteDelayPerLine
          char buf[64];
          _snprintf_s(buf, sizeof(buf), "%d", ts.PasteDelayPerLine);
          SetDlgItemNum(IDC_PASTEDELAY_EDIT, ts.PasteDelayPerLine);
-         // (11) SelectOnActivate
+         // (10) SelectOnActivate
          SetCheck(IDC_SELECT_ON_ACTIVATE, ts.SelOnActive ? BST_CHECKED : BST_UNCHECKED);
          // ダイアログにフォーカスを当てる
-Line 589 
 void CCopypastePropPageDlg::OnOK()
+Line 585 
 void CCopypastePropPageDlg::OnOK()
                  ts.PasteFlag &= ~CPF_TRIM_TRAILING_NL;
          }
-         // (7)
+         // (7)IDC_CONFIRM_CHANGE_PASTE
-         if (GetCheck(IDC_NORMALIZE_LINEBREAK)) {
-                 ts.PasteFlag |= CPF_NORMALIZE_LINEBREAK;
-         }
-         else {
-                 ts.PasteFlag &= ~CPF_NORMALIZE_LINEBREAK;
-         }
-         // (8)IDC_CONFIRM_CHANGE_PASTE
          if (GetCheck(IDC_CONFIRM_CHANGE_PASTE)) {
                  ts.PasteFlag |= CPF_CONFIRM_CHANGEPASTE;
          }
-Line 606 
 void CCopypastePropPageDlg::OnOK()
+Line 594 
 void CCopypastePropPageDlg::OnOK()
          }
          GetDlgItemTextA(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile, sizeof(ts.ConfirmChangePasteStringFile));
-         // (9)
+         // (8)
          GetDlgItemTextA(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));
-         // (10)
+         // (9)
          GetDlgItemTextA(IDC_PASTEDELAY_EDIT, buf, sizeof(buf));
          val = atoi(buf);
          ts.PasteDelayPerLine =
                  (val < 0) ? 0 :
                  (val > 5000) ? 5000 : val;
-         // (11) SelectOnActivate
+         // (10) SelectOnActivate
          ts.SelOnActive = (GetCheck(IDC_SELECT_ON_ACTIVATE) == BST_CHECKED);
  }
 Legend:



Removed from v.8458
 


changed lines


 
Added in v.8459
 Legend:



Removed from v.8458
 


changed lines


 
Added in v.8459
-Removed from v.8458
+Added in v.8459
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository