summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mir_app/src/lpopts.cpp53
-rw-r--r--src/mir_app/src/options.cpp26
2 files changed, 30 insertions, 49 deletions
diff --git a/src/mir_app/src/lpopts.cpp b/src/mir_app/src/lpopts.cpp
index af5c341c46..0e1efe5794 100644
--- a/src/mir_app/src/lpopts.cpp
+++ b/src/mir_app/src/lpopts.cpp
@@ -53,7 +53,7 @@ class CLangpackDlg : public CDlgBase
CCtrlBase m_date;
CCtrlBase m_locale;
CCtrlButton m_reload;
-
+
CCtrlHyperlink m_more;
void LoadLangpacks();
@@ -102,10 +102,8 @@ void CLangpackDlg::LoadLangpacks()
bool isPackFound = false;
WIN32_FIND_DATA wfd;
HANDLE hFind = FindFirstFile(tszFullPath, &wfd);
- if (hFind != INVALID_HANDLE_VALUE)
- {
- do
- {
+ if (hFind != INVALID_HANDLE_VALUE) {
+ do {
if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
continue;
@@ -113,11 +111,9 @@ void CLangpackDlg::LoadLangpacks()
mir_wstrcat(tszFullPath, wfd.cFileName);
LANGPACK_INFO pack;
- if (!LoadLangPackDescr(tszFullPath, &pack))
- {
+ if (!LoadLangPackDescr(tszFullPath, &pack)) {
pack.ftFileDate = wfd.ftLastWriteTime;
- if (langpack && !mir_wstrcmpi(langpack, wfd.cFileName))
- {
+ if (langpack && !mir_wstrcmpi(langpack, wfd.cFileName)) {
if (!isPackFound) pack.flags |= LPF_ENABLED;
isPackFound = true;
}
@@ -137,12 +133,10 @@ void CLangpackDlg::LoadLangpacks()
DWORD v = CallService(MS_SYSTEM_GETVERSION, 0, 0);
pack.szLastModifiedUsing.Format("%d.%d.%d", ((v >> 24) & 0xFF), ((v >> 16) & 0xFF), ((v >> 8) & 0xFF));
- if (GetModuleFileName(NULL, pack.tszFullPath, _countof(pack.tszFullPath)))
- {
+ if (GetModuleFileName(NULL, pack.tszFullPath, _countof(pack.tszFullPath))) {
mir_wstrcpy(pack.tszFileName, L"default");
HANDLE hFile = CreateFile(pack.tszFileName, 0, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
- if (hFile != INVALID_HANDLE_VALUE)
- {
+ if (hFile != INVALID_HANDLE_VALUE) {
GetFileTime(hFile, NULL, NULL, &pack.ftFileDate);
CloseHandle(hFile);
}
@@ -164,12 +158,11 @@ void CLangpackDlg::LoadLangpack(LANGPACK_INFO *pack)
mir_snwprintf(tszName, L"%s [%s]",
TranslateW(pack->tszLanguage),
pack->flags & LPF_DEFAULT ? TranslateT("built-in") : pack->tszFileName);
- UINT message = pack->flags & LPF_DEFAULT ? CB_INSERTSTRING : CB_ADDSTRING;
- int idx = pack->flags & LPF_DEFAULT
+
+ int idx = (pack->flags & LPF_DEFAULT)
? m_languages.InsertString(tszName, 0, (LPARAM)pack2)
: m_languages.AddString(tszName, (LPARAM)pack2);
- if (pack->flags & LPF_ENABLED)
- {
+ if (pack->flags & LPF_ENABLED) {
m_languages.SetCurSel(idx);
DisplayPackInfo(pack);
m_reload.Enable(!(pack->flags & LPF_DEFAULT));
@@ -178,8 +171,7 @@ void CLangpackDlg::LoadLangpack(LANGPACK_INFO *pack)
void CLangpackDlg::DisplayPackInfo(const LANGPACK_INFO *pack)
{
- if (!(pack->flags & LPF_NOLOCALE))
- {
+ if (!(pack->flags & LPF_NOLOCALE)) {
wchar_t szLocaleName[256], szLanguageName[128], szContryName[128];
if (!GetLocaleInfo(pack->Locale, WINVER >= _WIN32_WINNT_WIN7 ? LOCALE_SENGLISHLANGUAGENAME : LOCALE_SENGLANGUAGE, szLanguageName, _countof(szLanguageName)))
@@ -187,11 +179,9 @@ void CLangpackDlg::DisplayPackInfo(const LANGPACK_INFO *pack)
if (!GetLocaleInfo(pack->Locale, WINVER >= _WIN32_WINNT_WIN7 ? LOCALE_SENGLISHCOUNTRYNAME : LOCALE_SENGCOUNTRY, szContryName, _countof(szContryName)))
szContryName[0] = '\0';
- if (szLanguageName[0] && szContryName[0])
- {
+ if (szLanguageName[0] && szContryName[0]) {
mir_snwprintf(szLocaleName, L"%s (%s)", TranslateW(szLanguageName), TranslateW(szContryName));
- if (!IsValidLocale(pack->Locale, LCID_INSTALLED))
- {
+ if (!IsValidLocale(pack->Locale, LCID_INSTALLED)) {
wchar_t *pszIncompat;
pszIncompat = TranslateT("(incompatible)");
szLocaleName[_countof(szLocaleName) - mir_wstrlen(pszIncompat) - 1] = 0;
@@ -228,8 +218,7 @@ void CLangpackDlg::Languages_OnChange(CCtrlBase*)
void CLangpackDlg::Email_OnClick(CCtrlBase*)
{
ptrA email(m_email.GetTextA());
- if (email)
- {
+ if (email) {
char buf[512];
mir_snprintf(buf, "mailto:%s", email);
Utils_OpenUrl(buf);
@@ -251,11 +240,9 @@ void CLangpackDlg::OnApply()
wchar_t tszPath[MAX_PATH]; tszPath[0] = 0;
int idx = m_languages.GetCurSel();
int count = m_languages.GetCount();
- for (int i = 0; i < count; i++)
- {
+ for (int i = 0; i < count; i++) {
LANGPACK_INFO *pack = (LANGPACK_INFO*)m_languages.GetItemData(i);
- if (i == idx)
- {
+ if (i == idx) {
db_set_ws(NULL, "Langpack", "Current", pack->tszFileName);
mir_wstrcpy(tszPath, pack->tszFullPath);
pack->flags |= LPF_ENABLED;
@@ -263,12 +250,10 @@ void CLangpackDlg::OnApply()
else pack->flags &= ~LPF_ENABLED;
}
- if (tszPath[0])
- {
+ if (tszPath[0]) {
ReloadLangpack(tszPath);
- // there no variants to determine button id
- //if (LPPSHNOTIFY(lParam)->lParam == IDC_APPLY)
- {
+
+ if (m_bExiting) {
HWND hwndParent = GetParent(GetHwnd());
PostMessage(hwndParent, WM_CLOSE, 1, 0);
mir_forkthread(ReloadOptions, hwndParent);
diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index f572d9865a..31e4abc14f 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -748,6 +748,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
OptionsPageData *opd;
OptionsDlgData *dat = (OptionsDlgData*)GetWindowLongPtr(hdlg, GWLP_USERDATA);
HWND hwndTree = GetDlgItem(hdlg, IDC_PAGETREE);
+ PSHNOTIFY pshn;
switch (message) {
case WM_CTLCOLORSTATIC:
@@ -885,7 +886,6 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
case TVN_SELCHANGING:
opd = dat->getCurrent();
if (opd && opd->getHwnd() != NULL) {
- PSHNOTIFY pshn;
pshn.hdr.code = PSN_KILLACTIVE;
pshn.hdr.hwndFrom = dat->arOpd[dat->currentPage]->getHwnd();
pshn.hdr.idFrom = 0;
@@ -1033,20 +1033,17 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
break;
case IDCANCEL:
- {
- PSHNOTIFY pshn;
- pshn.hdr.idFrom = 0;
- pshn.lParam = 0;
- pshn.hdr.code = PSN_RESET;
- for (int i = 0; i < dat->arOpd.getCount(); i++) {
- OptionsPageData *p = dat->arOpd[i];
- if (p->getHwnd() == NULL || !p->changed)
- continue;
- pshn.hdr.hwndFrom = p->getHwnd();
- SendMessage(p->getHwnd(), WM_NOTIFY, 0, (LPARAM)&pshn);
- }
- DestroyWindow(hdlg);
+ pshn.hdr.idFrom = 0;
+ pshn.lParam = 0;
+ pshn.hdr.code = PSN_RESET;
+ for (int i = 0; i < dat->arOpd.getCount(); i++) {
+ OptionsPageData *p = dat->arOpd[i];
+ if (p->getHwnd() == NULL || !p->changed)
+ continue;
+ pshn.hdr.hwndFrom = p->getHwnd();
+ SendMessage(p->getHwnd(), WM_NOTIFY, 0, (LPARAM)&pshn);
}
+ DestroyWindow(hdlg);
break;
case IDOK:
@@ -1054,7 +1051,6 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
if (LOWORD(wParam) == IDOK && GetParent(GetFocus()) == GetDlgItem(hdlg, IDC_KEYWORD_FILTER))
return TRUE;
- PSHNOTIFY pshn;
EnableWindow(GetDlgItem(hdlg, IDC_APPLY), FALSE);
SetFocus(hwndTree);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 06:46:04 +0000