• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision10223 (tree)
Time2022-09-01 23:17:23
Authorzmatsuo

Log Message

その他設定-表示タブのレイアウトを修正

- レイアウトを修正
- Eterm look and feel を削除

- lngから削除
- リソースIDを削除

- debugプロパティーシートのリソースを別ファイルに分離

Change Summary

Incremental Difference

--- trunk/teraterm/common/tt_res.h (revision 10222)
+++ trunk/teraterm/common/tt_res.h (revision 10223)
@@ -50,7 +50,6 @@
5050 #define IDC_COLOR_BLUE 1015
5151 #define IDC_SAMPLE_COLOR 1016
5252 #define IDC_COMMAND_EDIT 1017
53-#define IDC_RESTART 1017
5453 #define IDC_ENTERKEY_CHECK 1018
5554 #define IDC_RADIO_CRLF 1019
5655 #define IDC_RADIO_CR 1020
@@ -119,6 +118,7 @@
119118 #define IDC_ENABLE_ATTR_COLOR_UNDERLINE 1080
120119 #define IDC_ENABLE_ATTR_FONT_UNDERLINE 1081
121120 #define IDC_ENABLE_ATTR_FONT_BOLD 1082
121+#define IDC_CHECK_CornerDontround 1083
122122 #define IDD_PRNABORTDLG 2100
123123 #define IDD_FILETRANSDLG 2200
124124 #define IDC_TRANSFNAME 2201
@@ -147,12 +147,10 @@
147147 #define IDC_SCROLL_LINE 2510
148148 #define IDC_PASTEDELAY_EDIT 2510
149149 #define IDC_SCP_PATH 2510
150-#define IDC_BGIMG_EDIT 2510
151150 #define IDC_ROTATE_SIZE 2510
152151 #define IDC_CONFIRM_CHANGE_PASTE 2512
153152 #define IDC_CURSOR_CTRL_SEQ 2512
154153 #define IDC_LOG_ROTATE 2512
155-#define IDC_BGIMG_CHECK 2512
156154 #define IDC_MOUSEWHEEL_SCROLL_LINE 2513
157155 #define IDC_WINDOW_CTRL 2513
158156 #define IDC_TRANSPROGRESS 2514
@@ -173,7 +171,6 @@
173171 #define IDC_PROTOELAPSEDTIME 2526
174172 #define IDC_TRANS_ELAPSED 2527
175173 #define IDC_TRANS_ETIME 2528
176-#define IDC_BGIMG_BUTTON 2528
177174 #define IDC_CLIPBOARD_ACCESS_LABEL 2529
178175 #define IDC_ROTATE_SIZE_TYPE 2529
179176 #define IDC_CLIPBOARD_ACCESS 2530
@@ -189,7 +186,6 @@
189186 #define IDC_OPT_HIDEDLG 2539
190187 #define IDC_OPT_INCBUF 2540
191188 #define IDC_OPT_TIMESTAMP_TYPE 2541
192-#define IDC_BGIMG_BRIGHTNESS 2551
193189 #define IDC_EDIT_BGIMG_BRIGHTNESS 2552
194190 #define IDC_TRIMNLCHAR 2564
195191 #define IDC_CLIPBOARD_NOTIFY 2566
@@ -218,10 +214,6 @@
218214 #define IDC_SELECT_ON_ACTIVATE 2589
219215 #define IDC_MIXED_THEME_FILE 2590
220216 #define IDC_ACCEPT_CLEAR_SBUFF 2591
221-#define IDC_DEBUG_POPUP_ENABLE 2592
222-#define IDC_DEBUG_POPUP_KEY1 2593
223-#define IDC_DEBUG_POPUP_KEY2 2594
224-#define IDC_DEBUG_CONSOLE_BUTTON 2595
225217 #define IDC_SENDFILE_FILENAME_BUTTON 2596
226218 #define IDC_SENDFILE_CHECK_BINARY 2597
227219 #define IDC_SENDFILE_FILENAME_TITLE 2598
--- trunk/teraterm/teraterm/CMakeLists.txt (revision 10222)
+++ trunk/teraterm/teraterm/CMakeLists.txt (revision 10223)
@@ -114,6 +114,7 @@
114114 debug_pp.cpp
115115 debug_pp.h
116116 debug_pp.rc
117+ debug_pp_res.h
117118 sendfiledlg.cpp
118119 sendfiledlg.h
119120 #
--- trunk/teraterm/teraterm/addsetting.cpp (revision 10222)
+++ trunk/teraterm/teraterm/addsetting.cpp (revision 10223)
@@ -650,9 +650,6 @@
650650 { IDC_ALPHABLEND, "DLG_TAB_VISUAL_ALPHA" },
651651 { IDC_ALPHA_BLEND_ACTIVE_LABEL, "DLG_TAB_VISUAL_ALPHA_ACTIVE" },
652652 { IDC_ALPHA_BLEND_INACTIVE_LABEL, "DLG_TAB_VISUAL_ALPHA_INACTIVE" },
653- { IDC_MIXED_THEME_FILE, "DLG_TAB_VISUAL_BGMIXED_THEMEFILE" },
654- { IDC_BGIMG_CHECK, "DLG_TAB_VISUAL_BGIMG" },
655- { IDC_BGIMG_BRIGHTNESS, "DLG_TAB_VISUAL_BGIMG_BRIGHTNESS" },
656653 { IDC_MOUSE, "DLG_TAB_VISUAL_MOUSE" },
657654 { IDC_FONT_QUALITY_LABEL, "DLG_TAB_VISUAL_FONT_QUALITY" },
658655 { IDC_ANSICOLOR, "DLG_TAB_VISUAL_ANSICOLOR" },
@@ -668,10 +665,6 @@
668665 { IDC_ENABLE_ATTR_COLOR_URL, "DLG_TAB_VISUAL_URL_COLOR" }, // URL Attribute
669666 { IDC_ENABLE_ATTR_FONT_URL, "DLG_TAB_VISUAL_URL_FONT" },
670667 { IDC_ENABLE_ANSI_COLOR, "DLG_TAB_VISUAL_ANSI" },
671-#if 0
672- { IDC_ETERM_LOOKFEEL, "DLG_TAB_VISUAL_ETERM" },
673- { IDC_RESTART, "DLG_TAB_VISUAL_RESTART" },
674-#endif
675668 };
676669 SetDlgTextsW(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFileW);
677670
@@ -848,77 +841,51 @@
848841 int sel;
849842
850843 switch (wParam) {
851- case IDC_THEME_EDITOR_BUTTON | (BN_CLICKED << 16): {
852- ThemeDialog(m_hInst, m_hWnd, &cv);
853- break;
854- }
855- case IDC_THEME_FILE | (CBN_SELCHANGE << 16): {
856- int r = GetCurSel(IDC_THEME_FILE);
857- // 固定のとき、ファイル名を入力できるようにする
858- BOOL enable = (r == 1) ? TRUE : FALSE;
859- EnableDlgItem(IDC_THEME_EDIT, enable);
860- EnableDlgItem(IDC_THEME_BUTTON, enable);
861- break;
862- }
863- case IDC_THEME_BUTTON | (BN_CLICKED << 16): {
864- // テーマファイルを選択する
865- OPENFILENAMEW ofn = {};
866- wchar_t szFile[MAX_PATH];
867- wchar_t *curdir;
868- wchar_t *theme_dir;
869- hGetCurrentDirectoryW(&curdir);
870-
871- if (GetFileAttributesW(ts.EtermLookfeel.BGThemeFileW) != INVALID_FILE_ATTRIBUTES) {
872- wcsncpy_s(szFile, _countof(szFile), ts.EtermLookfeel.BGThemeFileW, _TRUNCATE);
873- } else {
874- szFile[0] = 0;
844+ case IDC_THEME_EDITOR_BUTTON | (BN_CLICKED << 16): {
845+ ThemeDialog(m_hInst, m_hWnd, &cv);
846+ break;
875847 }
848+ case IDC_THEME_FILE | (CBN_SELCHANGE << 16): {
849+ int r = GetCurSel(IDC_THEME_FILE);
850+ // 固定のとき、ファイル名を入力できるようにする
851+ BOOL enable = (r == 1) ? TRUE : FALSE;
852+ EnableDlgItem(IDC_THEME_EDIT, enable);
853+ EnableDlgItem(IDC_THEME_BUTTON, enable);
854+ break;
855+ }
856+ case IDC_THEME_BUTTON | (BN_CLICKED << 16): {
857+ // テーマファイルを選択する
858+ OPENFILENAMEW ofn = {};
859+ wchar_t szFile[MAX_PATH];
860+ wchar_t *curdir;
861+ wchar_t *theme_dir;
862+ hGetCurrentDirectoryW(&curdir);
876863
877- aswprintf(&theme_dir, L"%s\\theme", ts.HomeDirW);
864+ if (GetFileAttributesW(ts.EtermLookfeel.BGThemeFileW) != INVALID_FILE_ATTRIBUTES) {
865+ wcsncpy_s(szFile, _countof(szFile), ts.EtermLookfeel.BGThemeFileW, _TRUNCATE);
866+ } else {
867+ szFile[0] = 0;
868+ }
878869
879- ofn.lStructSize = get_OPENFILENAME_SIZEW();
880- ofn.hwndOwner = GetSafeHwnd();
881- ofn.lpstrFilter = L"Theme Files(*.ini)\0*.ini\0All Files(*.*)\0*.*\0";
882- ofn.lpstrFile = szFile;
883- ofn.nMaxFile = _countof(szFile);
884- ofn.lpstrTitle = L"select theme file";
885- ofn.lpstrInitialDir = theme_dir;
886- ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
887- BOOL ok = GetOpenFileNameW(&ofn);
888- SetCurrentDirectoryW(curdir);
889- free(curdir);
890- free(theme_dir);
891- if (ok) {
892- SetDlgItemTextW(IDC_THEME_EDIT, szFile);
893- }
894- return TRUE;
895- }
870+ aswprintf(&theme_dir, L"%s\\theme", ts.HomeDirW);
896871
897- case IDC_BGIMG_BUTTON | (BN_CLICKED << 16):
898- // 背景画像をダイアログで指定する。
899- {
900- OPENFILENAMEW ofn;
901- wchar_t szFile[MAX_PATH];
902- wchar_t *curdir;
903- hGetCurrentDirectoryW(&curdir);
904-
905- memset(&ofn, 0, sizeof(ofn));
906- memset(szFile, 0, sizeof(szFile));
907- ofn.lStructSize = get_OPENFILENAME_SIZEW();
908- ofn.hwndOwner = GetSafeHwnd();
909- ofn.lpstrFilter = L"Image Files(*.jpg;*.jpeg;*.bmp)\0*.jpg;*.jpeg;*.bmp\0All Files(*.*)\0*.*\0";
910- ofn.lpstrFile = szFile;
911- ofn.nMaxFile = _countof(szFile);
912- ofn.lpstrTitle = L"select image file";
913- ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
914- BOOL ok = GetOpenFileNameW(&ofn);
915- SetCurrentDirectoryW(curdir);
916- free(curdir);
917- if (ok) {
918- SetDlgItemTextW(IDC_BGIMG_EDIT, szFile);
919- }
872+ ofn.lStructSize = get_OPENFILENAME_SIZEW();
873+ ofn.hwndOwner = GetSafeHwnd();
874+ ofn.lpstrFilter = L"Theme Files(*.ini)\0*.ini\0All Files(*.*)\0*.*\0";
875+ ofn.lpstrFile = szFile;
876+ ofn.nMaxFile = _countof(szFile);
877+ ofn.lpstrTitle = L"select theme file";
878+ ofn.lpstrInitialDir = theme_dir;
879+ ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
880+ BOOL ok = GetOpenFileNameW(&ofn);
881+ SetCurrentDirectoryW(curdir);
882+ free(curdir);
883+ free(theme_dir);
884+ if (ok) {
885+ SetDlgItemTextW(IDC_THEME_EDIT, szFile);
920886 }
921887 return TRUE;
888+ }
922889
923890 case IDC_EDIT_BGIMG_BRIGHTNESS | (EN_CHANGE << 16) :
924891 {
--- trunk/teraterm/teraterm/debug_pp.cpp (revision 10222)
+++ trunk/teraterm/teraterm/debug_pp.cpp (revision 10223)
@@ -33,7 +33,7 @@
3333 #include "tmfc.h"
3434 #include "tt_res.h"
3535 #include "debug_pp.h"
36-#include "../common/tt_res.h"
36+#include "debug_pp_res.h"
3737 #include "ttdebug.h"
3838 #include "dlglib.h"
3939 #include "compat_win.h"
--- trunk/teraterm/teraterm/debug_pp_res.h (nonexistent)
+++ trunk/teraterm/teraterm/debug_pp_res.h (revision 10223)
@@ -0,0 +1,21 @@
1+//{{NO_DEPENDENCIES}}
2+// Microsoft Visual C++ で生成されたインクルード ファイル。
3+// debug_pp.rc で使用
4+//
5+#define IDD_TABSHEET_DEBUG 126
6+#define IDC_DEBUG_POPUP_ENABLE 2592
7+#define IDC_DEBUG_POPUP_KEY1 2593
8+#define IDC_DEBUG_POPUP_KEY2 2594
9+#define IDC_DEBUG_CONSOLE_BUTTON 2595
10+
11+// Next default values for new objects
12+//
13+#ifdef APSTUDIO_INVOKED
14+#ifndef APSTUDIO_READONLY_SYMBOLS
15+#define _APS_NO_MFC 1
16+#define _APS_NEXT_RESOURCE_VALUE 132
17+#define _APS_NEXT_COMMAND_VALUE 52031
18+#define _APS_NEXT_CONTROL_VALUE 2620
19+#define _APS_NEXT_SYMED_VALUE 101
20+#endif
21+#endif
Show on old repository browser