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 #2160

Merged
merged 1 commit into from
Jan 3, 2024
Merged

Webpage Compare: Add Location Pane #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Externals/winwebdiff
Open in desktop
Submodule winwebdiff updated 11 files
+37 −2 src/WinWebDiff/WinWebDiff.cpp
+38 −5 src/WinWebDiffLib/Resource.h
+10 −0 src/WinWebDiffLib/WebDiffWindow.hpp
+212 −175 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
+68 −7 src/WinWebDiffLib/WinWebDiffLib.rc
+2 −1 src/WinWebDiffLib/WinWebDiffLib.vcxproj
+5 −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
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