Revert "WIP: Webpage Compare: Add Location Pane"

This reverts commit f8a3342.

Src/Merge.rc

@@ -241,7 +241,7 @@ BEGIN
             MENUITEM "1280x800",                    ID_WEB_SIZE_1280x800
             MENUITEM "1440x900",                    ID_WEB_SIZE_1440x900
         END
-        POPUP "&Event Sync"
+        POPUP "&Event Synchronization"
         BEGIN
             MENUITEM "&Enabled",                    ID_WEB_SYNC_ENABLED
             MENUITEM SEPARATOR
@@ -2342,6 +2342,22 @@ 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
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -4227,7 +4243,6 @@ END
 STRINGTABLE
 BEGIN
     IDS_WEBPAGE_COMPARING   "Comparing..."
-    IDS_WEBPAGE_ZOOM        "Zoom:"
 END
 
 #endif    // English (United States) resources

Src/Merge.vcxproj

@@ -1412,6 +1412,7 @@
       <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" />
@@ -1640,6 +1641,7 @@
     <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" />

Src/Merge.vcxproj.filters

@@ -705,6 +705,9 @@
     <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>
@@ -1335,6 +1338,9 @@
     <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>

Src/WebPageDiffBar.cpp

@@ -0,0 +1,55 @@
+// WebPageDiffDlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "WebPageDiffBar.h"
+#include "MergeApp.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CWebPageDiffBar dialog
+
+
+CWebPageDiffBar::CWebPageDiffBar()
+{
+	//{{AFX_DATA_INIT(CWebPageDiffBar)
+		// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void CWebPageDiffBar::DoDataExchange(CDataExchange* pDX)
+{
+	CDialogBar::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CWebPageDiffBar)
+		// NOTE: the ClassWizard will add DDX and DDV calls here
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CWebPageDiffBar, CTrDialogBar)
+	//{{AFX_MSG_MAP(CWebPageDiffBar)
+	ON_UPDATE_COMMAND_UI(IDC_COMPARE, OnUpdateBnClickedCompare)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CWebPageDiffBar message handlers
+
+BOOL CWebPageDiffBar::Create(CWnd *pParentWnd) 
+{
+	if (! CTrDialogBar::Create(pParentWnd, CWebPageDiffBar::IDD, 
+			CBRS_TOP | CBRS_TOOLTIPS | CBRS_FLYBY, CWebPageDiffBar::IDD))
+		return FALSE;
+
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void CWebPageDiffBar::OnUpdateBnClickedCompare(CCmdUI* pCmdUI)
+{
+	pCmdUI->Enable(true);
+}

Src/WebPageDiffBar.h

@@ -0,0 +1,45 @@
+// WebPageDiffBar.h : header file
+//
+
+#pragma once
+
+#include "TrDialogs.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// CWebPageDiffBar dialog
+
+class CWebPageDiffBar : public CTrDialogBar
+{
+// Construction
+public:
+	CWebPageDiffBar();
+
+	BOOL Create(CWnd* pParentWnd);
+
+// Dialog Data
+	//{{AFX_DATA(CWebPageDiffBar)
+	enum { IDD = IDD_WEBPAGEDIFF_BAR };
+		// NOTE: the ClassWizard will add data members here
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CWebPageDiffBar)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CWebPageDiffBar)
+	afx_msg void OnUpdateBnClickedCompare(CCmdUI* pCmdUI);
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+
+private:
+
+public:
+};