Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Webpage Compare: Add Location Pane #2164

Merged
merged 5 commits into from
Jan 14, 2024
Merged

Webpage Compare: Add Location Pane #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4bbc6a7
Revert "Revert "WIP: Webpage Compare: Add Location Pane""
sdottaka Jan 3, 2024
fcdb616
Merge branch 'webpagediff-locationpane' into webpagediff-locationpane-2
sdottaka Jan 10, 2024
0a02bcd
WIP
sdottaka Jan 12, 2024
7ba0114
WIP
sdottaka Jan 14, 2024
af1f566
WIP
sdottaka Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Docs/Manual/English/_Copyrights.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<!ENTITY CopyrightYears "2004-2023">
<!ENTITY CopyrightYears "2004-2024">
<!ENTITY CopyrightHolder "Thingamahoochie Software">
2 changes: 1 addition & 1 deletion Docs/Manual/Japanese/_Copyrights.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<!ENTITY CopyrightYears "2004-2023">
<!ENTITY CopyrightYears "2004-2024">
<!ENTITY CopyrightHolder "Thingamahoochie Software">
6 changes: 3 additions & 3 deletions DownloadDeps.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ https://github.com/WinMerge/winimerge/releases/download/v1.0.42/winimerge-1.0.42
https://github.com/WinMerge/winimerge/releases/download/v1.0.42/winimerge-1.0.42.0-x64.zip!Build\x64\Release ^
https://github.com/WinMerge/winimerge/releases/download/v1.0.42/winimerge-1.0.42.0-ARM.zip!Build\ARM\Release ^
https://github.com/WinMerge/winimerge/releases/download/v1.0.42/winimerge-1.0.42.0-ARM64.zip!Build\ARM64\Release ^
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.13/winwebdiff-1.0.13.0-x86.zip!Build\x86\Release ^
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.13/winwebdiff-1.0.13.0-x64.zip!Build\x64\Release ^
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.13/winwebdiff-1.0.13.0-ARM64.zip!Build\ARM64\Release ^
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.15/winwebdiff-1.0.15.0-x86.zip!Build\x86\Release ^
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.15/winwebdiff-1.0.15.0-x64.zip!Build\x64\Release ^
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.15/winwebdiff-1.0.15.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 ^
Expand Down
2 changes: 1 addition & 1 deletion Externals/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This file lists versions of the external components we are using.
- WinIMerge: 1.0.42.0
- freeimage: 3.18.0
- LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
- WinWebDiff: 1.0.13.0
- WinWebDiff: 1.0.15.0
- WebView2: 1.0.1518.46
- wil: 1.0.191107.2
- rapidjson: 1.1.1
Expand Down
2 changes: 1 addition & 1 deletion Externals/winwebdiff
Open in desktop
Submodule winwebdiff updated 13 files
+37 −2 src/WinWebDiff/WinWebDiff.cpp
+ − src/WinWebDiff/WinWebDiff.rc
+227 −0 src/WinWebDiffLib/DiffLocation.hpp
+38 −6 src/WinWebDiffLib/Resource.h
+61 −15 src/WinWebDiffLib/WebDiffWindow.hpp
+398 −212 src/WinWebDiffLib/WebToolWindow.hpp
+20 −1 src/WinWebDiffLib/WinWebDiffLib.cpp
+2 −0 src/WinWebDiffLib/WinWebDiffLib.def
+12 −2 src/WinWebDiffLib/WinWebDiffLib.h
+ − src/WinWebDiffLib/WinWebDiffLib.js
+69 −8 src/WinWebDiffLib/WinWebDiffLib.rc
+3 −1 src/WinWebDiffLib/WinWebDiffLib.vcxproj
+8 −2 src/WinWebDiffLib/WinWebDiffLib.vcxproj.filters
19 changes: 2 additions & 17 deletions Src/Merge.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ BEGIN
MENUITEM "1280x800", ID_WEB_SIZE_1280x800
MENUITEM "1440x900", ID_WEB_SIZE_1440x900
END
POPUP "&Event Synchronization"
POPUP "&Event Sync"
BEGIN
MENUITEM "&Enabled", ID_WEB_SYNC_ENABLED
MENUITEM SEPARATOR
Expand Down Expand Up @@ -2342,22 +2342,6 @@ BEGIN
CONTROL "",IDC_LIST_FILE,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,0,0,309,176
END

