Skip to content

Commit

Permalink
Merge branch 'sempreff-feature/AddForeButtonInBroadcastDialog'
Browse files Browse the repository at this point in the history 
#185
  • Loading branch information
@zmatsuo
zmatsuo committed Apr 5, 2024
2 parents 54c2422 + 38c0b66 commit 0ae148c
Show file tree
Hide file tree
Showing 21 changed files with 337 additions and 92 deletions.
10 changes: 10 additions & 0 deletions doc/en/html/about/history.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ <h3 id="teraterm_5.3">YYYY.MM.DD (Ver 5.3 not released yet)</h3>
<li><a href="../setup/teraterm-win.html#space">VTFontSpace</a> can be used to adjust to narrow the space between characters.
<li>Fixed some Emoji which character widths did not change with Override Emoji Characters width option. (Changed referenced Emoji table.)</li>
<li>Disabled COM ports are not included when making list of COM ports.</li>
<li>improve Broadcast command dialog:
<ul>
<li>edit control now support paste by R/M mouse clicking and Shift-INS.</li>
<li>edit control now works the same whether the IME is on or off.</li>
<li>add "to Fore" button to bring the selected windows to foreground.</li>
<li>add context menu in window list which provides foreground/minimize the selected windows and refresh the window list itself.</li>
<li>keep selection state when the window list is refreshed.</li>
<li>normalize Japanese button name.</li>
</ul>
</li>
</ul>
</li>

Expand Down
49 changes: 32 additions & 17 deletions doc/en/html/menu/control-broadcast.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,53 +10,68 @@

<body>
<h1>Broadcast command([Control] Menu)</h1>

<h2>If "Realtime mode" is off</h2>

<dl>
<dt>Command input control</dt>
<dd>
Input the command to be sent to each window.
</dd>

<dt>Enter key</dt>
<dd>
Choose an option whether new line is added or not after the transmission of the control command specified in above. A New line code can be chosen from the list of "CRLF", "CR", "LF".
Choose an option whether new line is added or not after the transmission of the command specified in above. A New line code can be chosen from the list of "CRLF", "CR", "LF".
</dd>

<dt>Submit</dt>
<dd>
Transmit the command. If "<a href="./setup-additional.html">AcceptBroadcast</a>" of the window is effective, the command will be received.
</dd>

<dt>History</dt>
<dd>
Choose an option whether to save the history of transmitted commands. A maximum number of history to be saved can be specified by "<a href="../setup/teraterm-misc.html#broadcast">MaxBroadcatHistory</a>" .
</dd>

<dt>Send to this process only</dt>
<dd>
If this option is chosen, the command will be transmitted only to the Tera Term window where "Broadcast command" dialog is specified.
If this option is chosen, the command will be transmitted only to the Tera Term window where the "Broadcast command" dialog is invoked regardless of the selection status in the window list.
</dd>
<dt>Windows List</dt>

<dt>Window List</dt>
<dd>
Choose the windows where the commands will be transmitted.
List of Tera Term windows.
Choose the windows by left click where the commands will be transmitted.
Right-click on the list to operate on the selected windows or to refresh the list.
</dd>

<dt>to Fore</dt>
<dd>
Bring the selected windows to foreground.
</dd>
</dl>


<h2>If "Realtime mode" is on</h2>

<dl>
<dt>Command input control</dt>
<dd>
Keys entered with this control focused will be transmitted to the windows that are chosen in the following window list. The command will be received by the window where "<a href="./setup-additional.html">AcceptBroadcast</a>" is even disabled.
Shift-INS and R/M mouse button acts as paste.
</dd>

<dt>Windows List</dt>

<dt>Window List</dt>
<dd>
List of Tera Term windows.
Choose the windows by left click where the commands will be transmitted.
Right-click on the list to operate on the selected windows or to refresh the list.
</dd>

<dt>to Fore</dt>
<dd>
Choose the windows where the commands will be transmitted.
Bring the selected windows in the window list to foreground.
</dd>
</dl>

