From b094ac395c83d47d2d28f80d509ec9386c3b0ece Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 8 Jan 2019 20:30:58 +0200 Subject: fixes #1736 (CrashDumper: "Use classic dates" options should not depend on "Generate crash reports") --- plugins/CrashDumper/res/crshdmp.rc | 6 +++--- plugins/CrashDumper/src/ui.cpp | 37 ------------------------------------- 2 files changed, 3 insertions(+), 40 deletions(-) (limited to 'plugins/CrashDumper') diff --git a/plugins/CrashDumper/res/crshdmp.rc b/plugins/CrashDumper/res/crshdmp.rc index 8c15dbadfc..310ccfa235 100644 --- a/plugins/CrashDumper/res/crshdmp.rc +++ b/plugins/CrashDumper/res/crshdmp.rc @@ -75,10 +75,10 @@ BEGIN EDITTEXT IDC_PASSWORD,14,65,107,14,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "Upload automatically when changed",IDC_UPLOADCHN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,161,10 GROUPBOX "Crash reports",IDC_STATIC,7,104,195,54 - CONTROL "Use classic dates",IDC_CLASSICDATES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,127,157,10 - CONTROL "Create reports in subfolders naming as current date",IDC_DATESUBFOLDER, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,141,180,10 CONTROL "Generate crash reports",IDC_CATCHCRASHES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,113,169,10 + CONTROL "Create reports in subfolders naming as current date",IDC_DATESUBFOLDER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,127,180,10 + CONTROL "Use classic dates",IDC_CLASSICDATES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,141,157,10 LTEXT "* You need to restart Miranda NG to apply changes",IDC_RESTARTNOTE,9,160,186,22,NOT WS_VISIBLE END diff --git a/plugins/CrashDumper/src/ui.cpp b/plugins/CrashDumper/src/ui.cpp index 53e2ffa2e8..801e2509d9 100644 --- a/plugins/CrashDumper/src/ui.cpp +++ b/plugins/CrashDumper/src/ui.cpp @@ -25,42 +25,6 @@ class CViewVersionInfo : public CDlgBase CCtrlButton m_btnCancel, m_btnCopyClip, m_btnCopyFile; CCtrlRichEdit m_redtViewVersionInfo; - HDWP MyResizeWindow(HDWP hDwp, HWND hwndCtrl, int nHorizontalOffset, int nVerticalOffset, int nWidthOffset, int nHeightOffset) - { - if (nullptr == m_hwnd) /* Wine fix. */ - return hDwp; - // get current bounding rectangle - RECT rcinit; - GetWindowRect(hwndCtrl, &rcinit); - - // get current top left point - POINT pt; - pt.x = rcinit.left; - pt.y = rcinit.top; - ScreenToClient(m_hwnd, &pt); - - return DeferWindowPos(hDwp, hwndCtrl, nullptr, - pt.x + nHorizontalOffset, - pt.y + nVerticalOffset, - rcinit.right - rcinit.left + nWidthOffset, - rcinit.bottom - rcinit.top + nHeightOffset, - SWP_NOZORDER); - } - - BOOL MyResizeGetOffset(int nWidth, int nHeight, int* nDx, int* nDy) - { - RECT rcinit; - - // get current bounding rectangle - GetWindowRect(m_redtViewVersionInfo.GetHwnd(), &rcinit); - - // calculate offsets - *nDx = nWidth - (rcinit.right - rcinit.left); - *nDy = nHeight - (rcinit.bottom - rcinit.top); - - return rcinit.bottom != rcinit.top && nHeight > 0; - } - public: CViewVersionInfo(DWORD flags) : CDlgBase(g_plugin, IDD_VIEWVERSION), @@ -222,7 +186,6 @@ class COptDialog : public CDlgBase void COptDialog::OnCatchCrashesChange(CCtrlCheck*) { - m_chkClassicDates.Enable(m_chkCatchCrashes.GetState()); m_chkRepSubfolder.Enable(m_chkCatchCrashes.GetState()); m_lblRestart.Show(); needrestart = 1; -- cgit v1.2.3