• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision6713 (tree)
Time2017-05-12 21:41:42
Authordoda

Log Message

バルーンチップ未対応 OS では通知関連の設定をグレーアウトするように変更

Change Summary

Incremental Difference

--- trunk/teraterm/common/ttlib.c (revision 6712)
+++ trunk/teraterm/common/ttlib.c (revision 6713)
@@ -1361,6 +1361,13 @@
13611361 return FALSE;
13621362 }
13631363
1364+// 通知アイコンでのバルーンチップに対応しているか判別する。
1365+// Me/2000 以降で TRUE を返す
1366+BOOL HasBalloonTipSupport()
1367+{
1368+ return IsWindows2000OrLater() || IsWindowsMe();
1369+}
1370+
13641371 int get_OPENFILENAME_SIZE()
13651372 {
13661373 if (IsWindows2000OrLater()) {
--- trunk/teraterm/common/ttlib.h (revision 6712)
+++ trunk/teraterm/common/ttlib.h (revision 6713)
@@ -58,6 +58,7 @@
5858 BOOL HasMultiMonitorSupport();
5959 BOOL HasGetAdaptersAddresses();
6060 BOOL HasDnsQuery();
61+BOOL HasBalloonTipSupport();
6162 int KanjiCode2List(int lang, int kcode);
6263 int List2KanjiCode(int lang, int kcode);
6364 int KanjiCodeTranslate(int lang, int kcode);
--- trunk/teraterm/teraterm/addsetting.cpp (revision 6712)
+++ trunk/teraterm/teraterm/addsetting.cpp (revision 6713)
@@ -363,6 +363,12 @@
363363 // (9)IDC_CLIPBOARD_NOTIFY
364364 btn = (CButton *)GetDlgItem(IDC_CLIPBOARD_NOTIFY);
365365 btn->SetCheck(ts.NotifyClipboardAccess);
366+ if (HasBalloonTipSupport()) {
367+ btn->EnableWindow(TRUE);
368+ }
369+ else {
370+ btn->EnableWindow(FALSE);
371+ }
366372
367373 // ダイアログにフォーカスを当てる (2004.12.7 yutaka)
368374 ::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_ACCEPT_MOUSE_EVENT_TRACKING));
--- trunk/teraterm/ttpcmn/ttcmn.c (revision 6712)
+++ trunk/teraterm/ttpcmn/ttcmn.c (revision 6713)
@@ -2487,7 +2487,7 @@
24872487 return;
24882488 }
24892489
2490- if (! (IsWindows2000OrLater() || IsWindowsMe())) {
2490+ if (! HasBalloonTipSupport()) {
24912491 return;
24922492 }
24932493
--- trunk/ttssh2/ttxssh/ttxssh.c (revision 6712)
+++ trunk/ttssh2/ttxssh/ttxssh.c (revision 6713)
@@ -3064,9 +3064,14 @@
30643064 if (pvar->settings.ForwardAgentConfirm) {
30653065 CheckDlgButton(dlg, IDC_FORWARDAGENTCONFIRM, TRUE);
30663066 }
3067+
30673068 if (pvar->settings.ForwardAgentNotify) {
30683069 CheckDlgButton(dlg, IDC_FORWARDAGENTNOTIFY, TRUE);
30693070 }
3071+ if (!HasBalloonTipSupport()) {
3072+ EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTNOTIFY), FALSE);
3073+ }
3074+
30703075 if (pvar->settings.VerifyHostKeyDNS) {
30713076 CheckDlgButton(dlg, IDC_VERIFYHOSTKEYDNS, TRUE);
30723077 }
@@ -3605,7 +3610,9 @@
36053610 }
36063611 else {
36073612 EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTCONFIRM), TRUE);
3608- EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTNOTIFY), TRUE);
3613+ if (HasBalloonTipSupport()) {
3614+ EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTNOTIFY), TRUE);
3615+ }
36093616 }
36103617 return TRUE;
36113618 }
Show on old repository browser