Expose post-3.49-2 engine options in the GUI

WinHTTrack/OptionTab1.cpp

@@ -30,6 +30,9 @@ COptionTab1::COptionTab1() : CPropertyPage(COptionTab1::IDD)
 	m_parseall = FALSE;
 	m_testall = FALSE;
 	m_htmlfirst = FALSE;
+	m_keepwww = FALSE;
+	m_keepslashes = FALSE;
+	m_keepqueryorder = FALSE;
 	//}}AFX_DATA_INIT
 }
 
@@ -45,6 +48,9 @@ void COptionTab1::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_parseall, m_parseall);
 	DDX_Check(pDX, IDC_testall, m_testall);
 	DDX_Check(pDX, IDC_htmlfirst, m_htmlfirst);
+	DDX_Check(pDX, IDC_keepwww, m_keepwww);
+	DDX_Check(pDX, IDC_keepslashes, m_keepslashes);
+	DDX_Check(pDX, IDC_keepqueryorder, m_keepqueryorder);
 	//}}AFX_DATA_MAP
 }
 
@@ -69,11 +75,17 @@ BOOL COptionTab1::OnInitDialog()
     GetDlgItem(IDC_link)     ->ModifyStyle(0,WS_DISABLED);
     GetDlgItem(IDC_testall)  ->ModifyStyle(0,WS_DISABLED);
     GetDlgItem(IDC_htmlfirst)->ModifyStyle(0,WS_DISABLED);
+    GetDlgItem(IDC_keepwww)  ->ModifyStyle(0,WS_DISABLED);
+    GetDlgItem(IDC_keepslashes)->ModifyStyle(0,WS_DISABLED);
+    GetDlgItem(IDC_keepqueryorder)->ModifyStyle(0,WS_DISABLED);
   } else {
     GetDlgItem(IDC_parseall) ->ModifyStyle(WS_DISABLED,0);
     GetDlgItem(IDC_link)     ->ModifyStyle(WS_DISABLED,0);
     GetDlgItem(IDC_testall)  ->ModifyStyle(WS_DISABLED,0);
     GetDlgItem(IDC_htmlfirst)->ModifyStyle(WS_DISABLED,0);
+    GetDlgItem(IDC_keepwww)  ->ModifyStyle(WS_DISABLED,0);
+    GetDlgItem(IDC_keepslashes)->ModifyStyle(WS_DISABLED,0);
+    GetDlgItem(IDC_keepqueryorder)->ModifyStyle(WS_DISABLED,0);
   }
 
   // Patcher l'interface pour les Français ;-)
@@ -83,6 +95,9 @@ BOOL COptionTab1::OnInitDialog()
     SetDlgItemTextCP(this, IDC_testall,LANG(LANG_I32)); // "Tester tous les liens (même ceux interdits)");
     SetDlgItemTextCP(this, IDC_parseall,LANG(LANG_I32b));
     SetDlgItemTextCP(this, IDC_htmlfirst,LANG(LANG_I32c));
+    SetDlgItemTextCP(this, IDC_keepwww,LANG(LANG_KEEPWWW));
+    SetDlgItemTextCP(this, IDC_keepslashes,LANG(LANG_KEEPSLASHES));
+    SetDlgItemTextCP(this, IDC_keepqueryorder,LANG(LANG_KEEPQUERYORDER));
   }
 
 	return TRUE;  // return TRUE unless you set the focus to a control
@@ -131,6 +146,9 @@ const char* COptionTab1::GetTip(int ID)
     case IDC_testall: return LANG(LANG_I2); break; // "Test all links in pages","Tester tous les liens dans les pages"); break;
     case IDC_parseall: return LANG(LANG_I2b); break;
     case IDC_htmlfirst: return LANG(LANG_I2c); break;
+    case IDC_keepwww:   return LANG(LANG_KEEPWWWTIP); break;
+    case IDC_keepslashes: return LANG(LANG_KEEPSLASHESTIP); break;
+    case IDC_keepqueryorder: return LANG(LANG_KEEPQUERYORDERTIP); break;
   }
   return "";
 }

WinHTTrack/OptionTab1.h

@@ -28,6 +28,9 @@ class COptionTab1 : public CPropertyPage
 	BOOL	m_parseall;
 	BOOL	m_testall;
 	BOOL	m_htmlfirst;
+	BOOL	m_keepwww;
+	BOOL	m_keepslashes;
+	BOOL	m_keepqueryorder;
 	//}}AFX_DATA
 
 

WinHTTrack/OptionTab10.cpp

@@ -44,6 +44,7 @@ COptionTab10::COptionTab10() : CPropertyPage(COptionTab10::IDD)
 	m_port = _T("");
 	m_ftpprox = FALSE;
 	//}}AFX_DATA_INIT
