WIP

WinMerge · Nov 19, 2023 · d0e71d2 · d0e71d2
1 parent 1269a76
commit d0e71d2
Show file tree

Hide file tree

Showing 45 changed files with 135 additions and 9 deletions.
diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
@@ -24,9 +24,9 @@ https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41
 https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-x64.zip!Build\x64\Release ^
 https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-ARM.zip!Build\ARM\Release ^
 https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-ARM64.zip!Build\ARM64\Release ^
-https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-x86.zip!Build\x86\Release ^
-https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-x64.zip!Build\x64\Release ^
-https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-ARM64.zip!Build\ARM64\Release ^
+https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-x86.zip!Build\x86\Release ^
+https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-x64.zip!Build\x64\Release ^
+https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-ARM64.zip!Build\ARM64\Release ^
 https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-w32-mt-XP.zip!Build\tidy-html5 ^
 https://github.com/htacg/tidy-html5/archive/refs/tags/5.4.0.zip!Build\tidy-html5 ^
 https://github.com/jqlang/jq/releases/download/jq-1.7/jq-win32.exe!Build\jq ^

diff --git a/Externals/versions.txt b/Externals/versions.txt
@@ -9,7 +9,7 @@ This file lists versions of the external components we are using.
 - WinIMerge: 1.0.41.0
   - freeimage: 3.18.0
   - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
-- WinWebDiff: 1.0.7.0
+- WinWebDiff: 1.0.8.0
   - WebView2: 1.0.1518.46
   - wil: 1.0.191107.2
   - rapidjson: 1.1.1

diff --git a/Externals/winwebdiff b/Externals/winwebdiff
diff --git a/Src/Merge.rc b/Src/Merge.rc
@@ -248,6 +248,7 @@ BEGIN
             MENUITEM "&Scroll",                     ID_WEB_SYNC_SCROLL
             MENUITEM "&Click",                      ID_WEB_SYNC_CLICK
             MENUITEM "&Input",                      ID_WEB_SYNC_INPUT
+            MENUITEM "&GoBack/Forward",             ID_WEB_SYNC_GOBACKFORWARD
         END
         POPUP "Clear &Browsing Data"
         BEGIN
@@ -1171,6 +1172,7 @@ BEGIN
         MENUITEM "&Scroll",                     ID_WEB_SYNC_SCROLL
         MENUITEM "&Click",                      ID_WEB_SYNC_CLICK
         MENUITEM "&Input",                      ID_WEB_SYNC_INPUT
+        MENUITEM "&GoBack/Forward",             ID_WEB_SYNC_GOBACKFORWARD
     END
 END
 

diff --git a/Src/WebPageDiffFrm.cpp b/Src/WebPageDiffFrm.cpp
@@ -115,8 +115,8 @@ BEGIN_MESSAGE_MAP(CWebPageDiffFrame, CMergeFrameCommon)
 	ON_COMMAND(ID_WEB_COMPARE_HTMLS, OnWebCompareHTMLs)
 	ON_COMMAND(ID_WEB_COMPARE_TEXTS, OnWebCompareTexts)
 	ON_COMMAND(ID_WEB_COMPARE_RESOURCETREES, OnWebCompareResourceTrees)
-	ON_COMMAND_RANGE(ID_WEB_SYNC_ENABLED, ID_WEB_SYNC_INPUT, OnWebSyncEvent)
-	ON_UPDATE_COMMAND_UI_RANGE(ID_WEB_SYNC_ENABLED, ID_WEB_SYNC_INPUT, OnUpdateWebSyncEvent)
+	ON_COMMAND_RANGE(ID_WEB_SYNC_ENABLED, ID_WEB_SYNC_GOBACKFORWARD, OnWebSyncEvent)
+	ON_UPDATE_COMMAND_UI_RANGE(ID_WEB_SYNC_ENABLED, ID_WEB_SYNC_GOBACKFORWARD, OnUpdateWebSyncEvent)
 	ON_COMMAND_RANGE(ID_WEB_CLEAR_DISK_CACHE, ID_WEB_CLEAR_ALL_PROFILE, OnWebClear)
 	// [Tools] menu
 	ON_COMMAND(ID_TOOLS_GENERATEREPORT, OnToolsGenerateReport)
@@ -1626,6 +1626,11 @@ void CWebPageDiffFrame::OnWebSyncEvent(UINT nID)
 			!m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_INPUT));
 		GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, m_pWebDiffWindow->GetSyncEventFlags());
 		break;
+	case ID_WEB_SYNC_GOBACKFORWARD:
+		m_pWebDiffWindow->SetSyncEventFlag(IWebDiffWindow::EVENT_GOBACKFORWARD,
+			!m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_GOBACKFORWARD));
+		GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, m_pWebDiffWindow->GetSyncEventFlags());
+		break;
 	}
 }
 
