Tera TermRevision: 9952
https://osdn.net/projects/ttssh2/scm/svn/commits/9952
Author: nmaya
Date: 2022-05-24 08:45:50 +0900 (Tue, 24 May 2022)
Log Message:
-----------
TTSSH オリジナルのアイコンを /ssh-icon= に指定できるようにした
Modified Paths:
--------------
branches/4-stable/doc/en/html/commandline/teraterm.html
branches/4-stable/doc/en/html/commandline/ttssh.html
branches/4-stable/doc/en/html/image/ttsecure.png
branches/4-stable/doc/en/html/setup/teraterm-win.html
branches/4-stable/doc/ja/html/commandline/teraterm.html
branches/4-stable/doc/ja/html/commandline/ttssh.html
branches/4-stable/doc/ja/html/image/ttsecure.png
branches/4-stable/doc/ja/html/setup/teraterm-win.html
branches/4-stable/ttssh2/ttxssh/resource.h
branches/4-stable/ttssh2/ttxssh/ttxssh.c
branches/4-stable/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: branches/4-stable/doc/en/html/commandline/teraterm.html
===================================================================
--- branches/4-stable/doc/en/html/commandline/teraterm.html 2022-05-23 15:29:27 UTC (rev 9951)
+++ branches/4-stable/doc/en/html/commandline/teraterm.html 2022-05-23 23:45:50 UTC (rev 9952)
@@ -243,7 +243,8 @@
</ul></dd>
<dt id="tekicon">/TEKICON=<icon name></dt>
- <dd>TEK window icon. Could be specified the same value of <a href="../setup/teraterm-win.html#WindowIcon">TEKIcon of setup file</a>.</dd>
+ <dd>TEK window icon.<br>
+ Could be specified the same value of <a href="../setup/teraterm-win.html#WindowIcon">TEKIcon of setup file</a>.</dd>
<dt id="timeout">/TIMEOUT=<connecting timeout value></dt>
<dd>Could be specified per seconds.</dd>
@@ -252,7 +253,8 @@
<dd>Start Tera Term in hidden (invisible) state.</dd>
<dt id="vticon">/VTICON=<icon name></dt>
- <dd>VT window icon. Could be specified the same value of <a href="../setup/teraterm-win.html#WindowIcon">VTIcon of setup file</a>.</dd>
+ <dd>VT window icon.<br>
+ Could be specified the same value of <a href="../setup/teraterm-win.html#WindowIcon">VTIcon of setup file</a>.</dd>
<dt id="w">/W=<window title></dt>
<dd>Window title</dd>
Modified: branches/4-stable/doc/en/html/commandline/ttssh.html
===================================================================
--- branches/4-stable/doc/en/html/commandline/ttssh.html 2022-05-23 15:29:27 UTC (rev 9951)
+++ branches/4-stable/doc/en/html/commandline/ttssh.html 2022-05-23 23:45:50 UTC (rev 9952)
@@ -155,14 +155,9 @@
<dt id="ssh-c">/ssh-c</dt>
<dd>disable compression</dd>
- <dt id="ssh-icon">/ssh-icon=<icon></dt>
- <dd>specify the icon on SSH connection
- <ul>
- <li><span class="syntax">flat</span> A green icon on TTSSH2.77 or later.</li>
- <li><span class="syntax">green</span> A green icon on TTSSH2.63 or later.</li>
- <li><span class="syntax">yellow</span> A yellow icon on TTSSH2.62 earlier.</li>
- <li><span class="syntax">default</span> A default icon(equal to flat).</li>
- </ul>
+ <dt id="ssh-icon">/ssh-icon=<icon name></dt>
+ <dd>specify the icon on SSH connection<br>
+ Could be specified the same value of <a href="../setup/teraterm-win.html#WindowIcon">SSHIcon of setup file</a>.
</dd>
<dt id="ssh-subsystem">/ssh-subsystem=<subsystem></dt>
Modified: branches/4-stable/doc/en/html/image/ttsecure.png
===================================================================
(Binary files differ)
Modified: branches/4-stable/doc/en/html/setup/teraterm-win.html
===================================================================
--- branches/4-stable/doc/en/html/setup/teraterm-win.html 2022-05-23 15:29:27 UTC (rev 9951)
+++ branches/4-stable/doc/en/html/setup/teraterm-win.html 2022-05-23 23:45:50 UTC (rev 9952)
@@ -648,6 +648,7 @@
<tbody>
<tr><td>flat</td> <td><img src="../image/ttssh-flat.png" ALT="flat ttssh icon"></tr>
+ <tr><td>classic</td> <td><img src="../image/ttsecure.png" ALT="original ttssh icon"></tr>
<tr><td>green</td> <td><img src="../image/ttssh-green.png" ALT="green ttssh icon"></tr>
<tr><td>yellow</td> <td><img src="../image/ttssh-yellow.png" ALT="yellow ttssh icon"></tr>
<tr><td>Default</td> <td>A default icon(equal to flat)</td></tr>
Modified: branches/4-stable/doc/ja/html/commandline/teraterm.html
===================================================================
--- branches/4-stable/doc/ja/html/commandline/teraterm.html 2022-05-23 15:29:27 UTC (rev 9951)
+++ branches/4-stable/doc/ja/html/commandline/teraterm.html 2022-05-23 23:45:50 UTC (rev 9952)
@@ -244,7 +244,8 @@
</ul></dd>
<dt id="tekicon">/TEKICON=<icon name></dt>
- <dd>TEK\x83E\x83C\x83\x93\x83h\x83E\x82̃E\x83C\x83\x93\x83h\x83E\x83A\x83C\x83R\x83\x93\x82\xF0\x8Ew\x92肷\x82\xE9\x81Bicon name\x82ɂ́A\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC<a href="../setup/teraterm-win.html#WindowIcon">TEKIcon\x90ݒ\xE8</a>\x82Ɠ\xAF\x82\xB6\x95\xA8\x82\xAA\x8Eg\x97p\x82ł\xAB\x82\xE9\x81B</dd>
+ <dd>TEK\x83E\x83C\x83\x93\x83h\x83E\x82̃E\x83C\x83\x93\x83h\x83E\x83A\x83C\x83R\x83\x93\x82\xF0\x8Ew\x92肷\x82\xE9<br>
+ icon name\x82ɂ́A\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC<a href="../setup/teraterm-win.html#WindowIcon">TEKIcon\x90ݒ\xE8</a>\x82Ɠ\xAF\x82\xB6\x82\xE0\x82̂\xAA\x8Eg\x97p\x82ł\xAB\x82܂\xB7\x81B</dd>
<dt id="timeout">/TIMEOUT=<connecting timeout value></dt>
<dd>\x90ڑ\xB1\x92\x86\x82̏\x88\x97\x9D\x82\xF0\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB7\x82\xE9\x82܂ł̎\x9E\x8Aԁi\x95b\x92P\x88ʁj</dd>
@@ -253,7 +254,8 @@
<dd>\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x8C\xA9\x82\xA6\x82Ȃ\xA2\x8F\xF3\x91ԂŋN\x93\xAE</dd>
<dt id="vticon">/VTICON=<icon name></dt>
- <dd>VT\x83E\x83C\x83\x93\x83h\x83E\x82̃E\x83C\x83\x93\x83h\x83E\x83A\x83C\x83R\x83\x93\x82\xF0\x8Ew\x92肷\x82\xE9\x81Bicon name\x82ɂ́A\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC<a href="../setup/teraterm-win.html#WindowIcon">VTIcon\x90ݒ\xE8</a>\x82Ɠ\xAF\x82\xB6\x95\xA8\x82\xAA\x8Eg\x97p\x82ł\xAB\x82\xE9\x81B</dd>
+ <dd>VT\x83E\x83C\x83\x93\x83h\x83E\x82̃E\x83C\x83\x93\x83h\x83E\x83A\x83C\x83R\x83\x93\x82\xF0\x8Ew\x92肷\x82\xE9<br>
+ icon name\x82ɂ́A\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC<a href="../setup/teraterm-win.html#WindowIcon">VTIcon\x90ݒ\xE8</a>\x82Ɠ\xAF\x82\xB6\x82\xE0\x82̂\xAA\x8Eg\x97p\x82ł\xAB\x82܂\xB7\x81B</dd>
<dt id="w">/W=<window title></dt>
<dd>\x83E\x83B\x83\x93\x83h\x83E\x82̃^\x83C\x83g\x83\x8B</dd>
Modified: branches/4-stable/doc/ja/html/commandline/ttssh.html
===================================================================
--- branches/4-stable/doc/ja/html/commandline/ttssh.html 2022-05-23 15:29:27 UTC (rev 9951)
+++ branches/4-stable/doc/ja/html/commandline/ttssh.html 2022-05-23 23:45:50 UTC (rev 9952)
@@ -155,14 +155,9 @@
<dt id="ssh-c">/ssh-c</dt>
<dd>\x88\xB3\x8Fk\x82\xF8\x82ɂ\xB7\x82\xE9</dd>
- <dt id="ssh-icon">/ssh-icon=<icon></dt>
- <dd>SSH\x90ڑ\xB1\x8E\x9E\x82̃A\x83C\x83R\x83\x93\x82\xF0\x8Ew\x92肷\x82\xE9\x81B
- <ul>
- <li><span class="syntax">flat</span> TTSSH2.77\x88ȍ~\x82̗̃t\x83\x89\x83b\x83g\x83A\x83C\x83R\x83\x93</li>
- <li><span class="syntax">green</span> TTSSH2.63\x82\xA9\x82\xE72.76\x82܂ł̗̃A\x83C\x83R\x83\x93</li>
- <li><span class="syntax">yellow</span> TTSSH2.62\x82܂ł̉\xA9\x90F\x82̃A\x83C\x83R\x83\x93</li>
- <li><span class="syntax">default</span> \x83f\x83t\x83H\x83\x8B\x83g\x82̃A\x83C\x83R\x83\x93 (flat\x82Ɠ\xAF\x82\xB6)</li>
- </ul>
+ <dt id="ssh-icon">/ssh-icon=<icon name></dt>
+ <dd>SSH\x90ڑ\xB1\x8E\x9E\x82̃A\x83C\x83R\x83\x93\x82\xF0\x8Ew\x92肷\x82\xE9<br>
+ icon name\x82ɂ́A\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC<a href="../setup/teraterm-win.html#WindowIcon">SSHIcon\x90ݒ\xE8</a>\x82Ɠ\xAF\x82\xB6\x82\xE0\x82̂\xAA\x8Eg\x97p\x82ł\xAB\x82܂\xB7\x81B
</dd>
<dt id="ssh-subsystem">/ssh-subsystem=<subsystem></dt>
Modified: branches/4-stable/doc/ja/html/image/ttsecure.png
===================================================================
(Binary files differ)
Modified: branches/4-stable/doc/ja/html/setup/teraterm-win.html
===================================================================
--- branches/4-stable/doc/ja/html/setup/teraterm-win.html 2022-05-23 15:29:27 UTC (rev 9951)
+++ branches/4-stable/doc/ja/html/setup/teraterm-win.html 2022-05-23 23:45:50 UTC (rev 9952)
@@ -663,6 +663,7 @@
<tbody>
<tr><td>flat</td> <td><img src="../image/ttssh-flat.png" ALT="ttssh\x83A\x83C\x83R\x83\x93(\x83t\x83\x89\x83b\x83g)"></tr>
+ <tr><td>classic</td> <td><img src="../image/ttsecure.png" ALT="ttssh\x83A\x83C\x83R\x83\x93(\x83I\x83\x8A\x83W\x83i\x83\x8B)"></tr>
<tr><td>green</td> <td><img src="../image/ttssh-green.png" ALT="ttssh\x83A\x83C\x83R\x83\x93(\x97\xCE)"></tr>
<tr><td>yellow</td> <td><img src="../image/ttssh-yellow.png" ALT="ttssh\x83A\x83C\x83R\x83\x93(\x89\xA9\x90F)"></tr>
<tr><td>Default</td> <td>\x95W\x8F\x80\x82̃A\x83C\x83R\x83\x93(flat\x82Ɠ\xAF\x82\xB6)</td></tr>
Modified: branches/4-stable/ttssh2/ttxssh/resource.h
===================================================================
--- branches/4-stable/ttssh2/ttxssh/resource.h 2022-05-23 15:29:27 UTC (rev 9951)
+++ branches/4-stable/ttssh2/ttxssh/resource.h 2022-05-23 23:45:50 UTC (rev 9952)
@@ -19,6 +19,7 @@
#define IDD_SSHUPDATE_HOSTKEY 111
#define IDI_SECURETT_GREEN 113
#define IDI_DROPDOWN 114
+#define IDI_SECURETT_CLASSIC 115
#define IDD_HOSTDLG 600
#define IDC_HOSTTCPIP 601
#define IDD_SSHDIFFERENTKEY 601
@@ -244,7 +245,7 @@
#define IDC_SSHAUTHSETUP_HELP 1251
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 118
Modified: branches/4-stable/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/4-stable/ttssh2/ttxssh/ttxssh.c 2022-05-23 15:29:27 UTC (rev 9951)
+++ branches/4-stable/ttssh2/ttxssh/ttxssh.c 2022-05-23 23:45:50 UTC (rev 9952)
@@ -367,6 +367,10 @@
(_stricmp(buf, "securett_green") == 0)) {
settings->IconID = IDI_SECURETT_GREEN;
}
+ else if ((_stricmp(buf, "classic") == 0) ||
+ (_stricmp(buf, "securett_classic") == 0)) {
+ settings->IconID = IDI_SECURETT_CLASSIC;
+ }
else {
settings->IconID = IDI_SECURETT;
}
@@ -492,6 +496,9 @@
else if (settings->IconID==IDI_SECURETT_GREEN) {
WritePrivateProfileString("TTSSH", "SSHIcon", "green", fileName);
}
+ else if (settings->IconID==IDI_SECURETT_CLASSIC) {
+ WritePrivateProfileString("TTSSH", "SSHIcon", "classic", fileName);
+ }
else {
WritePrivateProfileString("TTSSH", "SSHIcon", "Default", fileName);
}
@@ -1691,6 +1698,10 @@
(_stricmp(option+10, "securett_green") == 0)) {
pvar->settings.IconID = IDI_SECURETT_GREEN;
}
+ else if ((_stricmp(option+10, "classic") == 0) ||
+ (_stricmp(option+10, "securett_classic") == 0)) {
+ pvar->settings.IconID = IDI_SECURETT_CLASSIC;
+ }
else {
pvar->settings.IconID = IDI_SECURETT;
}
Modified: branches/4-stable/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- branches/4-stable/ttssh2/ttxssh/ttxssh.rc 2022-05-23 15:29:27 UTC (rev 9951)
+++ branches/4-stable/ttssh2/ttxssh/ttxssh.rc 2022-05-23 23:45:50 UTC (rev 9952)
@@ -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_CLASSIC ICON "ttsecure_classic.ico"
+IDI_SECURETT_YELLOW ICON "ttsecure_yellow.ico"
IDI_SECURETT_GREEN ICON "ttsecure_green.ico"
-IDI_SECURETT_YELLOW ICON "ttsecure_yellow.ico"
IDI_DROPDOWN ICON "dropdown.ico"
/////////////////////////////////////////////////////////////////////////////