From 6330c83bb2c4c1a1b2b1b0fd62fb672513d211de Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 10 May 2012 19:22:51 +0200 Subject: [PATCH] Fixed issue #1162: Sync dialog should use same font as progress dialog (use log font for both) Signed-off-by: Sven Strickroth --- src/Changelog.txt | 3 +++ src/TortoiseProc/ProgressDlg.cpp | 5 +++++ src/TortoiseProc/SyncDlg.cpp | 12 +++++------- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index cd064aaf5..4f0bf2c55 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -7,6 +7,9 @@ Released: unreleased * Synced TortoiseUDiff with TortoiseSVN * Fixed issue #1150: Add support for ANSI Color Codes in log Outputs +== Bug Fix == + * Fixed issue #1162: Sync dialog should use same font as progress dialog (use log font for both) + = Release 1.7.9.0 = Released: 2012-05-05 diff --git a/src/TortoiseProc/ProgressDlg.cpp b/src/TortoiseProc/ProgressDlg.cpp index d295d8849..e76d33a98 100644 --- a/src/TortoiseProc/ProgressDlg.cpp +++ b/src/TortoiseProc/ProgressDlg.cpp @@ -104,6 +104,11 @@ BOOL CProgressDlg::OnInitDialog() this->GetDlgItem(IDC_PROGRESS_BUTTON1)->ShowWindow(SW_HIDE); m_Animate.Open(IDR_DOWNLOAD); + CFont m_logFont; + CAppUtils::CreateFontForLogs(m_logFont); + //GetDlgItem(IDC_CMD_LOG)->SetFont(&m_logFont); + m_Log.SetFont(&m_logFont); + CString InitialText; if ( !m_PreText.IsEmpty() ) { diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp index 360f69603..6370a7343 100644 --- a/src/TortoiseProc/SyncDlg.cpp +++ b/src/TortoiseProc/SyncDlg.cpp @@ -630,13 +630,11 @@ BOOL CSyncDlg::OnInitDialog() return FALSE; // fail to create } - CHARFORMAT m_Format; - memset(&m_Format, 0, sizeof(CHARFORMAT)); - m_Format.cbSize = sizeof(CHARFORMAT); - m_Format.dwMask = CFM_FACE | CFM_BOLD; - wcsncpy(m_Format.szFaceName, L"Courier New", LF_FACESIZE - 1); - m_ctrlCmdOut.SetDefaultCharFormat(m_Format); - + // set the font to use in the log message view, configured in the settings dialog + CFont m_logFont; + CAppUtils::CreateFontForLogs(m_logFont); + //GetDlgItem(IDC_CMD_LOG)->SetFont(&m_logFont); + m_ctrlCmdOut.SetFont(&m_logFont); m_ctrlTabCtrl.InsertTab(&m_ctrlCmdOut,_T("Log"),-1); //m_ctrlCmdOut.ReplaceSel(_T("Hello")); -- 2.11.4.GIT