Fix issue #940: Replace slow (2)

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

diff --git a/Src/Constants.h b/Src/Constants.h
index feff8c8..a2bebc1 100644 (file)
--- a/Src/Constants.h
+++ b/Src/Constants.h
@@ -4,39 +4,33 @@
  * @brief WinMerge constants, URLs, paths etc.
  *
  */
-// ID line follows -- this is updated by SVN
-// $Id: Constants.h 6729 2009-05-11 07:14:59Z kimmov $
+#pragma once
 
-#ifndef _CONSTANTS_H_
-#define _CONSTANTS_H_
+#include "UnicodeString.h"
 
 /** @brief URL for hyperlink in About-dialog. */
-const TCHAR WinMergeURL[] = _T("http://winmerge.org/");
+const TCHAR WinMergeURL[] = _T("https://winmerge.org/");
 
 /**
  * @brief URL to help index in internet.
  * We use internet help when local help file is not found (not installed).
  */
-const TCHAR DocsURL[] = _T("http://manual.winmerge.org/index.html");
+const TCHAR DocsURL[] = _T("https://manual.winmerge.org/index.html");
 
 /** @brief URL to translations page in internet. */
-const TCHAR TranslationsUrl[] = _T("http://winmerge.org/translations/");
+const TCHAR TranslationsUrl[] = _T("https://winmerge.org/translations/");
 
 /** @brief URL of the GPL license. */
 const TCHAR LicenceUrl[] = _T("http://www.gnu.org/licenses/gpl-2.0.html");
 
-/** @brief WinMerge download page URL. */
-const TCHAR DownloadUrl[] = _T("http://winmerge.org/downloads/");
-
 /** @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%s.chm");
 
 /** @brief Contributors list. */
 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%s.html");
 
 /** @brief GPL Licence local file name. */
 const TCHAR LicenseFile[] = _T("Copying");
@@ -51,11 +45,6 @@ const TCHAR WinMergeDocumentsFolder[] = _T("WinMerge");
  */
 const TCHAR DefaultRelativeFilterPath[] = _T("WinMerge/Filters");
 
-/** @brief Executable Filename for ANSI build. */
-const TCHAR ExecutableFilename[] = _T("WinMerge.exe");
-/** @brief Executable Filename for Unicode build. */
-const TCHAR ExecutableFilenameU[] = _T("WinMergeU.exe");
-
 /** @brief Temp folder name prefix for WinMerge temp folders. */
 const TCHAR TempFolderPrefix[] = _T("WinMerge_TEMP_");
 
@@ -73,6 +62,6 @@ enum
        FFILEOPEN_MODIFIED  = 0x0004, /**< Mark file modified after opening. */
        FFILEOPEN_CMDLINE       = 0x0010, /**< Path is read from commandline */
        FFILEOPEN_PROJECT       = 0x0020, /**< Path is read from project-file */
+       FFILEOPEN_SETFOCUS  = 0x0040, /**< Set focus to this pane */
+       FFILEOPEN_AUTOMERGE = 0x0080, /**< auto-merge at this pane */
 };
-
-#endif // _CONSTANTS_H_