Tera TermRevision: 9917
https://osdn.net/projects/ttssh2/scm/svn/commits/9917
Author: zmatsuo
Date: 2022-05-12 22:55:46 +0900 (Thu, 12 May 2022)
Log Message:
-----------
[Setup]/[Setup directory...] の従来のコントロールを削除
- エディット、ボタンを削除
- リストのサイズを変更
Modified Paths:
--------------
trunk/teraterm/common/tt_res.h
trunk/teraterm/teraterm/setupdirdlg.cpp
trunk/teraterm/teraterm/ttermpro.rc
-------------- next part --------------
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h 2022-05-12 13:55:37 UTC (rev 9916)
+++ trunk/teraterm/common/tt_res.h 2022-05-12 13:55:46 UTC (rev 9917)
@@ -144,20 +144,15 @@
#define IDC_SCP_PATH 2510
#define IDC_BGIMG_EDIT 2510
#define IDC_ROTATE_SIZE 2510
-#define IDC_INI_SETUPDIR_EDIT 2510
-#define IDC_KEYCNF_SETUPDIR_EDIT 2511
#define IDC_CONFIRM_CHANGE_PASTE 2512
#define IDC_CURSOR_CTRL_SEQ 2512
#define IDC_LOG_ROTATE 2512
#define IDC_BGIMG_CHECK 2512
-#define IDC_CYGTERM_SETUPDIR_EDIT 2512
#define IDC_MOUSEWHEEL_SCROLL_LINE 2513
#define IDC_WINDOW_CTRL 2513
-#define IDC_ETERM1_SETUPDIR_EDIT 2513
#define IDC_TRANSPROGRESS 2514
#define IDC_WINDOW_REPORT 2514
#define IDC_PROTOPROGRESS 2515
-#define IDC_SSH_SETUPDIR_EDIT 2516
#define IDC_ACCEPT_TITLE_CHANGING_LABEL 2517
#define IDC_PASTEDELAY_LABEL 2518
#define IDC_TITLE_REPORT_LABEL 2518
@@ -175,18 +170,14 @@
#define IDC_BGIMG_LABEL 2527
#define IDC_TRANS_ETIME 2528
#define IDC_BGIMG_BUTTON 2528
-#define IDC_INI_SETUPDIR_BUTTON 2528
#define IDC_CLIPBOARD_ACCESS_LABEL 2529
#define IDC_ROTATE_SIZE_TYPE 2529
-#define IDC_KEYCNF_SETUPDIR_BUTTON 2529
#define IDC_CLIPBOARD_ACCESS 2530
#define IDC_ROTATE_STEP 2530
-#define IDC_CYGTERM_SETUPDIR_BUTTON 2530
#define IDC_ROTATE_STEP_TEXT 2531
#define IDC_ROTATE_SIZE_TEXT 2532
#define IDC_ROTATE_GROUP 2533
#define IDC_LOG_OPTION_GROUP 2534
-#define IDC_SSH_SETUPDIR_BUTTON 2534
#define IDC_OPT_BINARY 2535
#define IDC_OPT_APPEND 2536
#define IDC_OPT_PLAINTEXT 2537
@@ -194,30 +185,9 @@
#define IDC_OPT_HIDEDLG 2539
#define IDC_CHECK7 2540
#define IDC_OPT_INCBUF 2540
-#define IDC_INI_SETUPDIR_STATIC 2541
#define IDC_OPT_TIMESTAMP_TYPE 2541
-#define IDC_KEYCNF_SETUPDIR_STATIC 2542
-#define IDC_CYGTERM_SETUPDIR_STATIC 2543
-#define IDC_SSH_SETUPDIR_STATIC 2547
-#define IDC_INI_SETUPDIR_BUTTON_FILE 2548
-#define IDC_KEYCNF_SETUPDIR_BUTTON_FILE 2549
-#define IDC_CYGTERM_SETUPDIR_BUTTON_FILE 2550
-#define IDC_CYGTERM_SETUPDIR_BUTTON_FILE2 2551
-#define IDC_SSH_SETUPDIR_BUTTON_FILE 2551
#define IDC_BGIMG_BRIGHTNESS 2551
#define IDC_EDIT_BGIMG_BRIGHTNESS 2552
-#define IDC_INI_SETUPDIR_EDIT_VSTORE 2552
-#define IDC_INI_SETUPDIR_STATIC_VSTORE 2553
-#define IDC_INI_SETUPDIR_GROUP 2554
-#define IDC_KEYCNF_SETUPDIR_STATIC_VSTORE 2555
-#define IDC_KEYCNF_SETUPDIR_EDIT_VSTORE 2556
-#define IDC_KEYCNF_SETUPDIR_GROUP 2557
-#define IDC_CYGTERM_SETUPDIR_GROUP 2558
-#define IDC_CYGTERM_SETUPDIR_STATIC_VSTORE 2559
-#define IDC_CYGTERM_SETUPDIR_EDIT_VSTORE 2560
-#define IDC_SSH_SETUPDIR_GROUP 2561
-#define IDC_SSH_SETUPDIR_STATIC_VSTORE 2562
-#define IDC_SSH_SETUPDIR_EDIT_VSTORE 2563
#define IDC_TRIMNLCHAR 2564
#define IDC_CLIPBOARD_NOTIFY 2566
#define IDC_LIST_HIDDEN_FONTS 2567
Modified: trunk/teraterm/teraterm/setupdirdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/setupdirdlg.cpp 2022-05-12 13:55:37 UTC (rev 9916)
+++ trunk/teraterm/teraterm/setupdirdlg.cpp 2022-05-12 13:55:46 UTC (rev 9917)
@@ -470,18 +470,11 @@
{
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_SETUPDIR_TITLE" },
- { IDC_INI_SETUPDIR_GROUP, "DLG_SETUPDIR_INIFILE" },
- { IDC_KEYCNF_SETUPDIR_GROUP, "DLG_SETUPDIR_KEYBOARDFILE" },
- { IDC_CYGTERM_SETUPDIR_GROUP, "DLG_SETUPDIR_CYGTERMFILE" },
- { IDC_SSH_SETUPDIR_GROUP, "DLG_SETUPDIR_KNOWNHOSTSFILE" },
};
TTTSet *pts = (TTTSet *)GetWindowLongPtr(hDlgWnd, DWLP_USER);
- wchar_t *tmpbufW;
- HWND hWnd;
switch (msg) {
case WM_INITDIALOG: {
- BOOL ret;
pts = (TTTSet *)lp;
SetWindowLongPtr(hDlgWnd, DWLP_USER, (LONG_PTR)pts);
@@ -488,110 +481,6 @@
// I18N
SetDlgTextsW(hDlgWnd, TextInfos, _countof(TextInfos), pts->UILanguageFileW);
- // \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B(teraterm.ini)\x82̃p\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
- /// (1)
- SetDlgItemTextW(hDlgWnd, IDC_INI_SETUPDIR_EDIT, pts->SetupFNameW);
- /// (2) Virutal Store\x82ւ̕ϊ\xB7
- wchar_t *vs;
- ret = convertVirtualStoreW(pts->SetupFNameW, &vs);
- hWnd = GetDlgItem(hDlgWnd, IDC_INI_SETUPDIR_STATIC_VSTORE);
- EnableWindow(hWnd, ret);
- hWnd = GetDlgItem(hDlgWnd, IDC_INI_SETUPDIR_EDIT_VSTORE);
- EnableWindow(hWnd, ret);
- if (ret) {
- SetDlgItemTextW(hDlgWnd, IDC_INI_SETUPDIR_EDIT_VSTORE, vs);
- free(vs);
- }
- else {
- SetDlgItemTextA(hDlgWnd, IDC_INI_SETUPDIR_EDIT_VSTORE, "");
- }
-
- // \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B(KEYBOARD.CNF)\x82̃p\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
- /// (1)
- SetDlgItemTextW(hDlgWnd, IDC_KEYCNF_SETUPDIR_EDIT, pts->KeyCnfFNW);
- /// (2) Virutal Store\x82ւ̕ϊ\xB7
- ret = convertVirtualStoreW(pts->KeyCnfFNW, &vs);
- hWnd = GetDlgItem(hDlgWnd, IDC_KEYCNF_SETUPDIR_STATIC_VSTORE);
- EnableWindow(hWnd, ret);
- hWnd = GetDlgItem(hDlgWnd, IDC_KEYCNF_SETUPDIR_EDIT_VSTORE);
- EnableWindow(hWnd, ret);
- if (ret) {
- SetDlgItemTextW(hDlgWnd, IDC_KEYCNF_SETUPDIR_EDIT_VSTORE, vs);
- free(vs);
- }
- else {
- SetDlgItemTextA(hDlgWnd, IDC_KEYCNF_SETUPDIR_EDIT_VSTORE, "");
- }
-
- // cygterm.cfg \x82\xCD ttermpro.exe \x94z\x89\xBA\x82Ɉʒu\x82\xB7\x82\xE9\x81B
- /// (1)
- aswprintf(&tmpbufW, L"%s\\cygterm.cfg", pts->HomeDirW);
- SetDlgItemTextW(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT, tmpbufW);
- /// (2) Virutal Store\x82ւ̕ϊ\xB7
- ret = convertVirtualStoreW(tmpbufW, &vs);
- free(tmpbufW);
- hWnd = GetDlgItem(hDlgWnd, IDC_CYGTERM_SETUPDIR_STATIC_VSTORE);
- EnableWindow(hWnd, ret);
- hWnd = GetDlgItem(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT_VSTORE);
- EnableWindow(hWnd, ret);
- if (ret) {
- SetDlgItemTextW(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT_VSTORE, vs);
- free(vs);
- }
- else {
- SetDlgItemTextA(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT_VSTORE, "");
- }
-
- // ssh_known_hosts
- {
- HMODULE h = GetModuleHandle("ttxssh.dll");
- if (h != NULL) {
- size_t (CALLBACK *func)(wchar_t *, size_t) = NULL;
- void **pfunc = (void **)&func;
- *pfunc = (void *)GetProcAddress(h, "TTXReadKnownHostsFile");
- if (func) {
- size_t size = func(NULL, 0);
- if (size != 0) {
- wchar_t *temp = (wchar_t *)malloc(sizeof(wchar_t) * size);
- func(temp, size);
- assert(!IsRelativePathW(temp));
-
- SetDlgItemTextW(hDlgWnd, IDC_SSH_SETUPDIR_EDIT, temp);
-
- /// (2) Virutal Store\x82ւ̕ϊ\xB7
- ret = convertVirtualStoreW(temp, &vs);
- hWnd = GetDlgItem(hDlgWnd, IDC_SSH_SETUPDIR_STATIC_VSTORE);
- EnableWindow(hWnd, ret);
- hWnd = GetDlgItem(hDlgWnd, IDC_SSH_SETUPDIR_EDIT_VSTORE);
- EnableWindow(hWnd, ret);
- if (ret) {
- SetDlgItemTextW(hDlgWnd, IDC_SSH_SETUPDIR_EDIT_VSTORE, vs);
- free(vs);
- }
- else {
- SetDlgItemTextA(hDlgWnd, IDC_SSH_SETUPDIR_EDIT_VSTORE, "");
- }
- free(temp);
- }
- }
- }
- else {
- hWnd = GetDlgItem(hDlgWnd, IDC_SSH_SETUPDIR_EDIT);
- EnableWindow(hWnd, FALSE);
- SetDlgItemTextA(hDlgWnd, IDC_SSH_SETUPDIR_EDIT, "");
- hWnd = GetDlgItem(hDlgWnd, IDC_SSH_SETUPDIR_BUTTON);
- EnableWindow(hWnd, FALSE);
- hWnd = GetDlgItem(hDlgWnd, IDC_SSH_SETUPDIR_BUTTON_FILE);
- EnableWindow(hWnd, FALSE);
- hWnd = GetDlgItem(hDlgWnd, IDC_SSH_SETUPDIR_STATIC_VSTORE);
- EnableWindow(hWnd, FALSE);
- hWnd = GetDlgItem(hDlgWnd, IDC_SSH_SETUPDIR_EDIT_VSTORE);
- EnableWindow(hWnd, FALSE);
- SetDlgItemTextA(hDlgWnd, IDC_SSH_SETUPDIR_EDIT_VSTORE, "");
- }
- }
-
- /////////////////////////////////////////////////////////////
HWND hWndList = GetDlgItem(hDlgWnd, IDC_SETUP_DIR_LIST);
ListView_SetExtendedListViewStyleEx(hWndList, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT);
@@ -703,67 +592,7 @@
}
case WM_COMMAND: {
- BOOL button_pressed = FALSE;
- BOOL open_dir = FALSE;
- int edit;
- int edit_vstore;
switch (LOWORD(wp)) {
- case IDC_INI_SETUPDIR_BUTTON | (BN_CLICKED << 16) :
- edit = IDC_INI_SETUPDIR_EDIT;
- edit_vstore = IDC_INI_SETUPDIR_EDIT_VSTORE;
- open_dir = TRUE;
- button_pressed = TRUE;
- break;
-
- case IDC_INI_SETUPDIR_BUTTON_FILE | (BN_CLICKED << 16) :
- edit = IDC_INI_SETUPDIR_EDIT;
- edit_vstore = IDC_INI_SETUPDIR_EDIT_VSTORE;
- open_dir = FALSE;
- button_pressed = TRUE;
- break;
-
- case IDC_KEYCNF_SETUPDIR_BUTTON | (BN_CLICKED << 16) :
- edit = IDC_KEYCNF_SETUPDIR_EDIT;
- edit_vstore = IDC_KEYCNF_SETUPDIR_EDIT_VSTORE;
- open_dir = TRUE;
- button_pressed = TRUE;
- break;
-
- case IDC_KEYCNF_SETUPDIR_BUTTON_FILE | (BN_CLICKED << 16) :
- edit = IDC_KEYCNF_SETUPDIR_EDIT;
- edit_vstore = IDC_KEYCNF_SETUPDIR_EDIT_VSTORE;
- open_dir = FALSE;
- button_pressed = TRUE;
- break;
-
- case IDC_CYGTERM_SETUPDIR_BUTTON | (BN_CLICKED << 16) :
- edit = IDC_CYGTERM_SETUPDIR_EDIT;
- edit_vstore = IDC_CYGTERM_SETUPDIR_EDIT_VSTORE;
- open_dir = TRUE;
- button_pressed = TRUE;
- break;
-
- case IDC_CYGTERM_SETUPDIR_BUTTON_FILE | (BN_CLICKED << 16) :
- edit = IDC_CYGTERM_SETUPDIR_EDIT;
- edit_vstore = IDC_CYGTERM_SETUPDIR_EDIT_VSTORE;
- open_dir = FALSE;
- button_pressed = TRUE;
- break;
-
- case IDC_SSH_SETUPDIR_BUTTON | (BN_CLICKED << 16) :
- edit = IDC_SSH_SETUPDIR_EDIT;
- edit_vstore = IDC_SSH_SETUPDIR_EDIT_VSTORE;
- open_dir = TRUE;
- button_pressed = TRUE;
- break;
-
- case IDC_SSH_SETUPDIR_BUTTON_FILE | (BN_CLICKED << 16) :
- edit = IDC_SSH_SETUPDIR_EDIT;
- edit_vstore = IDC_SSH_SETUPDIR_EDIT_VSTORE;
- open_dir = FALSE;
- button_pressed = TRUE;
- break;
-
case IDHELP:
OpenHelp(HH_HELP_CONTEXT, HlpMenuSetupDir, pts->UILanguageFile);
break;
@@ -781,28 +610,6 @@
default:
return FALSE;
}
-
- if (button_pressed) {
- wchar_t *filename;
- if (!IsWindowEnabled(GetDlgItem(hDlgWnd, edit_vstore))) {
- hGetWindowTextW(GetDlgItem(hDlgWnd, edit), &filename);
- } else {
- hGetWindowTextW(GetDlgItem(hDlgWnd, edit_vstore), &filename);
- }
-
- const wchar_t *UILanguageFile = pts->UILanguageFileW;
- if (open_dir) {
- // \x83t\x83H\x83\x8B\x83_\x82\xF0\x8AJ\x82\xA2\x82āA\x83t\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9
- openDirectoryWithExplorer(filename, UILanguageFile);
- }
- else {
- const char *editor = pts->ViewlogEditor;
- openFileWithApplication(filename, editor, UILanguageFile);
- }
-
- free(filename);
- return TRUE;
- }
return FALSE;
}
case WM_CLOSE:
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2022-05-12 13:55:37 UTC (rev 9916)
+++ trunk/teraterm/teraterm/ttermpro.rc 2022-05-12 13:55:46 UTC (rev 9917)
@@ -313,38 +313,14 @@
EDITTEXT IDC_EDIT,5,5,150,112,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
END
-IDD_SETUP_DIR_DIALOG DIALOGEX 0, 0, 371, 306
+IDD_SETUP_DIR_DIALOG DIALOGEX 0, 0, 371, 148
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Setup directory"
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
- GROUPBOX "Tera Term Configuration File",IDC_INI_SETUPDIR_GROUP,7,7,356,46
- EDITTEXT IDC_INI_SETUPDIR_EDIT,13,17,253,14,ES_AUTOHSCROLL | ES_READONLY
- PUSHBUTTON "...",IDC_INI_SETUPDIR_BUTTON,278,17,26,14
- PUSHBUTTON "Open File",IDC_INI_SETUPDIR_BUTTON_FILE,312,17,40,14
- LTEXT "Virtual Store",IDC_INI_SETUPDIR_STATIC_VSTORE,15,37,45,8
- EDITTEXT IDC_INI_SETUPDIR_EDIT_VSTORE,68,35,251,14,ES_AUTOHSCROLL | ES_READONLY
- GROUPBOX "Keyboard Configuration File",IDC_KEYCNF_SETUPDIR_GROUP,7,55,356,46
- EDITTEXT IDC_KEYCNF_SETUPDIR_EDIT,13,65,253,14,ES_AUTOHSCROLL | ES_READONLY
- PUSHBUTTON "...",IDC_KEYCNF_SETUPDIR_BUTTON,278,65,26,14
- PUSHBUTTON "Open File",IDC_KEYCNF_SETUPDIR_BUTTON_FILE,312,65,40,14
- LTEXT "Virtual Store",IDC_KEYCNF_SETUPDIR_STATIC_VSTORE,15,85,45,8
- EDITTEXT IDC_KEYCNF_SETUPDIR_EDIT_VSTORE,68,83,251,14,ES_AUTOHSCROLL | ES_READONLY
- GROUPBOX "CygTerm Configuration File",IDC_CYGTERM_SETUPDIR_GROUP,7,103,356,46
- EDITTEXT IDC_CYGTERM_SETUPDIR_EDIT,13,113,253,14,ES_AUTOHSCROLL | ES_READONLY
- PUSHBUTTON "...",IDC_CYGTERM_SETUPDIR_BUTTON,278,113,26,14
- PUSHBUTTON "Open File",IDC_CYGTERM_SETUPDIR_BUTTON_FILE,312,113,39,14
- LTEXT "Virtual Store",IDC_CYGTERM_SETUPDIR_STATIC_VSTORE,15,133,45,8
- EDITTEXT IDC_CYGTERM_SETUPDIR_EDIT_VSTORE,68,131,251,14,ES_AUTOHSCROLL | ES_READONLY
- GROUPBOX "SSH known_hosts File",IDC_SSH_SETUPDIR_GROUP,7,151,356,46
- EDITTEXT IDC_SSH_SETUPDIR_EDIT,13,161,253,14,ES_AUTOHSCROLL | ES_READONLY
- PUSHBUTTON "...",IDC_SSH_SETUPDIR_BUTTON,278,161,26,14
- PUSHBUTTON "Open File",IDC_SSH_SETUPDIR_BUTTON_FILE,312,161,38,14
- LTEXT "Virtual Store",IDC_SSH_SETUPDIR_STATIC_VSTORE,15,181,45,8
- EDITTEXT IDC_SSH_SETUPDIR_EDIT_VSTORE,68,179,251,14,ES_AUTOHSCROLL | ES_READONLY
- CONTROL "",IDC_SETUP_DIR_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,201,356,78
- DEFPUSHBUTTON "OK",IDOK,256,285,50,14
- PUSHBUTTON "Help",IDHELP,313,285,50,14
+ CONTROL "",IDC_SETUP_DIR_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,7,356,113
+ DEFPUSHBUTTON "OK",IDOK,256,127,50,14
+ PUSHBUTTON "Help",IDHELP,313,127,50,14
END
IDD_SENDFILEDLG DIALOGEX 0, 0, 271, 188
@@ -464,7 +440,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 363
TOPMARGIN, 7
- BOTTOMMARGIN, 299
+ BOTTOMMARGIN, 141
END
IDD_SENDFILEDLG, DIALOG