Clone
ixen <ixen@copyhandler.com>
committed
on 21 Apr 14
Added serialization to TFileInfo and TFileInfoArray objects (CH-75).
LoggerImprovements + 5 more
src/ch/FilterDlg.cpp (+1 -1)
343 343         CString strText;
344 344         m_ctlIncludeMask.GetWindowText(strText);
345 345         m_ffFilter.SetUseMask(((m_bFilter != 0) && !strText.IsEmpty()));
346 346         m_ffFilter.SetCombinedMask((PCTSTR)strText);
347 347
348 348         m_ctlExcludeMask.GetWindowText(strText);
349 349         m_ffFilter.SetUseExcludeMask((m_bExclude != 0) && !strText.IsEmpty());
350 350         m_ffFilter.SetCombinedExcludeMask((PCTSTR)strText);
351 351
352 352         // size
353 353         m_ffFilter.SetUseSize1(m_bSize != 0);
354 354         m_ffFilter.SetUseSize2(m_bSize2 != 0);
355 355
356 356         m_ffFilter.SetSizeType1((chengine::ECompareType)m_ctlSizeType1.GetCurSel());
357 357         m_ffFilter.SetSizeType2((chengine::ECompareType)m_ctlSizeType2.GetCurSel());
358 358
359 359         m_ffFilter.SetSize1(static_cast<unsigned __int64>(m_uiSize1)*static_cast<unsigned __int64>(GetMultiplier(m_ctlSize1Multi.GetCurSel())));
360 360         m_ffFilter.SetSize2(static_cast<unsigned __int64>(m_uiSize2)*static_cast<unsigned __int64>(GetMultiplier(m_ctlSize2Multi.GetCurSel())));
361 361
362 362         // date
363           m_ffFilter.SetDateType((chengine::TFileFilter::EDateType)m_ctlDateType.GetCurSel());
  363         m_ffFilter.SetDateType((chengine::EDateType)m_ctlDateType.GetCurSel());
364 364
365 365         m_ffFilter.SetDateCmpType1((chengine::ECompareType)m_ctlDateType1.GetCurSel());
366 366         m_ffFilter.SetDateCmpType2((chengine::ECompareType)m_ctlDateType2.GetCurSel());
367 367
368 368         CTime tDate;
369 369         CTime tTime;
370 370         m_ffFilter.SetUseDate1(m_ctlDate1.GetTime(tDate) == GDT_VALID);
371 371         m_ffFilter.SetUseTime1(m_ctlTime1.GetTime(tTime) == GDT_VALID);
372 372         m_ffFilter.SetDateTime1(chengine::TDateTime(tDate.GetYear(), tDate.GetMonth(), tDate.GetDay(), tTime.GetHour(), tTime.GetMinute(), tTime.GetSecond()));
373 373         
374 374         m_ffFilter.SetUseDate2(m_ctlDate2.GetTime(tDate) == GDT_VALID);
375 375         m_ffFilter.SetUseTime2(m_ctlTime2.GetTime(tTime) == GDT_VALID);
376 376         m_ffFilter.SetDateTime2(chengine::TDateTime(tDate.GetYear(), tDate.GetMonth(), tDate.GetDay(), tTime.GetHour(), tTime.GetMinute(), tTime.GetSecond()));
377 377
378 378         m_ffFilter.SetUseDateTime1((m_bDate1 != 0) && (m_ffFilter.GetUseDate1() || m_ffFilter.GetUseTime1()));
379 379         m_ffFilter.SetUseDateTime2((m_bDate2 != 0) && (m_ffFilter.GetUseDate2() || m_ffFilter.GetUseTime2()));
380 380
381 381         // attributes
382 382         m_ffFilter.SetUseAttributes(m_bAttributes != 0);
383 383         m_ffFilter.SetArchive(m_iArchive);