diff options
Diffstat (limited to 'src/modules')
| -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 |
3 files changed, 30 insertions, 33 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;
|