OSDN -- 오픈 소스 소프트웨어 개발 및 다운로드
Translation Status of 한국말 translation status for ko

[Ttssh2-commit] [4702] OSC 52 の許可の設定 UI を追加。

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2011年 11月 1日 (火) 20:29:59 JST 

Revision: 4702
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4702
Author:   doda
Date:     2011-11-01 20:29:59 +0900 (Tue, 01 Nov 2011)

Log Message:
-----------
OSC 52 の許可の設定 UI を追加。

Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/French.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	2011-11-01 11:10:45 UTC (rev 4701)
+++ trunk/installer/release/lang/English.lng	2011-11-01 11:29:59 UTC (rev 4702)
@@ -178,6 +178,11 @@
 DLG_TAB_SEQENCE_TITLE_REPORT_IGNORE=ignore
 DLG_TAB_SEQENCE_TITLE_REPORT_ACCEPT=accept
 DLG_TAB_SEQENCE_TITLE_REPORT_EMPTY=empty
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS=C&lipboard access from remote
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_OFF=off
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_ON=read/write
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_READ=read only
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_WRITE=write only
 
 DLG_TAB_COPYPASTE_CONTINUE=Enable continued &line copy
 DLG_TAB_COPYPASTE_MOUSEPASTE=&Disable mouse R button paste

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2011-11-01 11:10:45 UTC (rev 4701)
+++ trunk/installer/release/lang/French.lng	2011-11-01 11:29:59 UTC (rev 4702)
@@ -178,6 +178,11 @@
 DLG_TAB_SEQENCE_TITLE_REPORT_IGNORE=ignorer
 DLG_TAB_SEQENCE_TITLE_REPORT_ACCEPT=accepter
 DLG_TAB_SEQENCE_TITLE_REPORT_EMPTY=vide
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS=C&lipboard access from remote
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_OFF=off
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_ON=read/write
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_READ=read only
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_WRITE=write only
 
 DLG_TAB_COPYPASTE_CONTINUE=Autoriser copie continue de ligne
 DLG_TAB_COPYPASTE_MOUSEPASTE=Interdire coller avec bouton D de la souris

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2011-11-01 11:10:45 UTC (rev 4701)
+++ trunk/installer/release/lang/German.lng	2011-11-01 11:29:59 UTC (rev 4702)
@@ -178,6 +178,11 @@
 DLG_TAB_SEQENCE_TITLE_REPORT_IGNORE=Ignorieren
 DLG_TAB_SEQENCE_TITLE_REPORT_ACCEPT=Akzeptieren
 DLG_TAB_SEQENCE_TITLE_REPORT_EMPTY=empty
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS=C&lipboard access from remote
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_OFF=off
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_ON=read/write
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_READ=read only
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_WRITE=write only
 
 DLG_TAB_COPYPASTE_CONTINUE=Mehrere Zeilen kopieren
 DLG_TAB_COPYPASTE_MOUSEPASTE=&Einfügen mit rechter Maustaste aus

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2011-11-01 11:10:45 UTC (rev 4701)
+++ trunk/installer/release/lang/Japanese.lng	2011-11-01 11:29:59 UTC (rev 4702)
@@ -178,6 +178,11 @@
 DLG_TAB_SEQENCE_TITLE_REPORT_IGNORE=–³Ž‹
 DLG_TAB_SEQENCE_TITLE_REPORT_ACCEPT=‰ž“š
 DLG_TAB_SEQENCE_TITLE_REPORT_EMPTY=‹ó”’
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS=ƒŠƒ‚[ƒg‚©‚ç‚̃NƒŠƒbƒvƒ{[ƒhƒAƒNƒZƒX(&L)
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_OFF=–³Œø
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_ON=“Ǎž/‘ž
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_READ=“Ǎž‚Ì‚Ý
+DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_WRITE=‘ž‚Ì‚Ý
 
 DLG_TAB_COPYPASTE_CONTINUE=Œp‘±sƒRƒs[‚ð—LŒø‚É‚·‚é(&L)
 DLG_TAB_COPYPASTE_MOUSEPASTE=‰EƒNƒŠƒbƒN‚Å‚Ì“\‚è•t‚¯‚𖳌ø‚É‚·‚é(&D)

Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2011-11-01 11:10:45 UTC (rev 4701)
+++ trunk/teraterm/common/tt_res.h	2011-11-01 11:29:59 UTC (rev 4702)
@@ -148,6 +148,8 @@
 #define IDC_PROTOELAPSEDTIME            2526
 #define IDC_TRANS_ELAPSED               2527
 #define IDC_TRANS_ETIME                 2528
+#define IDC_CLIPBOARD_ACCESS_LABEL      2529
+#define IDC_CLIPBOARD_ACCESS            2530
 #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	2011-11-01 11:10:45 UTC (rev 4701)
+++ trunk/teraterm/teraterm/addsetting.cpp	2011-11-01 11:29:59 UTC (rev 4702)
@@ -261,6 +261,8 @@
 		SendDlgItemMessage(IDC_WINDOW_CTRL, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_WINDOW_REPORT, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_CURSOR_CTRL_SEQ, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_CLIPBOARD_ACCESS_LABEL, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
 	}
 	else {
 		DlgSequenceFont = NULL;
@@ -305,6 +307,19 @@
 	get_lang_msg("DLG_TAB_SEQENCE_TITLE_REPORT_EMPTY", ts.UIMsg, sizeof(ts.UIMsg), "empty", ts.UILanguageFile);
 	SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
 
+	GetDlgItemText(IDC_CLIPBOARD_ACCESS_LABEL, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_SEQENCE_CLIPBOARD_ACCESS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_CLIPBOARD_ACCESS_LABEL, ts.UIMsg);
+
+	get_lang_msg("DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_OFF", ts.UIMsg, sizeof(ts.UIMsg), "off", ts.UILanguageFile);
+	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+	get_lang_msg("DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_WRITE", ts.UIMsg, sizeof(ts.UIMsg), "write only", ts.UILanguageFile);
+	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+	get_lang_msg("DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_READ", ts.UIMsg, sizeof(ts.UIMsg), "read only", ts.UILanguageFile);
+	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+	get_lang_msg("DLG_TAB_SEQENCE_CLIPBOARD_ACCESS_ON", ts.UIMsg, sizeof(ts.UIMsg), "read/write", ts.UILanguageFile);
+	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+
 	// (1)IDC_ACCEPT_MOUSE_EVENT_TRACKING
 	btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);
 	btn2 = (CButton *)GetDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL);
@@ -348,6 +363,23 @@
 	btn = (CButton *)GetDlgItem(IDC_CURSOR_CTRL_SEQ);
 	btn->SetCheck((ts.WindowFlag & WF_CURSORCHANGE) != 0);
 
+	// (8)IDC_CLIPBOARD_ACCESS
+	cmb = (CComboBox *)GetDlgItem(IDC_CLIPBOARD_ACCESS);
+	switch (ts.CtrlFlag & CSF_CBRW) {
+		case CSF_CBRW:
+			cmb->SetCurSel(3);
+			break;
+		case CSF_CBREAD:
+			cmb->SetCurSel(2);
+			break;
+		case CSF_CBWRITE:
+			cmb->SetCurSel(1);
+			break;
+		default: // off
+			cmb->SetCurSel(0);
+			break;
+	}
+
 	// ƒ_ƒCƒAƒƒO‚ɃtƒH[ƒJƒX‚ð“–‚Ä‚é (2004.12.7 yutaka)
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_CLICKABLE_URL));
 
@@ -422,6 +454,24 @@
 		ts.WindowFlag ^= WF_CURSORCHANGE;
 	}
 
