Tera TermRevision: 10370
https://osdn.net/projects/ttssh2/scm/svn/commits/10370
Author: zmatsuo
Date: 2022-11-20 01:34:23 +0900 (Sun, 20 Nov 2022)
Log Message:
-----------
テーマエディタ整理、ツールチップ追加
- 色タブで「ダブルクリックでカラーピッカーが開く」ツールチップを追加
- 1回だけ出る
- 変数など整理
- 各lngに文言を追加
Modified Paths:
--------------
trunk/installer/release/lang_utf8/English.lng
trunk/installer/release/lang_utf8/French.lng
trunk/installer/release/lang_utf8/Japanese.lng
trunk/installer/release/lang_utf8/Korean.lng
trunk/installer/release/lang_utf8/Russian.lng
trunk/installer/release/lang_utf8/Simplified Chinese.lng
trunk/installer/release/lang_utf8/Spanish.lng
trunk/installer/release/lang_utf8/Traditional Chinese.lng
trunk/teraterm/teraterm/themedlg.cpp
trunk/teraterm/teraterm/themedlg.rc
-------------- next part --------------
Modified: trunk/installer/release/lang_utf8/English.lng
===================================================================
--- trunk/installer/release/lang_utf8/English.lng 2022-11-19 11:20:11 UTC (rev 10369)
+++ trunk/installer/release/lang_utf8/English.lng 2022-11-19 16:34:23 UTC (rev 10370)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-11)
+; Updated by TeraTerm Project (2022-11-20)
[Tera Term]
DLG_SYSTEM_FONT=System,14,0
@@ -555,6 +555,7 @@
BTN_CANCEL=Cancel
BTN_CLOSE=Close
BTN_HELP=&Help
+BTN_DEFAULT=Default
; help
HELPFILE=teraterm.chm
@@ -567,10 +568,17 @@
; theme
DLG_THEME_PREVIEW_FILE_TITLE=preview/file
+DLG_THEME_PREVIEW_FILE_LOAD=Load
+DLG_THEME_PREVIEW_FILE_SAVE=Save
DLG_THEME_BG_TITLE=background image
-DLG_THEME_BG_REVERSE_TEXT_BG_ALPHA_TITLE=reverse text bg alpha
+DLG_THEME_BG_IMAGEFILE=background image file
+DLG_THEME_BG_ALPHA_TITLE=background image alpha
+DLG_THEME_BG_ALPHA_TEXT_BACK_ALPHA_TITLE=Normal back alpha(Opaque right direction):
+DLG_THEME_BG_ALPHA_REVERSE_TEXT_BACK_ALPHA_TITLE=Reverse back alpha:
+DLG_THEME_BG_ALPHA_OTHER_BACK_TITLE=Other back alpha:
+
DLG_THEME_COLOR_TITLE=text color
[TTSSH]
Modified: trunk/installer/release/lang_utf8/French.lng
===================================================================
--- trunk/installer/release/lang_utf8/French.lng 2022-11-19 11:20:11 UTC (rev 10369)
+++ trunk/installer/release/lang_utf8/French.lng 2022-11-19 16:34:23 UTC (rev 10370)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-11)
+; Updated by TeraTerm Project (2022-11-20)
; Last translated (French language) by Francois MOCQ (2010-07-21)
[Tera Term]
@@ -556,6 +556,7 @@
BTN_CANCEL=Effacer
BTN_CLOSE=Fermer
BTN_HELP=Aide
+BTN_DEFAULT=Default
; help
HELPFILE=teraterm.chm
@@ -568,10 +569,17 @@
; theme
DLG_THEME_PREVIEW_FILE_TITLE=preview/file
+DLG_THEME_PREVIEW_FILE_LOAD=Load
+DLG_THEME_PREVIEW_FILE_SAVE=Save
DLG_THEME_BG_TITLE=background image
-DLG_THEME_BG_REVERSE_TEXT_BG_ALPHA_TITLE=reverse text bg alpha
+DLG_THEME_BG_IMAGEFILE=background image file
+DLG_THEME_BG_ALPHA_TITLE=background image alpha
+DLG_THEME_BG_ALPHA_TEXT_BACK_ALPHA_TITLE=Normal back alpha(Opaque right direction):
+DLG_THEME_BG_ALPHA_REVERSE_TEXT_BACK_ALPHA_TITLE=Reverse back alpha:
+DLG_THEME_BG_ALPHA_OTHER_BACK_TITLE=Other back alpha:
+
DLG_THEME_COLOR_TITLE=text color
[TTSSH]
Modified: trunk/installer/release/lang_utf8/Japanese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Japanese.lng 2022-11-19 11:20:11 UTC (rev 10369)
+++ trunk/installer/release/lang_utf8/Japanese.lng 2022-11-19 16:34:23 UTC (rev 10370)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-11)
+; Updated by TeraTerm Project (2022-11-20)
[Tera Term]
DLG_SYSTEM_FONT=ＭＳ Ｐゴシック,12,128
@@ -555,6 +555,7 @@
BTN_CANCEL=キャンセル
BTN_CLOSE=閉じる(&C)
BTN_HELP=ヘルプ(&H)
+BTN_DEFAULT=デフォルト
; help
HELPFILE=teratermj.chm
@@ -570,6 +571,8 @@
; theme
DLG_THEME_PREVIEW_FILE_TITLE=プレビュー/ファイル
+DLG_THEME_PREVIEW_FILE_LOAD=読み込み
+DLG_THEME_PREVIEW_FILE_SAVE=保存
DLG_THEME_BG_TITLE=背景画像
DLG_THEME_BG_IMAGEFILE=背景画像ファイル
Modified: trunk/installer/release/lang_utf8/Korean.lng
===================================================================
--- trunk/installer/release/lang_utf8/Korean.lng 2022-11-19 11:20:11 UTC (rev 10369)
+++ trunk/installer/release/lang_utf8/Korean.lng 2022-11-19 16:34:23 UTC (rev 10370)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-11)
+; Updated by TeraTerm Project (2022-11-20)
; Last translated (Korean language) by Daehong Kim (2013-07-25)
[Tera Term]
@@ -556,6 +556,7 @@
BTN_CANCEL=취소
BTN_CLOSE=닫기
BTN_HELP=도움말(&H)
+BTN_DEFAULT=Default
; help
HELPFILE=teraterm.chm
@@ -568,10 +569,17 @@
; theme
DLG_THEME_PREVIEW_FILE_TITLE=preview/file
+DLG_THEME_PREVIEW_FILE_LOAD=Load
+DLG_THEME_PREVIEW_FILE_SAVE=Save
DLG_THEME_BG_TITLE=background image
-DLG_THEME_BG_REVERSE_TEXT_BG_ALPHA_TITLE=reverse text bg alpha
+DLG_THEME_BG_IMAGEFILE=background image file
+DLG_THEME_BG_ALPHA_TITLE=background image alpha
+DLG_THEME_BG_ALPHA_TEXT_BACK_ALPHA_TITLE=Normal back alpha(Opaque right direction):
+DLG_THEME_BG_ALPHA_REVERSE_TEXT_BACK_ALPHA_TITLE=Reverse back alpha:
+DLG_THEME_BG_ALPHA_OTHER_BACK_TITLE=Other back alpha:
+
DLG_THEME_COLOR_TITLE=text color
[TTSSH]
Modified: trunk/installer/release/lang_utf8/Russian.lng
===================================================================
--- trunk/installer/release/lang_utf8/Russian.lng 2022-11-19 11:20:11 UTC (rev 10369)
+++ trunk/installer/release/lang_utf8/Russian.lng 2022-11-19 16:34:23 UTC (rev 10370)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-11)
+; Updated by TeraTerm Project (2022-11-20)
; Last translated (Russian language) by Ryumik Sergey (2017-07-19)
[Tera Term]
@@ -556,6 +556,7 @@
BTN_CANCEL=Выйти
BTN_CLOSE=Закрыть
BTN_HELP=&Помощь
+BTN_DEFAULT=Default
; help
HELPFILE=teraterm.chm
@@ -568,10 +569,17 @@
; theme
DLG_THEME_PREVIEW_FILE_TITLE=preview/file
+DLG_THEME_PREVIEW_FILE_LOAD=Load
+DLG_THEME_PREVIEW_FILE_SAVE=Save
DLG_THEME_BG_TITLE=background image
-DLG_THEME_BG_REVERSE_TEXT_BG_ALPHA_TITLE=reverse text bg alpha
+DLG_THEME_BG_IMAGEFILE=background image file
+DLG_THEME_BG_ALPHA_TITLE=background image alpha
+DLG_THEME_BG_ALPHA_TEXT_BACK_ALPHA_TITLE=Normal back alpha(Opaque right direction):
+DLG_THEME_BG_ALPHA_REVERSE_TEXT_BACK_ALPHA_TITLE=Reverse back alpha:
+DLG_THEME_BG_ALPHA_OTHER_BACK_TITLE=Other back alpha:
+
DLG_THEME_COLOR_TITLE=text color
[TTSSH]
Modified: trunk/installer/release/lang_utf8/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Simplified Chinese.lng 2022-11-19 11:20:11 UTC (rev 10369)
+++ trunk/installer/release/lang_utf8/Simplified Chinese.lng 2022-11-19 16:34:23 UTC (rev 10370)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-11)
+; Updated by TeraTerm Project (2022-11-20)
; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11)
[Tera Term]
@@ -556,6 +556,7 @@
BTN_CANCEL=取消
BTN_CLOSE=关闭
BTN_HELP=帮助
+BTN_DEFAULT=Default
; help
HELPFILE=teratermj.chm
@@ -568,10 +569,17 @@
; theme
DLG_THEME_PREVIEW_FILE_TITLE=preview/file
+DLG_THEME_PREVIEW_FILE_LOAD=Load
+DLG_THEME_PREVIEW_FILE_SAVE=Save
DLG_THEME_BG_TITLE=background image
-DLG_THEME_BG_REVERSE_TEXT_BG_ALPHA_TITLE=reverse text bg alpha
+DLG_THEME_BG_IMAGEFILE=background image file
+DLG_THEME_BG_ALPHA_TITLE=background image alpha
+DLG_THEME_BG_ALPHA_TEXT_BACK_ALPHA_TITLE=Normal back alpha(Opaque right direction):
+DLG_THEME_BG_ALPHA_REVERSE_TEXT_BACK_ALPHA_TITLE=Reverse back alpha:
+DLG_THEME_BG_ALPHA_OTHER_BACK_TITLE=Other back alpha:
+
DLG_THEME_COLOR_TITLE=text color
[TTSSH]
Modified: trunk/installer/release/lang_utf8/Spanish.lng
===================================================================
--- trunk/installer/release/lang_utf8/Spanish.lng 2022-11-19 11:20:11 UTC (rev 10369)
+++ trunk/installer/release/lang_utf8/Spanish.lng 2022-11-19 16:34:23 UTC (rev 10370)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-11)
+; Updated by TeraTerm Project (2022-11-20)
; Traducido por Filiberto Olguin Ascona.
[Tera Term]
@@ -422,7 +422,7 @@
DLG_WINLIST_TITLE=Tera Term: Window list
DLG_WINLIST_LABEL=&Window:
DLG_WINLIST_OPEN=&Open
-DLG_WINLSIT_CLOSEWIN=&Close window
+DLG_WINLIST_CLOSEWIN=&Close window
MSG_FIND_DIR_ERROR=Cannot find directory
@@ -512,6 +512,7 @@
BTN_CANCEL=Cancel
BTN_CLOSE=Close
BTN_HELP=&Help
+BTN_DEFAULT=Default
; help
HELPFILE=teraterm.chm
@@ -524,10 +525,17 @@
; theme
DLG_THEME_PREVIEW_FILE_TITLE=preview/file
+DLG_THEME_PREVIEW_FILE_LOAD=Load
+DLG_THEME_PREVIEW_FILE_SAVE=Save
DLG_THEME_BG_TITLE=background image
-DLG_THEME_BG_REVERSE_TEXT_BG_ALPHA_TITLE=reverse text bg alpha
+DLG_THEME_BG_IMAGEFILE=background image file
+DLG_THEME_BG_ALPHA_TITLE=background image alpha
+DLG_THEME_BG_ALPHA_TEXT_BACK_ALPHA_TITLE=Normal back alpha(Opaque right direction):
+DLG_THEME_BG_ALPHA_REVERSE_TEXT_BACK_ALPHA_TITLE=Reverse back alpha:
+DLG_THEME_BG_ALPHA_OTHER_BACK_TITLE=Other back alpha:
+
DLG_THEME_COLOR_TITLE=text color
[TTSSH]
Modified: trunk/installer/release/lang_utf8/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Traditional Chinese.lng 2022-11-19 11:20:11 UTC (rev 10369)
+++ trunk/installer/release/lang_utf8/Traditional Chinese.lng 2022-11-19 16:34:23 UTC (rev 10370)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-11-11)
+; Updated by TeraTerm Project (2022-11-20)
; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20)
[Tera Term]
@@ -556,6 +556,7 @@
BTN_CANCEL=取消
BTN_CLOSE=關閉
BTN_HELP=幫助
+BTN_DEFAULT=Default
; help
HELPFILE=teratermj.chm
@@ -568,10 +569,17 @@
; theme
DLG_THEME_PREVIEW_FILE_TITLE=preview/file
+DLG_THEME_PREVIEW_FILE_LOAD=Load
+DLG_THEME_PREVIEW_FILE_SAVE=Save
DLG_THEME_BG_TITLE=background image
-DLG_THEME_BG_REVERSE_TEXT_BG_ALPHA_TITLE=reverse text bg alpha
+DLG_THEME_BG_IMAGEFILE=background image file
+DLG_THEME_BG_ALPHA_TITLE=background image alpha
+DLG_THEME_BG_ALPHA_TEXT_BACK_ALPHA_TITLE=Normal back alpha(Opaque right direction):
+DLG_THEME_BG_ALPHA_REVERSE_TEXT_BACK_ALPHA_TITLE=Reverse back alpha:
+DLG_THEME_BG_ALPHA_OTHER_BACK_TITLE=Other back alpha:
+
DLG_THEME_COLOR_TITLE=text color
[TTSSH]
Modified: trunk/teraterm/teraterm/themedlg.cpp
===================================================================
--- trunk/teraterm/teraterm/themedlg.cpp 2022-11-19 11:20:11 UTC (rev 10369)
+++ trunk/teraterm/teraterm/themedlg.cpp 2022-11-19 16:34:23 UTC (rev 10370)
@@ -68,28 +68,24 @@
HINSTANCE hInst;
TComVar *pcv;
TTTSet *pts;
- DLGTEMPLATE *dlg_templ;
- TipWin2 *tipwin;
HWND hVTWin;
// file tab
struct {
- DLGTEMPLATE *dlg_templ;
+ int dummy;
} FileTab;
// bg theme tab
- BGTheme bg_theme;
struct {
- DLGTEMPLATE *dlg_templ;
- TipWin2 *tipwin;
BGTheme bg_theme;
} BGTab;
// color theme tab
struct {
+ TipWin2 *tipwin;
TColorTheme color_theme;
- } color_tab;
+ } ColorTab;
struct {
BGTheme bg_theme;
TColorTheme color_theme;
- } backup;
+ } Backup;
} ThemeDlgData;
static void SetWindowTextColor(HWND hWnd, COLORREF color)
@@ -229,7 +225,7 @@
SendDlgItemMessageW(hWnd, IDC_BGIMG_COMBO, CB_SETITEMDATA, index, st->id);
}
- ResetControls(hWnd, &dlg_data->bg_theme);
+ ResetControls(hWnd, &dlg_data->BGTab.bg_theme);
return TRUE;
break;
}
@@ -276,11 +272,11 @@
OpenHelpCV(dlg_data->pcv, HH_HELP_CONTEXT, HlpMenuSetupAdditionalTheme);
break;
case PSN_KILLACTIVE: {
- ReadFromDialog(hWnd, &dlg_data->bg_theme);
+ ReadFromDialog(hWnd, &dlg_data->BGTab.bg_theme);
break;
}
case PSN_SETACTIVE: {
- ResetControls(hWnd, &dlg_data->bg_theme);
+ ResetControls(hWnd, &dlg_data->BGTab.bg_theme);
break;
}
default:
@@ -467,15 +463,21 @@
static INT_PTR CALLBACK ColorThemeProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
{
static const DlgTextInfo TextInfos[] = {
- {0, "DLG_GEN_TITLE"},
+ {IDC_COLOR_DEFAULT_BUTTON, "BTN_DEFAULT"},
};
ThemeDlgData *dlg_data = (ThemeDlgData *)GetWindowLongPtr(hWnd, DWLP_USER);
+ TTTSet *ts = dlg_data == NULL ? NULL : dlg_data->pts;
switch (msg) {
case WM_INITDIALOG: {
dlg_data = (ThemeDlgData *)(((PROPSHEETPAGEW_V1 *)lp)->lParam);
+ ts = dlg_data->pts;
SetWindowLongPtr(hWnd, DWLP_USER, (LONG_PTR)dlg_data);
+ SetDlgTextsW(hWnd, TextInfos, _countof(TextInfos), ts->UILanguageFileW);
+ dlg_data->ColorTab.tipwin = TipWin2Create(NULL, hWnd);
+ TipWin2SetTextW(dlg_data->ColorTab.tipwin, IDC_COLOR_LIST, L"Double click to open color picker");
+
{
HWND hWndList = GetDlgItem(hWnd, IDC_COLOR_LIST);
LV_COLUMNA lvcol;
@@ -501,7 +503,7 @@
SendMessage(hWndList, LVM_INSERTCOLUMNA, 3, (LPARAM)&lvcol);
}
- SetColor(&dlg_data->color_tab.color_theme);
+ SetColor(&dlg_data->ColorTab.color_theme);
SetColorListCtrl(hWnd);
break;
}
@@ -509,8 +511,8 @@
switch (wp) {
case IDC_COLOR_DEFAULT_BUTTON | (BN_CLICKED << 16): {
// \x83f\x83t\x83H\x83\x8B\x83g
- ThemeGetColorDefault(&dlg_data->color_tab.color_theme);
- SetColor(&dlg_data->color_tab.color_theme);
+ ThemeGetColorDefault(&dlg_data->ColorTab.color_theme);
+ SetColor(&dlg_data->ColorTab.color_theme);
SetColorListCtrl(hWnd);
break;
}
@@ -600,19 +602,28 @@
OpenHelpCV(dlg_data->pcv, HH_HELP_CONTEXT, HlpMenuSetupAdditionalTheme);
break;
case PSN_KILLACTIVE: {
- RestoreColor(&dlg_data->color_tab.color_theme);
+ RestoreColor(&dlg_data->ColorTab.color_theme);
break;
}
case PSN_SETACTIVE: {
- SetColor(&dlg_data->color_tab.color_theme);
+ SetColor(&dlg_data->ColorTab.color_theme);
SetColorListCtrl(hWnd);
break;
}
+ case TTN_POP:
+ // 1\x89\xAF\x95\\x8E\xA6\x82\xB7\x82邽\x82߁A\x95\xB6\x82\xBD\x82\xE7\x8D폜\x82\xB7\x82\xE9
+ TipWin2SetTextW(dlg_data->ColorTab.tipwin, IDC_COLOR_LIST, NULL);
+ break;
default:
break;
}
break;
}
+ case WM_DESTROY:
+ TipWin2Destroy(dlg_data->ColorTab.tipwin);
+ dlg_data->ColorTab.tipwin = NULL;
+ break;
+
default:
return FALSE;
}
@@ -671,7 +682,8 @@
static INT_PTR CALLBACK FileProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
{
static const DlgTextInfo TextInfos[] = {
- {0, "DLG_GEN_TITLE"},
+ { IDC_FILE_LOAD_BUTTON, "DLG_THEME_PREVIEW_FILE_LOAD" },
+ { IDC_FILE_SAVE_BUTTON, "DLG_THEME_PREVIEW_FILE_SAVE" },
};
ThemeDlgData *dlg_data = (ThemeDlgData *)GetWindowLongPtr(hWnd, DWLP_USER);
TTTSet *ts = dlg_data == NULL ? NULL : dlg_data->pts;
@@ -681,20 +693,8 @@
dlg_data = (ThemeDlgData *)(((PROPSHEETPAGEW_V1 *)lp)->lParam);
ts = dlg_data->pts;
SetWindowLongPtr(hWnd, DWLP_USER, (LONG_PTR)dlg_data);
+ SetDlgTextsW(hWnd, TextInfos, _countof(TextInfos), dlg_data->pts->UILanguageFileW);
- dlg_data->tipwin = TipWin2Create(NULL, hWnd);
-#if 0
- TipWin2SetTextW(dlg_data->tipwin, IDC_BUTTON1,
- L"\x83e\x81[\x83}\x83t\x83B\x83A\x83\x8B\x82\xF0\x93ǂݍ\x9E\x82\xDE\n"
- );
- TipWin2SetTextW(dlg_data->tipwin, IDC_BUTTON3,
- L"\x8C\xBB\x8D݂̃_\x83C\x83A\x83\x8D\x83O\x82̏\xF3\x91Ԃ\xF0\x90ݒ肵\x82ăe\x81[\x83}\x83t\x83@\x83C\x83\x8B\x82ɏ\x91\x82\xAB\x8D\x9E\x82\xDE\n"
- );
- TipWin2SetTextW(dlg_data->tipwin, IDC_BUTTON4,
- L"\x8C\xBB\x8D݂̃_\x83C\x83A\x83\x8D\x83O\x82̏\xF3\x91Ԃ\xF0\x90ݒ肷\x82\xE9\n"
- L"\x82\xB1\x82̃y\x81[\x83W\x82̐ݒ\xE8\x82͏\x91\x82\xAB\x8Fo\x82\xB3\x82Ȃ\xA2\x82Ǝ\xB8\x82\xED\x82\xEA\x82\xE9\n"
- );
-#endif
EnableWindow(GetDlgItem(hWnd, IDC_FILE_SAVE_BUTTON), FALSE);
return TRUE;
break;
@@ -704,8 +704,10 @@
switch (nmhdr->code) {
case PSN_APPLY: {
// OK
+#if 0
TipWin2Destroy(dlg_data->tipwin);
dlg_data->tipwin = NULL;
+#endif
break;
}
case PSN_HELP:
@@ -720,8 +722,8 @@
switch (wp) {
case IDC_FILE_UNDO_BUTTON | (BN_CLICKED << 16): {
// undo,\x8C\xB3\x82ɖ߂\xB7
- dlg_data->bg_theme = dlg_data->backup.bg_theme;
- dlg_data->color_tab.color_theme = dlg_data->backup.color_theme;
+ dlg_data->BGTab.bg_theme = dlg_data->Backup.bg_theme;
+ dlg_data->ColorTab.color_theme = dlg_data->Backup.color_theme;
goto set;
break;
}
@@ -728,8 +730,8 @@
case IDC_FILE_PREVIEW_BUTTON | (BN_CLICKED << 16): {
set:
// preview
- ThemeSetBG(&dlg_data->bg_theme);
- ThemeSetColor(&dlg_data->color_tab.color_theme);
+ ThemeSetBG(&dlg_data->BGTab.bg_theme);
+ ThemeSetColor(&dlg_data->ColorTab.color_theme);
BGSetupPrimary(TRUE);
InvalidateRect(dlg_data->hVTWin, NULL, FALSE);
break;
@@ -758,7 +760,7 @@
ofn.lpstrTitle = L"select theme file";
if (GetOpenFileNameW(&ofn)) {
- ThemeLoad(theme_file, &dlg_data->bg_theme, &dlg_data->color_tab.color_theme);
+ ThemeLoad(theme_file, &dlg_data->BGTab.bg_theme, &dlg_data->ColorTab.color_theme);
static const TTMessageBoxInfoW info = {
"Tera Term",
@@ -767,9 +769,8 @@
MB_YESNO | MB_ICONWARNING
};
if (TTMessageBoxW(hWnd, &info, ts->UILanguageFileW) == IDYES) {
- ThemeSetColor(&dlg_data->color_tab.color_theme);
- ThemeSetBG(&dlg_data->bg_theme);
- //SetColor(&dlg_data->color_tab.color_theme);
+ ThemeSetColor(&dlg_data->ColorTab.color_theme);
+ ThemeSetBG(&dlg_data->BGTab.bg_theme);
BGSetupPrimary(TRUE);
InvalidateRect(dlg_data->hVTWin, NULL, FALSE);
@@ -800,11 +801,11 @@
if (GetSaveFileNameW(&ofn)) {
LRESULT checked = SendDlgItemMessageA(hWnd, IDC_FILE_SAVE_BG_CHECK, BM_GETCHECK, 0, 0);
if (checked & BST_CHECKED) {
- ThemeSaveBG(&dlg_data->bg_theme, theme_file);
+ ThemeSaveBG(&dlg_data->BGTab.bg_theme, theme_file);
}
checked = SendDlgItemMessageA(hWnd, IDC_FILE_SAVE_COLOR_CHECK, BM_GETCHECK, 0, 0);
if (checked & BST_CHECKED) {
- ThemeSaveColor(&dlg_data->color_tab.color_theme, theme_file);
+ ThemeSaveColor(&dlg_data->ColorTab.color_theme, theme_file);
}
}
break;
@@ -910,7 +911,7 @@
OpenHelpCV(dlg_data->pcv, HH_HELP_CONTEXT, HlpMenuSetupAdditionalTheme);
break;
case PSN_KILLACTIVE: {
- BGTheme* bg_theme = &dlg_data->bg_theme;
+ BGTheme *bg_theme = &dlg_data->BGTab.bg_theme;
bg_theme->BGReverseTextAlpha = (BYTE)SendDlgItemMessageA(hWnd, IDC_REVERSE_TEXT_ALPHA_SLIDER, TBM_GETPOS, 0, 0);
bg_theme->TextBackAlpha = (BYTE)SendDlgItemMessageA(hWnd, IDC_TEXT_ALPHA_SLIDER, TBM_GETPOS, 0, 0);
bg_theme->BackAlpha = (BYTE)SendDlgItemMessageA(hWnd, IDC_BACK_ALPHA_SLIDER, TBM_GETPOS, 0, 0);
@@ -917,7 +918,7 @@
break;
}
case PSN_SETACTIVE: {
- BGTheme* bg_theme = &dlg_data->bg_theme;
+ BGTheme *bg_theme = &dlg_data->BGTab.bg_theme;
SendDlgItemMessageA(hWnd, IDC_REVERSE_TEXT_ALPHA_SLIDER, TBM_SETPOS, TRUE, bg_theme->BGReverseTextAlpha);
SendDlgItemMessageA(hWnd, IDC_TEXT_ALPHA_SLIDER, TBM_SETPOS, TRUE, bg_theme->TextBackAlpha);
SendDlgItemMessageA(hWnd, IDC_BACK_ALPHA_SLIDER, TBM_SETPOS, TRUE, bg_theme->BackAlpha);
@@ -959,7 +960,7 @@
wchar_t *title;
GetI18nStrWW("Tera Term", "DLG_THEME_BG_ALPHA_TITLE",
- L"bg alpha", dlg_data->pts->UILanguageFileW, &title);
+ L"background image alpha", dlg_data->pts->UILanguageFileW, &title);
PROPSHEETPAGEW_V1 psp = {};
psp.dwSize = sizeof(psp);
@@ -1017,24 +1018,24 @@
dlg_data->pcv = pcv;
dlg_data->pts = pcv->ts;
dlg_data->hVTWin = pcv->HWin;
- ThemeGetBG(&dlg_data->bg_theme);
- dlg_data->backup.bg_theme = dlg_data->bg_theme;
- ThemeGetColor(&dlg_data->color_tab.color_theme);
- dlg_data->backup.color_theme = dlg_data->color_tab.color_theme;
+ ThemeGetBG(&dlg_data->BGTab.bg_theme);
+ dlg_data->Backup.bg_theme = dlg_data->BGTab.bg_theme;
+ ThemeGetColor(&dlg_data->ColorTab.color_theme);
+ dlg_data->Backup.color_theme = dlg_data->ColorTab.color_theme;
CThemeDlg dlg(hInst, hWnd, dlg_data);
INT_PTR r = dlg.DoModal();
if (r == 0) {
// cancel\x8E\x9E\x81A\x83o\x83b\x83N\x83A\x83b\x83v\x93\xE0\x97e\x82ɖ߂\xB7
- ThemeSetBG(&dlg_data->backup.bg_theme);
- ThemeSetColor(&dlg_data->color_tab.color_theme);
+ ThemeSetBG(&dlg_data->Backup.bg_theme);
+ ThemeSetColor(&dlg_data->Backup.color_theme);
BGSetupPrimary(TRUE);
InvalidateRect(dlg_data->hVTWin, NULL, FALSE);
}
else if (r >= 1) {
// ok\x82Ȃ\xC7(Changes were saved by the user)
- ThemeSetBG(&dlg_data->bg_theme);
- ThemeSetColor(&dlg_data->color_tab.color_theme);
+ ThemeSetBG(&dlg_data->BGTab.bg_theme);
+ ThemeSetColor(&dlg_data->ColorTab.color_theme);
BGSetupPrimary(TRUE);
InvalidateRect(dlg_data->hVTWin, NULL, FALSE);
}
Modified: trunk/teraterm/teraterm/themedlg.rc
===================================================================
--- trunk/teraterm/teraterm/themedlg.rc 2022-11-19 11:20:11 UTC (rev 10369)
+++ trunk/teraterm/teraterm/themedlg.rc 2022-11-19 16:34:23 UTC (rev 10370)
@@ -110,11 +110,11 @@
STYLE DS_SETFONT | WS_CHILD | WS_BORDER
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
- LTEXT "TextBackAlpha (Opaque right direction):",IDC_TEXT_BACK_ALPHA_TITLE,14,6,195,8
+ LTEXT "Normal back alpha(Opaque right direction):",IDC_TEXT_BACK_ALPHA_TITLE,14,6,195,8
CONTROL "",IDC_TEXT_ALPHA_SLIDER,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,14,17,151,15
- LTEXT "ReverseTextBackAlpha:",IDC_REVERSE_TEXT_BACK_ALPHA_TITLE,14,35,195,8
+ LTEXT "Reverse back alpha:",IDC_REVERSE_TEXT_BACK_ALPHA_TITLE,14,35,195,8
CONTROL "",IDC_REVERSE_TEXT_ALPHA_SLIDER,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,14,46,151,15
- LTEXT "OtherBackAlpha:",IDC_OTHER_TEXT_BACK_ALPHA_TITLE,14,64,195,8
+ LTEXT "Other back alpha:",IDC_OTHER_TEXT_BACK_ALPHA_TITLE,14,64,195,8
CONTROL "",IDC_BACK_ALPHA_SLIDER,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,14,75,151,15
END