Tera TermRevision: 9808
https://osdn.net/projects/ttssh2/scm/svn/commits/9808
Author: nmaya
Date: 2022-03-13 23:03:44 +0900 (Sun, 13 Mar 2022)
Log Message:
-----------
Tera Term 4 のアイコンを別名で残す・r9807 の修正を反映
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/9807
Modified Paths:
--------------
trunk/cygwin/cygterm/cygterm.ico
trunk/teraterm/common/ico/flat_icon_32.psd
trunk/teraterm/common/ico/flat_icon_48.psd
trunk/teraterm/common/tt_res.h
trunk/teraterm/teraterm/ttermpro.rc
trunk/teraterm/ttpmacro/ttm_res.h
trunk/teraterm/ttpmacro/ttpmacro.rc
trunk/teraterm/ttpset/ttset.c
trunk/ttpmenu/teraterm.ico
trunk/ttssh2/ttxssh/resource.h
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.rc
Added Paths:
-----------
trunk/teraterm/common/teraterm_flat.ico
trunk/teraterm/common/vt_flat.ico
trunk/teraterm/ttpmacro/ttmacro_flat.ico
trunk/ttssh2/ttxssh/ttsecure_flat.ico
-------------- next part --------------
Modified: trunk/cygwin/cygterm/cygterm.ico
===================================================================
(Binary files differ)
Modified: trunk/teraterm/common/ico/flat_icon_32.psd
===================================================================
(Binary files differ)
Modified: trunk/teraterm/common/ico/flat_icon_48.psd
===================================================================
(Binary files differ)
Added: trunk/teraterm/common/teraterm_flat.ico
===================================================================
(Binary files differ)
Index: trunk/teraterm/common/teraterm_flat.ico
===================================================================
--- trunk/teraterm/common/teraterm_flat.ico 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/teraterm/common/teraterm_flat.ico 2022-03-13 14:03:44 UTC (rev 9808)
Property changes on: trunk/teraterm/common/teraterm_flat.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/teraterm/common/tt_res.h 2022-03-13 14:03:44 UTC (rev 9808)
@@ -30,6 +30,8 @@
#define IDD_SENDFILEDLG 127
#define IDD_TABSHEET_CODING 128
#define IDD_TABSHEET_FONT 129
+#define IDI_TTERM_FLAT 130
+#define IDI_VT_FLAT 131
#define IDR_TEKMENU 1000
#define IDC_EDIT_FULLPATH 1001
#define IDC_FULLPATH_LABEL 1002
@@ -357,7 +359,7 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
-#define _APS_NEXT_RESOURCE_VALUE 129
+#define _APS_NEXT_RESOURCE_VALUE 132
#define _APS_NEXT_COMMAND_VALUE 52031
#define _APS_NEXT_CONTROL_VALUE 2607
#define _APS_NEXT_SYMED_VALUE 101
Added: trunk/teraterm/common/vt_flat.ico
===================================================================
(Binary files differ)
Index: trunk/teraterm/common/vt_flat.ico
===================================================================
--- trunk/teraterm/common/vt_flat.ico 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/teraterm/common/vt_flat.ico 2022-03-13 14:03:44 UTC (rev 9808)
Property changes on: trunk/teraterm/common/vt_flat.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/teraterm/teraterm/ttermpro.rc 2022-03-13 14:03:44 UTC (rev 9808)
@@ -510,19 +510,14 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_TTERM ICON "../common/teraterm.ico"
-
IDI_VT ICON "../common/vt.ico"
-
IDI_TEK ICON "../common/tek.ico"
-
IDI_TTERM_CLASSIC ICON "../common/teraterm_classic.ico"
-
IDI_VT_CLASSIC ICON "../common/vt_classic.ico"
-
IDI_TTERM_3D ICON "../common/teraterm_3d.ico"
-
IDI_VT_3D ICON "../common/vt_3d.ico"
-
+IDI_TTERM_FLAT ICON "../common/teraterm_flat.ico"
+IDI_VT_FLAT ICON "../common/vt_flat.ico"
IDI_CYGTERM ICON "../../cygwin/cygterm/cygterm.ico"
Modified: trunk/teraterm/ttpmacro/ttm_res.h
===================================================================
--- trunk/teraterm/ttpmacro/ttm_res.h 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/teraterm/ttpmacro/ttm_res.h 2022-03-13 14:03:44 UTC (rev 9808)
@@ -24,12 +24,13 @@
#define IDC_LISTTEXT 604
#define IDC_EDIT_ERRLINE 605
#define IDC_FILENAME 606
+#define IDI_TTMACRO_FLAT 607
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 607
+#define _APS_NEXT_RESOURCE_VALUE 608
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 607
#define _APS_NEXT_SYMED_VALUE 101
Added: trunk/teraterm/ttpmacro/ttmacro_flat.ico
===================================================================
(Binary files differ)
Index: trunk/teraterm/ttpmacro/ttmacro_flat.ico
===================================================================
--- trunk/teraterm/ttpmacro/ttmacro_flat.ico 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/teraterm/ttpmacro/ttmacro_flat.ico 2022-03-13 14:03:44 UTC (rev 9808)
Property changes on: trunk/teraterm/ttpmacro/ttmacro_flat.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/teraterm/ttpmacro/ttpmacro.rc
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.rc 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/teraterm/ttpmacro/ttpmacro.rc 2022-03-13 14:03:44 UTC (rev 9808)
@@ -153,6 +153,7 @@
// remains consistent on all systems.
IDI_TTMACRO ICON "ttmacro.ico"
IDI_TTMACRO_3D ICON "ttmacro_3d.ico"
+IDI_TTMACRO_FLAT ICON "ttmacro_flat.ico"
#endif // \x89p\x8C\xEA (\x95č\x91) resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/teraterm/ttpset/ttset.c 2022-03-13 14:03:44 UTC (rev 9808)
@@ -269,6 +269,12 @@
else if (_wcsicmp(name, L"vt_3d") == 0) {
id = IDI_VT_3D;
}
+ else if (_wcsicmp(name, L"tterm_flat") == 0) {
+ id = IDI_TTERM_FLAT;
+ }
+ else if (_wcsicmp(name, L"vt_flat") == 0) {
+ id = IDI_VT_FLAT;
+ }
else if (_wcsicmp(name, L"cygterm") == 0) {
id = IDI_CYGTERM;
}
@@ -311,6 +317,12 @@
case IDI_VT_3D:
icon = "vt_3d";
break;
+ case IDI_TTERM_FLAT:
+ icon = "tterm_flat";
+ break;
+ case IDI_VT_FLAT:
+ icon = "vt_flat";
+ break;
case IDI_CYGTERM:
icon = "cygterm";
break;
Modified: trunk/ttpmenu/teraterm.ico
===================================================================
(Binary files differ)
Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/ttssh2/ttxssh/resource.h 2022-03-13 14:03:44 UTC (rev 9808)
@@ -19,6 +19,7 @@
#define IDD_SSHUPDATE_HOSTKEY 111
#define IDI_SECURETT_GREEN 113
#define IDI_DROPDOWN 114
+#define IDI_SECURETT_FLAT 115
#define IDD_HOSTDLG 600
#define IDC_HOSTTCPIP 601
#define IDD_SSHDIFFERENTKEY 601
Added: trunk/ttssh2/ttxssh/ttsecure_flat.ico
===================================================================
(Binary files differ)
Index: trunk/ttssh2/ttxssh/ttsecure_flat.ico
===================================================================
--- trunk/ttssh2/ttxssh/ttsecure_flat.ico 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/ttssh2/ttxssh/ttsecure_flat.ico 2022-03-13 14:03:44 UTC (rev 9808)
Property changes on: trunk/ttssh2/ttxssh/ttsecure_flat.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2022-03-13 14:03:44 UTC (rev 9808)
@@ -370,6 +370,10 @@
(_stricmp(buf, "securett_green") == 0)) {
settings->IconID = IDI_SECURETT_GREEN;
}
+ else if ((_stricmp(buf, "flat") == 0) ||
+ (_stricmp(buf, "securett_flat") == 0)) {
+ settings->IconID = IDI_SECURETT_FLAT;
+ }
else {
settings->IconID = IDI_SECURETT;
}
@@ -495,6 +499,9 @@
else if (settings->IconID==IDI_SECURETT_GREEN) {
WritePrivateProfileString("TTSSH", "SSHIcon", "green", fileName);
}
+ else if (settings->IconID==IDI_SECURETT_FLAT) {
+ WritePrivateProfileString("TTSSH", "SSHIcon", "flat", fileName);
+ }
else {
WritePrivateProfileString("TTSSH", "SSHIcon", "Default", fileName);
}
@@ -1544,6 +1551,10 @@
(_wcsicmp(option+10, L"securett_green") == 0)) {
pvar->settings.IconID = IDI_SECURETT_GREEN;
}
+ else if ((_wcsicmp(option+10, L"flat") == 0) ||
+ (_wcsicmp(option+10, L"securett_flat") == 0)) {
+ pvar->settings.IconID = IDI_SECURETT_FLAT;
+ }
else {
pvar->settings.IconID = IDI_SECURETT;
}
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2022-03-13 13:53:41 UTC (rev 9807)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2022-03-13 14:03:44 UTC (rev 9808)
@@ -653,8 +653,9 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_SECURETT ICON "ttsecure.ico"
+IDI_SECURETT_YELLOW ICON "ttsecure_yellow.ico"
IDI_SECURETT_GREEN ICON "ttsecure_green.ico"
-IDI_SECURETT_YELLOW ICON "ttsecure_yellow.ico"
+IDI_SECURETT_FLAT ICON "ttsecure_flat.ico"
IDI_DROPDOWN ICON "dropdown.ico"
/////////////////////////////////////////////////////////////////////////////