Merge with stable

[winmerge-jp/winmerge-jp.git] / Src / Constants.h

diff --git a/Src/Constants.h b/Src/Constants.h
index 42b3da7..ac53004 100644 (file)
--- a/Src/Constants.h
+++ b/Src/Constants.h
@@ -27,17 +27,17 @@ const TCHAR DownloadUrl[] = _T("http://www.geocities.co.jp/SiliconValley-SanJose
 const TCHAR CurrentVersionURL[] = _T("http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge-jp_current_version.txt");
 
 /** @brief Relative (to WinMerge executable ) path to local help file. */
-const TCHAR DocsPath[] = _T("\\Docs\\WinMerge.chm");
-const TCHAR DocsPath_ja[] = _T("\\Docs\\WinMerge_ja.chm");
+const TCHAR DocsPath[] = _T("Docs/WinMerge.chm");
+const TCHAR DocsPath_ja[] = _T("Docs/WinMerge_ja.chm");
 
 /** @brief Contributors list. */
-const TCHAR ContributorsPath[] = _T("\\contributors.txt");
+const TCHAR ContributorsPath[] = _T("contributors.txt");
 
 /** @brief Release notes in HTML format. */
-const TCHAR RelNotes[] = _T("\\Docs\\ReleaseNotes.html");
+const TCHAR RelNotes[] = _T("Docs/ReleaseNotes.html");
 
 /** @brief GPL Licence local file name. */
-const TCHAR LicenseFile[] = _T("\\Copying");
+const TCHAR LicenseFile[] = _T("Copying");
 
 /** @brief WinMerge folder in My Folders-folder. */
 const TCHAR WinMergeDocumentsFolder[] = _T("WinMerge");
@@ -47,7 +47,7 @@ const TCHAR WinMergeDocumentsFolder[] = _T("WinMerge");
  * We want to use WinMerge folder as general user-file folder in future.
  * So it makes sense to have own subfolder for filters.
  */
-const TCHAR DefaultRelativeFilterPath[] = _T("WinMerge\\Filters");
+const TCHAR DefaultRelativeFilterPath[] = _T("WinMerge/Filters");
 
 /** @brief Executable Filename for ANSI build. */
 const TCHAR ExecutableFilename[] = _T("WinMerge.exe");
@@ -57,6 +57,9 @@ const TCHAR ExecutableFilenameU[] = _T("WinMergeU.exe");
 /** @brief Temp folder name prefix for WinMerge temp folders. */
 const TCHAR TempFolderPrefix[] = _T("WinMerge_TEMP_");
 
+/** @brief registry dir to WinMerge */
+const TCHAR RegDir[] = _T("Software\\Thingamahoochie\\WinMerge");
+
 /**
  * @brief Flags used when opening files
  */