@@ -1645,6 +1650,9 @@ void CWebPageDiffFrame::OnUpdateWebSyncEvent(CCmdUI* pCmdUI)
 	case ID_WEB_SYNC_INPUT:
 		pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_INPUT));
 		break;
+	case ID_WEB_SYNC_GOBACKFORWARD:
+		pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_GOBACKFORWARD));
+		break;
 	}
 }
 

diff --git a/Src/WinWebDiffLib.h b/Src/WinWebDiffLib.h
@@ -61,6 +61,7 @@ struct IWebDiffWindow
 		EVENT_SCROLL        = ( 1 << 0 ),
 		EVENT_CLICK         = ( 1 << 1 ),
 		EVENT_INPUT         = ( 1 << 2 ),
+		EVENT_GOBACKFORWARD = ( 1 << 3 ),
 	};
 	enum CompareState
 	{

diff --git a/Src/resource.h b/Src/resource.h
@@ -1064,6 +1064,7 @@
 #define ID_WEB_SYNC_SCROLL              33766
 #define ID_WEB_SYNC_CLICK               33767
 #define ID_WEB_SYNC_INPUT               33768
+#define ID_WEB_SYNC_GOBACKFORWARD       33769
 #define ID_WEB_CLEAR_DISK_CACHE         33780
 #define ID_WEB_CLEAR_COOKIES            33781
 #define ID_WEB_CLEAR_BROWSING_HISTORY   33782

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
@@ -260,6 +260,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
@@ -288,6 +288,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
@@ -259,6 +259,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Limpar Dados de Navegação"
 

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
@@ -256,6 +256,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
@@ -285,6 +285,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
@@ -263,6 +263,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "清除浏览数据(&B)"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
@@ -287,6 +287,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "清除瀏覽資料(&B)"
 

diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
@@ -261,6 +261,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "&Viutà i dati di navigazione"
 

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
@@ -285,6 +285,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
@@ -285,6 +285,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
@@ -286,6 +286,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
@@ -259,6 +259,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Bladergegevens wissen"
 

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2023-11-18 16:03+0000\n"
+"POT-Creation-Date: 2023-11-19 21:53+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <[email protected]>\n"
@@ -253,6 +253,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
@@ -259,6 +259,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Tyhjennä &selaustiedot"
 

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
@@ -293,6 +293,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Effacer les données de &navigation"
 

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
@@ -260,6 +260,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "&Borrar datos de navegación"
 

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
@@ -288,6 +288,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "&Browserdaten löschen"
 

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
@@ -284,6 +284,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
@@ -287,6 +287,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Böngészési adatok törlése"
 

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
@@ -257,6 +257,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Cancella i dati di &navigazione"
 

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
 "POT-Creation-Date: 2020-12-05 22:07+0000\n"
-"PO-Revision-Date: 2023-11-18 16:15+0900\n"
+"PO-Revision-Date: 2023-11-19 22:04+0900\n"
 "Last-Translator: Takashi Sawanaka <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
 "Language: ja\n"
@@ -258,6 +258,9 @@ msgstr "クリック(&C)"
 msgid "&Input"
 msgstr "入力(&I)"
 
+msgid "&GoBack/Forward"
+msgstr "戻る/進む(&G)"
+
 msgid "Clear &Browsing Data"
 msgstr "閲覧データのクリア(&B)"
 

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
@@ -294,6 +294,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "검색 데이터 지우기(&B)"
 

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
@@ -259,6 +259,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Išvalyti &Naršymo duomenis"
 

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
@@ -258,6 +258,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
@@ -286,6 +286,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr ""
 

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
@@ -260,6 +260,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Wyczyść dane przeglądania"
 

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
@@ -260,6 +260,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Limpar dados de navegação"
 

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
@@ -258,6 +258,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Șterge datele de navigare"
 

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
@@ -261,6 +261,9 @@ msgstr ""
 msgid "&Input"
 msgstr ""
 
+msgid "&GoBack/Forward"
+msgstr ""
+
 msgid "Clear &Browsing Data"
 msgstr "Очистить &историю просмотров"
+1 −0		src/WinWebDiff/Resource.h
+6 −0		src/WinWebDiff/WinWebDiff.cpp
+ −		src/WinWebDiff/WinWebDiff.rc
+25 −1		src/WinWebDiffLib/WebDiffWindow.hpp
+20 −2		src/WinWebDiffLib/WebWindow.hpp
+2 −1		src/WinWebDiffLib/WinWebDiffLib.h