Skip to content

Commit 3255dc3

Browse files
sdottakasdottaka
authored
Webpage Compare: synchronize events (#2111)
1 parent f44c06a commit 3255dc3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+838
-15
lines changed

‎DownloadDeps.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41
2424
https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-x64.zip!Build\x64\Release ^
2525
https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-ARM.zip!Build\ARM\Release ^
2626
https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-ARM64.zip!Build\ARM64\Release ^
27-
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-x86.zip!Build\x86\Release ^
28-
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-x64.zip!Build\x64\Release ^
29-
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-ARM64.zip!Build\ARM64\Release ^
27+
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-x86.zip!Build\x86\Release ^
28+
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-x64.zip!Build\x64\Release ^
29+
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-ARM64.zip!Build\ARM64\Release ^
3030
https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-w32-mt-XP.zip!Build\tidy-html5 ^
3131
https://github.com/htacg/tidy-html5/archive/refs/tags/5.4.0.zip!Build\tidy-html5 ^
3232
https://github.com/jqlang/jq/releases/download/jq-1.7/jq-win32.exe!Build\jq ^

‎Externals/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This file lists versions of the external components we are using.
99
- WinIMerge: 1.0.41.0
1010
- freeimage: 3.18.0
1111
- LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
12-
- WinWebDiff: 1.0.7.0
12+
- WinWebDiff: 1.0.8.0
1313
- WebView2: 1.0.1518.46
1414
- wil: 1.0.191107.2
1515
- rapidjson: 1.1.1

‎Externals/winwebdiff

‎Src/Merge.rc

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,15 @@ BEGIN
241241
MENUITEM "1280x800", ID_WEB_SIZE_1280x800
242242
MENUITEM "1440x900", ID_WEB_SIZE_1440x900
243243
END
244+
POPUP "&Event Synchronization"
245+
BEGIN
246+
MENUITEM "&Enabled", ID_WEB_SYNC_ENABLED
247+
MENUITEM SEPARATOR
248+
MENUITEM "&Scroll", ID_WEB_SYNC_SCROLL
249+
MENUITEM "&Click", ID_WEB_SYNC_CLICK
250+
MENUITEM "&Input", ID_WEB_SYNC_INPUT
251+
MENUITEM "&GoBack/Forward", ID_WEB_SYNC_GOBACKFORWARD
252+
END
244253
POPUP "Clear &Browsing Data"
245254
BEGIN
246255
MENUITEM "&Disk Cache", ID_WEB_CLEAR_DISK_CACHE
@@ -1154,6 +1163,19 @@ BEGIN
11541163
END
11551164
END
11561165

1166+
IDR_POPUP_WEBPAGE_SYNC_EVENTS MENU
1167+
BEGIN
1168+
POPUP "_POPUP_"
1169+
BEGIN
1170+
MENUITEM "&Enabled", ID_WEB_SYNC_ENABLED
1171+
MENUITEM SEPARATOR
1172+
MENUITEM "&Scroll", ID_WEB_SYNC_SCROLL
1173+
MENUITEM "&Click", ID_WEB_SYNC_CLICK
1174+
MENUITEM "&Input", ID_WEB_SYNC_INPUT
1175+
MENUITEM "&GoBack/Forward", ID_WEB_SYNC_GOBACKFORWARD
1176+
END
1177+
END
1178+
11571179

11581180
/////////////////////////////////////////////////////////////////////////////
11591181
//
@@ -2332,7 +2354,8 @@ BEGIN
23322354
EDITTEXT IDC_ZOOM,178,2,32,14,ES_AUTOHSCROLL,WS_EX_RIGHT
23332355
LTEXT "UA:",-1,214,4,16,10
23342356
EDITTEXT IDC_USERAGENT,230,2,128,14,ES_AUTOHSCROLL
2335-
CONTROL "View &Differences",IDC_SHOWDIFFERENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,362,2,96,14
2357+
CONTROL "&Event Synchronization",IDC_SYNC_EVENTS,"Button",BS_SPLITBUTTON | WS_TABSTOP,362,2,106,14
2358+
CONTROL "View &Differences",IDC_SHOWDIFFERENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,472,2,96,14
23362359
END
23372360

23382361

‎Src/MergeFrameCommon.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void CMergeFrameCommon::RemoveBarBorder()
8888
*/
8989
void CMergeFrameCommon::SetLastCompareResult(int nResult)
9090
{
91-
HICON hReplace = (nResult == 0) ? m_hIdentical : m_hDifferent;
91+
HICON hReplace = (nResult == 0) ? m_hIdentical : ((nResult < 0) ? nullptr : m_hDifferent);
9292

9393
if (m_hCurrent != hReplace)
9494
{

‎Src/OptionsDef.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ inline const String OPT_CMP_WEB_VIEW_WIDTH {_T("Settings/WebPageViewWidth"s)};
247247
inline const String OPT_CMP_WEB_VIEW_HEIGHT {_T("Settings/WebPageViewHeight"s)};
248248
inline const String OPT_CMP_WEB_ZOOM {_T("Settings/WebZoom"s)};
249249
inline const String OPT_CMP_WEB_USER_AGENT {_T("Settings/WebUserAgent"s)};
250+
inline const String OPT_CMP_WEB_SYNC_EVENTS {_T("Settings/WebSyncEvents"s)};
251+
inline const String OPT_CMP_WEB_SYNC_EVENT_FLAGS {_T("Settings/WebSyncEventFlags"s)};
250252
inline const String OPT_CMP_WEB_URL_PATTERN_TO_INCLUDE {_T("Settings/WebPageURLPatternToInclude"s)};
251253
inline const String OPT_CMP_WEB_URL_PATTERN_TO_EXCLUDE {_T("Settings/WebPageURLPatternToExclude"s)};
252254

‎Src/OptionsInit.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ void Init(COptionsMgr *pOptions)
186186
pOptions->InitOption(OPT_CMP_WEB_USER_AGENT, _T(""));
187187
pOptions->InitOption(OPT_CMP_WEB_URL_PATTERN_TO_INCLUDE, _T(""));
188188
pOptions->InitOption(OPT_CMP_WEB_URL_PATTERN_TO_EXCLUDE, _T(""));
189+
pOptions->InitOption(OPT_CMP_WEB_SYNC_EVENTS, false);
190+
pOptions->InitOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, 0xff);
189191

190192
pOptions->InitOption(OPT_PROJECTS_PATH, _T(""));
191193
pOptions->InitOption(OPT_USE_SYSTEM_TEMP_PATH, true);

‎Src/WebPageDiffFrm.cpp

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ BEGIN_MESSAGE_MAP(CWebPageDiffFrame, CMergeFrameCommon)
115115
ON_COMMAND(ID_WEB_COMPARE_HTMLS, OnWebCompareHTMLs)
116116
ON_COMMAND(ID_WEB_COMPARE_TEXTS, OnWebCompareTexts)
117117
ON_COMMAND(ID_WEB_COMPARE_RESOURCETREES, OnWebCompareResourceTrees)
118+
ON_COMMAND_RANGE(ID_WEB_SYNC_ENABLED, ID_WEB_SYNC_GOBACKFORWARD, OnWebSyncEvent)
119+
ON_UPDATE_COMMAND_UI_RANGE(ID_WEB_SYNC_ENABLED, ID_WEB_SYNC_GOBACKFORWARD, OnUpdateWebSyncEvent)
118120
ON_COMMAND_RANGE(ID_WEB_CLEAR_DISK_CACHE, ID_WEB_CLEAR_ALL_PROFILE, OnWebClear)
119121
// [Tools] menu
120122
ON_COMMAND(ID_TOOLS_GENERATEREPORT, OnToolsGenerateReport)
@@ -129,6 +131,7 @@ BEGIN_MESSAGE_MAP(CWebPageDiffFrame, CMergeFrameCommon)
129131
ON_BN_CLICKED(IDC_FITTOWINDOW, OnBnClickedFitToWindow)
130132
ON_BN_CLICKED(IDC_SHOWDIFFERENCES, OnBnClickedShowDifferences)
131133
ON_BN_CLICKED(IDC_COMPARE, OnBnClickedCompare)
134+
ON_BN_CLICKED(IDC_SYNC_EVENTS, OnBnClickedSyncEvents)
132135
ON_EN_CHANGE(IDC_WIDTH, OnEnChangeWidth)
133136
ON_EN_CHANGE(IDC_HEIGHT, OnEnChangeHeight)
134137
ON_EN_CHANGE(IDC_ZOOM, OnEnChangeZoom)
@@ -138,6 +141,7 @@ BEGIN_MESSAGE_MAP(CWebPageDiffFrame, CMergeFrameCommon)
138141
ON_EN_KILLFOCUS(IDC_ZOOM, OnKillFocusBarControls)
139142
ON_EN_KILLFOCUS(IDC_USERAGENT, OnKillFocusBarControls)
140143
ON_NOTIFY(BCN_DROPDOWN, IDC_COMPARE, OnDropDownCompare)
144+
ON_NOTIFY(BCN_DROPDOWN, IDC_SYNC_EVENTS, OnDropDownSyncEvents)
141145
// Status bar
142146
ON_UPDATE_COMMAND_UI(ID_STATUS_DIFFNUM, OnUpdateStatusNum)
143147
//}}AFX_MSG_MAP
@@ -338,6 +342,9 @@ void CWebPageDiffFrame::OnWebDiffEvent(const WebDiffEvent& event)
338342
case WebDiffEvent::ZoomFactorChanged:
339343
UpdateWebPageDiffBar();
340344
break;
345+
case WebDiffEvent::CompareStateChanged:
346+
UpdateLastCompareResult();
347+
break;
341348
}
342349
}
343350

