Added LogDialog Proc

diff --git a/WinMute/AboutDlg.cpp b/WinMute/AboutDlg.cpp
index c4214bd39ef115b47a66d0cddc17c8e35d82bb84..2236d6eef7ca139b02fdd95290e8178d97d1b787 100644 (file)
--- a/WinMute/AboutDlg.cpp
+++ b/WinMute/AboutDlg.cpp
@@ -73,15 +73,10 @@ enum AboutTabsIDs {
 };
 
 struct AboutDlgData {
-   HWND hTabCtrl;
-   std::array<HWND, ABOUT_TAB_COUNT> hTabs;
-   HWND hActiveTab;
-   HFONT hTitleFont;
-
-   AboutDlgData() noexcept
-      : hTabCtrl{nullptr}, hTabs{nullptr}, hActiveTab{nullptr}, hTitleFont{nullptr}
-   {
-   }
+   HWND hTabCtrl = nullptr;
+   std::array<HWND, ABOUT_TAB_COUNT> hTabs{nullptr};
+   HWND hActiveTab = nullptr;
+   HFONT hTitleFont = nullptr;
 };
 
 static void InsertTabItem(HWND hTabCtrl, UINT id, const std::wstring& itemName)

diff --git a/WinMute/LogDialog.cpp b/WinMute/LogDialog.cpp
index 3a77cbfc9880a1193437a5896a0a821db3fccdda..14c1ca5e8f505475e4b9fe5ed13caf18811b5df3 100644 (file)
--- a/WinMute/LogDialog.cpp
+++ b/WinMute/LogDialog.cpp
@@ -33,66 +33,23 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "common.h"
 
-static void TranslateLogDlgProc(HWND hDlg)
-{
-   WMi18n &i18n = WMi18n::GetInstance();
-   SetWindowText(hDlg, i18n.GetTranslationW("log.title").c_str());
-}
+struct LogDlgData {
+};
 
-INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK LogDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-   AboutDlgData *dlgData =
-      reinterpret_cast<AboutDlgData *>(GetWindowLongPtr(hDlg, GWLP_USERDATA));
+   auto *dlgData =
+      reinterpret_cast<LogDlgData *>(GetWindowLongPtr(hDlg, GWLP_USERDATA));
+   UNREFERENCED_PARAMETER(wParam);
+   UNREFERENCED_PARAMETER(lParam);
    switch (msg) {
    case WM_INITDIALOG:
    {
-      dlgData = new AboutDlgData();
+      dlgData = new LogDlgData();
       SetWindowLongPtr(hDlg, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(dlgData));
 
-      dlgData->hTabCtrl = GetDlgItem(hDlg, IDC_ABOUT_TAB);
-
       WMi18n &i18n = WMi18n::GetInstance();
-      InsertTabItem(dlgData->hTabCtrl, ABOUT_TAB_GENERAL, i18n.GetTranslationW("about.tab.winmute"));
-      InsertTabItem(dlgData->hTabCtrl, ABOUT_TAB_LICENSE, i18n.GetTranslationW("about.tab.license"));
-
-      TranslateAboutDlgProc(hDlg);
-
-      dlgData->hTabs[ABOUT_TAB_GENERAL] = CreateDialog(
-         nullptr,
-         MAKEINTRESOURCE(IDD_ABOUT_WINMUTE),
-         hDlg,
-         About_GeneralDlgProc);
-      dlgData->hTabs[ABOUT_TAB_LICENSE] = CreateDialog(
-         nullptr,
-         MAKEINTRESOURCE(IDD_ABOUT_LICENSE),
-         hDlg,
-         About_LicenseDlgProc);
-
-
-      // Set title font
-      LOGFONT font;
-      font.lfHeight = 32;
-      font.lfWidth = 0;
-      font.lfEscapement = 0;
-      font.lfOrientation = 0;
-      font.lfWeight = FW_BOLD;
-      font.lfItalic = false;
-      font.lfUnderline = false;
-      font.lfStrikeOut = false;
-      font.lfEscapement = 0;
-      font.lfOrientation = 0;
-      font.lfOutPrecision = OUT_DEFAULT_PRECIS;
-      font.lfClipPrecision = CLIP_STROKE_PRECIS | CLIP_MASK | CLIP_TT_ALWAYS | CLIP_LH_ANGLES;
-      font.lfQuality = CLEARTYPE_QUALITY;
-      font.lfPitchAndFamily = VARIABLE_PITCH | FF_ROMAN;
-      wcscpy_s(font.lfFaceName, L"Segoe UI");
-
-      dlgData->hTitleFont = CreateFontIndirect(&font);
-      SendMessage(
-         hTitle,
-         WM_SETFONT,
-         reinterpret_cast<WPARAM>(dlgData->hTitleFont),
-         TRUE);
+      SetWindowText(hDlg, i18n.GetTranslationW("log.title").c_str());
 
       HICON hIcon = LoadIcon(
          GetModuleHandle(nullptr),
@@ -104,7 +61,6 @@ INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
    case WM_COMMAND:
       return 0;
    case WM_DESTROY:
-      DeleteObject(dlgData->hTitleFont);
       delete dlgData;
       SetWindowLongPtrW(hDlg, GWLP_USERDATA, 0);
       return 0;