Index: src/ch/CfgProperties.h =================================================================== diff -u -rad9bc5d98b91dc9f680742afbf4990b2b6dcda30 -rf25056c67d674c9491c8b23354236a253037132d --- src/ch/CfgProperties.h (.../CfgProperties.h) (revision ad9bc5d98b91dc9f680742afbf4990b2b6dcda30) +++ src/ch/CfgProperties.h (.../CfgProperties.h) (revision f25056c67d674c9491c8b23354236a253037132d) @@ -21,7 +21,7 @@ #pragma once -#include "TTaskConfiguration.h" +#include "../libchcore/TTaskConfiguration.h" namespace chcore { class TConfig; } @@ -41,7 +41,6 @@ PP_PLANGUAGE, PP_STATUSREFRESHINTERVAL, - PP_STATUSSHOWDETAILS, PP_STATUSAUTOREMOVEFINISHED, PP_FDWIDTH, @@ -89,6 +88,8 @@ PP_BFLAN, PP_BFUSENOBUFFERING, PP_BFBOUNDARYLIMIT, + PP_BUFFERCHUNKSIZE, + PP_BUFFERPAGESIZE, PP_LOGENABLELOGGING, PP_LOGMAXSIZE, @@ -148,9 +149,9 @@ #define ADAPT_TASK_PROPERTY(enum_id, task_enum_id)\ template<> struct PropData\ {\ - typedef TaskPropData::value_type value_type;\ - static value_type GetDefaultValue() { return TaskPropData::GetDefaultValue(); }\ - static const wchar_t* GetPropertyName() { return TaskPropData::GetPropertyName(); }\ + typedef chcore::TaskPropData::value_type value_type;\ + static value_type GetDefaultValue() { return chcore::TaskPropData::GetDefaultValue(); }\ + static const wchar_t* GetPropertyName() { return chcore::TaskPropData::GetPropertyName(); }\ static const wchar_t* GetPropertyNamePrefix() { return BRANCH_TASK_SETTINGS _T("."); }\ } @@ -181,7 +182,6 @@ // GUI PROPERTY_MINMAX(PP_STATUSREFRESHINTERVAL, unsigned int, _T("CHConfig.GUI.StatusDialog.RefreshInterval"), 1000, 0, 24*Hour); -PROPERTY(PP_STATUSSHOWDETAILS, bool, _T("CHConfig.GUI.StatusDialog.ShowDetails"), true); PROPERTY(PP_STATUSAUTOREMOVEFINISHED, bool, _T("CHConfig.GUI.StatusDialog.AutoRemoveFinishedTasks"), false); PROPERTY_MINMAX(PP_FDWIDTH, int, _T("CHConfig.GUI.FolderDialog.Width"), -1, -1, 32767); @@ -211,22 +211,24 @@ PROPERTY(PP_CMLIMITMAXOPERATIONS, unsigned int, _T("CHConfig.Core.Operation.LimitMaxOperations"), 1); // Task default settings (see TTaskConfiguration.h) -ADAPT_TASK_PROPERTY(PP_BFUSEONLYDEFAULT, eTO_UseOnlyDefaultBuffer); -ADAPT_TASK_PROPERTY(PP_BFDEFAULT, eTO_DefaultBufferSize); -ADAPT_TASK_PROPERTY(PP_BFONEDISK, eTO_OneDiskBufferSize); -ADAPT_TASK_PROPERTY(PP_BFTWODISKS, eTO_TwoDisksBufferSize); -ADAPT_TASK_PROPERTY(PP_BFCD, eTO_CDBufferSize); -ADAPT_TASK_PROPERTY(PP_BFLAN, eTO_LANBufferSize); -ADAPT_TASK_PROPERTY(PP_BFUSENOBUFFERING, eTO_DisableBuffering); -ADAPT_TASK_PROPERTY(PP_BFBOUNDARYLIMIT, eTO_DisableBufferingMinSize); +ADAPT_TASK_PROPERTY(PP_BFUSEONLYDEFAULT, chcore::eTO_UseOnlyDefaultBuffer); +ADAPT_TASK_PROPERTY(PP_BFDEFAULT, chcore::eTO_DefaultBufferSize); +ADAPT_TASK_PROPERTY(PP_BFONEDISK, chcore::eTO_OneDiskBufferSize); +ADAPT_TASK_PROPERTY(PP_BFTWODISKS, chcore::eTO_TwoDisksBufferSize); +ADAPT_TASK_PROPERTY(PP_BFCD, chcore::eTO_CDBufferSize); +ADAPT_TASK_PROPERTY(PP_BFLAN, chcore::eTO_LANBufferSize); +ADAPT_TASK_PROPERTY(PP_BFUSENOBUFFERING, chcore::eTO_DisableBuffering); +ADAPT_TASK_PROPERTY(PP_BFBOUNDARYLIMIT, chcore::eTO_DisableBufferingMinSize); +ADAPT_TASK_PROPERTY(PP_BUFFERCHUNKSIZE, chcore::eTO_BufferChunkSize); +ADAPT_TASK_PROPERTY(PP_BUFFERPAGESIZE, chcore::eTO_BufferPageSize); -ADAPT_TASK_PROPERTY(PP_CMSETDESTATTRIBUTES, eTO_SetDestinationAttributes); -ADAPT_TASK_PROPERTY(PP_CMSETDESTDATE, eTO_SetDestinationDateTime); -ADAPT_TASK_PROPERTY(PP_CMPROTECTROFILES, eTO_ProtectReadOnlyFiles); -ADAPT_TASK_PROPERTY(PP_CMREADSIZEBEFOREBLOCKING, eTO_ScanDirectoriesBeforeBlocking); -ADAPT_TASK_PROPERTY(PP_CMDEFAULTPRIORITY, eTO_ThreadPriority); -ADAPT_TASK_PROPERTY(PP_CMDISABLEPRIORITYBOOST, eTO_DisablePriorityBoost); -ADAPT_TASK_PROPERTY(PP_CMDELETEAFTERFINISHED, eTO_DeleteInSeparateSubTask); +ADAPT_TASK_PROPERTY(PP_CMSETDESTATTRIBUTES, chcore::eTO_SetDestinationAttributes); +ADAPT_TASK_PROPERTY(PP_CMSETDESTDATE, chcore::eTO_SetDestinationDateTime); +ADAPT_TASK_PROPERTY(PP_CMPROTECTROFILES, chcore::eTO_ProtectReadOnlyFiles); +ADAPT_TASK_PROPERTY(PP_CMREADSIZEBEFOREBLOCKING, chcore::eTO_ScanDirectoriesBeforeBlocking); +ADAPT_TASK_PROPERTY(PP_CMDEFAULTPRIORITY, chcore::eTO_ThreadPriority); +ADAPT_TASK_PROPERTY(PP_CMDISABLEPRIORITYBOOST, chcore::eTO_DisablePriorityBoost); +ADAPT_TASK_PROPERTY(PP_CMDELETEAFTERFINISHED, chcore::eTO_DeleteInSeparateSubTask); // Shell extension PROPERTY(PP_SHSHOWCOPY, bool, _T("CHConfig.ShellExtension.ShowCommands.Copy"), true);