IDD_WEBPAGEDIFF_BAR DIALOGEX 0, 0, 714, 18
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "Compare",IDC_COMPARE,"Button",BS_SPLITBUTTON | WS_TABSTOP,6,2,72,14
CONTROL "",IDC_FITTOWINDOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,2,14,14
EDITTEXT IDC_WIDTH,98,2,32,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
LTEXT "x",-1,134,4,8,10
EDITTEXT IDC_HEIGHT,140,2,32,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
EDITTEXT IDC_ZOOM,178,2,32,14,ES_AUTOHSCROLL,WS_EX_RIGHT
LTEXT "UA:",-1,214,4,16,10
EDITTEXT IDC_USERAGENT,230,2,128,14,ES_AUTOHSCROLL
CONTROL "&Event Synchronization",IDC_SYNC_EVENTS,"Button",BS_SPLITBUTTON | WS_TABSTOP,362,2,106,14
CONTROL "View &Differences",IDC_SHOWDIFFERENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,472,2,96,14
END


/////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -4243,6 +4227,7 @@ END
STRINGTABLE
BEGIN
IDS_WEBPAGE_COMPARING "Comparing..."
IDS_WEBPAGE_ZOOM "Zoom:"
END

#endif // English (United States) resources
Expand Down
2 changes: 0 additions & 2 deletions Src/Merge.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,6 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
</ClCompile>
<ClCompile Include="WebPageDiffBar.cpp" />
<ClCompile Include="WebPageDiffFrm.cpp" />
<ClCompile Include="WildcardDropList.cpp" />
<ClCompile Include="WindowsManagerDialog.cpp" />
Expand Down Expand Up @@ -1641,7 +1640,6 @@
<ClInclude Include="TrDialogs.h" />
<ClInclude Include="Common\varprop.h" />
<ClInclude Include="Common\VersionInfo.h" />
<ClInclude Include="WebPageDiffBar.h" />
<ClInclude Include="WebPageDiffFrm.h" />
<ClInclude Include="WildcardDropList.h" />
<ClInclude Include="WindowsManagerDialog.h" />
Expand Down
6 changes: 0 additions & 6 deletions Src/Merge.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,9 +705,6 @@
<ClCompile Include="PropCompareWebPage.cpp">
<Filter>MFCGui\PropertyPages\Source Files</Filter>
</ClCompile>
<ClCompile Include="WebPageDiffBar.cpp">
<Filter>MFCGui\MDIChild\WebPageCompare\Source Files</Filter>
</ClCompile>
<ClCompile Include="DirWatcher.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -1338,9 +1335,6 @@
<ClInclude Include="PropCompareWebPage.h">
<Filter>MFCGui\PropertyPages\Header Files</Filter>
</ClInclude>
<ClInclude Include="WebPageDiffBar.h">
<Filter>MFCGui\MDIChild\WebPageCompare\Header Files</Filter>
</ClInclude>
<ClInclude Include="DirWatcher.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down
2 changes: 1 addition & 1 deletion Src/Merge2.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ BEGIN
VALUE "FileDescription", "WinMerge\0"
VALUE "FileVersion", STRFILEVER
VALUE "InternalName", "WinMerge\0"
VALUE "LegalCopyright", "(c) 1996-2023 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "LegalCopyright", "(c) 1996-2024 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMergeU.EXE\0"
VALUE "PrivateBuild", STRPRIVATEBUILD
VALUE "ProductName", "WinMerge\0"
Expand Down
55 changes: 0 additions & 55 deletions Src/WebPageDiffBar.cpp
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions Src/WebPageDiffBar.h
View file
Open in desktop

This file was deleted.

Loading
Loading