Index: src/ch/FeedbackHandler.cpp =================================================================== diff -u -N -r4d1f8110906889d56552771fb58a6de86bc54a29 -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 --- src/ch/FeedbackHandler.cpp (.../FeedbackHandler.cpp) (revision 4d1f8110906889d56552771fb58a6de86bc54a29) +++ src/ch/FeedbackHandler.cpp (.../FeedbackHandler.cpp) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16) @@ -38,11 +38,12 @@ TFeedbackResult CFeedbackHandler::FileError(const TString& strSrcPath, const TString& strDstPath, EFileError /*eFileError*/, unsigned long ulError) { - if(HasFileErrorPermanentResponse()) - return TFeedbackResult(GetFileErrorPermanentResponse(), true); + EFeedbackResult eResult = eResult_Unknown; + if(HasFileErrorPermanentResponse(eResult)) + return TFeedbackResult(eResult, true); CFeedbackFileErrorDlg dlg(strSrcPath.c_str(), strDstPath.c_str(), ulError); - EFeedbackResult eResult = (EFeedbackResult)dlg.DoModal(); + eResult = (EFeedbackResult)dlg.DoModal(); if (dlg.m_bAllItems) SetFileErrorPermanentResponse(eResult); @@ -52,11 +53,12 @@ TFeedbackResult CFeedbackHandler::FileAlreadyExists(const TFileInfo& spSrcFileInfo, const TFileInfo& spDstFileInfo) { - if(HasFileAlreadyExistsPermanentResponse()) - return TFeedbackResult(GetFileAlreadyExistsPermanentResponse(), true); + EFeedbackResult eResult = eResult_Unknown; + if(HasFileAlreadyExistsPermanentResponse(eResult)) + return TFeedbackResult(eResult, true); CFeedbackReplaceDlg dlg(spSrcFileInfo, spDstFileInfo); - EFeedbackResult eResult = (EFeedbackResult)dlg.DoModal(); + eResult = (EFeedbackResult)dlg.DoModal(); if(dlg.m_bAllItems) SetFileAlreadyExistsPermanentResponse(eResult); @@ -66,11 +68,12 @@ TFeedbackResult CFeedbackHandler::NotEnoughSpace(const TString& strSrcPath, const TString& strDstPath, unsigned long long ullRequiredSize) { - if(HasNotEnoughSpacePermanentResponse()) - return TFeedbackResult(GetNotEnoughSpacePermanentResponse(), true); + EFeedbackResult eResult = eResult_Unknown; + if(HasNotEnoughSpacePermanentResponse(eResult)) + return TFeedbackResult(eResult, true); CFeedbackNotEnoughSpaceDlg dlg(ullRequiredSize, strSrcPath.c_str(), strDstPath.c_str()); - EFeedbackResult eResult = (EFeedbackResult) dlg.DoModal(); + eResult = (EFeedbackResult) dlg.DoModal(); if (dlg.m_bAllItems) SetNotEnoughSpacePermanentResponse(eResult); Index: src/ch/StatusDlg.cpp =================================================================== diff -u -N -r7972b0944e0a947144fbdb93262f7d73ac528dc7 -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 --- src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 7972b0944e0a947144fbdb93262f7d73ac528dc7) +++ src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16) @@ -70,6 +70,7 @@ ON_BN_CLICKED(IDC_PAUSE_BUTTON, OnPauseButton) ON_BN_CLICKED(IDC_CANCEL_BUTTON, OnCancelButton) ON_BN_CLICKED(IDC_SET_PRIORITY_BUTTON, OnSetPriorityButton) + ON_BN_CLICKED(IDC_TASK_ADVANCED_BUTTON, OnTaskAdvancedOptions) ON_BN_CLICKED(IDC_SET_BUFFERSIZE_BUTTON, OnSetBuffersizeButton) ON_BN_CLICKED(IDC_START_ALL_BUTTON, OnStartAllButton) ON_BN_CLICKED(IDC_RESTART_BUTTON, OnRestartButton) @@ -179,6 +180,7 @@ // enable/disable controls GetDlgItem(IDC_SET_BUFFERSIZE_BUTTON)->EnableWindow(bEnable); GetDlgItem(IDC_SET_PRIORITY_BUTTON)->EnableWindow(bEnable); + GetDlgItem(IDC_TASK_ADVANCED_BUTTON)->EnableWindow(bEnable); if (!bEnable) { @@ -368,6 +370,28 @@ } } +void CStatusDlg::OnTaskAdvancedOptions() +{ + CMenu menu; + HMENU hMenu = GetResManager().LoadMenu(MAKEINTRESOURCE(IDR_TASK_ADVANCED_MENU)); + if(!menu.Attach(hMenu)) + { + DestroyMenu(hMenu); + return; + } + + CMenu* pPopup = menu.GetSubMenu(0); + ASSERT(pPopup != NULL); + if(pPopup) + { + // set point in which to set menu + CRect rect; + GetDlgItem(IDC_TASK_ADVANCED_BUTTON)->GetWindowRect(&rect); + + pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, rect.right + 1, rect.top, this); + } +} + BOOL CStatusDlg::OnCommand(WPARAM wParam, LPARAM lParam) { if (HIWORD(wParam) == 0) @@ -412,6 +436,16 @@ break; } } + else if(LOWORD(wParam) == ID_POPUP_RESET_APPLY_TO_ALL) + { + // processing priority + chcore::TTaskPtr spSelectedTask = GetSelectedItemPointer(); + + if(spSelectedTask == NULL) + return ictranslate::CLanguageDialog::OnCommand(wParam, lParam); + + spSelectedTask->RestoreFeedbackDefaults(); + } } return ictranslate::CLanguageDialog::OnCommand(wParam, lParam); } @@ -806,6 +840,7 @@ 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_TASK_ADVANCED_BUTTON, 0, 1.0, 0, 0); // left part of dialog (global stats) AddResizableControl(IDC_GLOBAL_GROUP_STATIC, 0.0, 1.0, 0.5, 0); Index: src/ch/StatusDlg.h =================================================================== diff -u -N -ra5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8 -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 --- src/ch/StatusDlg.h (.../StatusDlg.h) (revision a5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8) +++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16) @@ -84,6 +84,7 @@ afx_msg void OnPauseButton(); afx_msg void OnCancelButton(); afx_msg void OnSetPriorityButton(); + afx_msg void OnTaskAdvancedOptions(); afx_msg void OnSetBuffersizeButton(); afx_msg void OnStartAllButton(); afx_msg void OnRestartButton(); Index: src/ch/ch.rc =================================================================== diff -u -N -rcdc76e1a95383dff63a5254aeb8d37035028512c -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 --- src/ch/ch.rc (.../ch.rc) (revision cdc76e1a95383dff63a5254aeb8d37035028512c) +++ src/ch/ch.rc (.../ch.rc) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16) @@ -128,7 +128,8 @@ PUSHBUTTON "Resume/all",IDC_START_ALL_BUTTON,79,208,71,14,0,0,HIDC_START_ALL_BUTTON PUSHBUTTON "Cancel/all",IDC_CANCEL_ALL_BUTTON,7,223,71,14,0,0,HIDC_CANCEL_ALL_BUTTON PUSHBUTTON "Remove/all",IDC_REMOVE_FINISHED_BUTTON,79,223,71,14,0,0,HIDC_REMOVE_FINISHED_BUTTON - PUSHBUTTON "Restart/all",IDC_RESTART_ALL_BUTTON,151,223,71,14,0,0,HIDC_RESTART_ALL_BUTTON + PUSHBUTTON "Restart/all",IDC_RESTART_ALL_BUTTON,151,223,79,14,0,0,HIDC_RESTART_ALL_BUTTON + PUSHBUTTON "Advanced >",IDC_TASK_ADVANCED_BUTTON,151,208,79,14,0,0,HIDC_TASK_ADVANCED_BUTTON PUSHBUTTON "",IDC_STICK_BUTTON,484,295,7,7,BS_CENTER | BS_VCENTER | BS_FLAT,0,HIDC_STICK_BUTTON PUSHBUTTON "...",IDC_SET_BUFFERSIZE_BUTTON,463,71,13,14,0,0,HIDC_SET_BUFFERSIZE_BUTTON PUSHBUTTON ">",IDC_SET_PRIORITY_BUTTON,463,85,13,14,0,0,HIDC_SET_PRIORITY_BUTTON @@ -627,7 +628,15 @@ END END +IDR_TASK_ADVANCED_MENU MENU +BEGIN + POPUP "_POPUP_" + BEGIN + MENUITEM "Reset 'apply to all' status", ID_POPUP_RESET_APPLY_TO_ALL + END +END + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -667,6 +676,17 @@ ///////////////////////////////////////////////////////////////////////////// // +// AFX_DIALOG_LAYOUT +// + +IDD_STATUS_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + + +///////////////////////////////////////////////////////////////////////////// +// // String Table // @@ -1122,10 +1142,10 @@ IDS_TASKMANAGER_LOAD_FAILED "Failed to load task list database. Copy Handler will create a new, empty database for you." IDS_DO_NOT_SHOW_AGAIN_STRING "Do not show this message again" - IDS_ALWAYS_SHOW_STRING "Always show" - IDS_HIDE_AND_REGISTER "Hide and register extension" - IDS_HIDE_AND_DONT_REGISTER "Hide and do not register extension" - IDS_DIALOGS_SHOW_HIDE_STRING "Show/hide dialogs" + IDS_ALWAYS_SHOW_STRING "Always show" + IDS_HIDE_AND_REGISTER "Hide and register extension" + IDS_HIDE_AND_DONT_REGISTER "Hide and do not register extension" + IDS_DIALOGS_SHOW_HIDE_STRING "Show/hide dialogs" IDS_SHELLEXT_REGISTER_SHOWHIDE_STRING "Show message about shell extension not registered" IDS_SHELLEXT_VERSIONMISMATCH_SHOWHIDE_STRING "Show message about shell extension version mismatch" IDS_SHELLEXT_CHOOSE_DIR_STRING "Choose directory..." Index: src/ch/resource.h =================================================================== diff -u -N -rcdc76e1a95383dff63a5254aeb8d37035028512c -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 --- src/ch/resource.h (.../resource.h) (revision cdc76e1a95383dff63a5254aeb8d37035028512c) +++ src/ch/resource.h (.../resource.h) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16) @@ -53,6 +53,7 @@ #define IDD_UPDATER_DIALOG 213 #define IDD_FEEDBACK_REPLACE_DIALOG 214 #define IDD_MSGBOX_DIALOG 215 +#define IDR_TASK_ADVANCED_MENU 216 #define IDC_PROGRAM_STATIC 1000 #define IDC_ADDFILE_BUTTON 1002 #define IDC_STATUS_LIST 1003 @@ -77,6 +78,7 @@ #define IDC_IGNOREFOLDERS_CHECK 1015 #define IDC_SET_PRIORITY_BUTTON 1016 #define IDC_ONLYSTRUCTURE_CHECK 1017 +#define IDC_TASK_ADVANCED_BUTTON 1017 #define IDC_PAUSE_BUTTON 1018 #define IDC_STANDARD_CHECK 1019 #define IDC_FORCEDIRECTORIES_CHECK 1020 @@ -668,14 +670,15 @@ #define ID_POPUP_TEMP 32815 #define ID_POPUP_CHECKFORUPDATES 32816 #define ID_POPUP_TOOLS 32817 +#define ID_POPUP_RESET_APPLY_TO_ALL 32818 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 -#define _APS_NEXT_RESOURCE_VALUE 216 -#define _APS_NEXT_COMMAND_VALUE 32818 +#define _APS_NEXT_RESOURCE_VALUE 218 +#define _APS_NEXT_COMMAND_VALUE 32819 #define _APS_NEXT_CONTROL_VALUE 1325 #define _APS_NEXT_SYMED_VALUE 101 #endif Index: src/ch/resource.hm =================================================================== diff -u -N -r9b8cccbee0fcfeca28a112cc0253a7641f73f74f -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 --- src/ch/resource.hm (.../resource.hm) (revision 9b8cccbee0fcfeca28a112cc0253a7641f73f74f) +++ src/ch/resource.hm (.../resource.hm) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16) @@ -1,114 +1,115 @@ // Microsoft Visual C++ generated Help ID include file. // Used by ch.rc // -#define HIDCANCEL 0x5b0 // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ADDDIR_BUTTON 0x3f3 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ADDFILE_BUTTON 0x3ea // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ADDFILTER_BUTTON 0x401 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ADD_BUTTON 0x424 // IDD_RECENTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ADVANCED_CHECK 0x3ff // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_APPLY_BUTTON 0x4c2 // IDD_OPTIONS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ARCHIVE_CHECK 0x48b // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ATTRIBUTES_CHECK 0x48a // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_AVAILABLE_STATIC 0x468 // IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_BROWSE_BUTTON 0x428 // IDD_RECENTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_BUFFERSIZES_BUTTON 0x400 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_BUFFERSIZES_LIST 0x3f4 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_BUFFERSIZE_STATIC 0x80830406 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_CANCEL_ALL_BUTTON 0x80830416 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_CANCEL_BUTTON 0x808303fe // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_CDROMMULTIPLIER_COMBO 0x476 // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_CDROMSIZE_EDIT 0x475 // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_CHANGE_BUTTON 0x4a1 // IDD_RECENTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DATE1TYPE_COMBO 0x490 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DATE1_DATETIMEPICKER 0x491 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DATE2TYPE_COMBO 0x494 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DATE2_CHECK 0x493 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DATE2_DATETIMEPICKER 0x495 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DATETYPE_COMBO 0x48f // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DATE_CHECK 0x489 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DEFAULTMULTIPLIER_COMBO 0x46d // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DEFAULTSIZE_EDIT 0x46e // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DELETE_BUTTON 0x413 // IDD_RECENTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DESTBROWSE_BUTTON 0x3f0 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DESTINATIONOBJECT_STATIC 0x80830404 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DESTPATH_COMBOBOXEX 0x49b // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DIRECTORY_CHECK 0x497 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_DOWN_BUTTON 0x4a9 // IDD_SHORTCUTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_EXCLUDEMASK_CHECK 0x499 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_FILES_LIST 0x429 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_FILTEREXCLUDE_COMBO 0x498 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_FILTERS_CHECK 0x3f6 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_FILTERS_LIST 0x3f2 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_FILTER_CHECK 0x47e // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_FILTER_COMBO 0x47d // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_FORCEDIRECTORIES_CHECK 0x3fc // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_GLOBALPROCESSED_STATIC 0x8083040b // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_GLOBALTRANSFER_STATIC 0x8083040c // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_HELP_BUTTON 0x4e9 // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_HIDDEN_CHECK 0x48d // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_IGNOREFOLDERS_CHECK 0x3f7 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_IGNORE_BUTTON 0x449 // IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_IMPORT_BUTTON 0x4a7 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_LANMULTIPLIER_COMBO 0x478 // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_LANSIZE_EDIT 0x477 // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_NAME_EDIT 0x49d // IDD_SHORTCUTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ONEDISKMULTIPLIER_COMBO 0x472 // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ONEDISKSIZE_EDIT 0x46f // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ONLYDEFAULT_CHECK 0x479 // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_ONLYSTRUCTURE_CHECK 0x3f9 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_OPERATION_COMBO 0x3f1 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_OPERATION_STATIC 0x80830405 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_PATH_COMBOBOXEX 0x49e // IDD_SHORTCUTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_PATH_EDIT 0x41f // IDD_RECENTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_PAUSE_ALL_BUTTON 0x80830414 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_PAUSE_BUTTON 0x3fa // IDD_FEEDBACK_FILE_ERROR_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_PRIORITY_COMBO 0x42f // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_PROGRESS_LIST 0x419 // IDD_MINIVIEW_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_PROPERTIES_LIST 0x418 // IDD_OPTIONS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_READONLY_CHECK 0x48c // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_RECENT_LIST 0x4a6 // IDD_RECENTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_REMOVEFILEFOLDER_BUTTON 0x3ec // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_REMOVEFILTER_BUTTON 0x402 // IDD_CUSTOM_COPY_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_REMOVE_FINISHED_BUTTON 0x80830417 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_REQUIRED_STATIC 0x467 // IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_RESTART_ALL_BUTTON 0x80830415 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_RESTART_BUTTON 0x80830412 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_RESUME_BUTTON 0x808303fd // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_RETRY_BUTTON 0x44c // IDD_FEEDBACK_FILE_ERROR_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SET_BUFFERSIZE_BUTTON 0x808303f5 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SET_PRIORITY_BUTTON 0x808303f8 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SHORTCUT_LIST 0x49c // IDD_SHORTCUTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SHOW_LOG_BUTTON 0x80830460 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SIZE1MULTI_COMBO 0x481 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SIZE1_EDIT 0x480 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SIZE1_SPIN 0x483 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SIZE2MULTI_COMBO 0x485 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SIZE2_CHECK 0x488 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SIZE2_EDIT 0x484 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SIZE2_SPIN 0x487 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SIZETYPE1_COMBO 0x482 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SIZETYPE2_COMBO 0x486 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SIZE_CHECK 0x47f // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SKIP_BUTTON 0x508 // IDD_FEEDBACK_FILE_ERROR_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SOURCEOBJECT_STATIC 0x80830403 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_START_ALL_BUTTON 0x80830411 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_STATUS_LIST 0x808303eb // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_STICK_BUTTON 0x80830462 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SUBTASKNAME_STATIC 0x80830408 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SUBTASKPROCESSED_STATIC 0x8083040e // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SUBTASKTIME_STATIC 0x8083040f // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SUBTASKTRANSFER_STATIC 0x80830418 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_SYSTEM_CHECK 0x48e // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_TASKID_STATIC 0x80830410 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_TASKPROCESSED_STATIC 0x80830409 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_TASKTIME_STATIC 0x8083051b // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_TASKTRANSFER_STATIC 0x8083040a // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_THREADPRIORITY_STATIC 0x80830407 // IDD_STATUS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_TIME1_DATETIMEPICKER 0x492 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_TIME2_DATETIMEPICKER 0x496 // IDD_FILTER_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_TWODISKSMULTIPLIER_COMBO 0x474 // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_TWODISKSSIZE_EDIT 0x473 // IDD_BUFFERSIZE_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDC_UP_BUTTON 0x4a8 // IDD_SHORTCUTEDIT_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDHELP 0x5b0 // IDD_OPTIONS_DIALOG [Angielski (Stany Zjednoczone)] -#define HIDOK 0x5b0 // IDD_ABOUTBOX [Angielski (Stany Zjednoczone)] +#define HIDCANCEL 0x5b0 // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_ADDDIR_BUTTON 0x3f3 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_ADDFILE_BUTTON 0x3ea // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_ADDFILTER_BUTTON 0x401 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_ADD_BUTTON 0x424 // IDD_RECENTEDIT_DIALOG [English (United States)] +#define HIDC_ADVANCED_CHECK 0x3ff // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_APPLY_BUTTON 0x4c2 // IDD_OPTIONS_DIALOG [English (United States)] +#define HIDC_ARCHIVE_CHECK 0x48b // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_ATTRIBUTES_CHECK 0x48a // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_AVAILABLE_STATIC 0x468 // IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG [English (United States)] +#define HIDC_BROWSE_BUTTON 0x428 // IDD_RECENTEDIT_DIALOG [English (United States)] +#define HIDC_BUFFERSIZES_BUTTON 0x400 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_BUFFERSIZES_LIST 0x3f4 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_BUFFERSIZE_STATIC 0x80830406 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_CANCEL_ALL_BUTTON 0x80830416 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_CANCEL_BUTTON 0x808303fe // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_CDROMMULTIPLIER_COMBO 0x476 // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_CDROMSIZE_EDIT 0x475 // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_CHANGE_BUTTON 0x4a1 // IDD_RECENTEDIT_DIALOG [English (United States)] +#define HIDC_DATE1TYPE_COMBO 0x490 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_DATE1_DATETIMEPICKER 0x491 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_DATE2TYPE_COMBO 0x494 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_DATE2_CHECK 0x493 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_DATE2_DATETIMEPICKER 0x495 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_DATETYPE_COMBO 0x48f // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_DATE_CHECK 0x489 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_DEFAULTMULTIPLIER_COMBO 0x46d // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_DEFAULTSIZE_EDIT 0x46e // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_DELETE_BUTTON 0x413 // IDD_RECENTEDIT_DIALOG [English (United States)] +#define HIDC_DESTBROWSE_BUTTON 0x3f0 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_DESTINATIONOBJECT_STATIC 0x80830404 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_DESTPATH_COMBOBOXEX 0x49b // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_DIRECTORY_CHECK 0x497 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_DOWN_BUTTON 0x4a9 // IDD_SHORTCUTEDIT_DIALOG [English (United States)] +#define HIDC_EXCLUDEMASK_CHECK 0x499 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_FILES_LIST 0x429 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_FILTEREXCLUDE_COMBO 0x498 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_FILTERS_CHECK 0x3f6 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_FILTERS_LIST 0x3f2 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_FILTER_CHECK 0x47e // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_FILTER_COMBO 0x47d // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_FORCEDIRECTORIES_CHECK 0x3fc // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_GLOBALPROCESSED_STATIC 0x8083040b // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_GLOBALTRANSFER_STATIC 0x8083040c // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_HELP_BUTTON 0x4e9 // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_HIDDEN_CHECK 0x48d // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_IGNOREFOLDERS_CHECK 0x3f7 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_IGNORE_BUTTON 0x449 // IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG [English (United States)] +#define HIDC_IMPORT_BUTTON 0x4a7 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_LANMULTIPLIER_COMBO 0x478 // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_LANSIZE_EDIT 0x477 // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_NAME_EDIT 0x49d // IDD_SHORTCUTEDIT_DIALOG [English (United States)] +#define HIDC_ONEDISKMULTIPLIER_COMBO 0x472 // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_ONEDISKSIZE_EDIT 0x46f // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_ONLYDEFAULT_CHECK 0x479 // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_ONLYSTRUCTURE_CHECK 0x3f9 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_OPERATION_COMBO 0x3f1 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_OPERATION_STATIC 0x80830405 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_PATH_COMBOBOXEX 0x49e // IDD_SHORTCUTEDIT_DIALOG [English (United States)] +#define HIDC_PATH_EDIT 0x41f // IDD_RECENTEDIT_DIALOG [English (United States)] +#define HIDC_PAUSE_ALL_BUTTON 0x80830414 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_PAUSE_BUTTON 0x3fa // IDD_FEEDBACK_FILE_ERROR_DIALOG [English (United States)] +#define HIDC_PRIORITY_COMBO 0x42f // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_PROGRESS_LIST 0x419 // IDD_MINIVIEW_DIALOG [English (United States)] +#define HIDC_PROPERTIES_LIST 0x418 // IDD_OPTIONS_DIALOG [English (United States)] +#define HIDC_READONLY_CHECK 0x48c // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_RECENT_LIST 0x4a6 // IDD_RECENTEDIT_DIALOG [English (United States)] +#define HIDC_REMOVEFILEFOLDER_BUTTON 0x3ec // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_REMOVEFILTER_BUTTON 0x402 // IDD_CUSTOM_COPY_DIALOG [English (United States)] +#define HIDC_REMOVE_FINISHED_BUTTON 0x80830417 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_REQUIRED_STATIC 0x467 // IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG [English (United States)] +#define HIDC_RESTART_ALL_BUTTON 0x80830415 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_RESTART_BUTTON 0x80830412 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_RESUME_BUTTON 0x808303fd // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_RETRY_BUTTON 0x44c // IDD_FEEDBACK_FILE_ERROR_DIALOG [English (United States)] +#define HIDC_SET_BUFFERSIZE_BUTTON 0x808303f5 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_SET_PRIORITY_BUTTON 0x808303f8 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_SHORTCUT_LIST 0x49c // IDD_SHORTCUTEDIT_DIALOG [English (United States)] +#define HIDC_SHOW_LOG_BUTTON 0x80830460 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_SIZE1MULTI_COMBO 0x481 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_SIZE1_EDIT 0x480 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_SIZE1_SPIN 0x483 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_SIZE2MULTI_COMBO 0x485 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_SIZE2_CHECK 0x488 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_SIZE2_EDIT 0x484 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_SIZE2_SPIN 0x487 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_SIZETYPE1_COMBO 0x482 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_SIZETYPE2_COMBO 0x486 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_SIZE_CHECK 0x47f // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_SKIP_BUTTON 0x508 // IDD_FEEDBACK_FILE_ERROR_DIALOG [English (United States)] +#define HIDC_SOURCEOBJECT_STATIC 0x80830403 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_START_ALL_BUTTON 0x80830411 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_STATUS_LIST 0x808303eb // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_STICK_BUTTON 0x80830462 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_SUBTASKNAME_STATIC 0x80830408 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_SUBTASKPROCESSED_STATIC 0x8083040e // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_SUBTASKTIME_STATIC 0x8083040f // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_SUBTASKTRANSFER_STATIC 0x80830418 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_SYSTEM_CHECK 0x48e // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_TASKID_STATIC 0x80830410 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_TASKPROCESSED_STATIC 0x80830409 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_TASKTIME_STATIC 0x8083051b // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_TASKTRANSFER_STATIC 0x8083040a // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_TASK_ADVANCED_BUTTON 0x808303f9 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_THREADPRIORITY_STATIC 0x80830407 // IDD_STATUS_DIALOG [English (United States)] +#define HIDC_TIME1_DATETIMEPICKER 0x492 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_TIME2_DATETIMEPICKER 0x496 // IDD_FILTER_DIALOG [English (United States)] +#define HIDC_TWODISKSMULTIPLIER_COMBO 0x474 // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_TWODISKSSIZE_EDIT 0x473 // IDD_BUFFERSIZE_DIALOG [English (United States)] +#define HIDC_UP_BUTTON 0x4a8 // IDD_SHORTCUTEDIT_DIALOG [English (United States)] +#define HIDHELP 0x5b0 // IDD_OPTIONS_DIALOG [English (United States)] +#define HIDOK 0x5b0 // IDD_ABOUTBOX [English (United States)] Index: src/libchcore/TFeedbackHandlerBase.cpp =================================================================== diff -u -N -r89f857792bba8752de98ddd477949e45cef5ba5a -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 --- src/libchcore/TFeedbackHandlerBase.cpp (.../TFeedbackHandlerBase.cpp) (revision 89f857792bba8752de98ddd477949e45cef5ba5a) +++ src/libchcore/TFeedbackHandlerBase.cpp (.../TFeedbackHandlerBase.cpp) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16) @@ -37,6 +37,63 @@ { } + void TFeedbackHandlerBase::SetFileErrorPermanentResponse(EFeedbackResult ePermanentResult) + { + boost::unique_lock lock(m_lock); + m_eFileError = ePermanentResult; + } + + chcore::EFeedbackResult TFeedbackHandlerBase::GetFileErrorPermanentResponse() const + { + boost::shared_lock lock(m_lock); + return m_eFileError; + } + + bool TFeedbackHandlerBase::HasFileErrorPermanentResponse(EFeedbackResult& rePermanentResult) const + { + boost::shared_lock lock(m_lock); + rePermanentResult = m_eFileError; + return rePermanentResult != EFeedbackResult::eResult_Unknown; + } + + void TFeedbackHandlerBase::SetFileAlreadyExistsPermanentResponse(EFeedbackResult ePermanentResult) + { + boost::unique_lock lock(m_lock); + m_eFileAlreadyExists = ePermanentResult; + } + + EFeedbackResult TFeedbackHandlerBase::GetFileAlreadyExistsPermanentResponse() const + { + boost::shared_lock lock(m_lock); + return m_eFileAlreadyExists; + } + + bool TFeedbackHandlerBase::HasFileAlreadyExistsPermanentResponse(EFeedbackResult& rePermanentResult) const + { + boost::shared_lock lock(m_lock); + rePermanentResult = m_eFileAlreadyExists; + return rePermanentResult != EFeedbackResult::eResult_Unknown; + } + + void TFeedbackHandlerBase::SetNotEnoughSpacePermanentResponse(EFeedbackResult ePermanentResult) + { + boost::unique_lock lock(m_lock); + m_eNotEnoughSpace = ePermanentResult; + } + + chcore::EFeedbackResult TFeedbackHandlerBase::GetNotEnoughSpacePermanentResponse() const + { + boost::shared_lock lock(m_lock); + return m_eNotEnoughSpace; + } + + bool TFeedbackHandlerBase::HasNotEnoughSpacePermanentResponse(EFeedbackResult& rePermanentResult) const + { + boost::shared_lock lock(m_lock); + rePermanentResult = m_eNotEnoughSpace; + return rePermanentResult != EFeedbackResult::eResult_Unknown; + } + void TFeedbackHandlerBase::Store(const ISerializerContainerPtr& spContainer) const { boost::shared_lock lock(m_lock); @@ -114,6 +171,8 @@ void TFeedbackHandlerBase::RestoreDefaults() { + boost::unique_lock lock(m_lock); + m_eFileError = EFeedbackResult::eResult_Unknown; m_eFileAlreadyExists = EFeedbackResult::eResult_Unknown; m_eNotEnoughSpace = EFeedbackResult::eResult_Unknown; Index: src/libchcore/TFeedbackHandlerBase.h =================================================================== diff -u -N -r89f857792bba8752de98ddd477949e45cef5ba5a -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 --- src/libchcore/TFeedbackHandlerBase.h (.../TFeedbackHandlerBase.h) (revision 89f857792bba8752de98ddd477949e45cef5ba5a) +++ src/libchcore/TFeedbackHandlerBase.h (.../TFeedbackHandlerBase.h) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16) @@ -36,17 +36,17 @@ virtual ~TFeedbackHandlerBase(); // marking responses as permanent - void SetFileErrorPermanentResponse(EFeedbackResult ePermanentResult) { m_eFileError = ePermanentResult; } - EFeedbackResult GetFileErrorPermanentResponse() const { return m_eFileError; } - bool HasFileErrorPermanentResponse() const { return m_eFileError != EFeedbackResult::eResult_Unknown; } + void SetFileErrorPermanentResponse(EFeedbackResult ePermanentResult); + EFeedbackResult GetFileErrorPermanentResponse() const; + bool HasFileErrorPermanentResponse(EFeedbackResult& rePermanentResult) const; - void SetFileAlreadyExistsPermanentResponse(EFeedbackResult ePermanentResult) { m_eFileAlreadyExists = ePermanentResult; } - EFeedbackResult GetFileAlreadyExistsPermanentResponse() const { return m_eFileAlreadyExists; } - bool HasFileAlreadyExistsPermanentResponse() const { return m_eFileAlreadyExists != EFeedbackResult::eResult_Unknown; } + void SetFileAlreadyExistsPermanentResponse(EFeedbackResult ePermanentResult); + EFeedbackResult GetFileAlreadyExistsPermanentResponse() const; + bool HasFileAlreadyExistsPermanentResponse(EFeedbackResult& rePermanentResult) const; - void SetNotEnoughSpacePermanentResponse(EFeedbackResult ePermanentResult) { m_eNotEnoughSpace = ePermanentResult; } - EFeedbackResult GetNotEnoughSpacePermanentResponse() const { return m_eNotEnoughSpace; } - bool HasNotEnoughSpacePermanentResponse() const { return m_eNotEnoughSpace != EFeedbackResult::eResult_Unknown; } + void SetNotEnoughSpacePermanentResponse(EFeedbackResult ePermanentResult); + EFeedbackResult GetNotEnoughSpacePermanentResponse() const; + bool HasNotEnoughSpacePermanentResponse(EFeedbackResult& rePermanentResult) const; // resets the permanent status from all responses virtual void RestoreDefaults() override; Index: src/libchcore/TTask.cpp =================================================================== diff -u -N -rfa1b35a5012ef3fad361edfacd9a627631d55e07 -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 --- src/libchcore/TTask.cpp (.../TTask.cpp) (revision fa1b35a5012ef3fad361edfacd9a627631d55e07) +++ src/libchcore/TTask.cpp (.../TTask.cpp) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16) @@ -321,6 +321,11 @@ BeginProcessing(); } + void TTask::RestoreFeedbackDefaults() + { + m_spInternalFeedbackHandler->RestoreDefaults(); + } + void TTask::PauseProcessing() { if (GetTaskState() != eTaskState_Finished && GetTaskState() != eTaskState_Cancelled) Index: src/libchcore/TTask.h =================================================================== diff -u -N -rba618764ec3c9221fa704e905a9f807bd85ed4c5 -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 --- src/libchcore/TTask.h (.../TTask.h) (revision ba618764ec3c9221fa704e905a9f807bd85ed4c5) +++ src/libchcore/TTask.h (.../TTask.h) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16) @@ -83,6 +83,8 @@ void SetForceFlag(bool bFlag = true); bool GetForceFlag(); + void RestoreFeedbackDefaults(); + private: void SetTaskDefinition(const TTaskDefinition& rTaskDefinition);