@@ -614,6 +621,8 @@ void CWebPageDiffFrame::LoadOptions()
614621
m_pWebDiffWindow->SetShowDifferences(GetOptionsMgr()->GetBool(OPT_CMP_WEB_SHOWDIFFERENCES));
615622
m_pWebDiffWindow->SetShowWordDifferences(GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT));
616623
m_pWebDiffWindow->SetUserAgent(GetOptionsMgr()->GetString(OPT_CMP_WEB_USER_AGENT).c_str());
624+
m_pWebDiffWindow->SetSyncEvents(GetOptionsMgr()->GetBool(OPT_CMP_WEB_SYNC_EVENTS));
625+
m_pWebDiffWindow->SetSyncEventFlags(GetOptionsMgr()->GetInt(OPT_CMP_WEB_SYNC_EVENT_FLAGS));
617626
COLORSETTINGS colors;
618627
IWebDiffWindow::ColorSettings colorSettings;
619628
Options::DiffColors::Load(GetOptionsMgr(), colors);
@@ -871,7 +880,7 @@ int CWebPageDiffFrame::UpdateLastCompareResult()
871880
int result = -1;
872881
if (m_bCompareCompleted)
873882
{
874-
result = m_pWebDiffWindow->GetDiffCount() > 0 ? 1 : 0;
883+
result = (m_pWebDiffWindow->GetCompareState() == IWebDiffWindow::COMPARED) ? (m_pWebDiffWindow->GetDiffCount() > 0 ? 1 : 0) : -1;
875884
SetLastCompareResult(result);
876885
}
877886
return result;
@@ -1076,6 +1085,24 @@ void CWebPageDiffFrame::OnDropDownCompare(NMHDR *pNMHDR, LRESULT *pResult)
10761085
point.x, point.y, AfxGetMainWnd());
10771086
}
10781087

