Index: src/ch/RuleEditDlg.cpp =================================================================== diff -u -r1c585b955eb548cbedc7d36f1ea5af484206e7eb -rf51cacae8d8461c98bbb4a498407d6aec8f94410 --- src/ch/RuleEditDlg.cpp (.../RuleEditDlg.cpp) (revision 1c585b955eb548cbedc7d36f1ea5af484206e7eb) +++ src/ch/RuleEditDlg.cpp (.../RuleEditDlg.cpp) (revision f51cacae8d8461c98bbb4a498407d6aec8f94410) @@ -21,6 +21,8 @@ #include "RuleEditDlg.h" #include "ch.h" #include "RuleEditAlreadyExistsDlg.h" +#include "RuleEditErrorDlg.h" +#include "RuleEditNotEnoughSpaceDlg.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -594,9 +596,7 @@ return; auto& rRule = rRules.GetAt(iItem); - rRule; -/* RuleEditErrorDlg dlg(rRule); if(dlg.DoModal() == IDOK) { @@ -606,23 +606,20 @@ rRule = dlg.GetRule(); AddErrorRule(rRule, iItem); } -*/ } } void RuleEditDlg::OnErrorAddButton() { FeedbackErrorRule newRule; -/* RuleEditErrorDlg dlg(newRule); if(dlg.DoModal() == IDOK) { const auto& rRule = dlg.GetRule(); m_rules.GetErrorRules().Add(rRule); AddErrorRule(rRule, -1); } -*/ } void RuleEditDlg::OnErrorRemoveButton() @@ -655,15 +652,14 @@ POSITION pos = m_ctlNotEnoughSpaceRulesList.GetFirstSelectedItemPosition(); if(pos != nullptr) { - FeedbackErrorRuleList& rRules = m_rules.GetErrorRules(); + FeedbackNotEnoughSpaceRuleList& rRules = m_rules.GetNotEnoughSpaceRules(); int iItem = m_ctlNotEnoughSpaceRulesList.GetNextSelectedItem(pos); if(iItem < 0) return; auto& rRule = rRules.GetAt(iItem); - rRule; -/* + RuleEditNotEnoughSpaceDlg dlg(rRule); if(dlg.DoModal() == IDOK) { @@ -673,23 +669,20 @@ rRule = dlg.GetRule(); AddNotEnoughSpaceRule(rRule, iItem); } -*/ } } void RuleEditDlg::OnNotEnoughSpaceAddButton() { - FeedbackErrorRule newRule; + FeedbackNotEnoughSpaceRule newRule; -/* RuleEditNotEnoughSpaceDlg dlg(newRule); if(dlg.DoModal() == IDOK) { const auto& rRule = dlg.GetRule(); m_rules.GetNotEnoughSpaceRules().Add(rRule); AddNotEnoughSpaceRule(rRule, -1); } -*/ } void RuleEditDlg::OnNotEnoughSpaceRemoveButton() Index: src/ch/RuleEditErrorDlg.cpp =================================================================== diff -u --- src/ch/RuleEditErrorDlg.cpp (revision 0) +++ src/ch/RuleEditErrorDlg.cpp (revision f51cacae8d8461c98bbb4a498407d6aec8f94410) @@ -0,0 +1,191 @@ +/*************************************************************************** +* Copyright (C) 2001-2020 by J�zef Starosczyk * +* ixen@copyhandler.com * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU Library General Public License * +* (version 2) as published by the Free Software Foundation; * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU Library General Public * +* License along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +#include "stdafx.h" +#include "ch.h" +#include "RuleEditErrorDlg.h" +#include "resource.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +///////////////////////////////////////////////////////////////////////////// +// FeedbackRuleEditorDlg dialog + +RuleEditErrorDlg::RuleEditErrorDlg(const chengine::FeedbackErrorRule& rRule) : + CLanguageDialog(IDD_RULE_EDIT_ERROR_DIALOG), + m_rule(rRule) +{ +} + +void RuleEditErrorDlg::DoDataExchange(CDataExchange* pDX) +{ + CLanguageDialog::DoDataExchange(pDX); + + DDX_Check(pDX, IDC_INCLUDE_MASK_CHECK, m_bUseIncludeMask); + DDX_Control(pDX, IDC_INCLUDE_MASK_COMBO, m_ctlIncludeMask); + + DDX_Check(pDX, IDC_EXCLUDE_MASK_CHECK, m_bUseExcludeMask); + DDX_Control(pDX, IDC_EXCLUDE_MASK_COMBO, m_ctlExcludeMask); + + DDX_Check(pDX, IDC_FILTER_BY_OPERATION_CHECK, m_bUseOperationType); + DDX_Control(pDX, IDC_FILTER_BY_OPERATION_COMBO, m_ctlOperationType); + + DDX_Check(pDX, IDC_FILTER_BY_SYSTEMERROR_CHECK, m_bUseSystemError); + DDX_Control(pDX, IDC_FILTER_BY_SYSTEMERROR_EDIT, m_ctlSystemError); + + DDX_Control(pDX, IDC_RESPONSE_COMBO, m_ctlResponse); +} + +BEGIN_MESSAGE_MAP(RuleEditErrorDlg,ictranslate::CLanguageDialog) + ON_BN_CLICKED(IDC_INCLUDE_MASK_CHECK, EnableControls) + ON_BN_CLICKED(IDC_EXCLUDE_MASK_CHECK, EnableControls) + ON_BN_CLICKED(IDC_FILTER_BY_OPERATION_CHECK, EnableControls) + ON_BN_CLICKED(IDC_FILTER_BY_SYSTEMERROR_CHECK, EnableControls) +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// FeedbackRuleEditorDlg message handlers + +BOOL RuleEditErrorDlg::OnInitDialog() +{ + CLanguageDialog::OnInitDialog(); + + // fill the combos with data + + // strings <, <=, ... + for(int iIndex = IDS_OPERATION_DELETEERROR; iIndex <= IDS_OPERATION_RETRIEVEFILEINFO; iIndex++) + { + const wchar_t* pszData = GetResManager().LoadString(iIndex); + m_ctlOperationType.AddString(pszData); + } + + // copy data from TFileFilter to a dialog - mask + m_bUseIncludeMask = m_rule.GetUseMask(); + + m_ctlIncludeMask.SetCurSel(m_ctlIncludeMask.AddString(m_rule.GetCombinedMask().c_str())); + for(int i = 0; i < m_astrAddMask.GetSize(); i++) + { + m_ctlIncludeMask.AddString(m_astrAddMask.GetAt(i)); + } + + m_bUseExcludeMask = m_rule.GetUseExcludeMask(); + m_ctlExcludeMask.SetCurSel(m_ctlExcludeMask.AddString(m_rule.GetCombinedExcludeMask().c_str())); + for(int i = 0; i < m_astrAddExcludeMask.GetSize(); i++) + { + m_ctlExcludeMask.AddString(m_astrAddExcludeMask.GetAt(i)); + } + + // size + m_bUseSystemError = m_rule.GetUseSystemErrorNo(); + CString strValue; + strValue.Format(L"%u", m_rule.GetSystemErrorNo()); + m_ctlSystemError.SetWindowText(strValue); + + // date + m_bUseOperationType = m_rule.GetUseErrorType(); + m_ctlOperationType.SetCurSel(m_rule.GetErrorType()); + + // response + for(int iIndex = IDS_FEEDBACK_RESPONSE_UNKNOWN; iIndex <= IDS_FEEDBACK_RESPONSE_RENAME; ++iIndex) + { + const wchar_t* pszData = GetResManager().LoadString(iIndex); + m_ctlResponse.AddString(pszData); + } + + UpdateData(FALSE); + + EnableControls(); + + return TRUE; +} + +void RuleEditErrorDlg::OnLanguageChanged() +{ + // selection + int iDateCompareTypeIndex = m_ctlOperationType.GetCurSel(); + int iResponseIndex = m_ctlResponse.GetCurSel(); + + m_ctlOperationType.ResetContent(); + m_ctlResponse.ResetContent(); + + // strings <, <=, ... + for(int iIndex = IDS_OPERATION_DELETEERROR; iIndex <= IDS_OPERATION_RETRIEVEFILEINFO; iIndex++) + { + const wchar_t* pszData = GetResManager().LoadString(iIndex); + m_ctlOperationType.AddString(pszData); + } + + for(int iIndex = IDS_FEEDBACK_RESPONSE_UNKNOWN; iIndex <= IDS_FEEDBACK_RESPONSE_RENAME; ++iIndex) + { + const wchar_t* pszData = GetResManager().LoadString(iIndex); + m_ctlResponse.AddString(pszData); + } + + m_ctlOperationType.SetCurSel(iDateCompareTypeIndex); + m_ctlResponse.SetCurSel(iResponseIndex); +} + +void RuleEditErrorDlg::EnableControls() +{ + UpdateData(TRUE); + // mask + m_ctlIncludeMask.EnableWindow(m_bUseIncludeMask); + m_ctlExcludeMask.EnableWindow(m_bUseExcludeMask); + + // size + m_ctlSystemError.EnableWindow(m_bUseSystemError); + + // date + m_ctlOperationType.EnableWindow(m_bUseOperationType); +} + +void RuleEditErrorDlg::OnOK() +{ + UpdateData(TRUE); + + // TFileFilter --> dialogu - mask + CString strText; + m_ctlIncludeMask.GetWindowText(strText); + m_rule.SetUseMask(((m_bUseIncludeMask != 0) && !strText.IsEmpty())); + m_rule.SetCombinedMask((PCTSTR)strText); + + m_ctlExcludeMask.GetWindowText(strText); + m_rule.SetUseExcludeMask((m_bUseExcludeMask != 0) && !strText.IsEmpty()); + m_rule.SetCombinedExcludeMask((PCTSTR)strText); + + // size + m_rule.SetUseSystemErrorNo(m_bUseSystemError != 0); + + CString strErrorNo; + m_ctlSystemError.GetWindowText(strErrorNo); + unsigned int uiErrorNo = boost::lexical_cast(strErrorNo); + m_rule.SetSystemErrorNo(uiErrorNo); + + // date + m_rule.SetUseErrorType(m_bUseOperationType != 0); + m_rule.SetErrorType((chengine::EFileError)m_ctlOperationType.GetCurSel()); + + // response + m_rule.SetResult((chengine::EFeedbackResult)m_ctlResponse.GetCurSel()); + + CLanguageDialog::OnOK(); +} Index: src/ch/RuleEditErrorDlg.h =================================================================== diff -u --- src/ch/RuleEditErrorDlg.h (revision 0) +++ src/ch/RuleEditErrorDlg.h (revision f51cacae8d8461c98bbb4a498407d6aec8f94410) @@ -0,0 +1,60 @@ +/*************************************************************************** +* Copyright (C) 2001-2008 by J�zef Starosczyk * +* ixen@copyhandler.com * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU Library General Public License * +* (version 2) as published by the Free Software Foundation; * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU Library General Public * +* License along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +#pragma once + +#include "../libchengine/FeedbackErrorRule.h" + +///////////////////////////////////////////////////////////////////////////// +// FeedbackRuleEditorDlg dialog + +class RuleEditErrorDlg : public ictranslate::CLanguageDialog +{ +// Construction +public: + RuleEditErrorDlg(const chengine::FeedbackErrorRule& rRule); + + chengine::FeedbackErrorRule GetRule() const { return m_rule; } + +protected: + void OnLanguageChanged() override; + void EnableControls(); + + BOOL OnInitDialog() override; + void OnOK() override; + void DoDataExchange(CDataExchange* pDX) override; + + DECLARE_MESSAGE_MAP() + +private: + BOOL m_bUseIncludeMask = FALSE; + CComboBox m_ctlIncludeMask; + BOOL m_bUseExcludeMask = FALSE; + CComboBox m_ctlExcludeMask; + BOOL m_bUseOperationType = FALSE; + CComboBox m_ctlOperationType; + BOOL m_bUseSystemError = FALSE; + CEdit m_ctlSystemError; + + CComboBox m_ctlResponse; + + chengine::FeedbackErrorRule m_rule; + + CStringArray m_astrAddMask; + CStringArray m_astrAddExcludeMask; +}; Index: src/ch/RuleEditNotEnoughSpaceDlg.cpp =================================================================== diff -u --- src/ch/RuleEditNotEnoughSpaceDlg.cpp (revision 0) +++ src/ch/RuleEditNotEnoughSpaceDlg.cpp (revision f51cacae8d8461c98bbb4a498407d6aec8f94410) @@ -0,0 +1,135 @@ +/*************************************************************************** +* Copyright (C) 2001-2020 by J�zef Starosczyk * +* ixen@copyhandler.com * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU Library General Public License * +* (version 2) as published by the Free Software Foundation; * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU Library General Public * +* License along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +#include "stdafx.h" +#include "ch.h" +#include "RuleEditNotEnoughSpaceDlg.h" +#include "resource.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +///////////////////////////////////////////////////////////////////////////// +// FeedbackRuleEditorDlg dialog + +RuleEditNotEnoughSpaceDlg::RuleEditNotEnoughSpaceDlg(const chengine::FeedbackNotEnoughSpaceRule& rRule) : + CLanguageDialog(IDD_RULE_EDIT_NOTENOUGHSPACE_DIALOG), + m_rule(rRule) +{ +} + +void RuleEditNotEnoughSpaceDlg::DoDataExchange(CDataExchange* pDX) +{ + CLanguageDialog::DoDataExchange(pDX); + + DDX_Check(pDX, IDC_INCLUDE_MASK_CHECK, m_bUseIncludeMask); + DDX_Control(pDX, IDC_INCLUDE_MASK_COMBO, m_ctlIncludeMask); + + DDX_Check(pDX, IDC_EXCLUDE_MASK_CHECK, m_bUseExcludeMask); + DDX_Control(pDX, IDC_EXCLUDE_MASK_COMBO, m_ctlExcludeMask); + + DDX_Control(pDX, IDC_RESPONSE_COMBO, m_ctlResponse); +} + +BEGIN_MESSAGE_MAP(RuleEditNotEnoughSpaceDlg,ictranslate::CLanguageDialog) + ON_BN_CLICKED(IDC_INCLUDE_MASK_CHECK, EnableControls) + ON_BN_CLICKED(IDC_EXCLUDE_MASK_CHECK, EnableControls) +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// FeedbackRuleEditorDlg message handlers + +BOOL RuleEditNotEnoughSpaceDlg::OnInitDialog() +{ + CLanguageDialog::OnInitDialog(); + + // copy data from TFileFilter to a dialog - mask + m_bUseIncludeMask = m_rule.GetUseMask(); + + m_ctlIncludeMask.SetCurSel(m_ctlIncludeMask.AddString(m_rule.GetCombinedMask().c_str())); + for(int i = 0; i < m_astrAddMask.GetSize(); i++) + { + m_ctlIncludeMask.AddString(m_astrAddMask.GetAt(i)); + } + + m_bUseExcludeMask = m_rule.GetUseExcludeMask(); + m_ctlExcludeMask.SetCurSel(m_ctlExcludeMask.AddString(m_rule.GetCombinedExcludeMask().c_str())); + for(int i = 0; i < m_astrAddExcludeMask.GetSize(); i++) + { + m_ctlExcludeMask.AddString(m_astrAddExcludeMask.GetAt(i)); + } + + // response + for(int iIndex = IDS_FEEDBACK_RESPONSE_UNKNOWN; iIndex <= IDS_FEEDBACK_RESPONSE_RENAME; ++iIndex) + { + const wchar_t* pszData = GetResManager().LoadString(iIndex); + m_ctlResponse.AddString(pszData); + } + + UpdateData(FALSE); + + EnableControls(); + + return TRUE; +} + +void RuleEditNotEnoughSpaceDlg::OnLanguageChanged() +{ + // selection + int iResponseIndex = m_ctlResponse.GetCurSel(); + + m_ctlResponse.ResetContent(); + + for(int iIndex = IDS_FEEDBACK_RESPONSE_UNKNOWN; iIndex <= IDS_FEEDBACK_RESPONSE_RENAME; ++iIndex) + { + const wchar_t* pszData = GetResManager().LoadString(iIndex); + m_ctlResponse.AddString(pszData); + } + + m_ctlResponse.SetCurSel(iResponseIndex); +} + +void RuleEditNotEnoughSpaceDlg::EnableControls() +{ + UpdateData(TRUE); + // mask + m_ctlIncludeMask.EnableWindow(m_bUseIncludeMask); + m_ctlExcludeMask.EnableWindow(m_bUseExcludeMask); +} + +void RuleEditNotEnoughSpaceDlg::OnOK() +{ + UpdateData(TRUE); + + CString strText; + m_ctlIncludeMask.GetWindowText(strText); + m_rule.SetUseMask(((m_bUseIncludeMask != 0) && !strText.IsEmpty())); + m_rule.SetCombinedMask((PCTSTR)strText); + + m_ctlExcludeMask.GetWindowText(strText); + m_rule.SetUseExcludeMask((m_bUseExcludeMask != 0) && !strText.IsEmpty()); + m_rule.SetCombinedExcludeMask((PCTSTR)strText); + + // response + m_rule.SetResult((chengine::EFeedbackResult)m_ctlResponse.GetCurSel()); + + CLanguageDialog::OnOK(); +} Index: src/ch/RuleEditNotEnoughSpaceDlg.h =================================================================== diff -u --- src/ch/RuleEditNotEnoughSpaceDlg.h (revision 0) +++ src/ch/RuleEditNotEnoughSpaceDlg.h (revision f51cacae8d8461c98bbb4a498407d6aec8f94410) @@ -0,0 +1,56 @@ +/*************************************************************************** +* Copyright (C) 2001-2008 by J�zef Starosczyk * +* ixen@copyhandler.com * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU Library General Public License * +* (version 2) as published by the Free Software Foundation; * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU Library General Public * +* License along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +#pragma once + +#include "../libchengine/FeedbackNotEnoughSpaceRule.h" + +///////////////////////////////////////////////////////////////////////////// +// FeedbackRuleEditorDlg dialog + +class RuleEditNotEnoughSpaceDlg : public ictranslate::CLanguageDialog +{ +// Construction +public: + RuleEditNotEnoughSpaceDlg(const chengine::FeedbackNotEnoughSpaceRule& rRule); + + chengine::FeedbackNotEnoughSpaceRule GetRule() const { return m_rule; } + +protected: + void OnLanguageChanged() override; + void EnableControls(); + + BOOL OnInitDialog() override; + void OnOK() override; + void DoDataExchange(CDataExchange* pDX) override; + + DECLARE_MESSAGE_MAP() + +private: + BOOL m_bUseIncludeMask = FALSE; + CComboBox m_ctlIncludeMask; + BOOL m_bUseExcludeMask = FALSE; + CComboBox m_ctlExcludeMask; + + CComboBox m_ctlResponse; + + chengine::FeedbackNotEnoughSpaceRule m_rule; + + CStringArray m_astrAddMask; + CStringArray m_astrAddExcludeMask; +}; Index: src/ch/ch.rc =================================================================== diff -u -r1c585b955eb548cbedc7d36f1ea5af484206e7eb -rf51cacae8d8461c98bbb4a498407d6aec8f94410 --- src/ch/ch.rc (.../ch.rc) (revision 1c585b955eb548cbedc7d36f1ea5af484206e7eb) +++ src/ch/ch.rc (.../ch.rc) (revision f51cacae8d8461c98bbb4a498407d6aec8f94410) @@ -475,7 +475,7 @@ LTEXT "When all of the following conditions are met...:",IDC_HEADER_STATIC,7,7,277,8 LTEXT "...then respond with:",IDC_RESPONSE_STATIC,7,155,277,8 COMBOBOX IDC_RESPONSE_COMBO,15,168,269,133,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_FILTER_BY_SYSTEMERROR_EDIT,15,126,269,14,ES_AUTOHSCROLL + EDITTEXT IDC_FILTER_BY_SYSTEMERROR_EDIT,15,126,269,14,ES_AUTOHSCROLL | ES_NUMBER END IDD_RULE_EDIT_NOTENOUGHSPACE_DIALOG DIALOGEX 0, 0, 291, 157 @@ -1415,15 +1415,6 @@ IDS_DT_STRING "<>" IDS_UPDATER_NEW_VERSION_STRING "Updated version: %officialver (%numericver).\nReleased: %reldate" - IDS_FEEDBACK_RESPONSE_UNKNOWN "Unknown" - IDS_FEEDBACK_RESPONSE_OVERWRITE "Replace" - IDS_FEEDBACK_RESPONSE_RESUME "Resume" - IDS_FEEDBACK_RESPONSE_SKIP "Skip" - IDS_FEEDBACK_RESPONSE_CANCEL "Cancel" - IDS_FEEDBACK_RESPONSE_PAUSE "Pause" - IDS_FEEDBACK_RESPONSE_RETRY "Retry" - IDS_FEEDBACK_RESPONSE_IGNORE "Ignore" - IDS_FEEDBACK_RESPONSE_RENAME "Rename" END STRINGTABLE @@ -1442,10 +1433,23 @@ IDS_UPDATER_NEWVERSIONEXISTS "There are updates available" IDS_UPDATER_RELEASENOTES "Release notes:" IDS_FINALIZE_CH_ERROR "Failed to finalize Copy Handler. Some information about tasks being processed might be lost. Error: %reason." + IDS_FEEDBACK_RESPONSE_UNKNOWN "Unknown" + IDS_FEEDBACK_RESPONSE_OVERWRITE "Replace" + IDS_FEEDBACK_RESPONSE_RESUME "Resume" + IDS_FEEDBACK_RESPONSE_SKIP "Skip" + IDS_FEEDBACK_RESPONSE_CANCEL "Cancel" END STRINGTABLE BEGIN + IDS_FEEDBACK_RESPONSE_PAUSE "Pause" + IDS_FEEDBACK_RESPONSE_RETRY "Retry" + IDS_FEEDBACK_RESPONSE_IGNORE "Ignore" + IDS_FEEDBACK_RESPONSE_RENAME "Rename" +END + +STRINGTABLE +BEGIN IDS_BSONEDISK_STRING "One disk: " IDS_BSTWODISKS_STRING "Two disks: " IDS_BSCD_STRING "CD: " @@ -1499,42 +1503,42 @@ IDS_FILTERDATE_STRING "any" IDS_HDREXCLUDEMASK_STRING "Exclude mask" IDS_HDREXCLUDEATTRIB_STRING "Attributes excluded" - IDS_HDRRESULT_STRING "Response" - IDS_HDROPERATION_STRING "Operation" - IDS_HDRSYSTEMERROR_STRING "System error" IDS_FILTERATTRIB_STRING "none" IDS_EMPTYFILTER_STRING "None of filtering options were selected" IDS_FLTALLFILTER_STRING "All files (*.*)|*.*||" IDS_IMPORTREPORT_STRING "Imported %count path(s)" - IDS_SOURCE_FILE_STRING "source" - IDS_DESTINATION_FILE_STRING "destination" END STRINGTABLE BEGIN - IDS_OPERATION_DELETEERROR "Delete" - IDS_OPERATION_SEEKERROR "Seek" - IDS_OPERATION_RESIZEERROR "Resize" - IDS_OPERATION_READERROR "Read" - IDS_OPERATION_WRITEERROR "Write" - IDS_OPERATION_FINALIZEERROR "Finalize" - IDS_OPERATION_FASTMOVEERROR "Fast move" - IDS_OPERATION_CREATEERROR "Create" - IDS_OPERATION_CHECKFORFREESPACE "Check for free space" - IDS_OPERATION_RETRIEVEFILEINFO "Retrieve file information" -END - -STRINGTABLE -BEGIN IDS_IMPORTERROR_STRING "Cannot import paths from the specified file" IDS_ERROR_INITIALIZING_COMMON_CONTROLS "Cannot initialize common controls. The application will now exit." IDS_ERROR_INITIALIZING_RICH_EDIT_CONTROL "Cannot initialize rich edit control. The application will now exit." + IDS_HDRRESULT_STRING "Response" + IDS_SOURCE_FILE_STRING "source" + IDS_DESTINATION_FILE_STRING "destination" + IDS_HDROPERATION_STRING "Operation" + IDS_HDRSYSTEMERROR_STRING "System error" + IDS_OPERATION_DELETEERROR "Delete" + IDS_OPERATION_SEEKERROR "Seek" + IDS_OPERATION_RESIZEERROR "Resize" + IDS_OPERATION_READERROR "Read" + IDS_OPERATION_WRITEERROR "Write" + IDS_OPERATION_FINALIZEERROR "Finalize" + IDS_OPERATION_FASTMOVEERROR "Fast move" + IDS_OPERATION_CREATEERROR "Create" END STRINGTABLE BEGIN + IDS_OPERATION_CHECKFORFREESPACE "Check for free space" + IDS_OPERATION_RETRIEVEFILEINFO "Retrieve file information" +END + +STRINGTABLE +BEGIN IDS_DATECREATED_STRING "Date of creation" IDS_DATELASTWRITE_STRING "Date of last write" IDS_DATEACCESSED_STRING "Date of last access" Index: src/ch/ch.vc140.vcxproj =================================================================== diff -u -r1c585b955eb548cbedc7d36f1ea5af484206e7eb -rf51cacae8d8461c98bbb4a498407d6aec8f94410 --- src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 1c585b955eb548cbedc7d36f1ea5af484206e7eb) +++ src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision f51cacae8d8461c98bbb4a498407d6aec8f94410) @@ -563,6 +563,8 @@ + + @@ -642,6 +644,8 @@ + + Index: src/ch/ch.vc140.vcxproj.filters =================================================================== diff -u -r1c585b955eb548cbedc7d36f1ea5af484206e7eb -rf51cacae8d8461c98bbb4a498407d6aec8f94410 --- src/ch/ch.vc140.vcxproj.filters (.../ch.vc140.vcxproj.filters) (revision 1c585b955eb548cbedc7d36f1ea5af484206e7eb) +++ src/ch/ch.vc140.vcxproj.filters (.../ch.vc140.vcxproj.filters) (revision f51cacae8d8461c98bbb4a498407d6aec8f94410) @@ -261,6 +261,12 @@ Source Files\GUI\Dialogs\Feedback rule editor + + Source Files\GUI\Dialogs\Feedback rule editor + + + Source Files\GUI\Dialogs\Feedback rule editor + @@ -449,6 +455,12 @@ Source Files\GUI\Dialogs\Feedback rule editor + + Source Files\GUI\Dialogs\Feedback rule editor + + + Source Files\GUI\Dialogs\Feedback rule editor +