diff options
| -rw-r--r-- | src/modules/langpack/lpopts.cpp | 14 | ||||
| -rw-r--r-- | src/resource.h | 2 | ||||
| -rw-r--r-- | src/resource.rc | 32 |
3 files changed, 17 insertions, 31 deletions
diff --git a/src/modules/langpack/lpopts.cpp b/src/modules/langpack/lpopts.cpp index 8e9922cf76..39493c6e8b 100644 --- a/src/modules/langpack/lpopts.cpp +++ b/src/modules/langpack/lpopts.cpp @@ -67,23 +67,11 @@ static void DisplayPackInfo(HWND hwndDlg, const LANGPACK_INFO *pack) GetDateFormat((LCID)CallService(MS_LANGPACK_GETLOCALE, 0, 0), DATE_SHORTDATE, &stFileDate, NULL, szDate, SIZEOF(szDate));
SetDlgItemText(hwndDlg, IDC_LANGDATE, szDate);
- /* plugins included */
- SetDlgItemText_CP(hwndDlg, IDC_PLUGINSINCLUDED, pack->codepage, pack->szPluginsIncluded);
- if (pack->szPluginsIncluded[0]) {
- if (!IsWindowVisible(GetDlgItem(hwndDlg, IDC_PLUGINSINCLUDEDLABEL))) {
- ShowWindow(GetDlgItem(hwndDlg,IDC_PLUGINSINCLUDEDLABEL), SW_SHOW);
- ShowWindow(GetDlgItem(hwndDlg, IDC_PLUGINSINCLUDED), SW_SHOW);
- }
- }
- else {
- ShowWindow(GetDlgItem(hwndDlg, IDC_PLUGINSINCLUDEDLABEL), SW_HIDE);
- ShowWindow(GetDlgItem(hwndDlg, IDC_PLUGINSINCLUDED), SW_HIDE);
- }
-
/* general */
SetDlgItemText_CP(hwndDlg, IDC_LANGMODUSING, pack->codepage, pack->szLastModifiedUsing);
SetDlgItemText_CP(hwndDlg, IDC_LANGAUTHORS, pack->codepage, pack->szAuthors);
SetDlgItemText_CP(hwndDlg, IDC_LANGEMAIL, pack->codepage, pack->szAuthorEmail);
+ SetDlgItemText_CP(hwndDlg, IDC_PLUGINSINCLUDED, pack->codepage, pack->szPluginsIncluded);
SetDlgItemText(hwndDlg, IDC_LANGINFOFRAME, TranslateTS(pack->tszLanguage));
}
diff --git a/src/resource.h b/src/resource.h index b1dd8682bc..645aa3ea39 100644 --- a/src/resource.h +++ b/src/resource.h @@ -192,12 +192,10 @@ #define IDC_RELOAD 1011
#define IDC_SPECIFYPORTS 1013
#define IDC_ST_ENTERMSG 1013
-#define IDC_LANGLOCALELABEL 1013
#define IDC_ST_ENTERURL 1014
#define IDC_SPECIFYPORTSO 1014
#define IDC_LANGLOCALE 1014
#define IDC_ENABLEUPNP 1015
-#define IDC_PLUGINSINCLUDEDLABEL 1015
#define IDC_VALIDATESSL 1016
#define IDC_PLUGINSINCLUDED 1016
#define IDC_ONLYAVAIL 1017
diff --git a/src/resource.rc b/src/resource.rc index 2eabe4ceae..d384d67c5e 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -830,22 +830,22 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
COMBOBOX IDC_LANGUAGES,86,4,210,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "",IDC_LANGINFOFRAME,5,22,291,139,WS_GROUP
- RTEXT "Author(s):",IDC_LANGAUTHORSLABEL,9,32,72,9,SS_NOPREFIX
- EDITTEXT IDC_LANGAUTHORS,86,32,206,25,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
- RTEXT "E-mail:",IDC_LANGEMAILLABEL,9,61,72,8,SS_NOPREFIX
- CONTROL "",IDC_LANGEMAIL,"Hyperlink",WS_TABSTOP,86,61,206,10
- RTEXT "Last modified using:",IDC_LANGMODUSINGLABEL,9,74,72,9,SS_NOPREFIX
- EDITTEXT IDC_LANGMODUSING,86,74,206,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- RTEXT "Date:",IDC_LANGDATELABEL,9,87,72,9,SS_NOPREFIX
- EDITTEXT IDC_LANGDATE,86,87,206,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- RTEXT "Locale:",IDC_LANGLOCALELABEL,9,99,72,9,SS_NOPREFIX
- EDITTEXT IDC_LANGLOCALE,86,99,206,12,ES_READONLY | NOT WS_BORDER
- CONTROL "Download more language packs",IDC_MORELANG,"Hyperlink",WS_GROUP | WS_TABSTOP | 0x1,9,164,283,10
- RTEXT "Current language:",IDC_STATIC,5,7,76,8
- RTEXT "Plugins included:",IDC_PLUGINSINCLUDEDLABEL,9,112,72,9,SS_NOPREFIX
- EDITTEXT IDC_PLUGINSINCLUDED,86,112,205,24,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
- PUSHBUTTON "Reload langpack",IDC_RELOAD,169,140,123,17
+ RTEXT "Current language:", IDC_STATIC, 5, 7, 76, 8
+ GROUPBOX "", IDC_LANGINFOFRAME, 5, 18, 291, 194, WS_GROUP
+ RTEXT "Author(s):",IDC_LANGAUTHORSLABEL,9,29,72,9,SS_NOPREFIX
+ EDITTEXT IDC_LANGAUTHORS,86,27,206,61,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
+ RTEXT "E-mail:",IDC_LANGEMAILLABEL,9,92,72,8,SS_NOPREFIX
+ CONTROL "",IDC_LANGEMAIL,"Hyperlink",WS_TABSTOP,86,92,206,10
+ RTEXT "Last modified using:",IDC_LANGMODUSINGLABEL,9,105,72,9,SS_NOPREFIX
+ EDITTEXT IDC_LANGMODUSING,86,105,206,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ RTEXT "Date:",IDC_LANGDATELABEL,9,118,72,9,SS_NOPREFIX
+ EDITTEXT IDC_LANGDATE,86,118,206,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ RTEXT "Locale:",IDC_STATIC,9,132,72,9,SS_NOPREFIX
+ EDITTEXT IDC_LANGLOCALE, 86, 132, 206, 12, ES_READONLY | NOT WS_BORDER
+ RTEXT "Plugins included:",IDC_STATIC,9,150,72,9,SS_NOPREFIX
+ EDITTEXT IDC_PLUGINSINCLUDED,86,148,205,38,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
+ PUSHBUTTON "Reload langpack",IDC_RELOAD,169,190,123,17
+ CONTROL "Download more language packs", IDC_MORELANG, "Hyperlink", WS_GROUP | WS_TABSTOP | 0x1, 9, 215, 283, 10
END
|