1088+
void CWebPageDiffFrame::OnBnClickedSyncEvents()
1089+
{
1090+
CRect rc;
1091+
m_wndWebPageDiffBar.GetDlgItem(IDC_SYNC_EVENTS)->GetWindowRect(&rc);
1092+
CPoint point { rc.left, rc.bottom };
1093+
BCMenu menuPopup;
1094+
menuPopup.LoadMenu(MAKEINTRESOURCE(IDR_POPUP_WEBPAGE_SYNC_EVENTS));
1095+
theApp.TranslateMenu(menuPopup.m_hMenu);
1096+
BCMenu* pPopup = (BCMenu*)menuPopup.GetSubMenu(0);
1097+
pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON,
1098+
point.x, point.y, AfxGetMainWnd());
1099+
}
1100+
1101+
void CWebPageDiffFrame::OnDropDownSyncEvents(NMHDR *pNMHDR, LRESULT *pResult)
1102+
{
1103+
OnBnClickedSyncEvents();
1104+
}
1105+
10791106
void CWebPageDiffFrame::OnEnChangeWidth()
10801107
{
10811108
if (m_bInUpdateWebPageDiffBar)
@@ -1576,6 +1603,59 @@ void CWebPageDiffFrame::OnWebCompareResourceTrees()
15761603
}));
15771604
}
15781605