Expand Down
10 changes: 10 additions & 0 deletions doc/ja/html/about/history.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ <h3 id="teraterm_5.3">YYYY.MM.DD (Ver 5.3 not released yet)</h3>
<li><a href="../setup/teraterm-win.html#space">VTFontSpace</a> で負の値を設定できるようにした。</li>
<li>Override Emoji Characters widthで文字幅が変化しない絵文字があったので修正した。(参照する絵文字テーブルを変更した。)</li>
<li>COMポートの一覧に無効化したCOMポートは含めないようにした。</li>
<li>Broadcast commandダイアログの挙動を改善した。
<ul>
<li>リアルタイムモードでは、コマンド入力コントロールで マウス右クリック・中クリック あるいは Shift-INS によりペーストできるようにした。また、この時の改行の確認は各ウィンドウではなくダイアログで行われるようにした。</li>
<li>リアルタイムモードでは、コマンド入力コントロールは IME の ON/OFF に関わらず同じ動きをするようにした。</li>
<li>ウィンドウリストで選択したウィンドウを前面に出すボタンを追加した。</li>
<li>ウィンドウリストにコンテキストメニューを加え、選択したウィンドウを前面に出す また 最小化する、および ウィンドウリスト自体を更新する機能を追加した。</li>
<li>ウィンドウリストを更新した際も選択状態を維持するようにした。</li>
<li>日本語のボタン名称を微調整した。</li>
</ul>
</li>
</ul>
</li>

Expand Down
25 changes: 20 additions & 5 deletions doc/ja/html/menu/control-broadcast.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<dt>Enter key</dt>
<dd>
上記コントロールで入力したコマンドを送信するとき、改行を付加するか選択します。改行として送信する改行コードを "CRLF", "CR", "LF" から選択します。
コマンド入力コントロールで入力したコマンドを送信するとき、改行を付加するか選択します。改行として送信する改行コードを "CRLF", "CR", "LF" から選択します。
</dd>

<dt>Submit</dt>
Expand All @@ -36,12 +36,19 @@

<dt>Send to this process only</dt>
<dd>
この設定を有効にすると、この "Broadcast command" ダイアログを出現させた Tera Term ウィンドウにのみコマンドを送信します。
この設定を有効にすると、ウィンドウリストでの選択に関わらず、この "Broadcast command" ダイアログを出現させた Tera Term ウィンドウにのみコマンドを送信します。
</dd>

<dt>ウィンドウリスト</dt>
<dd>
コマンドを送信するウィンドウを選択します。
Tera Term のウィンドウ一覧です。
コマンドを送信するウィンドウを左クリックで選択します。
右クリックのコンテキストメニューから、選択したウィンドウに対する操作や一覧の更新ができます。
</dd>

<dt>to Fore</dt>
<dd>
ウィンドウリストで選択したウィンドウを前面に表示します。
</dd>
</dl>

Expand All @@ -51,12 +58,20 @@
<dl>
<dt>コマンド入力コントロール</dt>
<dd>
このコントロールにフォーカスした状態で押したキーは、下記ウィンドウリストで選択されたウィンドウに送信されます。"<a href="./setup-additional.html">AcceptBroadcast</a>" が無効なウィンドウもコマンドを受信します。
このコントロールにフォーカスした状態で押したキーは、下記ウィンドウリストで選択したウィンドウに送信されます。"<a href="./setup-additional.html">AcceptBroadcast</a>" が無効なウィンドウもコマンドを受信します。
Shift-INS ならびに マウス右クリック・中クリック中クリックは、ペーストとして動作します。
</dd>

<dt>ウィンドウリスト</dt>
<dd>
コマンドを送信するウィンドウを選択します。
Tera Term のウィンドウ一覧です。
コマンドを送信するウィンドウを左クリックで選択します。
右クリックのコンテキストメニューから、選択したウィンドウに対する操作や一覧の更新ができます。
</dd>

<dt>to Fore</dt>
<dd>
ウィンドウリストで選択したウィンドウを前面に表示します。
</dd>
</dl>

Expand Down
5 changes: 5 additions & 0 deletions installer/release/lang_utf8/English.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,12 @@ DLG_BROADCAST_HISTORY=History
DLG_BROADCAST_PARENTONLY=Send to this process only
DLG_BROADCAST_ENTER=Enter key
DLG_BROADCAST_SUBMIT=Submit
DLG_BROADCAST_CLOSE=Close
DLG_BROADCAST_REALTIME=Realtime mode
DLG_BROADCAST_FOREGROUND=to Fore
CMENU_BROADCAST_FOREGROUND=Bring selected window to foreground
CMENU_BROADCAST_MINIMIZE=Minimize selected window
CMENU_BROADCAST_REFRESH=Refresh window list

