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

[<ge...@us...>]

Revision: 7131
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7131&view=rev
Author:   gerundt
Date:     2010-04-23 08:46:54 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
PATCH: [ 2988974 ] Fix help locations

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/DirView.cpp
    trunk/Src/Merge.cpp
    trunk/Src/MergeEditView.cpp
    trunk/Src/OpenDlg.cpp

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2010-04-21 16:31:24 UTC (rev 7130)
+++ trunk/Docs/Users/ChangeLog.txt	2010-04-23 08:46:54 UTC (rev 7131)
@@ -5,6 +5,7 @@
 
 WinMerge 2.13.12
   Update copyright year to 2010
+  Fix help locations (#2988974)
   Bugfix: Strange scrolling effect in location pane (#2942869)
   Translation updates:
   - Chinese Traditional (#2954833)

Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp	2010-04-21 16:31:24 UTC (rev 7130)
+++ trunk/Src/DirView.cpp	2010-04-23 08:46:54 UTC (rev 7131)
@@ -62,7 +62,7 @@
 /**
  * @brief Location for folder compare specific help to open.
  */
-static TCHAR DirViewHelpLocation[] = _T("::/htmlhelp/CompareDirs.html");
+static TCHAR DirViewHelpLocation[] = _T("::/htmlhelp/Compare_dirs.html");
 
 /**
  * @brief Limit (in seconds) to signal compare is ready for user.

Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp	2010-04-21 16:31:24 UTC (rev 7130)
+++ trunk/Src/Merge.cpp	2010-04-23 08:46:54 UTC (rev 7131)
@@ -70,7 +70,7 @@
 
 
 /** @brief Location for command line help to open. */
-static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/CommandLine.html");
+static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html");
 
 /////////////////////////////////////////////////////////////////////////////
 // CMergeApp

Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp	2010-04-21 16:31:24 UTC (rev 7130)
+++ trunk/Src/MergeEditView.cpp	2010-04-23 08:46:54 UTC (rev 7131)
@@ -61,7 +61,7 @@
 const UINT RESCAN_TIMEOUT = 1000;
 
 /** @brief Location for file compare specific help to open. */
-static TCHAR MergeViewHelpLocation[] = _T("::/htmlhelp/CompareFiles.html");
+static TCHAR MergeViewHelpLocation[] = _T("::/htmlhelp/Compare_files.html");
 
 /////////////////////////////////////////////////////////////////////////////
 // CMergeEditView

Modified: trunk/Src/OpenDlg.cpp
===================================================================
--- trunk/Src/OpenDlg.cpp	2010-04-21 16:31:24 UTC (rev 7130)
+++ trunk/Src/OpenDlg.cpp	2010-04-23 08:46:54 UTC (rev 7131)
@@ -58,7 +58,7 @@
 static const TCHAR EMPTY_EXTENSION[] = _T(".*");
 
 /** @brief Location for Open-dialog specific help to open. */
-static TCHAR OpenDlgHelpLocation[] = _T("::/htmlhelp/OpenPaths.html");
+static TCHAR OpenDlgHelpLocation[] = _T("::/htmlhelp/Open_paths.html");
 
 /////////////////////////////////////////////////////////////////////////////
 // COpenDlg dialog


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