Index: src/ch/CustomCopyDlg.h =================================================================== diff -u -rcdc76e1a95383dff63a5254aeb8d37035028512c -r926b1177cffa2face218fabb3d8af71910d1b8e5 --- src/ch/CustomCopyDlg.h (.../CustomCopyDlg.h) (revision cdc76e1a95383dff63a5254aeb8d37035028512c) +++ src/ch/CustomCopyDlg.h (.../CustomCopyDlg.h) (revision 926b1177cffa2face218fabb3d8af71910d1b8e5) @@ -21,6 +21,8 @@ #include "../libchcore/TFileFilter.h" #include "../libchcore/TTaskDefinition.h" +#include "CDragDropListCtrl.h" +#include "CDragDropComboEx.h" ///////////////////////////////////////////////////////////////////////////// // CCustomCopyDlg dialog @@ -30,7 +32,7 @@ // Construction public: CCustomCopyDlg(); // standard constructor - CCustomCopyDlg(const chcore::TTaskDefinition& rTaskDefinition); + explicit CCustomCopyDlg(const chcore::TTaskDefinition& rTaskDefinition); // Dialog Data enum { IDD = IDD_CUSTOM_COPY_DIALOG }; @@ -42,9 +44,10 @@ // Implementation protected: virtual void OnLanguageChanged(); - void UpdateDialog(); + + void UpdateFilesListCtrlHeaderWidth(); + void UpdateComboIcon(); - void SetComboPath(LPCTSTR lpszText); void EnableControls(); void AddFilter(const chcore::TFileFilter& rFilter, int iPos=-1); void AddPath(CString strPath); @@ -75,26 +78,28 @@ afx_msg void OnIgnorefoldersCheck(); afx_msg void OnForcedirectoriesCheck(); afx_msg void OnExportButtonClicked(); + afx_msg void OnSize(UINT nType, int cx, int cy); DECLARE_MESSAGE_MAP() public: chcore::TTaskDefinition m_tTaskDefinition; std::vector m_vRecent; // recently selected paths - bool m_bActualisation; // is this dialog processing the combo text changing ? - CComboBoxEx m_ctlDstPath; + CDragDropComboEx m_ctlDstPath; CListCtrl m_ctlFilters; CListBox m_ctlBufferSizes; CComboBox m_ctlOperation; CComboBox m_ctlPriority; - CListCtrl m_ctlFiles; - BOOL m_bOnlyCreate; - BOOL m_bIgnoreFolders; - BOOL m_bForceDirectories; - BOOL m_bFilters; - BOOL m_bAdvanced; + CDragDropListCtrl m_ctlFiles; CImageList m_ilImages; + + bool m_bActualisation = false; // is this dialog processing the combo text changing ? + BOOL m_bOnlyCreate = FALSE; + BOOL m_bIgnoreFolders = FALSE; + BOOL m_bForceDirectories = FALSE; + BOOL m_bFilters = FALSE; + BOOL m_bAdvanced = FALSE; }; #endif