+  m_proxytype = 0;
 }
 
 COptionTab10::~COptionTab10()
@@ -206,7 +207,9 @@ void COptionTab10::Onproxyconfigure()
     proxy.m_proxlogin=user_pass;
     proxy.m_proxpass=a+1;
   }
+  proxy.m_proxytype = m_proxytype;
   if (proxy.DoModal() == IDOK) {
+    m_proxytype = proxy.m_proxytype;
     if (proxy.m_proxlogin.GetLength()==0) {
       SetDlgItemTextCP(this, IDC_prox,proxy.m_proxadr);
       m_ctl_pwdhide.SetCheck(0);

WinHTTrack/OptionTab10.h

@@ -21,6 +21,7 @@ class COptionTab10 : public CPropertyPage
   const char* GetTip(int id);
   int modify;
   int prox_status;
+  int m_proxytype;   /* 0 = HTTP proxy, 1 = SOCKS5 proxy */
   char ProxyDetectBuff[16][1024];
   CString ProxyDetectName[16];
 

WinHTTrack/OptionTab3.cpp

@@ -32,6 +32,7 @@ COptionTab3::COptionTab3() : CPropertyPage(COptionTab3::IDD)
 	m_windebug = FALSE;
 	m_cache = FALSE;
 	m_travel3 = -1;
+	m_stripquery = _T("");
 	//}}AFX_DATA_INIT
 }
 
@@ -53,6 +54,7 @@ void COptionTab3::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_windebug, m_windebug);
 	DDX_Check(pDX, IDC_Cache, m_cache);
 	DDX_CBIndex(pDX, IDC_travel3, m_travel3);
+	DDX_Text(pDX, IDC_stripquery, m_stripquery);
 	//}}AFX_DATA_MAP
 }
 
@@ -82,6 +84,8 @@ BOOL COptionTab3::OnInitDialog()
     GetDlgItem(IDC_STATIC_primf)   ->ModifyStyle(0,WS_DISABLED);
     GetDlgItem(IDC_STATIC_travel)  ->ModifyStyle(0,WS_DISABLED);
     GetDlgItem(IDC_STATIC_travel2) ->ModifyStyle(0,WS_DISABLED);
+    GetDlgItem(IDC_stripquery)     ->ModifyStyle(0,WS_DISABLED);
+    GetDlgItem(IDC_STATIC_stripquery)->ModifyStyle(0,WS_DISABLED);
   } else {
     GetDlgItem(IDC_Cache)   ->ModifyStyle(WS_DISABLED,0);
     GetDlgItem(IDC_filter)  ->ModifyStyle(WS_DISABLED,0);
@@ -92,6 +96,8 @@ BOOL COptionTab3::OnInitDialog()
     GetDlgItem(IDC_STATIC_travel)  ->ModifyStyle(WS_DISABLED,0);
     GetDlgItem(IDC_STATIC_travel2) ->ModifyStyle(WS_DISABLED,0);
     GetDlgItem(IDC_STATIC_travel3) ->ModifyStyle(WS_DISABLED,0);
+    GetDlgItem(IDC_stripquery)     ->ModifyStyle(WS_DISABLED,0);
+    GetDlgItem(IDC_STATIC_stripquery)->ModifyStyle(WS_DISABLED,0);
   }
 
   // Patcher l'interface pour les Français ;-)
@@ -102,6 +108,7 @@ BOOL COptionTab3::OnInitDialog()
     SetDlgItemTextCP(this, IDC_STATIC_travel2,LANG(LANG_I40b)); // "Mode de parcours");
     SetDlgItemTextCP(this, IDC_STATIC_warning,LANG(LANG_I40c));
     SetDlgItemTextCP(this, IDC_STATIC_travel3,LANG(LANG_I40e));
+    SetDlgItemTextCP(this, IDC_STATIC_stripquery,LANG(LANG_STRIPQUERY));
     SetDlgItemTextCP(this, IDC_windebug,LANG_I40d);  // Activate debug mode (winhttrack.log)
     SetCombo(this,IDC_filter,LISTDEF_4);
     SetCombo(this,IDC_travel,LISTDEF_5);
@@ -158,6 +165,7 @@ const char* COptionTab3::GetTip(int ID)
     case IDC_travel2:  return LANG(LANG_I11b); break; // "Select the travel direction in the site","Sélection de la direction du miroir"); break;
     case IDC_travel3:  return LANG(LANG_I11c); break;
     case IDC_windebug: return LANG_I1h; break;
+    case IDC_stripquery: return LANG(LANG_STRIPQUERYTIP); break;
   }
   return "";
 }