1606+
void CWebPageDiffFrame::OnWebSyncEvent(UINT nID)
1607+
{
1608+
switch (nID)
1609+
{
1610+
case ID_WEB_SYNC_ENABLED:
1611+
m_pWebDiffWindow->SetSyncEvents(!m_pWebDiffWindow->GetSyncEvents());
1612+
GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENTS, m_pWebDiffWindow->GetSyncEvents());
1613+
break;
1614+
case ID_WEB_SYNC_SCROLL:
1615+
m_pWebDiffWindow->SetSyncEventFlag(IWebDiffWindow::EVENT_SCROLL,
1616+
!m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_SCROLL));
1617+
GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, m_pWebDiffWindow->GetSyncEventFlags());
1618+
break;
1619+
case ID_WEB_SYNC_CLICK:
1620+
m_pWebDiffWindow->SetSyncEventFlag(IWebDiffWindow::EVENT_CLICK,
1621+
!m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_CLICK));
1622+
GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, m_pWebDiffWindow->GetSyncEventFlags());
1623+
break;
1624+
case ID_WEB_SYNC_INPUT:
1625+
m_pWebDiffWindow->SetSyncEventFlag(IWebDiffWindow::EVENT_INPUT,
1626+
!m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_INPUT));
1627+
GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, m_pWebDiffWindow->GetSyncEventFlags());
1628+
break;
1629+
case ID_WEB_SYNC_GOBACKFORWARD:
1630+
m_pWebDiffWindow->SetSyncEventFlag(IWebDiffWindow::EVENT_GOBACKFORWARD,
1631+
!m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_GOBACKFORWARD));
1632+
GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, m_pWebDiffWindow->GetSyncEventFlags());
1633+
break;
1634+
}
1635+
}
1636+
1637+
void CWebPageDiffFrame::OnUpdateWebSyncEvent(CCmdUI* pCmdUI)
1638+
{
1639+
switch (pCmdUI->m_nID)
1640+
{
1641+
case ID_WEB_SYNC_ENABLED:
1642+
pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEvents());
1643+
break;
1644+
case ID_WEB_SYNC_SCROLL:
1645+
pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_SCROLL));
1646+
break;
1647+
case ID_WEB_SYNC_CLICK:
1648+
pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_CLICK));
1649+
break;
1650+
case ID_WEB_SYNC_INPUT:
1651+
pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_INPUT));
1652+
break;
1653+
case ID_WEB_SYNC_GOBACKFORWARD:
1654+
pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_GOBACKFORWARD));
1655+
break;
1656+
}
1657+
}
1658+
15791659
void CWebPageDiffFrame::OnWebClear(UINT nID)
15801660
{
15811661
IWebDiffWindow::BrowsingDataType dataKinds;

‎Src/WebPageDiffFrm.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ class CWebPageDiffFrame : public CMergeFrameCommon,public IMergeDoc
190190
afx_msg void OnWebCompareHTMLs();
191191
afx_msg void OnWebCompareTexts();
192192
afx_msg void OnWebCompareResourceTrees();
193+
afx_msg void OnWebSyncEvent(UINT nID);
194+
afx_msg void OnUpdateWebSyncEvent(CCmdUI* pCmdUI);
193195
afx_msg void OnWebClear(UINT nID);
194196
afx_msg void OnToolsGenerateReport();
195197
afx_msg void OnRefresh();
@@ -198,12 +200,14 @@ class CWebPageDiffFrame : public CMergeFrameCommon,public IMergeDoc
198200
afx_msg void OnBnClickedFitToWindow();
199201
afx_msg void OnBnClickedShowDifferences();
200202
afx_msg void OnBnClickedCompare();
203+
afx_msg void OnBnClickedSyncEvents();
201204
afx_msg void OnEnChangeWidth();
202205
afx_msg void OnEnChangeHeight();
203206
afx_msg void OnEnChangeZoom();
204207
afx_msg void OnEnChangeUserAgent();
205208
afx_msg void OnKillFocusBarControls();
206209
afx_msg void OnDropDownCompare(NMHDR* pNMHDR, LRESULT* pResult);
210+
afx_msg void OnDropDownSyncEvents(NMHDR* pNMHDR, LRESULT* pResult);
207211
//}}AFX_MSG
208212
DECLARE_MESSAGE_MAP()
209213
};

