diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/langpack/langpack.h | 1 | ||||
| -rw-r--r-- | src/modules/langpack/lpopts.cpp | 1 | ||||
| -rw-r--r-- | src/modules/options/options.cpp | 61 | ||||
| -rw-r--r-- | src/resource.h | 1 | ||||
| -rw-r--r-- | src/resource.rc | 16 |
5 files changed, 37 insertions, 43 deletions
diff --git a/src/modules/langpack/langpack.h b/src/modules/langpack/langpack.h index 9d6401c71e..137fabc245 100644 --- a/src/modules/langpack/langpack.h +++ b/src/modules/langpack/langpack.h @@ -48,7 +48,6 @@ struct LANGPACK_INFO char szAuthors[2048];
char szAuthorEmail[128];
char szLastModifiedUsing[64];
- char szPluginsIncluded[4080];
FILETIME ftFileDate;
TCHAR tszFileName[MAX_PATH]; /* just the file name itself */
TCHAR tszFullPath[MAX_PATH]; /* full path to the langpack */
diff --git a/src/modules/langpack/lpopts.cpp b/src/modules/langpack/lpopts.cpp index 39493c6e8b..33fd36e2a0 100644 --- a/src/modules/langpack/lpopts.cpp +++ b/src/modules/langpack/lpopts.cpp @@ -71,7 +71,6 @@ static void DisplayPackInfo(HWND hwndDlg, const LANGPACK_INFO *pack) 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/modules/options/options.cpp b/src/modules/options/options.cpp index 38efd94b32..4812506681 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -1108,41 +1108,40 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L case IDC_APPLY:
if (LOWORD(wParam) == IDOK && GetParent(GetFocus()) == GetDlgItem(hdlg, IDC_KEYWORD_FILTER))
return TRUE;
- else {
- PSHNOTIFY pshn;
- EnableWindow(GetDlgItem(hdlg, IDC_APPLY), FALSE);
- SetFocus(hwndTree);
- opd = dat->getCurrent();
- if (opd != NULL) {
- pshn.lParam = 0;
- pshn.hdr.code = PSN_KILLACTIVE;
- pshn.hdr.hwndFrom = opd->hwnd;
- pshn.hdr.idFrom = LOWORD(wParam);
- if (SendMessage(opd->hwnd, WM_NOTIFY, 0, (LPARAM)&pshn))
- break;
- }
+ PSHNOTIFY pshn;
+ EnableWindow(GetDlgItem(hdlg, IDC_APPLY), FALSE);
+ SetFocus(hwndTree);
- pshn.hdr.code = PSN_APPLY;
- for (int i = 0; i < dat->arOpd.getCount(); i++) {
- if (dat->arOpd[i]->hwnd == NULL || !dat->arOpd[i]->changed) continue;
- dat->arOpd[i]->changed = 0;
- pshn.hdr.hwndFrom = dat->arOpd[i]->hwnd;
- if (SendMessage(dat->arOpd[i]->hwnd, WM_NOTIFY, 0, (LPARAM)&pshn) == PSNRET_INVALID_NOCHANGEPAGE) {
- dat->hCurrentPage = dat->arOpd[i]->hTreeItem;
- TreeView_SelectItem(hwndTree, dat->hCurrentPage);
- if (opd)
- ShowWindow(opd->hwnd, SW_HIDE);
- dat->currentPage = i;
- if (opd)
- ShowWindow(opd->hwnd, SW_SHOW);
- return 0;
- }
- }
+ opd = dat->getCurrent();
+ if (opd != NULL) {
+ pshn.lParam = 0;
+ pshn.hdr.code = PSN_KILLACTIVE;
+ pshn.hdr.hwndFrom = opd->hwnd;
+ pshn.hdr.idFrom = LOWORD(wParam);
+ if (SendMessage(opd->hwnd, WM_NOTIFY, 0, (LPARAM)&pshn))
+ break;
+ }
- if (LOWORD(wParam) == IDOK)
- DestroyWindow(hdlg);
+ pshn.hdr.code = PSN_APPLY;
+ for (int i = 0; i < dat->arOpd.getCount(); i++) {
+ if (dat->arOpd[i]->hwnd == NULL || !dat->arOpd[i]->changed) continue;
+ dat->arOpd[i]->changed = 0;
+ pshn.hdr.hwndFrom = dat->arOpd[i]->hwnd;
+ if (SendMessage(dat->arOpd[i]->hwnd, WM_NOTIFY, 0, (LPARAM)&pshn) == PSNRET_INVALID_NOCHANGEPAGE) {
+ dat->hCurrentPage = dat->arOpd[i]->hTreeItem;
+ TreeView_SelectItem(hwndTree, dat->hCurrentPage);
+ if (opd)
+ ShowWindow(opd->hwnd, SW_HIDE);
+ dat->currentPage = i;
+ if (opd)
+ ShowWindow(opd->hwnd, SW_SHOW);
+ return 0;
+ }
}
+
+ if (LOWORD(wParam) == IDOK)
+ DestroyWindow(hdlg);
}
break;
diff --git a/src/resource.h b/src/resource.h index 645aa3ea39..2774806f79 100644 --- a/src/resource.h +++ b/src/resource.h @@ -197,7 +197,6 @@ #define IDC_LANGLOCALE 1014
#define IDC_ENABLEUPNP 1015
#define IDC_VALIDATESSL 1016
-#define IDC_PLUGINSINCLUDED 1016
#define IDC_ONLYAVAIL 1017
#define IDC_MORELANG 1017
#define IDC_METALIST 1018
diff --git a/src/resource.rc b/src/resource.rc index d384d67c5e..34597bf494 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -824,14 +824,14 @@ BEGIN CTEXT "(Lower ranks are preferred)",IDC_STATIC,51,99,162,8
END
-IDD_OPT_LANGUAGES DIALOGEX 0, 0, 301, 232
+IDD_OPT_LANGUAGES DIALOGEX 0, 0, 301, 191
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
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
- RTEXT "Current language:", IDC_STATIC, 5, 7, 76, 8
- GROUPBOX "", IDC_LANGINFOFRAME, 5, 18, 291, 194, WS_GROUP
+ RTEXT "Current language:",IDC_STATIC,5,7,76,8
+ GROUPBOX "",IDC_LANGINFOFRAME,5,18,291,153,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
@@ -841,11 +841,9 @@ BEGIN 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
+ EDITTEXT IDC_LANGLOCALE,86,132,206,12,ES_READONLY | NOT WS_BORDER
+ PUSHBUTTON "Reload langpack",IDC_RELOAD,169,148,123,17
+ CONTROL "Download more language packs",IDC_MORELANG,"Hyperlink",WS_GROUP | WS_TABSTOP | 0x1,9,173,283,10
END
@@ -1132,7 +1130,7 @@ BEGIN VERTGUIDE, 86
VERTGUIDE, 292
VERTGUIDE, 296
- BOTTOMMARGIN, 227
+ BOTTOMMARGIN, 186
END
END
#endif // APSTUDIO_INVOKED
|