Index: src/ch/CustomCopyDlg.cpp =================================================================== diff -u -N -raa6bff57279b9f9cfc276e9adab2763e2900878d -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision aa6bff57279b9f9cfc276e9adab2763e2900878d) +++ src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -114,6 +114,54 @@ { CLanguageDialog::OnInitDialog(); + AddResizableControl(IDC_001_STATIC, 0.0, 0.0, 1.0, 0.0); + AddResizableControl(IDC_FILES_LIST, 0.0, 0.0, 1.0, 0.5); + AddResizableControl(IDC_ADDFILE_BUTTON, 1.0, 0.0, 0.0, 0.0); + AddResizableControl(IDC_ADDDIR_BUTTON, 1.0, 0.0, 0.0, 0.0); + AddResizableControl(IDC_REMOVEFILEFOLDER_BUTTON, 1.0, 0.0, 0.0, 0.0); + AddResizableControl(IDC_IMPORT_BUTTON, 1.0, 0.0, 0.0, 0.0); + + AddResizableControl(IDC_002_STATIC, 0.0, 0.5, 1.0, 0.0); + AddResizableControl(IDC_DESTPATH_COMBOBOXEX, 0.0, 0.5, 1.0, 0.0); + AddResizableControl(IDC_DESTBROWSE_BUTTON, 1.0, 0.5, 0.0, 0.0); + + AddResizableControl(IDC_BAR1_STATIC, 0.0, 0.5, 0.5, 0.0); + AddResizableControl(IDC_007_STATIC, 0.5, 0.5, 0.0, 0.0); + AddResizableControl(IDC_BAR2_STATIC, 0.5, 0.5, 0.5, 0.0); + + AddResizableControl(IDC_003_STATIC, 0.0, 0.5, 0.33, 0.0); + AddResizableControl(IDC_004_STATIC, 0.33, 0.5, 0.33, 0.0); + AddResizableControl(IDC_005_STATIC, 0.66, 0.5, 0.33, 0.0); + + AddResizableControl(IDC_OPERATION_COMBO, 0.0, 0.5, 0.33, 0.0); + AddResizableControl(IDC_PRIORITY_COMBO, 0.33, 0.5, 0.33, 0.0); + AddResizableControl(IDC_COUNT_SPIN, 1.0, 0.5, 0.0, 0.0); + AddResizableControl(IDC_COUNT_EDIT, 0.66, 0.5, 0.33, 0.0); + + AddResizableControl(IDC_006_STATIC, 0.0, 0.5, 1.0, 0.0); + AddResizableControl(IDC_BUFFERSIZES_LIST, 0.0, 0.5, 1.0, 0.0); + AddResizableControl(IDC_BUFFERSIZES_BUTTON, 1.0, 0.5, 0.0, 0.0); + + AddResizableControl(IDC_FILTERS_CHECK, 0.0, 0.5, 0.0, 0.0); + AddResizableControl(IDC_BAR3_STATIC, 0.0, 0.5, 1.0, 0.0); + AddResizableControl(IDC_FILTERS_LIST, 0.0, 0.5, 1.0, 0.5); + AddResizableControl(IDC_ADDFILTER_BUTTON, 1.0, 0.5, 0.0, 0.0); + AddResizableControl(IDC_REMOVEFILTER_BUTTON, 1.0, 0.5, 0.0, 0.0); + + AddResizableControl(IDC_ADVANCED_CHECK, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_BAR4_STATIC, 0.0, 1.0, 1.0, 0.0); + + AddResizableControl(IDC_IGNOREFOLDERS_CHECK, 0.0, 1.0, 1.0, 0.0); + AddResizableControl(IDC_ONLYSTRUCTURE_CHECK, 0.0, 1.0, 1.0, 0.0); + AddResizableControl(IDC_FORCEDIRECTORIES_CHECK, 0.0, 1.0, 1.0, 0.0); + + AddResizableControl(IDC_BAR5_STATIC, 0.0, 1.0, 1.0, 0.0); + AddResizableControl(IDOK, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDCANCEL, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_HELP_BUTTON, 1.0, 1.0, 0.0, 0.0); + + InitializeResizableControls(); + // make this dialog on top SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/); Index: src/ch/FeedbackFileErrorDlg.cpp =================================================================== diff -u -N -ra0481d0f6e16809bac11e8cb77f3808f4956a7b1 -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/FeedbackFileErrorDlg.cpp (.../FeedbackFileErrorDlg.cpp) (revision a0481d0f6e16809bac11e8cb77f3808f4956a7b1) +++ src/ch/FeedbackFileErrorDlg.cpp (.../FeedbackFileErrorDlg.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -45,6 +45,17 @@ { CLanguageDialog::OnInitDialog(); + AddResizableControl(IDC_001_STATIC, 0.0, 0.0, 0.0, 0.0); + AddResizableControl(IDC_DESC_STATIC, 0.0, 0.0, 1.0, 0.0); + AddResizableControl(IDC_INFO_STATIC, 0.0, 0.0, 1.0, 1.0); + AddResizableControl(IDC_RETRY_BUTTON, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_SKIP_BUTTON, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_PAUSE_BUTTON, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDCANCEL, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_ALL_ITEMS_CHECK, 0.0, 1.0, 1.0, 0.0); + + InitializeResizableControls(); + ictranslate::CResourceManager& rResManager = GetResManager(); CString strFmt; strFmt = rResManager.LoadString(m_strDstPath.IsEmpty() ? IDS_INFO_FILE_STRING : IDS_INFO_TWO_FILE_STRING); Index: src/ch/FeedbackNotEnoughSpaceDlg.cpp =================================================================== diff -u -N -ra0481d0f6e16809bac11e8cb77f3808f4956a7b1 -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/FeedbackNotEnoughSpaceDlg.cpp (.../FeedbackNotEnoughSpaceDlg.cpp) (revision a0481d0f6e16809bac11e8cb77f3808f4956a7b1) +++ src/ch/FeedbackNotEnoughSpaceDlg.cpp (.../FeedbackNotEnoughSpaceDlg.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -88,7 +88,26 @@ BOOL CFeedbackNotEnoughSpaceDlg::OnInitDialog() { CLanguageDialog::OnInitDialog(); - + + AddResizableControl(IDC_HEADER_STATIC, 0.0, 0.0, 1.0, 0.0); + AddResizableControl(IDC_001_STATIC, 0.0, 0.0, 0.0, 0.0); + + AddResizableControl(IDC_FILES_LIST, 0.0, 0.0, 1.0, 1.0); + + AddResizableControl(IDC_003_STATIC, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_004_STATIC, 0.0, 1.0, 0.0, 0.0); + + AddResizableControl(IDC_REQUIRED_STATIC, 0.0, 1.0, 1.0, 0.0); + AddResizableControl(IDC_AVAILABLE_STATIC, 0.0, 1.0, 1.0, 0.0); + + AddResizableControl(IDC_RETRY_BUTTON, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_IGNORE_BUTTON, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDCANCEL, 1.0, 1.0, 0.0, 0.0); + + AddResizableControl(IDC_ALL_ITEMS_CHECK, 0.0, 1.0, 1.0, 0.0); + + InitializeResizableControls(); + // set to top SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/); Index: src/ch/FeedbackReplaceDlg.cpp =================================================================== diff -u -N -ra0481d0f6e16809bac11e8cb77f3808f4956a7b1 -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision a0481d0f6e16809bac11e8cb77f3808f4956a7b1) +++ src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -51,6 +51,26 @@ { CLanguageDialog::OnInitDialog(); + AddResizableControl(IDC_INFO_STATIC, 0.0, 0.0, 1.0, 0.0); + + AddResizableControl(IDC_00_STATIC, 0.0, 0.0, 1.0, 0.0); + AddResizableControl(IDC_SRC_ICON_STATIC, 0.0, 0.0, 0.0, 0.0); + AddResizableControl(IDC_SRC_INFO_STATIC, 0.0, 0.0, 1.0, 0.5); + + AddResizableControl(IDC_01_STATIC, 0.0, 0.5, 1.0, 0.0); + AddResizableControl(IDC_DST_ICON_STATIC, 0.0, 0.5, 0.0, 0.0); + AddResizableControl(IDC_DST_INFO_STATIC, 0.0, 0.5, 1.0, 0.5); + + AddResizableControl(IDC_COPY_REST_BUTTON, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_SKIP_BUTTON, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_PAUSE_BUTTON, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_CANCEL_BUTTON, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_REPLACE_BUTTON, 0.0, 1.0, 0.0, 0.0); + + AddResizableControl(IDC_ALL_ITEMS_CHECK, 0.0, 1.0, 1.0, 0.0); + + InitializeResizableControls(); + // load the informations about files RefreshFilesInfo(); RefreshImages(); Index: src/ch/FileInfo.cpp =================================================================== diff -u -N -r449a5b399ab21ca0d06050b47b264f2f704af966 -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/FileInfo.cpp (.../FileInfo.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) +++ src/ch/FileInfo.cpp (.../FileInfo.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -270,9 +270,13 @@ CString CFileInfo::GetFileName(void) const { - ASSERT(m_pClipboard); + ASSERT(m_pClipboard || m_iSrcIndex == -1); - CString strPath=(m_iSrcIndex != -1) ? m_pClipboard->GetAt(m_iSrcIndex)->GetPath()+m_strFilePath : m_strFilePath; + CString strPath; + if(m_pClipboard && m_iSrcIndex != -1) + strPath = m_pClipboard->GetAt(m_iSrcIndex)->GetPath() + m_strFilePath; + else + strPath = m_strFilePath; TCHAR szName[_MAX_FNAME]; TCHAR szExt[_MAX_EXT]; Index: src/ch/OptionsDlg.cpp =================================================================== diff -u -N -rf34d204b8eecd6817dbe4a1c3b3541cf9a8794b0 -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/OptionsDlg.cpp (.../OptionsDlg.cpp) (revision f34d204b8eecd6817dbe4a1c3b3541cf9a8794b0) +++ src/ch/OptionsDlg.cpp (.../OptionsDlg.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -90,7 +90,15 @@ BOOL COptionsDlg::OnInitDialog() { CLanguageDialog::OnInitDialog(); - + + AddResizableControl(IDC_PROPERTIES_LIST, 0.0, 0.0, 1.0, 1.0); + AddResizableControl(IDOK, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDCANCEL, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_APPLY_BUTTON, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDHELP, 1.0, 1.0, 0.0, 0.0); + + InitializeResizableControls(); + m_ctlProperties.Init(); // copy shortcut and recent paths Index: src/ch/RecentDlg.cpp =================================================================== diff -u -N -raa6bff57279b9f9cfc276e9adab2763e2900878d -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/RecentDlg.cpp (.../RecentDlg.cpp) (revision aa6bff57279b9f9cfc276e9adab2763e2900878d) +++ src/ch/RecentDlg.cpp (.../RecentDlg.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -67,6 +67,23 @@ { CLanguageDialog::OnInitDialog(); + AddResizableControl(IDC_001_STATIC, 0.0, 0.0, 1.0, 0.0); + AddResizableControl(IDC_RECENT_LIST, 0.0, 0.0, 1.0, 1.0); + + AddResizableControl(IDC_002_STATIC, 0.0, 1.0, 1.0, 0.0); + + AddResizableControl(IDC_PATH_EDIT, 0.0, 1.0, 1.0, 0.0); + AddResizableControl(IDC_BROWSE_BUTTON, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_ADD_BUTTON, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_CHANGE_BUTTON, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_DELETE_BUTTON, 0.0, 1.0, 0.0, 0.0); + + AddResizableControl(IDOK, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDCANCEL, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_HELP_BUTTON, 1.0, 1.0, 0.0, 0.0); + + InitializeResizableControls(); + // system image list SHFILEINFO sfi; m_himl = (HIMAGELIST)SHGetFileInfo(_T("C:\\"), FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(SHFILEINFO), Index: src/ch/ReplacePathsDlg.cpp =================================================================== diff -u -N -r49b67b7417f8b42ce581ebfe604f47df841f763b -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/ReplacePathsDlg.cpp (.../ReplacePathsDlg.cpp) (revision 49b67b7417f8b42ce581ebfe604f47df841f763b) +++ src/ch/ReplacePathsDlg.cpp (.../ReplacePathsDlg.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -68,6 +68,20 @@ { CLanguageDialog::OnInitDialog(); + AddResizableControl(IDC_001_STATIC, 0.0, 0.0, 1.0, 0.0); + AddResizableControl(IDC_PATHS_LIST, 0.0, 0.0, 1.0, 1.0); + AddResizableControl(IDC_SOURCE_EDIT, 0.0, 1.0, 1.0, 0.0); + + AddResizableControl(IDC_002_STATIC, 0.0, 1.0, 1.0, 0.0); + + AddResizableControl(IDC_DESTINATION_EDIT, 0.0, 1.0, 1.0, 0.0); + AddResizableControl(IDC_BROWSE_BUTTON, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDOK, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDCANCEL, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_HELP_BUTTON, 1.0, 1.0, 0.0, 0.0); + + InitializeResizableControls(); + for (int i=0;iGetClipboardDataSize();i++) m_ctlPathsList.AddString(m_pTask->GetClipboardData(i)->GetPath()); Index: src/ch/ShortcutsDlg.cpp =================================================================== diff -u -N -r449a5b399ab21ca0d06050b47b264f2f704af966 -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) +++ src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -73,6 +73,28 @@ { CLanguageDialog::OnInitDialog(); + AddResizableControl(IDC_001_STATIC, 0, 0, 1, 0); + AddResizableControl(IDC_SHORTCUT_LIST, 0, 0, 1, 1); + AddResizableControl(IDC_UP_BUTTON, 1, 0, 0, 0); + AddResizableControl(IDC_DOWN_BUTTON, 1, 0, 0, 0); + + AddResizableControl(IDC_004_STATIC, 0, 1, 1, 0); + AddResizableControl(IDC_002_STATIC, 0, 1, 0, 0); + AddResizableControl(IDC_003_STATIC, 0, 1, 0, 0); + + AddResizableControl(IDC_NAME_EDIT, 0, 1, 1, 0); + AddResizableControl(IDC_PATH_COMBOBOXEX, 0, 1, 1, 0); + AddResizableControl(IDC_BROWSE_BUTTON, 1, 1, 0, 0); + + AddResizableControl(IDC_ADD_BUTTON, 0, 1, 0, 0); + AddResizableControl(IDC_CHANGE_BUTTON, 0, 1, 0, 0); + AddResizableControl(IDC_DELETE_BUTTON, 0, 1, 0, 0); + AddResizableControl(IDOK, 1, 1, 0, 0); + AddResizableControl(IDCANCEL, 1, 1, 0, 0); + AddResizableControl(IDC_HELP_BUTTON, 1, 1, 0, 0); + + InitializeResizableControls(); + // system image list SHFILEINFO sfi; m_himl = (HIMAGELIST)SHGetFileInfo(_T("C:\\"), FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(SHFILEINFO), Index: src/ch/StatusDlg.cpp =================================================================== diff -u -N -r9c71c0a84781c524c0091ee86914d5cc3bbf5190 -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 9c71c0a84781c524c0091ee86914d5cc3bbf5190) +++ src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -97,7 +97,9 @@ BOOL CStatusDlg::OnInitDialog() { CLanguageDialog::OnInitDialog(); - + + PrepareResizableControls(); + // get size of list ctrl CRect rcList; m_ctlStatusList.GetWindowRect(&rcList); @@ -978,3 +980,82 @@ RefreshStatus(); } + +// ============================================================================ +/// CStatusDlg::PrepareResizableControls +/// @date 2009/04/18 +/// +/// @brief Prepares the resizable controls. +// ============================================================================ +void CStatusDlg::PrepareResizableControls() +{ + ClearResizableControls(); + + AddResizableControl(IDC_001_STATIC, 0, 0, 0.5, 0.0); + AddResizableControl(IDC_STATUS_LIST, 0, 0, 0.5, 1.0); + AddResizableControl(IDC_ROLL_UNROLL_BUTTON, 0.5, 0, 0, 0); + + AddResizableControl(IDC_PAUSE_BUTTON, 0, 1.0, 0, 0); + AddResizableControl(IDC_RESTART_BUTTON, 0, 1.0, 0, 0); + AddResizableControl(IDC_RESUME_BUTTON, 0, 1.0, 0, 0); + AddResizableControl(IDC_CANCEL_BUTTON, 0, 1.0, 0, 0); + AddResizableControl(IDC_DELETE_BUTTON, 0, 1.0, 0, 0); + AddResizableControl(IDC_PAUSE_ALL_BUTTON, 0, 1.0, 0, 0); + AddResizableControl(IDC_START_ALL_BUTTON, 0, 1.0, 0, 0); + AddResizableControl(IDC_CANCEL_ALL_BUTTON, 0, 1.0, 0, 0); + AddResizableControl(IDC_REMOVE_FINISHED_BUTTON, 0, 1.0, 0, 0); + AddResizableControl(IDC_RESTART_ALL_BUTTON, 0, 1.0, 0, 0); + AddResizableControl(IDC_ADVANCED_BUTTON, 0, 1.0, 0, 0); + + AddResizableControl(IDC_STICK_BUTTON, 1.0, 1.0, 0, 0); + + // sections separators + AddResizableControl(IDC_014_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_015_STATIC, 0.5, 0.0, 0.0, 0); + + AddResizableControl(IDC_018_STATIC, 0.5, 0.0, 0.25, 0); + AddResizableControl(IDC_019_STATIC, 0.5, 0.0, 0.25, 0); + AddResizableControl(IDC_016_STATIC, 0.75, 0.0, 0.25, 0); + AddResizableControl(IDC_017_STATIC, 0.75, 0.0, 0.25, 0); + + // left part of right column + AddResizableControl(IDC_002_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_003_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_004_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_005_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_006_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_007_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_008_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_009_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_010_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_011_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_012_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_013_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_020_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_021_STATIC, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_SHOW_LOG_BUTTON, 0.5, 0.0, 0.0, 0); + AddResizableControl(IDC_SHOW_LOG_BUTTON, 0.5, 0.0, 0.0, 0.0); + + // full length right column + AddResizableControl(IDC_ALL_PROGRESS, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_TASK_PROGRESS, 0.5, 0.0, 0.5, 0); + + // right part of right column + AddResizableControl(IDC_ERRORS_EDIT, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_ASSOCIATEDFILES__STATIC, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_OPERATION_STATIC, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_SOURCE_STATIC, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_DESTINATION_STATIC, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_PROGRESS_STATIC, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_TIME_STATIC, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_TRANSFER_STATIC, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_OVERALL_PROGRESS_STATIC, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_OVERALL_TRANSFER_STATIC, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_BUFFERSIZE_STATIC, 0.5, 0.0, 0.5, 0); + AddResizableControl(IDC_PRIORITY_STATIC, 0.5, 0.0, 0.5, 0); + + AddResizableControl(IDC_SET_BUFFERSIZE_BUTTON, 1.0, 0.0, 0.0, 0.0); + AddResizableControl(IDC_SET_PRIORITY_BUTTON, 1.0, 0.0, 0.0, 0.0); + + InitializeResizableControls(); +} Index: src/ch/StatusDlg.h =================================================================== diff -u -N -r49b67b7417f8b42ce581ebfe604f47df841f763b -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/StatusDlg.h (.../StatusDlg.h) (revision 49b67b7417f8b42ce581ebfe604f47df841f763b) +++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -91,6 +91,8 @@ protected: virtual void OnLanguageChanged(); + void PrepareResizableControls(); + // Generated message map functions //{{AFX_MSG(CStatusDlg) virtual BOOL OnInitDialog(); Index: src/ch/ch.h =================================================================== diff -u -N -rbfe720fda9529e7a77b4fb6410b4d4945b69188b -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/ch.h (.../ch.h) (revision bfe720fda9529e7a77b4fb6410b4d4945b69188b) +++ src/ch/ch.h (.../ch.h) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -27,7 +27,6 @@ #include "AppHelper.h" #include "CfgProperties.h" #include "../chext/chext.h" -//#include "LogFile.h" #include "../libicpf/log.h" #include "../libchcore/EngineCfg.h" #include "../libictranslate/ResourceManager.h" Index: src/ch/ch.rc =================================================================== diff -u -N -rf34d204b8eecd6817dbe4a1c3b3541cf9a8794b0 -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/ch/ch.rc (.../ch.rc) (revision f34d204b8eecd6817dbe4a1c3b3541cf9a8794b0) +++ src/ch/ch.rc (.../ch.rc) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -151,7 +151,7 @@ END IDD_FEEDBACK_FILE_ERROR_DIALOG DIALOGEX 0, 0, 283, 112 -STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SYSMODAL | DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "File Error" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN @@ -165,45 +165,45 @@ LTEXT "File: c:\\test.avi\nReason: No permission to perform the operation requested.",IDC_INFO_STATIC,51,28,225,42 END -IDD_MINIVIEW_DIALOG DIALOGEX 0, 0, 90, 23 +IDD_MINIVIEW_DIALOG DIALOGEX 0, 0, 91, 23 STYLE DS_ABSALIGN | DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW CAPTION "Status" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - LISTBOX IDC_PROGRESS_LIST,7,7,76,9,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_TABSTOP,0,HIDC_PROGRESS_LIST + LISTBOX IDC_PROGRESS_LIST,7,7,77,9,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_TABSTOP,0,HIDC_PROGRESS_LIST END -IDD_OPTIONS_DIALOG DIALOGEX 0, 0, 396, 214 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_OPTIONS_DIALOG DIALOGEX 0, 0, 397, 214 +STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Options" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "&OK",IDOK,173,193,50,14,0,0,HIDOK PUSHBUTTON "&Cancel",IDCANCEL,227,193,50,14,0,0,HIDCANCEL - LISTBOX IDC_PROPERTIES_LIST,7,7,382,179,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,HIDC_PROPERTIES_LIST + LISTBOX IDC_PROPERTIES_LIST,7,7,383,179,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,HIDC_PROPERTIES_LIST PUSHBUTTON "&Apply",IDC_APPLY_BUTTON,283,193,50,14,0,0,HIDC_APPLY_BUTTON - PUSHBUTTON "&Help",IDHELP,339,193,50,14,0,0,HIDHELP + PUSHBUTTON "&Help",IDHELP,340,193,50,14,0,0,HIDHELP END -IDD_REPLACE_PATHS_DIALOG DIALOGEX 0, 0, 342, 148 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_REPLACE_PATHS_DIALOG DIALOGEX 0, 0, 343, 148 +STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Partial replace of source paths" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - LISTBOX IDC_PATHS_LIST,7,17,328,52,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,HIDC_PATHS_LIST - EDITTEXT IDC_SOURCE_EDIT,7,70,328,14,ES_AUTOHSCROLL,0,HIDC_SOURCE_EDIT + LISTBOX IDC_PATHS_LIST,7,17,329,52,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,HIDC_PATHS_LIST + EDITTEXT IDC_SOURCE_EDIT,7,70,329,14,ES_AUTOHSCROLL,0,HIDC_SOURCE_EDIT EDITTEXT IDC_DESTINATION_EDIT,7,98,309,14,ES_AUTOHSCROLL,0,HIDC_DESTINATION_EDIT - PUSHBUTTON "...",IDC_BROWSE_BUTTON,319,98,16,14,0,0,HIDC_BROWSE_BUTTON + PUSHBUTTON "...",IDC_BROWSE_BUTTON,320,98,16,14,0,0,HIDC_BROWSE_BUTTON DEFPUSHBUTTON "OK",IDOK,173,127,50,14,0,0,HIDOK PUSHBUTTON "&Cancel",IDCANCEL,229,127,50,14,0,0,HIDCANCEL - LTEXT "Source paths:",IDC_001_STATIC,7,7,328,8 - LTEXT "Change to:",IDC_002_STATIC,7,89,328,8 - PUSHBUTTON "&Help",IDC_HELP_BUTTON,285,127,50,14,0,0,HIDC_HELP_BUTTON + LTEXT "Source paths:",IDC_001_STATIC,7,7,329,8 + LTEXT "Change to:",IDC_002_STATIC,7,89,329,8 + PUSHBUTTON "&Help",IDC_HELP_BUTTON,286,127,50,14,0,0,HIDC_HELP_BUTTON END -IDD_STATUS_DIALOG DIALOGEX 0, 0, 478, 250 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +IDD_STATUS_DIALOG DIALOGEX 0, 0, 479, 250 +STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Status" FONT 8, "Tahoma", 0, 0, 0x1 @@ -219,15 +219,15 @@ PUSHBUTTON "Remove/all",IDC_REMOVE_FINISHED_BUTTON,79,229,71,14,0,0,HIDC_REMOVE_FINISHED_BUTTON PUSHBUTTON "Restart/all",IDC_RESTART_ALL_BUTTON,151,229,71,14,0,0,HIDC_RESTART_ALL_BUTTON PUSHBUTTON "&Advanced >",IDC_ADVANCED_BUTTON,160,212,71,14,0,0,HIDC_ADVANCED_BUTTON - PUSHBUTTON "",IDC_STICK_BUTTON,471,243,7,7,BS_CENTER | BS_VCENTER | BS_FLAT,0,HIDC_STICK_BUTTON - PUSHBUTTON "&<<",IDC_ROLL_UNROLL_BUTTON,212,7,19,12,0,0,HIDC_ROLL_UNROLL_BUTTON - PUSHBUTTON "...",IDC_SET_BUFFERSIZE_BUTTON,458,72,13,14,0,0,HIDC_SET_BUFFERSIZE_BUTTON - PUSHBUTTON ">",IDC_SET_PRIORITY_BUTTON,458,88,13,14,0,0,HIDC_SET_PRIORITY_BUTTON + PUSHBUTTON "",IDC_STICK_BUTTON,472,243,7,7,BS_CENTER | BS_VCENTER | BS_FLAT,0,HIDC_STICK_BUTTON + PUSHBUTTON "&<<",IDC_ROLL_UNROLL_BUTTON,212,7,19,12,NOT WS_VISIBLE,0,HIDC_ROLL_UNROLL_BUTTON + PUSHBUTTON "...",IDC_SET_BUFFERSIZE_BUTTON,459,72,13,14,0,0,HIDC_SET_BUFFERSIZE_BUTTON + PUSHBUTTON ">",IDC_SET_PRIORITY_BUTTON,459,88,13,14,0,0,HIDC_SET_PRIORITY_BUTTON PUSHBUTTON "View log",IDC_SHOW_LOG_BUTTON,249,116,60,14,0,0,HIDC_SHOW_LOG_BUTTON LTEXT "Operations list:",IDC_001_STATIC,7,7,197,8 - CONTROL "Progress1",IDC_ALL_PROGRESS,"msctls_progress32",PBS_SMOOTH,312,234,159,9 + CONTROL "Progress1",IDC_ALL_PROGRESS,"msctls_progress32",PBS_SMOOTH,313,234,159,9 LTEXT "Progress:",IDC_002_STATIC,249,235,62,8 - CONTROL "Progress2",IDC_TASK_PROGRESS,"msctls_progress32",0x0,312,181,159,6 + CONTROL "Progress2",IDC_TASK_PROGRESS,"msctls_progress32",0x0,313,181,159,6 LTEXT "Progress:",IDC_003_STATIC,249,179,62,8 LTEXT "Destination object:",IDC_004_STATIC,249,59,62,8 LTEXT "Source object:",IDC_005_STATIC,249,47,62,8 @@ -241,43 +241,43 @@ LTEXT "Processed:",IDC_013_STATIC,249,205,62,8 CTEXT "Global statistics",IDC_014_STATIC,293,191,84,8 CTEXT "Current selection statistics",IDC_015_STATIC,293,7,113,8 - CONTROL "",IDC_016_STATIC,"Static",SS_ETCHEDHORZ,384,194,87,1 + CONTROL "",IDC_016_STATIC,"Static",SS_ETCHEDHORZ,385,194,87,1 CONTROL "",IDC_017_STATIC,"Static",SS_ETCHEDHORZ,411,10,61,1 CONTROL "",IDC_018_STATIC,"Static",SS_ETCHEDHORZ,249,194,37,1 CONTROL "",IDC_019_STATIC,"Static",SS_ETCHEDHORZ,249,10,38,1 LTEXT "Time:",IDC_020_STATIC,249,152,62,8 PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,196,44,14,0,0,HIDC_RESUME_BUTTON - EDITTEXT IDC_ERRORS_EDIT,312,104,159,26,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE,HIDC_ERRORS_EDIT + EDITTEXT IDC_ERRORS_EDIT,313,104,159,26,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE,HIDC_ERRORS_EDIT LTEXT "Associated file:",IDC_021_STATIC,249,19,62,8 - CONTROL "",IDC_ASSOCIATEDFILES__STATIC,"STATICEX",0x4,312,17,159,12,WS_EX_STATICEDGE,HIDC_ASSOCIATEDFILES__STATIC - CONTROL "",IDC_OPERATION_STATIC,"STATICEX",0x4,312,32,159,12,WS_EX_STATICEDGE,HIDC_OPERATION_STATIC - CONTROL "",IDC_SOURCE_STATIC,"STATICEX",0x4,312,45,159,12,WS_EX_STATICEDGE,HIDC_SOURCE_STATIC - CONTROL "",IDC_DESTINATION_STATIC,"STATICEX",0x4,312,58,159,12,WS_EX_STATICEDGE,HIDC_DESTINATION_STATIC - CONTROL "",IDC_PROGRESS_STATIC,"STATICEX",0x4,312,135,159,12,WS_EX_STATICEDGE,HIDC_PROGRESS_STATIC - CONTROL "",IDC_TIME_STATIC,"STATICEX",0x4,312,150,159,12,WS_EX_STATICEDGE,HIDC_TIME_STATIC - CONTROL "",IDC_TRANSFER_STATIC,"STATICEX",0x4,312,165,159,12,WS_EX_STATICEDGE,HIDC_TRANSFER_STATIC - CONTROL "",IDC_OVERALL_PROGRESS_STATIC,"STATICEX",0x4,312,203,159,12,WS_EX_STATICEDGE,HIDC_OVERALL_PROGRESS_STATIC - CONTROL "",IDC_OVERALL_TRANSFER_STATIC,"STATICEX",0x4,312,218,159,12,WS_EX_STATICEDGE,HIDC_OVERALL_TRANSFER_STATIC - CONTROL "",IDC_BUFFERSIZE_STATIC,"STATICEX",0x4,312,74,143,12,WS_EX_STATICEDGE,HIDC_BUFFERSIZE_STATIC - CONTROL "",IDC_PRIORITY_STATIC,"STATICEX",0x4,312,88,143,12,WS_EX_STATICEDGE,HIDC_PRIORITY_STATIC + CONTROL "",IDC_ASSOCIATEDFILES__STATIC,"STATICEX",0x4,313,17,159,12,WS_EX_STATICEDGE,HIDC_ASSOCIATEDFILES__STATIC + CONTROL "",IDC_OPERATION_STATIC,"STATICEX",0x4,313,32,159,12,WS_EX_STATICEDGE,HIDC_OPERATION_STATIC + CONTROL "",IDC_SOURCE_STATIC,"STATICEX",0x4,313,45,159,12,WS_EX_STATICEDGE,HIDC_SOURCE_STATIC + CONTROL "",IDC_DESTINATION_STATIC,"STATICEX",0x4,313,58,159,12,WS_EX_STATICEDGE,HIDC_DESTINATION_STATIC + CONTROL "",IDC_PROGRESS_STATIC,"STATICEX",0x4,313,135,159,12,WS_EX_STATICEDGE,HIDC_PROGRESS_STATIC + CONTROL "",IDC_TIME_STATIC,"STATICEX",0x4,313,150,159,12,WS_EX_STATICEDGE,HIDC_TIME_STATIC + CONTROL "",IDC_TRANSFER_STATIC,"STATICEX",0x4,313,165,159,12,WS_EX_STATICEDGE,HIDC_TRANSFER_STATIC + CONTROL "",IDC_OVERALL_PROGRESS_STATIC,"STATICEX",0x4,313,203,159,12,WS_EX_STATICEDGE,HIDC_OVERALL_PROGRESS_STATIC + CONTROL "",IDC_OVERALL_TRANSFER_STATIC,"STATICEX",0x4,313,218,159,12,WS_EX_STATICEDGE,HIDC_OVERALL_TRANSFER_STATIC + CONTROL "",IDC_BUFFERSIZE_STATIC,"STATICEX",0x4,313,74,143,12,WS_EX_STATICEDGE,HIDC_BUFFERSIZE_STATIC + CONTROL "",IDC_PRIORITY_STATIC,"STATICEX",0x4,313,88,143,12,WS_EX_STATICEDGE,HIDC_PRIORITY_STATIC END -IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG DIALOGEX 0, 0, 254, 147 -STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG DIALOGEX 0, 0, 255, 147 +STYLE DS_SYSMODAL | DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Not enough free space" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,78,113,57,14,0,0,HIDC_RETRY_BUTTON PUSHBUTTON "C&ontinue",IDC_IGNORE_BUTTON,136,113,57,14,0,0,HIDC_IGNORE_BUTTON - PUSHBUTTON "&Cancel",IDCANCEL,197,113,50,14,0,0,HIDCANCEL - LISTBOX IDC_FILES_LIST,41,35,206,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,0,HIDC_FILES_LIST - LTEXT "",IDC_REQUIRED_STATIC,108,85,139,8,0,0,HIDC_REQUIRED_STATIC - LTEXT "",IDC_AVAILABLE_STATIC,108,97,139,8,0,0,HIDC_AVAILABLE_STATIC - ICON IDI_WARNING_ICON,IDC_001_STATIC,9,11,20,20,SS_REALSIZEIMAGE + PUSHBUTTON "&Cancel",IDCANCEL,198,113,50,14,0,0,HIDCANCEL + LISTBOX IDC_FILES_LIST,42,35,206,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,0,HIDC_FILES_LIST + LTEXT "",IDC_REQUIRED_STATIC,109,85,139,8,0,0,HIDC_REQUIRED_STATIC + LTEXT "",IDC_AVAILABLE_STATIC,109,97,139,8,0,0,HIDC_AVAILABLE_STATIC + ICON IDI_WARNING_ICON,IDC_001_STATIC,9,11,21,20,SS_REALSIZEIMAGE LTEXT "Required space:",IDC_003_STATIC,41,85,59,8 LTEXT "Space available:",IDC_004_STATIC,41,97,59,8 - LTEXT "",IDC_HEADER_STATIC,41,7,206,24 - CONTROL "&Do not ask anymore",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,240,10 + LTEXT "",IDC_HEADER_STATIC,42,7,206,24 + CONTROL "&Do not ask anymore",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,241,10 END IDD_SHUTDOWN_DIALOG DIALOGEX 0, 0, 186, 86 @@ -292,51 +292,51 @@ CONTROL "Progress1",IDC_TIME_PROGRESS,"msctls_progress32",PBS_SMOOTH,7,48,172,9 END -IDD_CUSTOM_COPY_DIALOG DIALOGEX 0, 0, 349, 319 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_CUSTOM_COPY_DIALOG DIALOGEX 0, 0, 351, 318 +STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Copying/moving parameters" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN CONTROL "List1",IDC_FILES_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,16,279,57,0,HIDC_FILES_LIST - PUSHBUTTON "Add &file(s)...",IDC_ADDFILE_BUTTON,289,15,53,14,0,0,HIDC_ADDFILE_BUTTON - PUSHBUTTON "Add f&older...",IDC_ADDDIR_BUTTON,289,30,53,14,0,0,HIDC_ADDDIR_BUTTON - PUSHBUTTON "&Delete",IDC_REMOVEFILEFOLDER_BUTTON,289,45,53,14,0,0,HIDC_REMOVEFILEFOLDER_BUTTON - PUSHBUTTON "&Import...",IDC_IMPORT_BUTTON,289,60,53,14,0,0,HIDC_IMPORT_BUTTON + PUSHBUTTON "Add &file(s)...",IDC_ADDFILE_BUTTON,291,15,53,14,0,0,HIDC_ADDFILE_BUTTON + PUSHBUTTON "Add f&older...",IDC_ADDDIR_BUTTON,291,30,53,14,0,0,HIDC_ADDDIR_BUTTON + PUSHBUTTON "&Delete",IDC_REMOVEFILEFOLDER_BUTTON,291,45,53,14,0,0,HIDC_REMOVEFILEFOLDER_BUTTON + PUSHBUTTON "&Import...",IDC_IMPORT_BUTTON,291,60,53,14,0,0,HIDC_IMPORT_BUTTON CONTROL "",IDC_DESTPATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,7,86,314,136,0,HIDC_DESTPATH_COMBOBOXEX - PUSHBUTTON "...",IDC_DESTBROWSE_BUTTON,324,85,18,14,0,0,HIDC_DESTBROWSE_BUTTON + PUSHBUTTON "...",IDC_DESTBROWSE_BUTTON,326,85,18,14,0,0,HIDC_DESTBROWSE_BUTTON COMBOBOX IDC_OPERATION_COMBO,13,124,117,143,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_OPERATION_COMBO COMBOBOX IDC_PRIORITY_COMBO,137,124,122,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_PRIORITY_COMBO - EDITTEXT IDC_COUNT_EDIT,262,124,80,14,ES_AUTOHSCROLL,0,HIDC_COUNT_EDIT - CONTROL "Spin1",IDC_COUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,331,124,11,14 + EDITTEXT IDC_COUNT_EDIT,264,124,80,14,ES_AUTOHSCROLL,0,HIDC_COUNT_EDIT + CONTROL "Spin1",IDC_COUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,333,124,11,14 LISTBOX IDC_BUFFERSIZES_LIST,13,152,275,20,LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP,0,HIDC_BUFFERSIZES_LIST - PUSHBUTTON "&Change...",IDC_BUFFERSIZES_BUTTON,292,152,50,14,0,0,HIDC_BUFFERSIZES_BUTTON + PUSHBUTTON "&Change...",IDC_BUFFERSIZES_BUTTON,294,152,50,14,0,0,HIDC_BUFFERSIZES_BUTTON CONTROL "Filtering",IDC_FILTERS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,61,10,0,HIDC_FILTERS_CHECK CONTROL "List2",IDC_FILTERS_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,13,190,303,46,0,HIDC_FILTERS_LIST - PUSHBUTTON "+",IDC_ADDFILTER_BUTTON,320,190,22,14,0,0,HIDC_ADDFILTER_BUTTON - PUSHBUTTON "-",IDC_REMOVEFILTER_BUTTON,320,206,22,14,0,0,HIDC_REMOVEFILTER_BUTTON + PUSHBUTTON "+",IDC_ADDFILTER_BUTTON,322,190,22,14,0,0,HIDC_ADDFILTER_BUTTON + PUSHBUTTON "-",IDC_REMOVEFILTER_BUTTON,322,206,22,14,0,0,HIDC_REMOVEFILTER_BUTTON CONTROL "Advanced options",IDC_ADVANCED_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,242,84,10,0,HIDC_ADVANCED_CHECK CONTROL "Do not create destination directories - copy files loosely to destination folder",IDC_IGNOREFOLDERS_CHECK, "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,255,329,10,0,HIDC_IGNOREFOLDERS_CHECK CONTROL "Do not copy/move contents of files - only create it (empty)",IDC_ONLYSTRUCTURE_CHECK, "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,277,329,10,0,HIDC_ONLYSTRUCTURE_CHECK - PUSHBUTTON "&OK",IDOK,186,298,50,14,0,0,HIDOK - PUSHBUTTON "&Cancel",IDCANCEL,239,298,50,14,0,0,HIDCANCEL - LTEXT "Source files/folders:",IDC_001_STATIC,7,7,335,8 - LTEXT "Destination folder:",IDC_002_STATIC,7,76,335,8 + PUSHBUTTON "&OK",IDOK,186,297,50,14,0,0,HIDOK + PUSHBUTTON "&Cancel",IDCANCEL,239,297,50,14,0,0,HIDCANCEL + LTEXT "Source files/folders:",IDC_001_STATIC,7,7,337,8 + LTEXT "Destination folder:",IDC_002_STATIC,7,76,337,8 LTEXT "Operation type:",IDC_003_STATIC,13,115,117,8 LTEXT "Priority:",IDC_004_STATIC,137,115,120,8 - LTEXT "Count of copies:",IDC_005_STATIC,262,115,80,8 + LTEXT "Count of copies:",IDC_005_STATIC,264,115,80,8 LTEXT "Buffer sizes:",IDC_006_STATIC,13,142,244,8 - CONTROL "",IDC_BAR3_STATIC,"Static",SS_ETCHEDHORZ,74,181,268,1 - CONTROL "",IDC_BAR4_STATIC,"Static",SS_ETCHEDHORZ,96,247,246,1 - CONTROL "",IDC_BAR5_STATIC,"Static",SS_ETCHEDHORZ,7,291,335,1 - CONTROL "",IDC_BAR2_STATIC,"Static",SS_ETCHEDHORZ,105,107,237,1 + CONTROL "",IDC_BAR3_STATIC,"Static",SS_ETCHEDHORZ,76,181,268,1 + CONTROL "",IDC_BAR4_STATIC,"Static",SS_ETCHEDHORZ,98,247,246,1 + CONTROL "",IDC_BAR5_STATIC,"Static",SS_ETCHEDHORZ,7,291,337,1 + CONTROL "",IDC_BAR2_STATIC,"Static",SS_ETCHEDHORZ,107,107,237,1 CTEXT "Standard options",IDC_007_STATIC,20,104,80,8 CONTROL "",IDC_BAR1_STATIC,"Static",SS_ETCHEDHORZ,7,107,8,1 CONTROL "Create directory structure in destination folder (relatively to root directory)",IDC_FORCEDIRECTORIES_CHECK, "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,266,329,10,0,HIDC_FORCEDIRECTORIES_CHECK - PUSHBUTTON "&Help",IDC_HELP_BUTTON,292,298,50,14,0,0,HIDC_HELP_BUTTON + PUSHBUTTON "&Help",IDC_HELP_BUTTON,294,297,50,14,0,0,HIDC_HELP_BUTTON END IDD_FILTER_DIALOG DIALOGEX 0, 0, 291, 266 @@ -384,8 +384,8 @@ PUSHBUTTON "&Help",IDC_HELP_BUTTON,234,245,50,14,0,0,HIDC_HELP_BUTTON END -IDD_SHORTCUTEDIT_DIALOG DIALOGEX 0, 0, 324, 206 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHORTCUTEDIT_DIALOG DIALOGEX 0, 0, 325, 206 +STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Shortcuts editing" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN @@ -398,31 +398,31 @@ PUSHBUTTON "&Delete",IDC_DELETE_BUTTON,121,160,50,14,0,0,HIDC_DELETE_BUTTON DEFPUSHBUTTON "&OK",IDOK,156,185,50,14,0,0,HIDOK PUSHBUTTON "&Cancel",IDCANCEL,211,185,50,14,0,0,HIDCANCEL - LTEXT "Shortcuts:",IDC_001_STATIC,7,7,310,8 + LTEXT "Shortcuts:",IDC_001_STATIC,7,7,311,8 LTEXT "Name:",IDC_002_STATIC,18,126,53,8 LTEXT "Path:",IDC_003_STATIC,18,145,56,8 - GROUPBOX "Shortcut properties",IDC_004_STATIC,7,111,310,70 - PUSHBUTTON "Move up",IDC_UP_BUTTON,272,47,45,14,0,0,HIDC_UP_BUTTON - PUSHBUTTON "Move down",IDC_DOWN_BUTTON,272,63,45,14,0,0,HIDC_DOWN_BUTTON - PUSHBUTTON "&Help",IDC_HELP_BUTTON,267,185,50,14,0,0,HIDC_HELP_BUTTON + GROUPBOX "Shortcut properties",IDC_004_STATIC,7,111,311,70 + PUSHBUTTON "Move up",IDC_UP_BUTTON,273,47,45,14,0,0,HIDC_UP_BUTTON + PUSHBUTTON "Move down",IDC_DOWN_BUTTON,273,63,45,14,0,0,HIDC_DOWN_BUTTON + PUSHBUTTON "&Help",IDC_HELP_BUTTON,268,185,50,14,0,0,HIDC_HELP_BUTTON END -IDD_RECENTEDIT_DIALOG DIALOGEX 0, 0, 324, 190 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_RECENTEDIT_DIALOG DIALOGEX 0, 0, 325, 190 +STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Recent paths" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - CONTROL "List1",IDC_RECENT_LIST,"SysListView32",LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,16,310,88,0,HIDC_RECENT_LIST + CONTROL "List1",IDC_RECENT_LIST,"SysListView32",LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,16,311,88,0,HIDC_RECENT_LIST EDITTEXT IDC_PATH_EDIT,20,123,266,14,ES_AUTOHSCROLL,0,HIDC_PATH_EDIT PUSHBUTTON "...",IDC_BROWSE_BUTTON,290,123,18,14,0,0,HIDC_BROWSE_BUTTON PUSHBUTTON "&Add",IDC_ADD_BUTTON,20,141,50,14,0,0,HIDC_ADD_BUTTON PUSHBUTTON "&Update",IDC_CHANGE_BUTTON,72,141,50,14,0,0,HIDC_CHANGE_BUTTON PUSHBUTTON "&Delete",IDC_DELETE_BUTTON,124,141,50,14,0,0,HIDC_DELETE_BUTTON DEFPUSHBUTTON "&OK",IDOK,156,169,50,14,0,0,HIDOK PUSHBUTTON "&Cancel",IDCANCEL,211,169,50,14,0,0,HIDCANCEL - LTEXT "Recently used paths:",IDC_001_STATIC,7,7,310,8 - GROUPBOX "Path",IDC_002_STATIC,7,110,310,51 - PUSHBUTTON "&Help",IDC_HELP_BUTTON,267,169,50,14,0,0,HIDC_HELP_BUTTON + LTEXT "Recently used paths:",IDC_001_STATIC,7,7,311,8 + GROUPBOX "Path",IDC_002_STATIC,7,110,311,51 + PUSHBUTTON "&Help",IDC_HELP_BUTTON,268,169,50,14,0,0,HIDC_HELP_BUTTON END IDD_ABOUTBOX DIALOGEX 0, 0, 369, 139 @@ -470,24 +470,24 @@ PUSHBUTTON "&Download latest version...",IDC_OPEN_WEBPAGE_BUTTON,85,62,112,14 END -IDD_FEEDBACK_REPLACE_DIALOG DIALOGEX 0, 0, 272, 158 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_FEEDBACK_REPLACE_DIALOG DIALOGEX 0, 0, 273, 159 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "File already exists" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "File you are trying to copy already exists. What do you want to do ?",IDC_INFO_STATIC,7,7,258,15 + LTEXT "File you are trying to copy already exists. What do you want to do ?",IDC_INFO_STATIC,7,7,259,15 PUSHBUTTON "&Replace",IDC_REPLACE_BUTTON,7,124,50,14 PUSHBUTTON "&Copy rest",IDC_COPY_REST_BUTTON,60,124,50,14 - CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,141,258,10 + CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,142,259,10 PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,111,124,50,14 PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,163,124,50,14 - PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,215,124,50,14 - ICON "",IDC_SRC_ICON_STATIC,21,36,20,20 - ICON "",IDC_DST_ICON_STATIC,21,86,20,20 - LTEXT "",IDC_SRC_INFO_STATIC,59,32,206,36 - LTEXT "",IDC_DST_INFO_STATIC,59,81,206,36 - LTEXT "File being copied:",IDC_00_STATIC,14,19,250,8 - LTEXT "Existing file:",IDC_01_STATIC,15,69,250,8 + PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,216,124,50,14 + ICON "",IDC_SRC_ICON_STATIC,21,36,21,20 + ICON "",IDC_DST_ICON_STATIC,21,86,21,20 + LTEXT "",IDC_SRC_INFO_STATIC,60,32,206,36 + LTEXT "",IDC_DST_INFO_STATIC,60,81,206,36 + LTEXT "File being copied:",IDC_00_STATIC,14,20,250,8 + LTEXT "Existing file:",IDC_01_STATIC,16,70,250,8 END @@ -518,39 +518,39 @@ IDD_MINIVIEW_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 83 + RIGHTMARGIN, 84 TOPMARGIN, 7 BOTTOMMARGIN, 16 END IDD_OPTIONS_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 389 + RIGHTMARGIN, 390 TOPMARGIN, 7 BOTTOMMARGIN, 207 END IDD_REPLACE_PATHS_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 335 + RIGHTMARGIN, 336 TOPMARGIN, 7 BOTTOMMARGIN, 141 END IDD_STATUS_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 471 + RIGHTMARGIN, 472 TOPMARGIN, 7 BOTTOMMARGIN, 243 END IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 247 + RIGHTMARGIN, 248 TOPMARGIN, 7 BOTTOMMARGIN, 140 END @@ -566,9 +566,9 @@ IDD_CUSTOM_COPY_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 342 + RIGHTMARGIN, 344 TOPMARGIN, 7 - BOTTOMMARGIN, 312 + BOTTOMMARGIN, 311 END IDD_FILTER_DIALOG, DIALOG @@ -582,15 +582,15 @@ IDD_SHORTCUTEDIT_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 317 + RIGHTMARGIN, 318 TOPMARGIN, 7 BOTTOMMARGIN, 199 END IDD_RECENTEDIT_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 317 + RIGHTMARGIN, 318 TOPMARGIN, 7 BOTTOMMARGIN, 183 END @@ -622,9 +622,9 @@ IDD_FEEDBACK_REPLACE_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 265 + RIGHTMARGIN, 266 TOPMARGIN, 7 - BOTTOMMARGIN, 151 + BOTTOMMARGIN, 152 END END #endif // APSTUDIO_INVOKED Index: src/chext/DropMenuExt.cpp =================================================================== diff -u -N -r0373359eff650e8cf04a5992711ef9f20347536f -r17059054c69cd5726f4c7d35357f3b9556471783 --- src/chext/DropMenuExt.cpp (.../DropMenuExt.cpp) (revision 0373359eff650e8cf04a5992711ef9f20347536f) +++ src/chext/DropMenuExt.cpp (.../DropMenuExt.cpp) (revision 17059054c69cd5726f4c7d35357f3b9556471783) @@ -103,7 +103,7 @@ return hResult; } -STDMETHODIMP CDropMenuExt::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT /*idCmdLast*/, UINT uFlags) +STDMETHODIMP CDropMenuExt::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT /*idCmdLast*/, UINT /*uFlags*/) { ATLTRACE(_T("CDropMenuExt::QueryContextMenu()\n")); // check options @@ -274,7 +274,7 @@ return HandleMenuMsg2(uMsg, wParam, lParam, NULL); } -STDMETHODIMP CDropMenuExt::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* plResult) +STDMETHODIMP CDropMenuExt::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* /*plResult*/) { ATLTRACE(_T("CDropMenuExt::HandleMenuMsg2(): uMsg = %lu, wParam = %lu, lParam = %lu\n"), uMsg, wParam, lParam); return S_FALSE;