svnno****@sourc*****
svnno****@sourc*****
2015年 5月 23日 (土) 21:50:25 JST
Tera TermRevision: 5883
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5883
Author: yutakapon
Date: 2015-05-23 21:50:25 +0900 (Sat, 23 May 2015)
Log Message:
-----------
チケット #34943 設定フォルダを開く
案3に変更する。
Eterm look-feelの設定を削除した。
Ticket Links:
------------
http://sourceforge.jp/projects/ttssh2/tracker/detail/34943
Modified Paths:
--------------
trunk/teraterm/common/tt_res.h
trunk/teraterm/teraterm/ttermpro.rc
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h 2015-05-23 12:42:04 UTC (rev 5882)
+++ trunk/teraterm/common/tt_res.h 2015-05-23 12:50:25 UTC (rev 5883)
@@ -147,9 +147,7 @@
#define IDC_ETERM1_SETUPDIR_EDIT 2513
#define IDC_TRANSPROGRESS 2514
#define IDC_WINDOW_REPORT 2514
-#define IDC_ETERM2_SETUPDIR_EDIT 2514
#define IDC_PROTOPROGRESS 2515
-#define IDC_ETERM3_SETUPDIR_EDIT 2515
#define IDC_SSH_SETUPDIR_EDIT 2516
#define IDC_ACCEPT_TITLE_CHANGING_LABEL 2517
#define IDC_PASTEDELAY_LABEL 2518
@@ -178,13 +176,9 @@
#define IDC_ROTATE_STEP 2530
#define IDC_CYGTERM_SETUPDIR_BUTTON 2530
#define IDC_ROTATE_STEP_TEXT 2531
-#define IDC_ETERM1_SETUPDIR_BUTTON 2531
#define IDC_ROTATE_SIZE_TEXT 2532
-#define IDC_ETERM2_SETUPDIR_BUTTON 2532
#define IDC_ROTATE_GROUP 2533
-#define IDC_ETERM3_SETUPDIR_BUTTON 2533
#define IDC_LOG_OPTION_GROUP 2534
-#define IDC_SSH_BUTTON 2534
#define IDC_SSH_SETUPDIR_BUTTON 2534
#define IDC_OPT_BINARY 2535
#define IDC_OPT_APPEND 2536
@@ -196,9 +190,6 @@
#define IDC_INI_SETUPDIR_STATIC 2541
#define IDC_KEYCNF_SETUPDIR_STATIC 2542
#define IDC_CYGTERM_SETUPDIR_STATIC 2543
-#define IDC_ETERM1_SETUPDIR_STATIC 2544
-#define IDC_ETERM2_SETUPDIR_STATIC 2545
-#define IDC_ETERM3_SETUPDIR_STATIC 2546
#define IDC_SSH_SETUPDIR_STATIC 2547
#define ID_ACC_SENDBREAK 50001
#define ID_ACC_COPY 50002
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2015-05-23 12:42:04 UTC (rev 5882)
+++ trunk/teraterm/teraterm/ttermpro.rc 2015-05-23 12:50:25 UTC (rev 5883)
@@ -24,7 +24,7 @@
// Dialog
//
-IDD_SETUP_DIR_DIALOG DIALOGEX 0, 0, 385, 182
+IDD_SETUP_DIR_DIALOG DIALOGEX 0, 0, 385, 115
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Setup directory"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -38,18 +38,9 @@
LTEXT "cygterm.cfg",IDC_CYGTERM_SETUPDIR_STATIC,7,59,40,8
EDITTEXT IDC_CYGTERM_SETUPDIR_EDIT,73,58,253,14,ES_AUTOHSCROLL | ES_READONLY
PUSHBUTTON "...",IDC_CYGTERM_SETUPDIR_BUTTON,338,58,26,14
- LTEXT "ImageFile.INI",IDC_ETERM1_SETUPDIR_STATIC,7,81,44,8
- EDITTEXT IDC_ETERM1_SETUPDIR_EDIT,73,80,253,14,ES_AUTOHSCROLL | ES_READONLY
- PUSHBUTTON "...",IDC_ETERM1_SETUPDIR_BUTTON,338,80,26,14
- LTEXT "Scale.INI",IDC_ETERM2_SETUPDIR_STATIC,7,103,30,8
- EDITTEXT IDC_ETERM2_SETUPDIR_EDIT,73,102,253,14,ES_AUTOHSCROLL | ES_READONLY
- PUSHBUTTON "...",IDC_ETERM2_SETUPDIR_BUTTON,338,102,26,14
- LTEXT "Tile.INI",IDC_ETERM3_SETUPDIR_STATIC,7,127,24,8
- EDITTEXT IDC_ETERM3_SETUPDIR_EDIT,73,126,253,14,ES_AUTOHSCROLL | ES_READONLY
- PUSHBUTTON "...",IDC_ETERM3_SETUPDIR_BUTTON,338,126,26,14
- LTEXT "ssh_known_hosts",IDC_SSH_SETUPDIR_STATIC,9,151,58,8
- EDITTEXT IDC_SSH_SETUPDIR_EDIT,73,150,253,14,ES_AUTOHSCROLL | ES_READONLY
- PUSHBUTTON "...",IDC_SSH_SETUPDIR_BUTTON,338,150,26,14
+ LTEXT "ssh_known_hosts",IDC_SSH_SETUPDIR_STATIC,9,82,58,8
+ EDITTEXT IDC_SSH_SETUPDIR_EDIT,73,81,253,14,ES_AUTOHSCROLL | ES_READONLY
+ PUSHBUTTON "...",IDC_SSH_SETUPDIR_BUTTON,338,81,26,14
END
@@ -66,7 +57,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 378
TOPMARGIN, 7
- BOTTOMMARGIN, 175
+ BOTTOMMARGIN, 108
END
END
#endif // APSTUDIO_INVOKED
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2015-05-23 12:42:04 UTC (rev 5882)
+++ trunk/teraterm/teraterm/vtwin.cpp 2015-05-23 12:50:25 UTC (rev 5883)
@@ -4715,8 +4715,6 @@
static char keycnfpath[MAX_PATH], keycnffilename[MAX_PATH];
static char cygtermpath[MAX_PATH], cygtermfilename[MAX_PATH];
static char eterm1path[MAX_PATH], eterm1filename[MAX_PATH];
- static char eterm2path[MAX_PATH], eterm2filename[MAX_PATH];
- static char eterm3path[MAX_PATH], eterm3filename[MAX_PATH];
char temp[MAX_PATH];
typedef int (CALLBACK *PSSH_read_known_hosts_file)(char *, int);
PSSH_read_known_hosts_file func = NULL;
@@ -4748,25 +4746,6 @@
_snprintf_s(temp, sizeof(temp), "%s\\%s", cygtermpath, cygtermfilename);
SetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT, temp);
- // TODO: Eterm look-feel \x8A֘A\x82\xCD BGThemeFile \x83G\x83\x93\x83g\x83\x8A\x82\xA9\x82\xE7\x8E擾\x82\xB7\x82\xE9\x81B
- strncpy_s(eterm1filename, sizeof(eterm1filename), "ImageFile.INI", _TRUNCATE);
- _snprintf_s(eterm1path, sizeof(eterm1path), "%s\\theme", teratermexepath);
- //SetDlgItemText(hDlgWnd, IDC_ETERM1_SETUPDIR_STATIC, eterm1filename);
- _snprintf_s(temp, sizeof(temp), "%s\\%s", eterm1path, eterm1filename);
- SetDlgItemText(hDlgWnd, IDC_ETERM1_SETUPDIR_EDIT, temp);
-
- strncpy_s(eterm2filename, sizeof(eterm2filename), "Scale.INI", _TRUNCATE);
- _snprintf_s(eterm2path, sizeof(eterm2path), "%s\\theme", teratermexepath);
- //SetDlgItemText(hDlgWnd, IDC_ETERM2_SETUPDIR_STATIC, eterm2filename);
- _snprintf_s(temp, sizeof(temp), "%s\\%s", eterm2path, eterm2filename);
- SetDlgItemText(hDlgWnd, IDC_ETERM2_SETUPDIR_EDIT, temp);
-
- strncpy_s(eterm3filename, sizeof(eterm3filename), "Tile.INI", _TRUNCATE);
- _snprintf_s(eterm3path, sizeof(eterm3path), "%s\\theme", teratermexepath);
- //SetDlgItemText(hDlgWnd, IDC_ETERM3_SETUPDIR_STATIC, eterm3filename);
- _snprintf_s(temp, sizeof(temp), "%s\\%s", eterm3path, eterm3filename);
- SetDlgItemText(hDlgWnd, IDC_ETERM3_SETUPDIR_EDIT, temp);
-
// ssh_known_hosts
if (func == NULL) {
if (((h = GetModuleHandle("ttxssh.dll")) != NULL)) {
@@ -4808,18 +4787,6 @@
openVirtualStore(cygtermpath, cygtermfilename);
return TRUE;
- case IDC_ETERM1_SETUPDIR_BUTTON | (BN_CLICKED << 16) :
- openVirtualStore(eterm1path, eterm1filename);
- return TRUE;
-
- case IDC_ETERM2_SETUPDIR_BUTTON | (BN_CLICKED << 16) :
- openVirtualStore(eterm2path, eterm2filename);
- return TRUE;
-
- case IDC_ETERM3_SETUPDIR_BUTTON | (BN_CLICKED << 16) :
- openVirtualStore(eterm3path, eterm3filename);
- return TRUE;
-
case IDC_SSH_SETUPDIR_BUTTON | (BN_CLICKED << 16) :
openVirtualStore(hostsfilepath, hostsfilename);
return TRUE;