WinHTTrack/OptionTab3.h

@@ -35,6 +35,7 @@ class COptionTab3 : public CPropertyPage
 	BOOL	m_windebug;
 	BOOL	m_cache;
 	int		m_travel3;
+	CString	m_stripquery;
 	//}}AFX_DATA
 
 

WinHTTrack/OptionTab4.cpp

@@ -33,6 +33,7 @@ COptionTab4::COptionTab4() : CPropertyPage(COptionTab4::IDD)
 	m_rems = FALSE;
 	m_rate = _T("");
 	m_ka = FALSE;
+	m_pausefiles = _T("");
 	//}}AFX_DATA_INIT
 }
 
@@ -51,6 +52,7 @@ void COptionTab4::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_rems, m_rems);
 	DDX_Text(pDX, IDC_rate, m_rate);
 	DDX_Check(pDX, IDC_ka, m_ka);
+	DDX_Text(pDX, IDC_pausefiles, m_pausefiles);
 	//}}AFX_DATA_MAP
 }
 
@@ -79,6 +81,7 @@ BOOL COptionTab4::OnInitDialog()
     SetDlgItemTextCP(this, IDC_rems,LANG(LANG_I47)); // "Abandon hote si lent");
     SetDlgItemTextCP(this, IDC_ka,LANG(LANG_I47e));
     SetDlgItemTextCP(this, IDC_STATIC_timeout,LANG_I47d); // TimeOut(s)
+    SetDlgItemTextCP(this, IDC_STATIC_pausefiles,LANG(LANG_PAUSEFILES));
   }
 
 	return TRUE;  // return TRUE unless you set the focus to a control
@@ -131,6 +134,7 @@ const char* COptionTab4::GetTip(int ID)
     case IDC_rate:    return LANG(LANG_I15); break; // "Minimum transfer rate tolerated","Taux de transfert minimal toléré"); break;
     case IDC_rems:    return LANG(LANG_I16); break; // "Cancel all links from a host if it is too slow","Annuler tous les liens sur un domaine en cas de transfert trop lent"); break;
     case IDC_ka:      return LANG(LANG_I47f); break;
+    case IDC_pausefiles: return LANG(LANG_PAUSEFILESTIP); break;
   }
   return "";
 }

WinHTTrack/OptionTab4.h

@@ -31,6 +31,7 @@ class COptionTab4 : public CPropertyPage
 	BOOL	m_rems;
 	CString	m_rate;
 	BOOL	m_ka;
+	CString	m_pausefiles;
 	//}}AFX_DATA
 
 

WinHTTrack/OptionTab8.cpp

@@ -34,6 +34,7 @@ COptionTab8::COptionTab8() : CPropertyPage(COptionTab8::IDD)
 	m_toler = FALSE;
 	m_updhack = FALSE;
 	m_urlhack = FALSE;
+	m_cookiesfile = _T("");
 	//}}AFX_DATA_INIT
 }
 
@@ -53,18 +54,30 @@ void COptionTab8::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_toler, m_toler);
 	DDX_Check(pDX, IDC_updhack, m_updhack);
 	DDX_Check(pDX, IDC_urlhack, m_urlhack);
+	DDX_Text(pDX, IDC_cookiesfile, m_cookiesfile);
 	//}}AFX_DATA_MAP
 }
 
 
 BEGIN_MESSAGE_MAP(COptionTab8, CPropertyPage)
 	//{{AFX_MSG_MAP(COptionTab8)
+	ON_BN_CLICKED(IDC_cookiesfilebrowse, OnCookiesFileBrowse)
 	//}}AFX_MSG_MAP
   ON_NOTIFY_EX( TTN_NEEDTEXT, 0, OnToolTipNotify )
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
 // COptionTab8 message handlers
+
+void COptionTab8::OnCookiesFileBrowse()
+{
+  // writable buffer: CFileDialog rewrites the '|' separators in place
+  char szFilter[] = "Cookies file (cookies.txt, *.txt)|*.txt|All files (*.*)|*.*||";
+  CFileDialog dial(TRUE, "txt", NULL, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, szFilter);
+  if (dial.DoModal() == IDOK)
+    SetDlgItemTextCP(this, IDC_cookiesfile, dial.GetPathName());
+}
+
 BOOL COptionTab8::OnInitDialog() 
 {
 	CDialog::OnInitDialog();
@@ -104,6 +117,7 @@ BOOL COptionTab8::OnInitDialog()
     SetDlgItemTextCP(this, IDC_toler,LANG(LANG_I62));
     SetDlgItemTextCP(this, IDC_updhack,LANG(LANG_I62b));
     SetDlgItemTextCP(this, IDC_urlhack,LANG(LANG_I62b2));
+    SetDlgItemTextCP(this, IDC_STATIC_cookiesfile,LANG(LANG_COOKIEFILE));
     SetCombo(this,IDC_checktype,LISTDEF_7);
     SetCombo(this,IDC_robots,LISTDEF_8);
   }  
