Webpage Compare: Display "Comparing..." in the status bar during comp…

…arison.
WinMerge · Dec 28, 2023 · 8bc70b1 · 8bc70b1
1 parent 88b55f2
commit 8bc70b1
Show file tree

Hide file tree

Showing 43 changed files with 160 additions and 25 deletions.
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
@@ -3458,6 +3458,7 @@ void CMainFrame::UnwatchDocuments(IMergeDoc* pMergeDoc)
 
 void CMainFrame::WaitAndDoMessageLoop(bool& completed, int ms)
 {
+	long lIdleCount = 0;
 	while (!completed)
 	{
 		MSG msg;
@@ -3466,6 +3467,8 @@ void CMainFrame::WaitAndDoMessageLoop(bool& completed, int ms)
 			if (!AfxGetApp()->PumpMessage())
 				break;
 		}
+		if (!theApp.OnIdle(lIdleCount++))
+			lIdleCount = 0;
 		Sleep(ms);
 	}
 }

diff --git a/Src/Merge.rc b/Src/Merge.rc
@@ -4240,6 +4240,11 @@ BEGIN
     IDS_PREVIEWBAR_CLOSE    "&Close"
 END
 
+STRINGTABLE
+BEGIN
+    IDS_WEBPAGE_COMPARING   "Comparing..."
+END
+
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/Src/WebPageDiffFrm.cpp b/Src/WebPageDiffFrm.cpp
@@ -1169,31 +1169,43 @@ void CWebPageDiffFrame::OnUpdateStatusNum(CCmdUI* pCmdUI)
 	tchar_t sIdx[32] = { 0 };
 	tchar_t sCnt[32] = { 0 };
 	String s;
-	const int nDiffs = m_pWebDiffWindow->GetDiffCount();
-
-	// Files are identical - show text "Identical"
-	if (nDiffs <= 0)
-		s = theApp.LoadString(IDS_IDENTICAL);
-
-	// There are differences, but no selected diff
-	// - show amount of diffs
-	else if (m_pWebDiffWindow->GetCurrentDiffIndex() < 0)
+	auto compareState = m_pWebDiffWindow->GetCompareState();
+
+	if (compareState == IWebDiffWindow::NOT_COMPARED)
 	{
-		s = theApp.LoadString(nDiffs == 1 ? IDS_1_DIFF_FOUND : IDS_NO_DIFF_SEL_FMT);
-		_itot_s(nDiffs, sCnt, 10);
-		strutils::replace(s, _T("%1"), sCnt);
 	}
-
-	// There are differences and diff selected
-	// - show diff number and amount of diffs
+	else if (compareState == IWebDiffWindow::COMPARING)
+	{
+		s = theApp.LoadString(IDS_WEBPAGE_COMPARING);
+	}
 	else
 	{
-		s = theApp.LoadString(IDS_DIFF_NUMBER_STATUS_FMT);
-		const int signInd = m_pWebDiffWindow->GetCurrentDiffIndex();
-		_itot_s(signInd + 1, sIdx, 10);
-		strutils::replace(s, _T("%1"), sIdx);
-		_itot_s(nDiffs, sCnt, 10);
-		strutils::replace(s, _T("%2"), sCnt);
+		const int nDiffs = m_pWebDiffWindow->GetDiffCount();
+
+		// Files are identical - show text "Identical"
+		if (nDiffs <= 0)
+			s = theApp.LoadString(IDS_IDENTICAL);
+
+		// There are differences, but no selected diff
+		// - show amount of diffs
+		else if (m_pWebDiffWindow->GetCurrentDiffIndex() < 0)
+		{
+			s = theApp.LoadString(nDiffs == 1 ? IDS_1_DIFF_FOUND : IDS_NO_DIFF_SEL_FMT);
+			_itot_s(nDiffs, sCnt, 10);
+			strutils::replace(s, _T("%1"), sCnt);
+		}
+
+		// There are differences and diff selected
+		// - show diff number and amount of diffs
+		else
+		{
+			s = theApp.LoadString(IDS_DIFF_NUMBER_STATUS_FMT);
+			const int signInd = m_pWebDiffWindow->GetCurrentDiffIndex();
+			_itot_s(signInd + 1, sIdx, 10);
+			strutils::replace(s, _T("%1"), sIdx);
+			_itot_s(nDiffs, sCnt, 10);
+			strutils::replace(s, _T("%2"), sCnt);
+		}
 	}
 	pCmdUI->SetText(s.c_str());
 }

