svnno****@sourc*****
svnno****@sourc*****
2017年 5月 12日 (金) 21:41:42 JST
Tera TermRevision: 6713
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6713
Author: doda
Date: 2017-05-12 21:41:42 +0900 (Fri, 12 May 2017)
Log Message:
-----------
バルーンチップ未対応 OS では通知関連の設定をグレーアウトするように変更
Modified Paths:
--------------
trunk/teraterm/common/ttlib.c
trunk/teraterm/common/ttlib.h
trunk/teraterm/teraterm/addsetting.cpp
trunk/teraterm/ttpcmn/ttcmn.c
trunk/teraterm/ttpcmn/ttpcmn.def
trunk/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c 2017-05-12 12:41:35 UTC (rev 6712)
+++ trunk/teraterm/common/ttlib.c 2017-05-12 12:41:42 UTC (rev 6713)
@@ -1361,6 +1361,13 @@
return FALSE;
}
+// \x92ʒm\x83A\x83C\x83R\x83\x93\x82ł̃o\x83\x8B\x81[\x83\x93\x83`\x83b\x83v\x82ɑΉ\x9E\x82\xB5\x82Ă\xA2\x82邩\x94\xBB\x95ʂ\xB7\x82\xE9\x81B
+// Me/2000 \x88ȍ~\x82\xC5 TRUE \x82\xF0\x95Ԃ\xB7
+BOOL HasBalloonTipSupport()
+{
+ return IsWindows2000OrLater() || IsWindowsMe();
+}
+
int get_OPENFILENAME_SIZE()
{
if (IsWindows2000OrLater()) {
Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h 2017-05-12 12:41:35 UTC (rev 6712)
+++ trunk/teraterm/common/ttlib.h 2017-05-12 12:41:42 UTC (rev 6713)
@@ -58,6 +58,7 @@
BOOL HasMultiMonitorSupport();
BOOL HasGetAdaptersAddresses();
BOOL HasDnsQuery();
+BOOL HasBalloonTipSupport();
int KanjiCode2List(int lang, int kcode);
int List2KanjiCode(int lang, int kcode);
int KanjiCodeTranslate(int lang, int kcode);
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2017-05-12 12:41:35 UTC (rev 6712)
+++ trunk/teraterm/teraterm/addsetting.cpp 2017-05-12 12:41:42 UTC (rev 6713)
@@ -363,6 +363,12 @@
// (9)IDC_CLIPBOARD_NOTIFY
btn = (CButton *)GetDlgItem(IDC_CLIPBOARD_NOTIFY);
btn->SetCheck(ts.NotifyClipboardAccess);
+ if (HasBalloonTipSupport()) {
+ btn->EnableWindow(TRUE);
+ }
+ else {
+ btn->EnableWindow(FALSE);
+ }
// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82Ă\xE9 (2004.12.7 yutaka)
::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_ACCEPT_MOUSE_EVENT_TRACKING));
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2017-05-12 12:41:35 UTC (rev 6712)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2017-05-12 12:41:42 UTC (rev 6713)
@@ -2487,7 +2487,7 @@
return;
}
- if (! (IsWindows2000OrLater() || IsWindowsMe())) {
+ if (! HasBalloonTipSupport()) {
return;
}
Modified: trunk/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.def 2017-05-12 12:41:35 UTC (rev 6712)
+++ trunk/teraterm/ttpcmn/ttpcmn.def 2017-05-12 12:41:42 UTC (rev 6713)
@@ -82,3 +82,4 @@
HasMultiMonitorSupport @71
HasGetAdaptersAddresses @72
HasDnsQuery @73
+ HasBalloonTipSupport @87
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2017-05-12 12:41:35 UTC (rev 6712)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2017-05-12 12:41:42 UTC (rev 6713)
@@ -3064,9 +3064,14 @@
if (pvar->settings.ForwardAgentConfirm) {
CheckDlgButton(dlg, IDC_FORWARDAGENTCONFIRM, TRUE);
}
+
if (pvar->settings.ForwardAgentNotify) {
CheckDlgButton(dlg, IDC_FORWARDAGENTNOTIFY, TRUE);
}
+ if (!HasBalloonTipSupport()) {
+ EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTNOTIFY), FALSE);
+ }
+
if (pvar->settings.VerifyHostKeyDNS) {
CheckDlgButton(dlg, IDC_VERIFYHOSTKEYDNS, TRUE);
}
@@ -3605,7 +3610,9 @@
}
else {
EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTCONFIRM), TRUE);
- EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTNOTIFY), TRUE);
+ if (HasBalloonTipSupport()) {
+ EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTNOTIFY), TRUE);
+ }
}
return TRUE;
}