Tera Term

[Ttssh2-commit] [5505] マルチキャスト名を設定できる箇所を調整

svnno****@sourc***** svnno****@sourc*****
2014年 3月 7日 (金) 21:28:07 JST

• 前の記事 [Ttssh2-commit] [5504] 変更履歴更新 (r5503)
• 次の記事 [Ttssh2-commit] [5506] 変更履歴更新 (r5505)
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 5505
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5505
Author:   maya
Date:     2014-03-07 21:28:07 +0900 (Fri, 07 Mar 2014)
Log Message:
-----------
マルチキャスト名を設定できる箇所を調整
  r5493 の使わない部分(INI読み書き・設定ダイアログ)をrevert
  コマンドライン引数を追加

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5493

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    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/installer/release/lang/Korean.lng
    trunk/installer/release/lang/Russian.lng
    trunk/installer/release/lang/Simplified Chinese.lng
    trunk/teraterm/common/tt_res.h
    trunk/teraterm/teraterm/addsetting.cpp
    trunk/teraterm/teraterm/ttermpro.rc
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/installer/release/TERATERM.INI	2014-03-07 12:28:07 UTC (rev 5505)
@@ -387,9 +387,6 @@
 ; Broadcast command enabling flag on the dialog window (on/off)
 AcceptBroadcast=on
 
-; Multicast name string for multicast macro command
-MulticastName=
-
 ; Number of broadcast command history
 MaxBroadcatHistory=99
 

Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/installer/release/lang/English.lng	2014-03-07 12:28:07 UTC (rev 5505)
@@ -174,7 +174,6 @@
 DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=A&uto scroll only in bottom line
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&Clear display when window resized
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=Change cursor shape with &IME state
-DLG_TAB_GENERAL_MULTICAST_LABEL=&Multicast name
 
 DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request
 DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/installer/release/lang/French.lng	2014-03-07 12:28:07 UTC (rev 5505)
@@ -175,7 +175,6 @@
 DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=D\xE9filement auto seulement sur la derni\xE8re ligne
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=Effacer l'\xE9cran quand la fen\xEAtre est redimensionn\xE9e
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=Change cursor shape with &IME state
-DLG_TAB_GENERAL_MULTICAST_LABEL=&Multicast name
 
 DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accepter les \xE9v\xE9nement souris
 DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL=Accepter les \xE9v\xE9nement souris quand CTRL est appuy\xE9

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/installer/release/lang/German.lng	2014-03-07 12:28:07 UTC (rev 5505)
@@ -175,7 +175,6 @@
 DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=&Automatischer Bildlauf nur in unterster Zeile
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&Clear display when window resized
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=Change cursor shape with &IME state
-DLG_TAB_GENERAL_MULTICAST_LABEL=&Multicast name
 
 DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request
 DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/installer/release/lang/Japanese.lng	2014-03-07 12:28:07 UTC (rev 5505)
