Index: src/ch/RuleEditDlg.cpp =================================================================== diff -u -N -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()