@@ -160,6 +174,7 @@ const char* COptionTab8::GetTip(int ID)
     case IDC_toler:     return LANG(LANG_I1i); break;
     case IDC_updhack:   return LANG(LANG_I1k); break;
     case IDC_urlhack:   return LANG(LANG_I1k2); break;
+    case IDC_cookiesfile: return LANG(LANG_COOKIEFILETIP); break;
   }
   return "";
 }

WinHTTrack/OptionTab8.h

@@ -32,6 +32,7 @@ class COptionTab8 : public CPropertyPage
 	BOOL	m_toler;
 	BOOL	m_updhack;
 	BOOL	m_urlhack;
+	CString	m_cookiesfile;
 	//}}AFX_DATA
 
 
@@ -47,6 +48,7 @@ class COptionTab8 : public CPropertyPage
 	// Generated message map functions
 	//{{AFX_MSG(COptionTab8)
 	virtual BOOL OnInitDialog();
+	afx_msg void OnCookiesFileBrowse();
 	//}}AFX_MSG
   afx_msg BOOL OnToolTipNotify( UINT id, NMHDR * pNMHDR, LRESULT * pResult );
   DECLARE_MESSAGE_MAP()

WinHTTrack/ProxyId.cpp

@@ -28,6 +28,7 @@ CProxyId::CProxyId(CWnd* pParent /*=NULL*/)
 	m_proxlogin = _T("");
 	m_proxpass = _T("");
 	m_proxport = _T("");
+	m_proxytype = 0;
 	//}}AFX_DATA_INIT
 }
 
@@ -40,6 +41,8 @@ void CProxyId::DoDataExchange(CDataExchange* pDX)
 	DDX_Text(pDX, IDC_proxlogin, m_proxlogin);
 	DDX_Text(pDX, IDC_proxpass, m_proxpass);
 	DDX_Text(pDX, IDC_proxport, m_proxport);
+	DDX_Control(pDX, IDC_proxytype, m_ctl_proxytype);
+	DDX_CBIndex(pDX, IDC_proxytype, m_proxytype);
 	//}}AFX_DATA_MAP
 }
 
@@ -61,9 +64,16 @@ BOOL CProxyId::OnInitDialog()
   SetIcon(httrack_icon,true);
   EnableToolTips(true);     // TOOL TIPS
   SetForegroundWindow();   // yop en premier plan!
+
+  /* Proxy protocol selector (HTTP or SOCKS5). Index maps to m_proxytype;
+     the scheme is prepended to the -P argument by the shell. */
+  m_ctl_proxytype.AddString("HTTP");
+  m_ctl_proxytype.AddString("SOCKS5");
+  m_ctl_proxytype.SetCurSel(m_proxytype == 1 ? 1 : 0);
 
   if (LANG_T(-1)) {    // Patcher en français
     SetWindowTextCP(this,  LANG(LANG_R1));
+    SetDlgItemTextCP(this, IDC_STATIC_ptype,LANG(LANG_PROXYTYPE));
     SetDlgItemTextCP(this, IDC_STATIC_adr,LANG(LANG_R2));
     SetDlgItemTextCP(this, IDC_STATIC_port,LANG(LANG_R3));
     SetDlgItemTextCP(this, IDC_STATIC_auth,LANG(LANG_R4));
@@ -131,6 +141,7 @@ BOOL CProxyId::OnToolTipNotify( UINT id, NMHDR * pNMHDR, LRESULT * pResult )
 const char* CProxyId::GetTip(int ID)
 {
   switch(ID) {
+    case IDC_proxytype:  return LANG(LANG_PROXYTYPETIP); break;
     case IDC_proxadr:    return LANG(LANG_R10); break;
     case IDC_proxport:   return LANG(LANG_R11); break;
     case IDC_proxlogin:  return LANG(LANG_R12); break;

WinHTTrack/ProxyId.h

@@ -19,10 +19,12 @@ class CProxyId : public CDialog
 // Dialog Data
 	//{{AFX_DATA(CProxyId)
 	enum { IDD = IDD_ProxyId };
+	CComboBox	m_ctl_proxytype;
 	CString	m_proxadr;
 	CString	m_proxlogin;
 	CString	m_proxpass;
 	CString	m_proxport;
+	int	m_proxytype;
 	//}}AFX_DATA