@@ -174,7 +174,6 @@
 DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=\x8Dʼn\xBA\x8Ds\x82ł\xBE\x82\xAF\x8E\xA9\x93\xAE\x83X\x83N\x83\x8D\x81[\x83\x8B\x82\xB7\x82\xE9(&U)
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x95ύX\x8E\x9E\x82ɕ\\x8E\xA6\x93\xE0\x97e\x82\xF0\x83N\x83\x8A\x83A\x82\xB7\x82\xE9(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=&IME\x82̏\xF3\x91Ԃɂ\xE6\x82\xC1\x82ăJ\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x95ύX\x82\xB7\x82\xE9
-DLG_TAB_GENERAL_MULTICAST_LABEL=\x83}\x83\x8B\x83`\x83L\x83\x83\x83X\x83g\x96\xBC(&M)
 
 DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING=\x83}\x83E\x83X\x83C\x83x\x83\x93\x83g\x92ʒm\x97v\x8B\x81\x82\xF0\x8E󂯓\xFC\x82\xEA\x82\xE9(&M)
 DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL=Control\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82Ă\xA2\x82\xE9\x8AԂ̓}\x83E\x83X\x83C\x83x\x83\x93\x83g\x82\xF0\x92ʒm\x82\xB5\x82Ȃ\xA2(&D)

Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/installer/release/lang/Korean.lng	2014-03-07 12:28:07 UTC (rev 5505)
@@ -175,7 +175,6 @@
 DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=\xB8\xC7 \xB9\xD8\xC1ٿ\xA1\xBC\xAD \xC0ڵ\xBF \xBD\xBAũ\xB7\xD1(&U)
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=â ũ\xB1Ⱑ \xC0缳\xC1\xA4\xB5\xC9 \xB6\xA7 ȭ\xB8\xE9 \xBA\xF1\xBF\xEC\xB1\xE2(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=IME\xBB\xF3\xC5¿\xA1 \xB5\xFB\xB6\xF3 Ŀ\xBC\xAD \xB8\xF0\xBE\xE7 \xBA\xAF\xB0\xE6(&I)
-DLG_TAB_GENERAL_MULTICAST_LABEL=&Multicast name
 
 DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xB8\xB6\xBF콺 \xC0̺\xA5Ʈ \xC3\xDFô \xBF\xE4û\xC0\xBB \xB9޽\xC0\xB4ϴ\xD9(&M)
 DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL=\xC4\xC1Ʈ\xB7\xD1\xC0\xCC \xB4\xAD\xB7\xC8\xC0\xBB \xB6\xA7 \xB8\xB6\xBF콺 \xC0̺\xA5Ʈ \xC3\xDF\xC0\xFB \xBA\xF1Ȱ\xBC\xBAȭ(&D)

Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/installer/release/lang/Russian.lng	2014-03-07 12:28:07 UTC (rev 5505)
@@ -175,7 +175,6 @@
 DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=&\xC0\xE2\xF2\xEE\xEF\xE5\xF0\xE5\xE2\xEE\xE4 \xF1\xF2\xF0\xEE\xEA\xE8 \xF2\xEE\xEB\xFC\xEA\xEE \xED\xE0 \xED\xE8\xE6\xED\xFE\xFE \xEB\xE8\xED\xE8\xFE
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&\xCE\xF7\xE8\xF1\xF2\xE8\xF2\xFC \xFD\xEA\xF0\xE0\xED \xEF\xF0\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE8 \xF0\xE0\xE7\xEC\xE5\xF0\xE0 \xEE\xEA\xED\xE0
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=&\xC8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xE2\xE8\xE4 \xEA\xF3\xF0\xF1\xEE\xF0\xE0 \xE2 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1 \xF0\xE5\xE6\xE8\xEC\xEE\xEC IME
-DLG_TAB_GENERAL_MULTICAST_LABEL=&Multicast name
 
 DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xCF\xF0\xE8\xED\xFF\xF2\xFC \xE7\xE0\xEF\xF0\xEE\xF1 \xED\xE0 \xEE\xF2\xF1\xEB\xE5\xE6\xE8\xE2\xE0\xED\xE8\xE5 \xF1\xEE\xE1\xFB\xF2\xE8\xE9 \xEC\xFB\xF8\xE8
 DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL=&\xCE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEE\xF2\xF1\xEB\xE5\xE6\xE8\xE2\xE0\xED\xE8\xE5 \xF1\xEE\xE1\xFB\xF2\xE8\xE9 \xEC\xFB\xF8\xE8

Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/installer/release/lang/Simplified Chinese.lng	2014-03-07 12:28:07 UTC (rev 5505)
@@ -174,7 +174,6 @@
 DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=\xB5ײ\xBF\xB9\xF6\xB6\xAF\xCC\xF5\xD7\xD4\xCA\xCAӦ\xB3\xA4\xB6\xC8(&U)
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=\xB8ı䴰\xBFڴ\xF3Сʱ\xC7\xE5\xBF\xD5\xC6\xC1Ļ(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=\xB8\xF9\xBE\xDD\xCA\xE4\xC8뷨״̬\xB8ı\xE4\xB9\xE2\xB1\xEA\xD0\xCE״(&I)
-DLG_TAB_GENERAL_MULTICAST_LABEL=&Multicast name
 
 DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xBD\xD3\xCA\xDC\xCA\xF3\xB1\xEA\xCA¼\xFE\xB8\xFA\xD7\xD9\xC7\xEB\xC7\xF3(&M)
 DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL=\xB0\xB4\xCF\xC2 Ctrl \xBC\xFCʱ\xA3\xAC\xBD\xFB\xD3\xC3\xCA\xF3\xB1\xEA\xCA¼\xFE\xB8\xFA\xD7\xD9(&D)

Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/teraterm/common/tt_res.h	2014-03-07 12:28:07 UTC (rev 5505)
@@ -168,9 +168,6 @@
 #define IDC_ROTATE_STEP_TEXT            2531
 #define IDC_ROTATE_SIZE_TEXT            2532
 #define IDC_ROTATE_GROUP                2533
-#define IDC_MULTICAST_LABEL             2534
-#define IDC_EDIT2                       2535
-#define IDC_MULTICAST                   2535
 #define ID_ACC_SENDBREAK                50001
 #define ID_ACC_COPY                     50002
 #define ID_ACC_NEWCONNECTION            50003
@@ -265,7 +262,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        123
 #define _APS_NEXT_COMMAND_VALUE         52031
-#define _APS_NEXT_CONTROL_VALUE         2536
+#define _APS_NEXT_CONTROL_VALUE         2534
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/teraterm/teraterm/addsetting.cpp	2014-03-07 12:28:07 UTC (rev 5505)
@@ -118,8 +118,6 @@
 		SendDlgItemMessage(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_CLEAR_ON_RESIZE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_CURSOR_CHANGE_IME, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_MULTICAST_LABEL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_MULTICAST, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
 	}
 	else {
 		DlgGeneralFont = NULL;
@@ -146,9 +144,6 @@
 	GetDlgItemText(IDC_CURSOR_CHANGE_IME, uimsg, sizeof(uimsg));
 	get_lang_msg("DLG_TAB_GENERAL_CURSOR_CHANGE_IME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_CURSOR_CHANGE_IME, ts.UIMsg);
-	GetDlgItemText(IDC_MULTICAST_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_MULTICAST_LABEL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_MULTICAST_LABEL, ts.UIMsg);
 
 	// (1)DisableAcceleratorSendBreak
 	btn = (CButton *)GetDlgItem(IDC_DISABLE_SENDBREAK);
@@ -178,9 +173,6 @@
 	btn = (CButton *)GetDlgItem(IDC_CURSOR_CHANGE_IME);
 	btn->SetCheck((ts.WindowFlag & WF_IMECURSORCHANGE) != 0);
 
-	// (8)IDC_MULTICAST
-	SetDlgItemText(IDC_MULTICAST, ts.MulticastName);
-
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9 (2004.12.7 yutaka)
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_CLICKABLE_URL));
 
@@ -226,9 +218,6 @@
 	if (((ts.WindowFlag & WF_IMECURSORCHANGE) != 0) != btn->GetCheck()) {
 		ts.WindowFlag ^= WF_IMECURSORCHANGE;
 	}
-
-	// (8)IDC_MULTICAST
-	GetDlgItemText(IDC_MULTICAST, ts.MulticastName, sizeof(ts.MulticastName));
 }
 
 

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/teraterm/teraterm/ttermpro.rc	2014-03-07 12:28:07 UTC (rev 5505)
@@ -64,8 +64,6 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,220,10
     CONTROL         "Change cursor shape with &IME state",IDC_CURSOR_CHANGE_IME,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,220,10
-    LTEXT           "Multicast name",IDC_MULTICAST_LABEL,12,116,61,8
-    EDITTEXT        IDC_MULTICAST,79,115,131,14,ES_AUTOHSCROLL
 END
 
 IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 242, 158

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2014-03-07 02:59:47 UTC (rev 5504)
+++ trunk/teraterm/ttpset/ttset.c	2014-03-07 12:28:07 UTC (rev 5505)
@@ -1261,12 +1261,6 @@
 	ts->AcceptBroadcast =
 		GetOnOff(Section, "AcceptBroadcast", FName, TRUE);
 
-	// Multicast Name
-	GetPrivateProfileString(Section, "MulticastName", "",
-	                        Temp, sizeof(Temp), FName);
-	strncpy_s(ts->MulticastName, sizeof(ts->MulticastName), Temp,
-	          _TRUNCATE);
-
 	// Confirm send a file when drag and drop (2007.12.28 maya)
 	ts->ConfirmFileDragAndDrop =
 		GetOnOff(Section, "ConfirmFileDragAndDrop", FName, TRUE);
@@ -2475,10 +2469,6 @@
 	// 337: 2007/03/20 Accept Broadcast
 	WriteOnOff(Section, "AcceptBroadcast", FName, ts->AcceptBroadcast);
 
-	// Multicast Name
-	WritePrivateProfileString(Section, "MulticastName",
-		ts->MulticastName, FName);
-
 	// Confirm send a file when drag and drop (2007.12.28 maya)
 	WriteOnOff(Section, "ConfirmFileDragAndDrop", FName,
 	           ts->ConfirmFileDragAndDrop);
@@ -3420,6 +3410,9 @@
 				ts->Language = IdUtf8; break;
 			}
 		}
+		else if (_strnicmp(Temp, "/MN=", 4) == 0) {	/* multicastname */
+			Dequote(&Temp[4], ts->MulticastName);
+		}
 		else if (_strnicmp(Temp, "/M=", 3) == 0) {	/* macro filename */
 			if ((Temp[3] == 0) || (Temp[3] == '*'))
 				strncpy_s(ts->MacroFN, sizeof(ts->MacroFN), "*",

• 前の記事 [Ttssh2-commit] [5504] 変更履歴更新 (r5503)
• 次の記事 [Ttssh2-commit] [5506] 変更履歴更新 (r5505)
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]