Tera TermRevision: 10395
https://osdn.net/projects/ttssh2/scm/svn/commits/10395
Author: zmatsuo
Date: 2022-12-03 15:40:31 +0900 (Sat, 03 Dec 2022)
Log Message:
-----------
トレイアイコンを出したままにできるようにした
- Additional setting - General tab
- [Tray test]ボタンを追加
- Windowsで表示/非表示設定するため
- アイコンが出ている間だけ設定できる
ticket #46094
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/46094
Modified Paths:
--------------
trunk/doc/en/html/menu/setup-additional.html
trunk/doc/ja/html/menu/setup-additional.html
trunk/installer/release/lang_utf8/English.lng
trunk/installer/release/lang_utf8/French.lng
trunk/installer/release/lang_utf8/German.lng
trunk/installer/release/lang_utf8/Japanese.lng
trunk/installer/release/lang_utf8/Korean.lng
trunk/installer/release/lang_utf8/Russian.lng
trunk/installer/release/lang_utf8/Simplified Chinese.lng
trunk/installer/release/lang_utf8/Spanish.lng
trunk/installer/release/lang_utf8/Traditional Chinese.lng
trunk/teraterm/common/tt_res.h
trunk/teraterm/teraterm/addsetting.cpp
trunk/teraterm/teraterm/ttermpro.rc
-------------- next part --------------
Modified: trunk/doc/en/html/menu/setup-additional.html
===================================================================
--- trunk/doc/en/html/menu/setup-additional.html 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/doc/en/html/menu/setup-additional.html 2022-12-03 06:40:31 UTC (rev 10395)
@@ -95,14 +95,15 @@
Notification area(it was called the Task Tray before Windows XP) settings.
- Now (r10371), only ttxssh.dll uses notification.
-
<dl>
<dt id="NotifySound">Notify sound</dt>
<dd>Notification sound(sound can be muted in Windows XP and later)</dd>
- <dt>Test button</dt>
+ <dt>Popup Test button</dt>
<dd>Test Notification</dd>
+
+ <dt>Tray Test button</dt>
+ <dd>Show icon in Notification area</dd>
</dl>
<h2 id="TabControlSequence">"Control Sequence" Tab</h2>
Modified: trunk/doc/ja/html/menu/setup-additional.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional.html 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/doc/ja/html/menu/setup-additional.html 2022-12-03 06:40:31 UTC (rev 10395)
@@ -94,14 +94,15 @@
\x92ʒm\x97̈\xE6(Windows XP\x88ȑO\x82̓^\x83X\x83N\x83g\x83\x8C\x83C\x82ƌĂ\xEA\x82Ă\xA2\x82܂\xB5\x82\xBD)\x82̐ݒ\xE8\x81B
- \x8C\xBB\x8E\x9E\x93_\x82\xC5(r10371)\x82Œʒm\x82𗘗p\x82\xB5\x82Ă\xA2\x82\xE9\x82̂\xCDttxssh.dll\x82݂̂ł\xB7\x81B
-
<dl>
<dt id="NotifySound">Notify sound</dt>
<dd>\x92ʒm\x89\xB9\x82\xF0\x8B\x96\x89\xB7\x82\xE9(Windows XP\x88ȍ~\x82͉\xB9\x82\xF0\x8F\xC1\x82\xB7\x82\xB1\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7)</dd>
- <dt>Test button</dt>
- <dd>\x92ʒm\x82̃e\x83X\x83g\x82\xF0\x8Ds\x82\xA4</dd>
+ <dt>Popup Test \x83{\x83^\x83\x93</dt>
+ <dd>\x92ʒm\x82̃e\x83X\x83g\x82\xF0\x8Ds\x82\xA2\x82܂\xB7</dd>
+
+ <dt>Tray Test \x83{\x83^\x83\x93</dt>
+ <dd>\x92ʒm\x97̈\xE6\x82ɃA\x83C\x83R\x83\x93\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7</dd>
</dl>
<h2 id="TabControlSequence">"Control Sequence" \x83^\x83u</h2>
Modified: trunk/installer/release/lang_utf8/English.lng
===================================================================
--- trunk/installer/release/lang_utf8/English.lng 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/installer/release/lang_utf8/English.lng 2022-12-03 06:40:31 UTC (rev 10395)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-20)
+; Updated by TeraTerm Project (2022-12-01)
[Tera Term]
DLG_SYSTEM_FONT=System,14,0
@@ -194,7 +194,8 @@
DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
DLG_TAB_GENERAL_NOTIFICATION_TITLE=Notification
DLG_TAB_GENERAL_NOTIFIY_SOUND=&Notify sound
-DLG_TAB_GENERAL_NOTIFICATION_TEST=&Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_POPUP=&Popup Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_TRAY=&Tray Test
DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request
DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed
Modified: trunk/installer/release/lang_utf8/French.lng
===================================================================
--- trunk/installer/release/lang_utf8/French.lng 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/installer/release/lang_utf8/French.lng 2022-12-03 06:40:31 UTC (rev 10395)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-20)
+; Updated by TeraTerm Project (2022-12-01)
; Last translated (French language) by Francois MOCQ (2010-07-21)
[Tera Term]
@@ -195,7 +195,8 @@
DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
DLG_TAB_GENERAL_NOTIFICATION_TITLE=Notification
DLG_TAB_GENERAL_NOTIFIY_SOUND=&Notify sound
-DLG_TAB_GENERAL_NOTIFICATION_TEST=&Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_POPUP=&Popup Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_TRAY=&Tray Test
DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accepter les événement souris
DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=Accepter les événement souris quand CTRL est appuyé
Modified: trunk/installer/release/lang_utf8/German.lng
===================================================================
--- trunk/installer/release/lang_utf8/German.lng 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/installer/release/lang_utf8/German.lng 2022-12-03 06:40:31 UTC (rev 10395)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-11)
+; Updated by TeraTerm Project (2022-12-01)
; Last translated (German language) by Frederik Schwarzer (2010-05-17)
[Tera Term]
@@ -195,7 +195,8 @@
DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
DLG_TAB_GENERAL_NOTIFICATION_TITLE=Notification
DLG_TAB_GENERAL_NOTIFIY_SOUND=&Notify sound
-DLG_TAB_GENERAL_NOTIFICATION_TEST=&Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_POPUP=&Popup Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_TRAY=&Tray Test
DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request
DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed
Modified: trunk/installer/release/lang_utf8/Japanese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Japanese.lng 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/installer/release/lang_utf8/Japanese.lng 2022-12-03 06:40:31 UTC (rev 10395)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-20)
+; Updated by TeraTerm Project (2022-12-01)
[Tera Term]
DLG_SYSTEM_FONT=ＭＳ Ｐゴシック,12,128
@@ -194,7 +194,8 @@
DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=シリアルポートのスピードを表示する(&R)
DLG_TAB_GENERAL_NOTIFICATION_TITLE=通知
DLG_TAB_GENERAL_NOTIFIY_SOUND=通知音
-DLG_TAB_GENERAL_NOTIFICATION_TEST=テスト
+DLG_TAB_GENERAL_NOTIFICATION_TEST_POPUP=&Popup テスト
+DLG_TAB_GENERAL_NOTIFICATION_TEST_TRAY=&Tray テスト
DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=マウスイベント通知要求を受け入れる(&M)
DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=Controlキーを押している間はマウスイベントを通知しない(&D)
Modified: trunk/installer/release/lang_utf8/Korean.lng
===================================================================
--- trunk/installer/release/lang_utf8/Korean.lng 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/installer/release/lang_utf8/Korean.lng 2022-12-03 06:40:31 UTC (rev 10395)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-20)
+; Updated by TeraTerm Project (2022-12-01)
; Last translated (Korean language) by Daehong Kim (2013-07-25)
[Tera Term]
@@ -195,7 +195,8 @@
DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
DLG_TAB_GENERAL_NOTIFICATION_TITLE=Notification
DLG_TAB_GENERAL_NOTIFIY_SOUND=&Notify sound
-DLG_TAB_GENERAL_NOTIFICATION_TEST=&Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_POPUP=&Popup Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_TRAY=&Tray Test
DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=마우스 이벤트 추척 요청을 받습니다(&M)
DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=컨트롤이 눌렸을 때 마우스 이벤트 추적 비활성화(&D)
Modified: trunk/installer/release/lang_utf8/Russian.lng
===================================================================
--- trunk/installer/release/lang_utf8/Russian.lng 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/installer/release/lang_utf8/Russian.lng 2022-12-03 06:40:31 UTC (rev 10395)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-20)
+; Updated by TeraTerm Project (2022-12-01)
; Last translated (Russian language) by Ryumik Sergey (2017-07-19)
[Tera Term]
@@ -195,7 +195,8 @@
DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
DLG_TAB_GENERAL_NOTIFICATION_TITLE=Notification
DLG_TAB_GENERAL_NOTIFIY_SOUND=&Notify sound
-DLG_TAB_GENERAL_NOTIFICATION_TEST=&Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_POPUP=&Popup Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_TRAY=&Tray Test
DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Принять запрос на отслеживание событий мыши
DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=&Отключить отслеживание событий мыши
Modified: trunk/installer/release/lang_utf8/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Simplified Chinese.lng 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/installer/release/lang_utf8/Simplified Chinese.lng 2022-12-03 06:40:31 UTC (rev 10395)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-20)
+; Updated by TeraTerm Project (2022-12-01)
; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11)
[Tera Term]
@@ -195,7 +195,8 @@
DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
DLG_TAB_GENERAL_NOTIFICATION_TITLE=Notification
DLG_TAB_GENERAL_NOTIFIY_SOUND=&Notify sound
-DLG_TAB_GENERAL_NOTIFICATION_TEST=&Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_POPUP=&Popup Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_TRAY=&Tray Test
DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=接受鼠标事件跟踪请求(&M)
DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=按下 Ctrl 键时，禁用鼠标事件跟踪(&D)
Modified: trunk/installer/release/lang_utf8/Spanish.lng
===================================================================
--- trunk/installer/release/lang_utf8/Spanish.lng 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/installer/release/lang_utf8/Spanish.lng 2022-12-03 06:40:31 UTC (rev 10395)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-20)
+; Updated by TeraTerm Project (2022-12-01)
; Traducido por Filiberto Olguin Ascona.
[Tera Term]
@@ -185,7 +185,8 @@
DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
DLG_TAB_GENERAL_NOTIFICATION_TITLE=Notification
DLG_TAB_GENERAL_NOTIFIY_SOUND=&Notify sound
-DLG_TAB_GENERAL_NOTIFICATION_TEST=&Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_POPUP=&Popup Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_TRAY=&Tray Test
DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request
DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed
Modified: trunk/installer/release/lang_utf8/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Traditional Chinese.lng 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/installer/release/lang_utf8/Traditional Chinese.lng 2022-12-03 06:40:31 UTC (rev 10395)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-20)
+; Updated by TeraTerm Project (2022-12-01)
; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20)
[Tera Term]
@@ -195,7 +195,8 @@
DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
DLG_TAB_GENERAL_NOTIFICATION_TITLE=Notification
DLG_TAB_GENERAL_NOTIFIY_SOUND=&Notify sound
-DLG_TAB_GENERAL_NOTIFICATION_TEST=&Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_POPUP=&Popup Test
+DLG_TAB_GENERAL_NOTIFICATION_TEST_TRAY=&Tray Test
DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=接受滑鼠事件跟蹤請求(&M)
DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=按下 Ctrl 鍵時，禁用滑鼠事件跟蹤(&D)
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/teraterm/common/tt_res.h 2022-12-03 06:40:31 UTC (rev 10395)
@@ -235,7 +235,8 @@
#define IDC_BEEP_DROPDOWN 2616
#define IDC_NOTIFICATION_TITLE 2617
#define IDC_NOTIFY_SOUND 2618
-#define IDC_NOTIFICATION_TEST 2619
+#define IDC_NOTIFICATION_TEST_POPUP 2619
+#define IDC_NOTIFICATION_TEST_TRAY 2620
#define ID_ACC_SENDBREAK 50001
#define ID_ACC_COPY 50002
#define ID_ACC_NEWCONNECTION 50003
@@ -335,7 +336,7 @@
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 132
#define _APS_NEXT_COMMAND_VALUE 52031
-#define _APS_NEXT_CONTROL_VALUE 2620
+#define _APS_NEXT_CONTROL_VALUE 2621
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/teraterm/teraterm/addsetting.cpp 2022-12-03 06:40:31 UTC (rev 10395)
@@ -122,7 +122,8 @@
{ IDC_TITLEFMT_DISPSERIALSPEED, "DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED" },
{ IDC_NOTIFICATION_TITLE, "DLG_TAB_GENERAL_NOTIFICATION_TITLE" },
{ IDC_NOTIFY_SOUND, "DLG_TAB_GENERAL_NOTIFIY_SOUND" },
- { IDC_NOTIFICATION_TEST, "DLG_TAB_GENERAL_NOTIFICATION_TEST" },
+ { IDC_NOTIFICATION_TEST_POPUP, "DLG_TAB_GENERAL_NOTIFICATION_TEST_POPUP" },
+ { IDC_NOTIFICATION_TEST_TRAY, "DLG_TAB_GENERAL_NOTIFICATION_TEST_TRAY" },
};
SetDlgTextsW(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFileW);
@@ -227,7 +228,8 @@
BOOL CGeneralPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)
{
switch (wParam) {
- case IDC_NOTIFICATION_TEST | (BN_CLICKED << 16): {
+ case IDC_NOTIFICATION_TEST_POPUP | (BN_CLICKED << 16): {
+ // popup\x82\xF0\x8Fo\x82\xB7\x83e\x83X\x83g
NotifyIcon *ni = (NotifyIcon *)cv.NotifyIcon;
const wchar_t *msg = L"Test button was pushed";
BOOL prev_sound = Notify2GetSound(ni);
@@ -237,6 +239,28 @@
Notify2SetSound(ni, prev_sound);
break;
}
+ case IDC_NOTIFICATION_TEST_TRAY | (BN_CLICKED << 16): {
+ // tray\x82\xC9icon\x82\xF0\x8Fo\x82\xB7(\x8E\xA9\x93\xAE\x82ŏ\xC1\x82\xA6\x82Ȃ\xA2)
+ NotifyIcon *ni = (NotifyIcon *)cv.NotifyIcon;
+ BOOL prev_sound = Notify2GetSound(ni);
+ BOOL notify_sound = (BOOL)GetCheck(IDC_NOTIFY_SOUND);
+ Notify2SetSound(ni, notify_sound);
+ Notify2SetBallonDontHide(ni, TRUE);
+ Notify2SetMessageW(ni, NULL, NULL, 1);
+ Notify2SetSound(ni, prev_sound);
+
+ static const TTMessageBoxInfoW info = {
+ "Tera Term",
+ "MSG_TT_NOTICE", L"Tera Term: Notice",
+ NULL, L"You can change notify setting",
+ MB_OK };
+ TTMessageBoxW(m_hWnd, &info, ts.UILanguageFileW);
+
+ // \x92ʒm\x97̈\xE6\x82̃A\x83C\x83R\x83\x93\x82\xF0\x8F\xC1\x82\xB7
+ Notify2Hide(ni);
+ Notify2SetBallonDontHide(ni, FALSE);
+ break;
+ }
default:
break;
}
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2022-12-03 06:40:18 UTC (rev 10394)
+++ trunk/teraterm/teraterm/ttermpro.rc 2022-12-03 06:40:31 UTC (rev 10395)
@@ -85,7 +85,8 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,170,130,10
LTEXT "Notification",IDC_NOTIFICATION_TITLE,12,188,73,8
CONTROL "&Notify sound",IDC_NOTIFY_SOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,201,220,10
- PUSHBUTTON "&Test",IDC_NOTIFICATION_TEST,20,215,50,14
+ PUSHBUTTON "&Popup test",IDC_NOTIFICATION_TEST_POPUP,20,215,50,14
+ PUSHBUTTON "&Tray test",IDC_NOTIFICATION_TEST_TRAY,75,215,50,14
END
IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 258, 204