Revision: 7940 https://osdn.net/projects/ttssh2/scm/svn/commits/7940 Author: zmatsuo Date: 2019-08-11 20:29:52 +0900 (Sun, 11 Aug 2019) Log Message: ----------- SelectOnActivateをGUIから設定できるようにした 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 2019-08-11 11:29:41 UTC (rev 7939) +++ trunk/teraterm/common/tt_res.h 2019-08-11 11:29:52 UTC (rev 7940) @@ -167,7 +167,6 @@ #define IDC_TRANS_ELAPSED 2527 #define IDC_BGIMG_LABEL 2527 #define IDC_TRANS_ETIME 2528 -#define IDC_BUTTON1 2528 #define IDC_BGIMG_BUTTON 2528 #define IDC_INI_SETUPDIR_BUTTON 2528 #define IDC_CLIPBOARD_ACCESS_LABEL 2529 @@ -237,6 +236,7 @@ #define IDC_SAME_PROCESS_NEXTDROP_CHECK 2586 #define IDC_DONTSHOW_CHECK 2587 #define IDC_DAD_NOTE 2588 +#define IDC_SELECT_ON_ACTIVATE 2589 #define ID_ACC_SENDBREAK 50001 #define ID_ACC_COPY 50002 #define ID_ACC_NEWCONNECTION 50003 Modified: trunk/teraterm/teraterm/addsetting.cpp =================================================================== --- trunk/teraterm/teraterm/addsetting.cpp 2019-08-11 11:29:41 UTC (rev 7939) +++ trunk/teraterm/teraterm/addsetting.cpp 2019-08-11 11:29:52 UTC (rev 7940) @@ -427,7 +427,8 @@ { IDC_CONFIRM_STRING_FILE_LABEL, "DLG_TAB_COPYPASTE_STRINGFILE" }, { IDC_DELIMITER, "DLG_TAB_COPYPASTE_DELIMITER" }, { IDC_PASTEDELAY_LABEL, "DLG_TAB_COPYPASTE_PASTEDELAY" }, - { IDC_PASTEDELAY_LABEL2, "DLG_TAB_COPYPASTE_PASTEDELAY2" } + { IDC_PASTEDELAY_LABEL2, "DLG_TAB_COPYPASTE_PASTEDELAY2" }, + { IDC_SELECT_ON_ACTIVATE, "DLG_TAB_COPYPASTE_SELECT_ON_ACTIVATE" } }; SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile); @@ -479,6 +480,9 @@ _snprintf_s(buf, sizeof(buf), "%d", ts.PasteDelayPerLine); SetDlgItemNum(IDC_PASTEDELAY_EDIT, ts.PasteDelayPerLine); + // (11) SelectOnActivate + SetCheck(IDC_SELECT_ON_ACTIVATE, ts.SelOnActive ? BST_CHECKED : BST_UNCHECKED); + // \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82Ă\xE9 ::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_LINECOPY)); } @@ -598,6 +602,9 @@ ts.PasteDelayPerLine = (val < 0) ? 0 : (val > 5000) ? 5000 : val; + + // (11) SelectOnActivate + ts.SelOnActive = (GetCheck(IDC_SELECT_ON_ACTIVATE) == BST_CHECKED); } Modified: trunk/teraterm/teraterm/ttermpro.rc =================================================================== --- trunk/teraterm/teraterm/ttermpro.rc 2019-08-11 11:29:41 UTC (rev 7939) +++ trunk/teraterm/teraterm/ttermpro.rc 2019-08-11 11:29:52 UTC (rev 7940) @@ -118,7 +118,7 @@ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,130,220,10 END -IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 258, 188 +IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 258, 194 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU FONT 8, "Tahoma", 0, 0, 0x0 BEGIN @@ -143,6 +143,7 @@ LTEXT "P&aste delay per line",IDC_PASTEDELAY_LABEL,11,160,70,10 EDITTEXT IDC_PASTEDELAY_EDIT,95,158,24,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "ms",IDC_PASTEDELAY_LABEL2,123,160,23,10 + CONTROL "Disa&bling text selection when the window is activated",IDC_SELECT_ON_ACTIVATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,173,200,10 END IDD_TABSHEET_VISUAL DIALOGEX 0, 0, 258, 188 @@ -395,7 +396,7 @@ LEFTMARGIN, 5 RIGHTMARGIN, 252 TOPMARGIN, 5 - BOTTOMMARGIN, 185 + BOTTOMMARGIN, 191 END IDD_TABSHEET_VISUAL, DIALOG @@ -577,11 +578,11 @@ BEGIN MENUITEM "&Terminal...", ID_SETUP_TERMINAL MENUITEM "&Window...", ID_SETUP_WINDOW - POPUP "&Font" + POPUP "&Font" BEGIN - MENUITEM "&Font...", ID_SETUP_FONT - MENUITEM "&Dialog Font...", ID_SETUP_DLG_FONT - END + MENUITEM "&Font...", ID_SETUP_FONT + MENUITEM "&Dialog Font...", ID_SETUP_DLG_FONT + END MENUITEM "&Keyboard...", ID_SETUP_KEYBOARD MENUITEM "S&erial port...", ID_SETUP_SERIALPORT MENUITEM "T&CP/IP...", ID_SETUP_TCPIP