Index: src/ch/AboutDlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -rb46e69bed7377207f670be1fdbe84bc2e3d11e30 --- src/ch/AboutDlg.h (.../AboutDlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/AboutDlg.h (.../AboutDlg.h) (revision b46e69bed7377207f670be1fdbe84bc2e3d11e30) @@ -32,22 +32,15 @@ virtual BOOL OnTooltipText(UINT uiID, TOOLTIPTEXT* pTip); // Dialog Data - //{{AFX_DATA(CAboutDlg) enum { IDD = IDD_ABOUTBOX }; - //}}AFX_DATA - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CAboutDlg) - protected: - //}}AFX_VIRTUAL +protected: static bool m_bLock; // locker // Implementation protected: - //{{AFX_MSG(CAboutDlg) - afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor); virtual BOOL OnInitDialog(); - //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; Index: src/ch/TMsgBox.cpp =================================================================== diff -u -r75318f0d3808d8d3c02dbc333c80b6d6e07fae13 -rb46e69bed7377207f670be1fdbe84bc2e3d11e30 --- src/ch/TMsgBox.cpp (.../TMsgBox.cpp) (revision 75318f0d3808d8d3c02dbc333c80b6d6e07fae13) +++ src/ch/TMsgBox.cpp (.../TMsgBox.cpp) (revision b46e69bed7377207f670be1fdbe84bc2e3d11e30) @@ -431,6 +431,8 @@ cf.dwEffects &= ~CFE_AUTOCOLOR; cf.crTextColor = crTextColor; m_ctlRichEdit.SetDefaultCharFormat(cf); + + m_ctlRichEdit.SetBackgroundColor(FALSE, RGB(255, 0, 0)); } void TMsgBox::CalculateMinimumDlgSize() Index: src/ch/UpdaterDlg.cpp =================================================================== diff -u -r50ad2dc9f0b42ba432bb54e4a042582277410773 -rb46e69bed7377207f670be1fdbe84bc2e3d11e30 --- src/ch/UpdaterDlg.cpp (.../UpdaterDlg.cpp) (revision 50ad2dc9f0b42ba432bb54e4a042582277410773) +++ src/ch/UpdaterDlg.cpp (.../UpdaterDlg.cpp) (revision b46e69bed7377207f670be1fdbe84bc2e3d11e30) @@ -44,11 +44,8 @@ BOOL CUpdaterDlg::OnInitDialog() { ictranslate::CLanguageDialog::OnInitDialog(); -/* - ictranslate::CFormat fmt(GetResManager().LoadString(IDS_UPDATER_WAITING_STRING)); - fmt.SetParam(_t("%site"), _T(PRODUCT_SITE)); - m_ctlText.SetWindowText(fmt);*/ + InitRichEdit(); // disable button initially CWnd* pWnd = GetDlgItem(IDC_OPEN_WEBPAGE_BUTTON); @@ -167,7 +164,16 @@ fmt.SetParam(L"%reldate", m_ucChecker.GetReleaseDate()); CString strEntireText = fmt; - strEntireText += L"\r\n\r\nRelease notes:\n" + CString(m_ucChecker.GetReleaseNotes()); + CString strReleaseNotes = m_ucChecker.GetReleaseNotes(); + strReleaseNotes = strReleaseNotes.Trim(); + if(!strReleaseNotes.IsEmpty()) + { + fmt.SetFormat(L"\n\n%relnoteshdr\n%relnotestxt"); + fmt.SetParam(L"%relnoteshdr", rResManager.LoadString(IDS_UPDATER_RELEASENOTES)); + fmt.SetParam(L"%relnotestxt", m_ucChecker.GetReleaseNotes()); + strEntireText += fmt; + } + UpdateSecondaryText(strEntireText); // Update button state @@ -232,3 +238,16 @@ { m_ctlRichEdit.SetWindowText(pszText); } + +void CUpdaterDlg::InitRichEdit() +{ + COLORREF crTextColor = GetSysColor(COLOR_BTNTEXT); + CHARFORMAT2 cf; + cf.cbSize = sizeof(CHARFORMAT2); + + m_ctlRichEdit.GetDefaultCharFormat(cf); + cf.dwMask |= CFM_COLOR; + cf.dwEffects &= ~CFE_AUTOCOLOR; + cf.crTextColor = crTextColor; + m_ctlRichEdit.SetDefaultCharFormat(cf); +} Index: src/ch/UpdaterDlg.h =================================================================== diff -u -r50ad2dc9f0b42ba432bb54e4a042582277410773 -rb46e69bed7377207f670be1fdbe84bc2e3d11e30 --- src/ch/UpdaterDlg.h (.../UpdaterDlg.h) (revision 50ad2dc9f0b42ba432bb54e4a042582277410773) +++ src/ch/UpdaterDlg.h (.../UpdaterDlg.h) (revision b46e69bed7377207f670be1fdbe84bc2e3d11e30) @@ -42,6 +42,7 @@ void UpdateIcon(EUpdateType eType); void UpdateMainText(const wchar_t* pszText); void UpdateSecondaryText(const wchar_t* pszText); + void InitRichEdit(); protected: CStatic m_ctlMainText; Index: src/ch/ch.rc =================================================================== diff -u -r50ad2dc9f0b42ba432bb54e4a042582277410773 -rb46e69bed7377207f670be1fdbe84bc2e3d11e30 --- src/ch/ch.rc (.../ch.rc) (revision 50ad2dc9f0b42ba432bb54e4a042582277410773) +++ src/ch/ch.rc (.../ch.rc) (revision b46e69bed7377207f670be1fdbe84bc2e3d11e30) @@ -965,8 +965,6 @@ IDS_EQ_STRING "=" IDS_GE_STRING ">=" IDS_GT_STRING ">" - IDS_UPDATER_NEW_VERSION_STRING - "Updated version: %officialver (%numericver).\nReleased: %reldate" END STRINGTABLE @@ -983,6 +981,8 @@ IDS_UPDATER_KILLEDERROR "Checking for updates was stopped" IDS_UPDATER_ALREADYNEWESTVERSION "You already have the newest version" IDS_UPDATER_NEWVERSIONEXISTS "There are updates available" + IDS_UPDATER_NEW_VERSION_STRING "Updated version: %officialver (%numericver).\nReleased: %reldate" + IDS_UPDATER_RELEASENOTES "Release notes:" END STRINGTABLE Index: src/ch/resource.h =================================================================== diff -u -r50ad2dc9f0b42ba432bb54e4a042582277410773 -rb46e69bed7377207f670be1fdbe84bc2e3d11e30 --- src/ch/resource.h (.../resource.h) (revision 50ad2dc9f0b42ba432bb54e4a042582277410773) +++ src/ch/resource.h (.../resource.h) (revision b46e69bed7377207f670be1fdbe84bc2e3d11e30) @@ -410,6 +410,7 @@ #define IDS_UPDATER_KILLEDERROR 5046 #define IDS_UPDATER_ALREADYNEWESTVERSION 5047 #define IDS_UPDATER_NEWVERSIONEXISTS 5048 +#define IDS_UPDATER_RELEASENOTES 5049 #define IDS_ONECOPY_STRING 6000 #define IDS_REGISTEROK_STRING 6001 #define IDS_REGISTERERR_STRING 6002