+	// (8)IDC_TITLE_REPORT
+	cmb = (CComboBox *)GetDlgItem(IDC_CLIPBOARD_ACCESS);
+	switch (cmb->GetCurSel()) {
+		case 0: // off
+			ts.CtrlFlag &= ~CSF_CBRW;
+			break;
+		case 1: // write only
+			ts.CtrlFlag &= ~CSF_CBRW;
+			ts.CtrlFlag |= CSF_CBWRITE;
+			break;
+		case 2: // read only
+			ts.CtrlFlag &= ~CSF_CBRW;
+			ts.CtrlFlag |= CSF_CBREAD;
+			break;
+		default: // read/write
+			ts.CtrlFlag |= CSF_CBRW;
+			break;
+	}
 }
 
 

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2011-11-01 11:10:45 UTC (rev 4701)
+++ trunk/teraterm/teraterm/ttermpro.rc	2011-11-01 11:29:59 UTC (rev 4702)
@@ -94,6 +94,8 @@
     CONTROL         "&Window control sequence",IDC_WINDOW_CTRL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,70,220,10
     CONTROL         "Window &report sequence",IDC_WINDOW_REPORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,220,10
     CONTROL         "&Cursor control sequence",IDC_CURSOR_CTRL_SEQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,220,10
+    LTEXT           "C&lipboard access from remote",IDC_CLIPBOARD_ACCESS_LABEL,11,116,141,8
+    COMBOBOX        IDC_CLIPBOARD_ACCESS,162,114,45,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 242, 148


Ttssh2-commit メーリングリストの案内
Back to archive index