[Ttssh2-commit] [3594] 中ボタンペーストの有効 / 無効を Additional Settings ダイアログで設定を行えるようにした。

アーカイブの一覧に戻る

svnno****@sourc***** svnno****@sourc*****
2009年 7月 14日 (火) 18:48:47 JST


Revision: 3594
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3594
Author:   doda
Date:     2009-07-14 18:48:47 +0900 (Tue, 14 Jul 2009)

Log Message:
-----------
中ボタンペーストの有効/無効を Additional Settings ダイアログで設定を行えるようにした。

Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/teraterm/common/tt_res.h
    trunk/teraterm/teraterm/addsetting.cpp
    trunk/teraterm/teraterm/ttermpro.rc


-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2009-07-11 11:41:02 UTC (rev 3593)
+++ trunk/installer/release/lang/English.lng	2009-07-14 09:48:47 UTC (rev 3594)
@@ -166,6 +166,7 @@
 DLG_TAB_COPYPASTE_CONTINUE=EnableContinued&LineCopy
 DLG_TAB_COPYPASTE_MOUSEPASTE=&DisableMouseRButtonPaste
 DLG_TAB_COPYPASTE_CONFIRMPASTE=&ConfirmMouseRButtonPaste
+DLG_TAB_COPYPASTE_MOUSEPASTEM=DisableMouse&MButtonPaste
 DLG_TAB_COPYPASTE_SELECTLBUTTON=Select&OnlyByLButton
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=ConfirmChange&Paste
 DLG_TAB_CONFIRM_STRING_FILE=&StringFile

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2009-07-11 11:41:02 UTC (rev 3593)
+++ trunk/installer/release/lang/German.lng	2009-07-14 09:48:47 UTC (rev 3594)
@@ -165,6 +165,7 @@
 DLG_TAB_COPYPASTE_CONTINUE=mehrere Zeilen kopieren
 DLG_TAB_COPYPASTE_MOUSEPASTE=&Einfügen mit rechter Maustaste aus
 DLG_TAB_COPYPASTE_CONFIRMPASTE=&Einfügen mit rechter Maustaste ein