DLG_PRNABORT_PRINTING=Printing

Expand Down
5 changes: 5 additions & 0 deletions installer/release/lang_utf8/French.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@ DLG_BROADCAST_HISTORY=Historique
DLG_BROADCAST_PARENTONLY=Envoyer à ce seul processus
DLG_BROADCAST_ENTER=T. Entrée
DLG_BROADCAST_SUBMIT=Valider
DLG_BROADCAST_CLOSE=Close
DLG_BROADCAST_REALTIME=Mode tps-réel
DLG_BROADCAST_FOREGROUND=to Fore
CMENU_BROADCAST_FOREGROUND=Bring selected window to foreground
CMENU_BROADCAST_MINIMIZE=Minimize selected window
CMENU_BROADCAST_REFRESH=Refresh window list

DLG_PRNABORT_PRINTING=Impression

Expand Down
5 changes: 5 additions & 0 deletions installer/release/lang_utf8/German.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@ DLG_BROADCAST_HISTORY=Verlauf
DLG_BROADCAST_PARENTONLY=Sende nur Prozess
DLG_BROADCAST_ENTER=Auswahl-Taste
DLG_BROADCAST_SUBMIT=Absenden
DLG_BROADCAST_CLOSE=Close
DLG_BROADCAST_REALTIME=Echtzeit-Modus
DLG_BROADCAST_FOREGROUND=to Fore
CMENU_BROADCAST_FOREGROUND=Bring selected window to foreground
CMENU_BROADCAST_MINIMIZE=Minimize selected window
CMENU_BROADCAST_REFRESH=Refresh window list

DLG_PRNABORT_PRINTING=Printing

Expand Down
5 changes: 5 additions & 0 deletions installer/release/lang_utf8/Japanese.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,12 @@ DLG_BROADCAST_HISTORY=ヒストリ
DLG_BROADCAST_PARENTONLY=このプロセスのみに送信
DLG_BROADCAST_ENTER=Enterキー
DLG_BROADCAST_SUBMIT=送信
DLG_BROADCAST_CLOSE=閉じる
DLG_BROADCAST_REALTIME=リアルタイム
DLG_BROADCAST_FOREGROUND=前面へ
CMENU_BROADCAST_FOREGROUND=選択ウィンドウを前面へ
CMENU_BROADCAST_MINIMIZE=選択ウィンドウを最小化
CMENU_BROADCAST_REFRESH=ウィンドウ一覧の更新

DLG_PRNABORT_PRINTING=印刷中

Expand Down
5 changes: 5 additions & 0 deletions installer/release/lang_utf8/Korean.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@ DLG_BROADCAST_HISTORY=이력
DLG_BROADCAST_PARENTONLY=이 프로세스에만 보내기
DLG_BROADCAST_ENTER=Enter 키
DLG_BROADCAST_SUBMIT=제출
DLG_BROADCAST_CLOSE=Close
DLG_BROADCAST_REALTIME=실시간 모드
DLG_BROADCAST_FOREGROUND=to Fore
CMENU_BROADCAST_FOREGROUND=Bring selected window to foreground
CMENU_BROADCAST_MINIMIZE=Minimize selected window
CMENU_BROADCAST_REFRESH=Refresh window list

DLG_PRNABORT_PRINTING=인쇄

Expand Down
5 changes: 5 additions & 0 deletions installer/release/lang_utf8/Russian.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@ DLG_BROADCAST_HISTORY=История
DLG_BROADCAST_PARENTONLY=Только в этой сессии
DLG_BROADCAST_ENTER=Кл.Enter
DLG_BROADCAST_SUBMIT=Передача
DLG_BROADCAST_CLOSE=Close
DLG_BROADCAST_REALTIME=Реальн. время
DLG_BROADCAST_FOREGROUND=to Fore
CMENU_BROADCAST_FOREGROUND=Bring selected window to foreground
CMENU_BROADCAST_MINIMIZE=Minimize selected window
CMENU_BROADCAST_REFRESH=Refresh window list

DLG_PRNABORT_PRINTING=Печать

