[Winmerge-svn] SF.net SVN: winmerge:[7075] trunk

[<ki...@us...>]

Revision: 7075
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7075&view=rev
Author:   kimmov
Date:     2009-12-30 22:57:20 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
PATCH: [ 2923684 ] GUI Language update
 Fixes bug #2808178
 Submitted by Matthias Mayer

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/ChildFrm.cpp
    trunk/Src/DiffViewBar.cpp
    trunk/Src/DiffViewBar.h
    trunk/Src/LocationBar.cpp
    trunk/Src/LocationBar.h

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Docs/Users/ChangeLog.txt	2009-12-30 22:57:20 UTC (rev 7075)
@@ -10,6 +10,7 @@
   Bugfix: GUI Word Wrap missing text (#2921400, #2894033)
   Bugfix: Selected custom odepage was not used (#2921555)
   Bugfix: Created new matching folder to wrong folder (#2890961)
+  Bugfix: Pane headers not updated after language change (#2923684)
 
 WinMerge 2.13.10 2009-12-21 (r7051)
   Visual Studio project files upgraded to VS2005 format (r7045)

Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp	2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Src/ChildFrm.cpp	2009-12-30 22:57:20 UTC (rev 7075)
@@ -767,6 +767,8 @@
 {
 	m_leftStatus.UpdateResources();
 	m_rightStatus.UpdateResources();
+	m_wndLocationBar.UpdateResources();
+	m_wndDetailBar.UpdateResources();
 }
 
 /**

Modified: trunk/Src/DiffViewBar.cpp
===================================================================
--- trunk/Src/DiffViewBar.cpp	2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Src/DiffViewBar.cpp	2009-12-30 22:57:20 UTC (rev 7075)
@@ -11,6 +11,7 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
+#include "Merge.h"
 
 #include "ChildFrm.h"
 #include "DiffViewBar.h"
@@ -159,3 +160,11 @@
 {
 	m_hwndFrame = hwndFrame;
 }
+/**
+ * @brief Update any resources necessary after a GUI language change
+ */
+void CDiffViewBar::UpdateResources()
+{
+	String sCaption = theApp.LoadString(IDS_DIFFBAR_CAPTION);
+	SetWindowText(sCaption.c_str());
+}

Modified: trunk/Src/DiffViewBar.h
===================================================================
--- trunk/Src/DiffViewBar.h	2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Src/DiffViewBar.h	2009-12-30 22:57:20 UTC (rev 7075)
@@ -38,6 +38,7 @@
 	int  GetPanelHeight();
 	void UpdateBarHeight(int DiffPanelHeight);
 	void SetFrameHwnd(HWND hwndFrame);
+	void UpdateResources();
 
 protected:
 	CSplitterWndEx * m_pwndDetailSplitter;

Modified: trunk/Src/LocationBar.cpp
===================================================================
--- trunk/Src/LocationBar.cpp	2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Src/LocationBar.cpp	2009-12-30 22:57:20 UTC (rev 7075)
@@ -125,3 +125,11 @@
 {
 	m_hwndFrame = hwndFrame;
 }
+/**
+ * @brief Update any resources necessary after a GUI language change
+ */
+void CLocationBar::UpdateResources()
+{
+	String sCaption = theApp.LoadString(IDS_LOCBAR_CAPTION);
+	SetWindowText(sCaption.c_str());
+}

Modified: trunk/Src/LocationBar.h
===================================================================
--- trunk/Src/LocationBar.h	2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Src/LocationBar.h	2009-12-30 22:57:20 UTC (rev 7075)
@@ -34,7 +34,7 @@
 		UINT nID = AFX_IDW_PANE_FIRST);
 
 	void SetFrameHwnd(HWND hwndFrame);
-
+	void UpdateResources();
 protected:
 // Overrides
 	// ClassWizard generated virtual function overrides


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.