+DLG_TAB_COPYPASTE_MOUSEPASTEM=DisableMouse&MButtonPaste
 DLG_TAB_COPYPASTE_SELECTLBUTTON=&Auswahl nur über Button
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=ConfirmChange&Paste
 DLG_TAB_CONFIRM_STRING_FILE=&StringFile

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2009-07-11 11:41:02 UTC (rev 3593)
+++ trunk/installer/release/lang/Japanese.lng	2009-07-14 09:48:47 UTC (rev 3594)
@@ -166,6 +166,7 @@
 DLG_TAB_COPYPASTE_CONTINUE=Œp‘±sƒRƒs[‚ð—LŒø‚É‚·‚é(&L)
 DLG_TAB_COPYPASTE_MOUSEPASTE=‰EƒNƒŠƒbƒN‚Å‚Ì“\‚è•t‚¯‚𖳌ø‚É‚·‚é(&D)
 DLG_TAB_COPYPASTE_CONFIRMPASTE=‰EƒNƒŠƒbƒN‚Å‚Ì“\‚è•t‚¯‚ðŠm”F‚·‚é(&C)
+DLG_TAB_COPYPASTE_MOUSEPASTEM=’†ƒNƒŠƒbƒN‚Å‚Ì“\‚è•t‚¯‚𖳌ø‚É‚·‚é(&M)
 DLG_TAB_COPYPASTE_SELECTLBUTTON=¶ƒNƒŠƒbƒN‚Å‚Ì‚Ý‘I‘ð‚ðŠJŽn‚·‚é(&O)
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=ŠëŒ¯‚ȃNƒŠƒbƒvƒ{[ƒh‚Ì“\‚è•t‚¯‚ðŠm”F‚·‚é(&P)
 DLG_TAB_CONFIRM_STRING_FILE=ƒL[ƒ[ƒhƒtƒ@ƒCƒ‹(&S)

Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2009-07-11 11:41:02 UTC (rev 3593)
+++ trunk/teraterm/common/tt_res.h	2009-07-14 09:48:47 UTC (rev 3594)
@@ -94,6 +94,7 @@
 #define IDC_ENABLE_ATTR_COLOR_REVERSE   1071
 #define IDC_ENABLE_URL_COLOR            1072
 #define IDC_ENABLE_ANSI_COLOR           1073
+#define IDC_DISABLE_PASTE_MBUTTON       1074
 #define IDD_PRNABORTDLG                 2100
 #define IDD_FILETRANSDLG                2200
 #define IDC_TRANSFNAME                  2201

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2009-07-11 11:41:02 UTC (rev 3593)
+++ trunk/teraterm/teraterm/addsetting.cpp	2009-07-14 09:48:47 UTC (rev 3594)
@@ -300,6 +300,7 @@
 		SendDlgItemMessage(IDC_LINECOPY, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_DISABLE_PASTE_RBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_CONFIRM_PASTE_RBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_DISABLE_PASTE_MBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_SELECT_LBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_CONFIRM_CHANGE_PASTE, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_DELIMITER, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
@@ -321,6 +322,9 @@
 	GetDlgItemText(IDC_CONFIRM_PASTE_RBUTTON, uimsg, sizeof(uimsg));
 	get_lang_msg("DLG_TAB_COPYPASTE_CONFIRMPASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_CONFIRM_PASTE_RBUTTON, ts.UIMsg);
+	GetDlgItemText(IDC_DISABLE_PASTE_MBUTTON, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_COPYPASTE_MOUSEPASTEM", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_DISABLE_PASTE_MBUTTON, ts.UIMsg);
 	GetDlgItemText(IDC_SELECT_LBUTTON, uimsg, sizeof(uimsg));
 	get_lang_msg("DLG_TAB_COPYPASTE_SELECTLBUTTON", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_SELECT_LBUTTON, ts.UIMsg);
@@ -357,11 +361,15 @@
 	// (3)ConfirmPasteMouseRButton
 	btn2->SetCheck(ts.ConfirmPasteMouseRButton);
 
-	// (4)SelectOnlyByLButton
+	// (4)DisablePasteMouseMButton
+	btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_MBUTTON);
+	btn->SetCheck(ts.DisablePasteMouseMButton);
+
+	// (5)SelectOnlyByLButton
 	btn = (CButton *)GetDlgItem(IDC_SELECT_LBUTTON);
 	btn->SetCheck(ts.SelectOnlyByLButton);
 
-	// (5)ConfirmChangePaste 
+	// (6)ConfirmChangePaste 
 	btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
 	btn->SetCheck(ts.ConfirmChangePaste);
 
@@ -377,10 +385,10 @@
 		btn->EnableWindow(FALSE);
 	}
 
-	// (6)delimiter characters
+	// (7)delimiter characters
 	SetDlgItemText(IDC_DELIM_LIST, ts.DelimList);
 
-	// (7)PasteDelayPerLine
+	// (8)PasteDelayPerLine
 	_snprintf_s(buf, sizeof(buf), "%d", ts.PasteDelayPerLine);
 	SetDlgItemText(IDC_PASTEDELAY_EDIT, buf);
 
@@ -465,18 +473,22 @@
 	ts.ConfirmPasteMouseRButton = btn->GetCheck();
 
 	// (4)
+	btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_MBUTTON);
+	ts.DisablePasteMouseMButton = btn->GetCheck();
+
+	// (5)
 	btn = (CButton *)GetDlgItem(IDC_SELECT_LBUTTON);
 	ts.SelectOnlyByLButton = btn->GetCheck();
 
-	// (5)IDC_CONFIRM_CHANGE_PASTE
+	// (6)IDC_CONFIRM_CHANGE_PASTE
 	btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
 	ts.ConfirmChangePaste = btn->GetCheck();
 	GetDlgItemText(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile, sizeof(ts.ConfirmChangePasteStringFile));
 
-	// (6)
+	// (7)
 	GetDlgItemText(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));
 
-	// (7)
+	// (8)
 	GetDlgItemText(IDC_PASTEDELAY_EDIT, buf, sizeof(buf));
 	val = atoi(buf);
 	ts.PasteDelayPerLine = min(max(0, val), 5000);

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2009-07-11 11:41:02 UTC (rev 3593)
+++ trunk/teraterm/teraterm/ttermpro.rc	2009-07-14 09:48:47 UTC (rev 3594)
@@ -246,16 +246,18 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,200,10
     CONTROL         "&ConfirmMouseRButtonPaste",IDC_CONFIRM_PASTE_RBUTTON,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,40,190,10
-    CONTROL         "Select&OnlyByLButton",IDC_SELECT_LBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,55,200,10
-    CONTROL         "ConfirmChange&Paste",IDC_CONFIRM_CHANGE_PASTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,70,200,10
-    LTEXT           "&StringFile",IDC_CONFIRM_STRING_FILE_LABEL,22,85,61,8
-    EDITTEXT        IDC_CONFIRM_STRING_FILE,85,83,106,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_CONFIRM_STRING_FILE_PATH,196,83,13,12
-    LTEXT           "Del&imiter Characters",IDC_DELIMITER,11,100,65,10
-    EDITTEXT        IDC_DELIM_LIST,85,98,130,12,ES_AUTOHSCROLL
-    LTEXT           "P&asteDelayPerLine",IDC_PASTEDELAY_LABEL,11,115,70,10
-    EDITTEXT        IDC_PASTEDELAY_EDIT,85,113,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "ms",IDC_PASTEDELAY_LABEL2,113,115,23,10
+    CONTROL         "DisableMouse&MButtonPaste",IDC_DISABLE_PASTE_MBUTTON,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,55,200,10
+    CONTROL         "Select&OnlyByLButton",IDC_SELECT_LBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,70,200,10
+    CONTROL         "ConfirmChange&Paste",IDC_CONFIRM_CHANGE_PASTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,200,10
+    LTEXT           "&StringFile",IDC_CONFIRM_STRING_FILE_LABEL,22,100,61,8
+    EDITTEXT        IDC_CONFIRM_STRING_FILE,85,98,106,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CONFIRM_STRING_FILE_PATH,196,98,13,12
+    LTEXT           "Del&imiter Characters",IDC_DELIMITER,11,115,65,10
+    EDITTEXT        IDC_DELIM_LIST,85,113,130,12,ES_AUTOHSCROLL
+    LTEXT           "P&asteDelayPerLine",IDC_PASTEDELAY_LABEL,11,130,70,10
+    EDITTEXT        IDC_PASTEDELAY_EDIT,85,128,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "ms",IDC_PASTEDELAY_LABEL2,113,130,23,10
 END
 
 



Ttssh2-commit メーリングリストの案内
アーカイブの一覧に戻る