Expand Down
5 changes: 5 additions & 0 deletions installer/release/lang_utf8/Simplified Chinese.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@ DLG_BROADCAST_HISTORY=历史
DLG_BROADCAST_PARENTONLY=仅发送
DLG_BROADCAST_ENTER=Enter键
DLG_BROADCAST_SUBMIT=提交
DLG_BROADCAST_CLOSE=Close
DLG_BROADCAST_REALTIME=实时模式
DLG_BROADCAST_FOREGROUND=to Fore
CMENU_BROADCAST_FOREGROUND=Bring selected window to foreground
CMENU_BROADCAST_MINIMIZE=Minimize selected window
CMENU_BROADCAST_REFRESH=Refresh window list

DLG_PRNABORT_PRINTING=打印中

Expand Down
5 changes: 5 additions & 0 deletions installer/release/lang_utf8/Spanish.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@ DLG_BROADCAST_HISTORY=History
DLG_BROADCAST_PARENTONLY=Send to this process only
DLG_BROADCAST_ENTER=Enter key
DLG_BROADCAST_SUBMIT=Submit
DLG_BROADCAST_CLOSE=Close
DLG_BROADCAST_REALTIME=Realtime mode
DLG_BROADCAST_FOREGROUND=to Fore
CMENU_BROADCAST_FOREGROUND=Bring selected window to foreground
CMENU_BROADCAST_MINIMIZE=Minimize selected window
CMENU_BROADCAST_REFRESH=Refresh window list

DLG_PRNABORT_PRINTING=Printing

Expand Down
5 changes: 5 additions & 0 deletions installer/release/lang_utf8/Tamil.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@ DLG_BROADCAST_HISTORY=வரலாறு
DLG_BROADCAST_PARENTONLY=இந்த செயல்முறைக்கு மட்டும் அனுப்பவும்
DLG_BROADCAST_ENTER=உள்ளிடு விசை
DLG_BROADCAST_SUBMIT=சமர்ப்பி
DLG_BROADCAST_CLOSE=Close
DLG_BROADCAST_REALTIME=நிகழ்நேர பயன்முறை
DLG_BROADCAST_FOREGROUND=to Fore
CMENU_BROADCAST_FOREGROUND=Bring selected window to foreground
CMENU_BROADCAST_MINIMIZE=Minimize selected window
CMENU_BROADCAST_REFRESH=Refresh window list

DLG_PRNABORT_PRINTING=அச்சிடுதல்

Expand Down
5 changes: 5 additions & 0 deletions installer/release/lang_utf8/Traditional Chinese.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@ DLG_BROADCAST_HISTORY=紀錄
DLG_BROADCAST_PARENTONLY=僅發送
DLG_BROADCAST_ENTER=Enter鍵
DLG_BROADCAST_SUBMIT=提交
DLG_BROADCAST_CLOSE=Close
DLG_BROADCAST_REALTIME=實時的
DLG_BROADCAST_FOREGROUND=to Fore
CMENU_BROADCAST_FOREGROUND=Bring selected window to foreground
CMENU_BROADCAST_MINIMIZE=Minimize selected window
CMENU_BROADCAST_REFRESH=Refresh window list

DLG_PRNABORT_PRINTING=列印中

Expand Down
5 changes: 3 additions & 2 deletions teraterm/common/tt_res.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@
#define IDC_SPIPATH_TITLE 2621
#define IDC_SPIPATH_EDIT 2622
#define IDC_SPIPATH_BUTTON 2623
#define IDC_FORE_RECEIVER 2624
#define ID_ACC_SENDBREAK 50001
#define ID_ACC_COPY 50002
#define ID_ACC_NEWCONNECTION 50003
Expand Down Expand Up @@ -336,13 +337,13 @@
#define ID_FILE_TERATERMMENU 52006

// Next default values for new objects
//
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 132
#define _APS_NEXT_COMMAND_VALUE 52031
#define _APS_NEXT_CONTROL_VALUE 2624
#define _APS_NEXT_CONTROL_VALUE 2625
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
1 change: 1 addition & 0 deletions teraterm/common/ttcommon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ DllExport void PASCAL UnregWin(HWND HWin);
DllExport void WINAPI SetWinMenuW(HMENU menu, const wchar_t *langFile, int VTFlag);
DllExport void PASCAL SetWinList(HWND HWin, HWND HDlg, int IList);
DllExport void PASCAL SelectWin(int WinId);
DllExport void PASCAL ForegroundWin(HWND);
DllExport void PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic);
DllExport HWND PASCAL GetNthWin(int n);
DllExport int PASCAL GetRegisteredWindowCount(void);
Expand Down
Loading

0 comments on commit 0ae148c

Please sign in to comment.