[ashaposhnikov] 75810: [RAPPS] Settings Dialog changes - replaced `static` with unnamed namespace (static in this context was deprecated in C++03) - fixed `Choose Folder` dialog text not loading th...
9 Sep
2017
9 Sep
'17
7:11 p.m.
Author: ashaposhnikov
Date: Sat Sep 9 19:11:04 2017
New Revision: 75810
URL: http://svn.reactos.org/svn/reactos?rev=75810&view=rev
Log:
[RAPPS] Settings Dialog changes
- replaced `static` with unnamed namespace (static in this context was deprecated in
C++03)
- fixed `Choose Folder` dialog text not loading the first time (trivial)
Modified:
branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1]
Sat Sep 9 19:11:04 2017
@@ -12,39 +12,38 @@
SETTINGS_INFO NewSettingsInfo;
-#define IS_CHECKED(a, b) \
- a = (SendDlgItemMessageW(hDlg, b, BM_GETCHECK, 0, 0) == BST_CHECKED) ? TRUE : FALSE
-
-BOOL
-ChooseFolder(HWND hwnd)
+BOOL ChooseFolder(HWND hwnd)
{
BOOL bRet = FALSE;
BROWSEINFOW bi;
- ATL::CStringW szBuf;
-
- szBuf.LoadStringW(IDS_CHOOSE_FOLDER_TEXT);
+ ATL::CStringW szChooseFolderText;
+
+ szChooseFolderText.LoadStringW(IDS_CHOOSE_FOLDER_TEXT);
ZeroMemory(&bi, sizeof(bi));
bi.hwndOwner = hwnd;
bi.pidlRoot = NULL;
- bi.lpszTitle = szBuf.GetString();
+ bi.lpszTitle = szChooseFolderText.GetString();
bi.ulFlags = BIF_USENEWUI | BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS | /*
BIF_BROWSEFILEJUNCTIONS | */ BIF_VALIDATE;
- szBuf.Empty();
if (SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)))
{
+ ATL::CStringW szBuf;
+
LPITEMIDLIST lpItemList = SHBrowseForFolderW(&bi);
if (lpItemList && SHGetPathFromIDListW(lpItemList,
szBuf.GetBuffer(MAX_PATH)))
{
szBuf.ReleaseBuffer();
if (!szBuf.IsEmpty())
{
- SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szBuf);
+ SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szBuf.GetString());
bRet = TRUE;
}
}
else
+ {
szBuf.ReleaseBuffer();
+ }
CoTaskMemFree(lpItemList);
CoUninitialize();
@@ -53,156 +52,164 @@
return bRet;
}
-static VOID InitSettingsControls(HWND hDlg, PSETTINGS_INFO Info)
+namespace
{
- SendDlgItemMessageW(hDlg, IDC_SAVE_WINDOW_POS, BM_SETCHECK, Info->bSaveWndPos,
0);
- SendDlgItemMessageW(hDlg, IDC_UPDATE_AVLIST, BM_SETCHECK, Info->bUpdateAtStart,
0);
- SendDlgItemMessageW(hDlg, IDC_LOG_ENABLED, BM_SETCHECK, Info->bLogEnabled, 0);
- SendDlgItemMessageW(hDlg, IDC_DEL_AFTER_INSTALL, BM_SETCHECK, Info->bDelInstaller,
0);
-
- SetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT),
- Info->szDownloadDir);
-
- CheckRadioButton(hDlg, IDC_PROXY_DEFAULT, IDC_USE_PROXY, IDC_PROXY_DEFAULT +
Info->Proxy);
-
- if (IDC_PROXY_DEFAULT + Info->Proxy == IDC_USE_PROXY)
- {
- EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), TRUE);
- EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), TRUE);
- }
-
- SetWindowTextW(GetDlgItem(hDlg, IDC_PROXY_SERVER), Info->szProxyServer);
- SetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), Info->szNoProxyFor);
-}
-
-static INT_PTR CALLBACK SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM
lParam)
-{
- switch (Msg)
- {
- case WM_INITDIALOG:
- {
- NewSettingsInfo = SettingsInfo;
- InitSettingsControls(hDlg, &SettingsInfo);
- }
- break;
-
- case WM_COMMAND:
- {
- switch (LOWORD(wParam))
- {
- case IDC_CHOOSE:
- ChooseFolder(hDlg);
- break;
-
- case IDC_SAVE_WINDOW_POS:
- IS_CHECKED(NewSettingsInfo.bSaveWndPos, IDC_SAVE_WINDOW_POS);
- break;
-
- case IDC_UPDATE_AVLIST:
- IS_CHECKED(NewSettingsInfo.bUpdateAtStart, IDC_UPDATE_AVLIST);
- break;
-
- case IDC_LOG_ENABLED:
- IS_CHECKED(NewSettingsInfo.bLogEnabled, IDC_LOG_ENABLED);
- break;
-
- case IDC_DEL_AFTER_INSTALL:
- IS_CHECKED(NewSettingsInfo.bDelInstaller, IDC_DEL_AFTER_INSTALL);
- break;
-
- case IDC_PROXY_DEFAULT:
- NewSettingsInfo.Proxy = 0;
- EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE);
- EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), FALSE);
- break;
-
- case IDC_NO_PROXY:
- NewSettingsInfo.Proxy = 1;
- EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE);
- EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), FALSE);
- break;
-
- case IDC_USE_PROXY:
- NewSettingsInfo.Proxy = 2;
+ inline BOOL IsCheckedDlgItem(HWND hDlg, INT nIDDlgItem)
+ {
+ return (SendDlgItemMessageW(hDlg, nIDDlgItem, BM_GETCHECK, 0, 0) == BST_CHECKED)
? TRUE : FALSE;
+ }
+
+ VOID InitSettingsControls(HWND hDlg, PSETTINGS_INFO Info)
+ {
+ SendDlgItemMessageW(hDlg, IDC_SAVE_WINDOW_POS, BM_SETCHECK, Info->bSaveWndPos,
0);
+ SendDlgItemMessageW(hDlg, IDC_UPDATE_AVLIST, BM_SETCHECK,
Info->bUpdateAtStart, 0);
+ SendDlgItemMessageW(hDlg, IDC_LOG_ENABLED, BM_SETCHECK, Info->bLogEnabled,
0);
+ SendDlgItemMessageW(hDlg, IDC_DEL_AFTER_INSTALL, BM_SETCHECK,
Info->bDelInstaller, 0);
+
+ SetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT),
+ Info->szDownloadDir);
+
+ CheckRadioButton(hDlg, IDC_PROXY_DEFAULT, IDC_USE_PROXY, IDC_PROXY_DEFAULT +
Info->Proxy);
+
+ if (IDC_PROXY_DEFAULT + Info->Proxy == IDC_USE_PROXY)
+ {
EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), TRUE);
EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), TRUE);
- break;
-
- case IDC_DEFAULT_SETTINGS:
- FillDefaultSettings(&NewSettingsInfo);
- InitSettingsControls(hDlg, &NewSettingsInfo);
- break;
-
- case IDOK:
- {
- ATL::CStringW szDir;
- ATL::CStringW szProxy;
- ATL::CStringW szNoProxy;
- DWORD dwAttr;
-
- GetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT),
- szDir.GetBuffer(MAX_PATH), MAX_PATH);
- szDir.ReleaseBuffer();
-
- GetWindowTextW(GetDlgItem(hDlg, IDC_PROXY_SERVER),
- szProxy.GetBuffer(MAX_PATH), MAX_PATH);
- szProxy.ReleaseBuffer();
- ATL::CStringW::CopyChars(NewSettingsInfo.szProxyServer,
- _countof(NewSettingsInfo.szProxyServer),
- szProxy.GetString(),
- szProxy.GetLength() + 1);
-
- GetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR),
- szNoProxy.GetBuffer(MAX_PATH), MAX_PATH);
- szNoProxy.ReleaseBuffer();
- ATL::CStringW::CopyChars(NewSettingsInfo.szNoProxyFor,
- _countof(NewSettingsInfo.szNoProxyFor),
- szNoProxy.GetString(),
- szNoProxy.GetLength() + 1);
-
- dwAttr = GetFileAttributesW(szDir.GetString());
- if (dwAttr != INVALID_FILE_ATTRIBUTES &&
- (dwAttr & FILE_ATTRIBUTE_DIRECTORY))
+ }
+
+ SetWindowTextW(GetDlgItem(hDlg, IDC_PROXY_SERVER), Info->szProxyServer);
+ SetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), Info->szNoProxyFor);
+ }
+
+ INT_PTR CALLBACK SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
+ {
+ switch (Msg)
+ {
+ case WM_INITDIALOG:
+ {
+ NewSettingsInfo = SettingsInfo;
+ InitSettingsControls(hDlg, &SettingsInfo);
+ }
+ break;
+
+ case WM_COMMAND:
+ {
+ switch (LOWORD(wParam))
{
- ATL::CStringW::CopyChars(NewSettingsInfo.szDownloadDir,
- _countof(NewSettingsInfo.szDownloadDir),
- szDir.GetString(),
- szDir.GetLength() + 1);
- }
- else
+ case IDC_CHOOSE:
+ ChooseFolder(hDlg);
+ break;
+
+ case IDC_SAVE_WINDOW_POS:
+ NewSettingsInfo.bSaveWndPos = IsCheckedDlgItem(hDlg,
IDC_SAVE_WINDOW_POS);
+ break;
+
+ case IDC_UPDATE_AVLIST:
+ NewSettingsInfo.bUpdateAtStart = IsCheckedDlgItem(hDlg,
IDC_UPDATE_AVLIST);
+ break;
+
+ case IDC_LOG_ENABLED:
+ NewSettingsInfo.bLogEnabled = IsCheckedDlgItem(hDlg, IDC_LOG_ENABLED);
+ break;
+
+ case IDC_DEL_AFTER_INSTALL:
+ NewSettingsInfo.bDelInstaller = IsCheckedDlgItem(hDlg,
IDC_DEL_AFTER_INSTALL);
+ break;
+
+ case IDC_PROXY_DEFAULT:
+ NewSettingsInfo.Proxy = 0;
+ EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE);
+ EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), FALSE);
+ break;
+
+ case IDC_NO_PROXY:
+ NewSettingsInfo.Proxy = 1;
+ EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE);
+ EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), FALSE);
+ break;
+
+ case IDC_USE_PROXY:
+ NewSettingsInfo.Proxy = 2;
+ EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), TRUE);
+ EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), TRUE);
+ break;
+
+ case IDC_DEFAULT_SETTINGS:
+ FillDefaultSettings(&NewSettingsInfo);
+ InitSettingsControls(hDlg, &NewSettingsInfo);
+ break;
+
+ case IDOK:
{
- ATL::CStringW szMsgText;
- szMsgText.LoadStringW(IDS_CHOOSE_FOLDER_ERROR);
-
- if (MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_YESNO) == IDYES)
+ ATL::CStringW szDir;
+ ATL::CStringW szProxy;
+ ATL::CStringW szNoProxy;
+ DWORD dwAttr;
+
+ GetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT),
+ szDir.GetBuffer(MAX_PATH), MAX_PATH);
+ szDir.ReleaseBuffer();
+
+ GetWindowTextW(GetDlgItem(hDlg, IDC_PROXY_SERVER),
+ szProxy.GetBuffer(MAX_PATH), MAX_PATH);
+ szProxy.ReleaseBuffer();
+ ATL::CStringW::CopyChars(NewSettingsInfo.szProxyServer,
+ _countof(NewSettingsInfo.szProxyServer),
+ szProxy.GetString(),
+ szProxy.GetLength() + 1);
+
+ GetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR),
+ szNoProxy.GetBuffer(MAX_PATH), MAX_PATH);
+ szNoProxy.ReleaseBuffer();
+ ATL::CStringW::CopyChars(NewSettingsInfo.szNoProxyFor,
+ _countof(NewSettingsInfo.szNoProxyFor),
+ szNoProxy.GetString(),
+ szNoProxy.GetLength() + 1);
+
+ dwAttr = GetFileAttributesW(szDir.GetString());
+ if (dwAttr != INVALID_FILE_ATTRIBUTES &&
+ (dwAttr & FILE_ATTRIBUTE_DIRECTORY))
{
- if (CreateDirectoryW(szDir.GetString(), NULL))
- {
- EndDialog(hDlg, LOWORD(wParam));
- }
+ ATL::CStringW::CopyChars(NewSettingsInfo.szDownloadDir,
+ _countof(NewSettingsInfo.szDownloadDir),
+ szDir.GetString(),
+ szDir.GetLength() + 1);
}
else
{
- SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT));
- break;
+ ATL::CStringW szMsgText;
+ szMsgText.LoadStringW(IDS_CHOOSE_FOLDER_ERROR);
+
+ if (MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_YESNO) ==
IDYES)
+ {
+ if (CreateDirectoryW(szDir.GetString(), NULL))
+ {
+ EndDialog(hDlg, LOWORD(wParam));
+ }
+ }
+ else
+ {
+ SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT));
+ break;
+ }
}
+
+ SettingsInfo = NewSettingsInfo;
+ SaveSettings(GetParent(hDlg));
+ EndDialog(hDlg, LOWORD(wParam));
}
-
- SettingsInfo = NewSettingsInfo;
- SaveSettings(GetParent(hDlg));
- EndDialog(hDlg, LOWORD(wParam));
+ break;
+
+ case IDCANCEL:
+ EndDialog(hDlg, LOWORD(wParam));
+ break;
+ }
}
break;
-
- case IDCANCEL:
- EndDialog(hDlg, LOWORD(wParam));
- break;
- }
- }
- break;
- }
-
- return FALSE;
+ }
+
+ return FALSE;
+ }
}
VOID CreateSettingsDlg(HWND hwnd)
2623
days inactive
2623
days old
0 comments
1 participants
participants (1)
-
ashaposhnikov＠svn.reactos.org