diff --git a/Src/WinWebDiffLib.h b/Src/WinWebDiffLib.h
@@ -6,7 +6,7 @@
 
 struct WebDiffEvent
 {
-	enum EVENT_TYPE { ZoomFactorChanged, NewWindowRequested, WindowCloseRequested, NavigationStarting, FrameNavigationStarting, HistoryChanged, SourceChanged, DocumentTitleChanged, NavigationCompleted, FrameNavigationCompleted, WebMessageReceived, FrameWebMessageReceived, TabChanged, HSCROLL, VSCROLL, CompareStateChanged };
+	enum EVENT_TYPE { ZoomFactorChanged, NewWindowRequested, WindowCloseRequested, NavigationStarting, FrameNavigationStarting, HistoryChanged, SourceChanged, DocumentTitleChanged, NavigationCompleted, FrameNavigationCompleted, WebMessageReceived, FrameWebMessageReceived, GoBacked, GoForwarded, TabChanged, HSCROLL, VSCROLL, CompareStateChanged };
 	EVENT_TYPE type;
 	int pane;
 };

diff --git a/Src/resource.h b/Src/resource.h
@@ -1660,6 +1660,7 @@
 #define IDS_PREVIEWBAR_ZOOMIN           44536
 #define IDS_PREVIEWBAR_ZOOMOUT          44537
 #define IDS_PREVIEWBAR_CLOSE            44538
+#define IDS_WEBPAGE_COMPARING           44539
 
 
 // Next default values for new objects

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
@@ -4056,6 +4056,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
@@ -4661,6 +4661,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
@@ -3738,6 +3738,9 @@ msgstr "Mais Zoom"
 msgid "Zoom &Out"
 msgstr "Menos Zoom"
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Embelezamento"
 

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
@@ -4117,6 +4117,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
@@ -4820,6 +4820,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Embellir"
 

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
@@ -4171,6 +4171,9 @@ msgstr "放大(&I)"
 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "格式美化"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
@@ -4820,6 +4820,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "美化"
 

diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
@@ -4135,6 +4135,9 @@ msgstr "Ingrandamentu più &forte"
 msgid "Zoom &Out"
 msgstr "Ingrandamentu &menu forte"
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Imbellimentu"
 

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
@@ -4660,6 +4660,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
@@ -4593,6 +4593,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
@@ -4698,6 +4698,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
@@ -4121,6 +4121,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Mooi maken"
 

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-19 21:53+0000\n"
+"POT-Creation-Date: 2023-12-28 07:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -3732,6 +3732,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
@@ -4158,6 +4158,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Kaunistelu"
 

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
@@ -4850,6 +4850,9 @@ msgstr "Zoom a&vant"
 msgid "Zoom &Out"
 msgstr "Zoom a&rrière"
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Embellissement"
 

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
@@ -4125,6 +4125,9 @@ msgstr "Aumentar &zoom"
 msgid "Zoom &Out"
 msgstr "Reducir z&oom"
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Melloras"
 

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
@@ -4456,6 +4456,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Verschönerung"
 

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
@@ -4638,6 +4638,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
@@ -4799,6 +4799,9 @@ msgstr "&Nagyítás"
 msgid "Zoom &Out"
 msgstr "K&icsinyítés"
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Megjelenés optimalizálás"
 

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
@@ -4097,6 +4097,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

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-19 22:04+0900\n"
+"PO-Revision-Date: 2023-12-28 08:08+0900\n"
 "Last-Translator: Takashi Sawanaka <sawanaka@d1.dion.ne.jp>\n"
 "Language-Team: Japanese <winmerge-translate@lists.sourceforge.net>\n"
 "Language: ja\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-Basepath: ..\n"
-"X-Generator: Poedit 3.4.1\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #. LANGUAGE, SUBLANGUAGE
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
@@ -4126,6 +4126,9 @@ msgstr "拡大(&I)"
 msgid "Zoom &Out"
 msgstr "縮小(&O)"
 
+msgid "Comparing..."
+msgstr "比較しています..."
+
 msgid "Prettification"
 msgstr "整形"
 

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
@@ -4845,6 +4845,9 @@ msgstr "확대(&I)"
 msgid "Zoom &Out"
 msgstr "축소(&O)"
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "꾸미기"
 

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
@@ -3738,6 +3738,9 @@ msgstr "Did&inti"
 msgid "Zoom &Out"
 msgstr "Mažin&ti"
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Sutvarkymas"
 

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
@@ -4128,6 +4128,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
@@ -4707,6 +4707,9 @@ msgstr ""
 msgid "Zoom &Out"
 msgstr ""
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr ""
 

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
@@ -3739,6 +3739,9 @@ msgstr "Powiększ"
 msgid "Zoom &Out"
 msgstr "Pomniejsz"
 
+msgid "Comparing..."
+msgstr ""
+
 msgid "Prettification"
 msgstr "Upiększanie"