‎Src/WinWebDiffLib.h

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
struct WebDiffEvent
88
{
9-
enum EVENT_TYPE { ZoomFactorChanged, NewWindowRequested, WindowCloseRequested, NavigationStarting, HistoryChanged, SourceChanged, DocumentTitleChanged, NavigationCompleted, WebMessageReceived, TabChanged, HSCROLL, VSCROLL };
9+
enum EVENT_TYPE { ZoomFactorChanged, NewWindowRequested, WindowCloseRequested, NavigationStarting, FrameNavigationStarting, HistoryChanged, SourceChanged, DocumentTitleChanged, NavigationCompleted, FrameNavigationCompleted, WebMessageReceived, FrameWebMessageReceived, TabChanged, HSCROLL, VSCROLL, CompareStateChanged };
1010
EVENT_TYPE type;
1111
int pane;
1212
};
@@ -55,6 +55,20 @@ struct IWebDiffWindow
5555
SETTINGS = ( 1 << 13 ),
5656
ALL_PROFILE = ( 1 << 14 )
5757
};
58+
enum EventType
59+
{
60+
EVENT_NONE = 0,
61+
EVENT_SCROLL = ( 1 << 0 ),
62+
EVENT_CLICK = ( 1 << 1 ),
63+
EVENT_INPUT = ( 1 << 2 ),
64+
EVENT_GOBACKFORWARD = ( 1 << 3 ),
65+
};
66+
enum CompareState
67+
{
68+
NOT_COMPARED,
69+
COMPARING,
70+
COMPARED,
71+
};
5872
struct DiffOptions
5973
{
6074
enum DiffAlgorithm {
@@ -170,6 +184,13 @@ struct IWebDiffWindow
170184
virtual bool CanRedo() = 0;
171185
virtual const DiffOptions& GetDiffOptions() const = 0;
172186
virtual void SetDiffOptions(const DiffOptions& diffOptions) = 0;
187+
virtual bool GetSyncEvents() const = 0;
188+
virtual void SetSyncEvents(bool syncEvents) = 0;
189+
virtual unsigned GetSyncEventFlags() const = 0;
190+
virtual void SetSyncEventFlags(unsigned flags) = 0;
191+
virtual bool GetSyncEventFlag(EventType event) const = 0;
192+
virtual void SetSyncEventFlag(EventType event, bool flag) = 0;
193+
virtual CompareState GetCompareState() const = 0;
173194
};
174195

175196
extern "C"

‎Src/resource.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#define IDR_POPUP_IMG_CTXT 121
2626
#define IDR_POPUP_PROJECT_DIFF_OPTIONS 122
2727
#define IDR_POPUP_WEBPAGE_COMPARE 123
28+
#define IDR_POPUP_WEBPAGE_SYNC_EVENTS 124
2829
#define IDD_ABOUTBOX 200
2930
#define IDD_OPEN 202
3031
#define IDD_SAVECLOSING 203
@@ -624,6 +625,7 @@
624625
#define IDC_USERAGENT 1628
625626
#define IDC_COMPARE 1630
626627
#define IDC_SHOWDIFFERENCES 1631
628+
#define IDC_SYNC_EVENTS 1632
627629
#define IDC_EDIT_WHOLE_WORD 8603
628630
#define IDC_EDIT_MATCH_CASE 8604
629631
#define IDC_EDIT_FINDTEXT 8605
@@ -1058,10 +1060,15 @@
10581060
#define ID_WEB_COMPARE_HTMLS 33762
10591061
#define ID_WEB_COMPARE_TEXTS 33763
10601062
#define ID_WEB_COMPARE_RESOURCETREES 33764
1061-
#define ID_WEB_CLEAR_DISK_CACHE 33765
1062-
#define ID_WEB_CLEAR_COOKIES 33766
1063-
#define ID_WEB_CLEAR_BROWSING_HISTORY 33767
1064-
#define ID_WEB_CLEAR_ALL_PROFILE 33768
1063+
#define ID_WEB_SYNC_ENABLED 33765
1064+
#define ID_WEB_SYNC_SCROLL 33766
1065+
#define ID_WEB_SYNC_CLICK 33767
1066+
#define ID_WEB_SYNC_INPUT 33768
1067+
#define ID_WEB_SYNC_GOBACKFORWARD 33769
1068+
#define ID_WEB_CLEAR_DISK_CACHE 33780
1069+
#define ID_WEB_CLEAR_COOKIES 33781
1070+
#define ID_WEB_CLEAR_BROWSING_HISTORY 33782
1071+
#define ID_WEB_CLEAR_ALL_PROFILE 33783
10651072
#define ID_FILE_NEW_TABLE 34164
10661073
#define ID_FILE_NEW_HEX 34165
10671074
#define ID_FILE_NEW_IMAGE 34166

‎Translations/WinMerge/Arabic.po

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,24 @@ msgstr ""
245245
msgid "Fit to Window"
246246
msgstr ""
247247

248+
msgid "&Event Synchronization"
249+
msgstr ""
250+
251+
msgid "&Enabled"
252+
msgstr ""
253+
254+
msgid "&Scroll"
255+
msgstr ""
256+
257+
msgid "&Click"
258+
msgstr ""
259+
260+
msgid "&Input"
261+
msgstr ""
262+
263+
msgid "&GoBack/Forward"
264+
msgstr ""
265+
248266
msgid "Clear &Browsing Data"
249267
msgstr ""
250268

‎Translations/WinMerge/Basque.po

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,24 @@ msgstr ""
273273
msgid "Fit to Window"
274274
msgstr ""
275275

276+
msgid "&Event Synchronization"
277+
msgstr ""
278+
279+
msgid "&Enabled"
280+
msgstr ""
281+
282+
msgid "&Scroll"
283+
msgstr ""
284+
285+
msgid "&Click"
286+
msgstr ""
287+
288+
msgid "&Input"
289+
msgstr ""
290+
291+
msgid "&GoBack/Forward"
292+
msgstr ""
293+
276294
msgid "Clear &Browsing Data"
277295
msgstr ""
278296

0 commit comments

Comments
 (0)