Consistently referring to file last modification timestamp column as "Date modified"

That's what Windows Explorer uses.
Previously the column was labeled "Changed", but respective menu items were Columns > Modification and Sort > By Modification.
Most changes are just renames of controls to force retranslation

Source commit: 49c5600b6454b91729297cceadcf80016f2857b0

source/forms/FileFind.cpp

@@ -59,7 +59,7 @@ __fastcall TFileFindDialog::TFileFindDialog(TComponent * Owner)
 
   UpdateImages();
 
-  UseDesktopFont(FileView);
+  UseDesktopFont(FileView2);
   UseDesktopFont(StatusBar);
 
   FFrameAnimation.Init(AnimationPaintBox, L"Find");
@@ -71,7 +71,7 @@ __fastcall TFileFindDialog::~TFileFindDialog()
   TFindFileConfiguration FormConfiguration = CustomWinConfiguration->FindFile;
   // | is there to make TCustomListViewColProperties.SetParamsStr stop there
   // (and it allows adding new parameters to the col properties in the future)
-  FormConfiguration.ListParams = FORMAT(L"%s|/%d", (FileView->ColProperties->ParamsStr, 1));
+  FormConfiguration.ListParams = FORMAT(L"%s|/%d", (FileView2->ColProperties->ParamsStr, 1));
   UnicodeString WindowParams = StoreFormSize(this);
   // this is particularly to prevent saving the form state
   // for the first time, keeping default positioning by a system
@@ -88,7 +88,7 @@ __fastcall TFileFindDialog::~TFileFindDialog()
 //---------------------------------------------------------------------------
 void __fastcall TFileFindDialog::UpdateImages()
 {
-  FileView->SmallImages = ShellImageListForControl(this, ilsSmall);
+  FileView2->SmallImages = ShellImageListForControl(this, ilsSmall);
 }
 //---------------------------------------------------------------------------
 bool __fastcall TFileFindDialog::IsFinding()
@@ -113,13 +113,13 @@ void __fastcall TFileFindDialog::UpdateControls()
   }
   StartStopButton->Caption = StartStopCaption;
   EnableControl(FilterGroup, !Finding);
-  FocusAction->Enabled = (FileView->ItemFocused != NULL);
-  bool EnableFileOperations = !Finding && (FileView->SelCount > 0);
+  FocusAction->Enabled = (FileView2->ItemFocused != NULL);
+  bool EnableFileOperations = !Finding && (FileView2->SelCount > 0);
   DeleteAction->Enabled = EnableFileOperations;
   DownloadAction->Enabled = EnableFileOperations;
   EditAction->Enabled = EnableFileOperations;
-  CopyAction->Enabled = (FileView->Items->Count > 0);
-  SelectAllAction->Enabled = (FileView->SelCount < FileView->Items->Count);
+  CopyAction->Enabled = (FileView2->Items->Count > 0);
+  SelectAllAction->Enabled = (FileView2->SelCount < FileView2->Items->Count);
 
   switch (FState)
   {
@@ -152,7 +152,7 @@ void __fastcall TFileFindDialog::UpdateControls()
       break;
   }
 
-  FocusButton->Default = FileView->Focused() && (FState != ffInit);
+  FocusButton->Default = FileView2->Focused() && (FState != ffInit);
   StartStopButton->Default = !FocusButton->Default;
 }
 //---------------------------------------------------------------------------
@@ -200,12 +200,12 @@ void __fastcall TFileFindDialog::ClearItem(TListItem * Item)
 //---------------------------------------------------------------------------
 void __fastcall TFileFindDialog::Clear()
 {
-  for (int Index = 0; Index < FileView->Items->Count; Index++)
+  for (int Index = 0; Index < FileView2->Items->Count; Index++)
   {
-    ClearItem(FileView->Items->Item[Index]);
+    ClearItem(FileView2->Items->Item[Index]);
   }
 
-  FileView->Items->Clear();
+  FileView2->Items->Clear();
 }
 //---------------------------------------------------------------------------
 void __fastcall TFileFindDialog::Start()
@@ -284,22 +284,22 @@ void __fastcall TFileFindDialog::FileFound(TTerminal * /*Terminal*/,
   const UnicodeString FileName, const TRemoteFile * AFile, bool & Cancel)
 {
   TListItem * Item;
-  int Count = FileView->Items->Count;
+  int Count = FileView2->Items->Count;
   if ((GetColProperties()->SortColumn == NoSort) || (Count == 0))
   {
-    Item = FileView->Items->Add();
+    Item = FileView2->Items->Add();
   }
   else
   {
-    TRemoteFile * FirstFile = static_cast<TRemoteFile *>(FileView->Items->Item[0]->Data);
-    TRemoteFile * LastFile = static_cast<TRemoteFile *>(FileView->Items->Item[Count - 1]->Data);
+    TRemoteFile * FirstFile = static_cast<TRemoteFile *>(FileView2->Items->Item[0]->Data);
+    TRemoteFile * LastFile = static_cast<TRemoteFile *>(FileView2->Items->Item[Count - 1]->Data);
     if (FilesCompare(AFile, FirstFile) < 0)
     {
-      Item = FileView->Items->Insert(0);
+      Item = FileView2->Items->Insert(0);
     }
     else if (FilesCompare(LastFile, AFile) < 0)
     {
-      Item = FileView->Items->Add();
+      Item = FileView2->Items->Add();
     }
     else
     {
@@ -309,7 +309,7 @@ void __fastcall TFileFindDialog::FileFound(TTerminal * /*Terminal*/,
       {
         int Index = (Start + End) / 2;
         DebugAssert((Index >= 0) && (Index < End));
-        TRemoteFile * FileAtIndex = static_cast<TRemoteFile *>(FileView->Items->Item[Index]->Data);
+        TRemoteFile * FileAtIndex = static_cast<TRemoteFile *>(FileView2->Items->Item[Index]->Data);
         int Compare = FilesCompare(AFile, FileAtIndex);
         if (Compare <= 0)
         {
@@ -320,7 +320,7 @@ void __fastcall TFileFindDialog::FileFound(TTerminal * /*Terminal*/,
           Start = Index;
         }
       }
-      Item = FileView->Items->Insert(Start + 1);
+      Item = FileView2->Items->Insert(Start + 1);
     }
   }
 
@@ -386,7 +386,7 @@ void __fastcall TFileFindDialog::StartStopButtonClick(TObject * /*Sender*/)
     Clear();
     if (ActiveControl->Parent == FilterGroup)
     {
-      FileView->SetFocus();
+      FileView2->SetFocus();
     }
     Start();
   }
@@ -416,7 +416,7 @@ void __fastcall TFileFindDialog::FormShow(TObject * /*Sender*/)
   RestoreFormSize(CustomWinConfiguration->FindFile.WindowParams, this);
   UnicodeString S = CustomWinConfiguration->FindFile.ListParams;
   UnicodeString ParamsStr = CutToChar(S, L'/', true);
-  FileView->ColProperties->ParamsStr = ParamsStr;
+  FileView2->ColProperties->ParamsStr = ParamsStr;
   UnicodeString V = CutToChar(S, L'/', true);
   if (StrToIntDef(V, 0) == 0)
   {
@@ -522,7 +522,7 @@ void __fastcall TFileFindDialog::DoFocusFile(const UnicodeString & Path)
 //---------------------------------------------------------------------------
 void __fastcall TFileFindDialog::FocusFile()
 {
-  UnicodeString Path = static_cast<TRemoteFile *>(FileView->ItemFocused->Data)->FullFileName;
+  UnicodeString Path = static_cast<TRemoteFile *>(FileView2->ItemFocused->Data)->FullFileName;
   // To make focussing directories work,
   // otherwise it would try to focus "empty-named file" in the Path
   Path = UnixExcludeTrailingBackslash(Path);
@@ -537,9 +537,9 @@ void __fastcall TFileFindDialog::FocusFile()
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TFileFindDialog::FileViewDblClick(TObject * /*Sender*/)
+void __fastcall TFileFindDialog::FileView2DblClick(TObject * /*Sender*/)
 {
-  if (FileView->ItemFocused != NULL)
+  if (FileView2->ItemFocused != NULL)
   {
     FocusFile();
   }
@@ -550,7 +550,7 @@ void __fastcall TFileFindDialog::FocusActionExecute(TObject * /*Sender*/)
   FocusFile();
 }
 //---------------------------------------------------------------------------
-void __fastcall TFileFindDialog::FileViewSelectItem(TObject * /*Sender*/,
+void __fastcall TFileFindDialog::FileView2SelectItem(TObject * /*Sender*/,
   TListItem * /*Item*/, bool /*Selected*/)
 {
   UpdateControls();
@@ -569,9 +569,9 @@ void __fastcall TFileFindDialog::CopyToClipboard()
 {
   TInstantOperationVisualizer Visualizer;
   std::unique_ptr<TStrings> Strings(new TStringList());
-  for (int Index = 0; Index < FileView->Items->Count; Index++)
+  for (int Index = 0; Index < FileView2->Items->Count; Index++)
   {
-    TListItem * Item = FileView->Items->Item[Index];
+    TListItem * Item = FileView2->Items->Item[Index];
     TRemoteFile * File = static_cast<TRemoteFile *>(Item->Data);
     Strings->Add(File->FullFileName);
   }
@@ -589,7 +589,7 @@ void __fastcall TFileFindDialog::FormClose(TObject * /*Sender*/, TCloseAction &
   Action = caFree;
 }
 //---------------------------------------------------------------------------
-void __fastcall TFileFindDialog::FileViewContextPopup(TObject * Sender, TPoint & MousePos, bool & Handled)
+void __fastcall TFileFindDialog::FileView2ContextPopup(TObject * Sender, TPoint & MousePos, bool & Handled)
 {
   // to update source popup menu before TBX menu is created
   UpdateControls();
@@ -604,7 +604,7 @@ TListItem * __fastcall TFileFindDialog::FileOperationFinished(const UnicodeStrin
   if (DebugAlwaysTrue(I != FFileItemMap.end()))
   {
     Result = I->second;
-    FileView->MakeProgressVisible(Result);
+    FileView2->MakeProgressVisible(Result);
     FFileItemMap.erase(I);
   }
   return Result;
@@ -617,7 +617,7 @@ void __fastcall TFileFindDialog::FileDeleteFinished(
   if (FileName.IsEmpty())
   {
     DebugAssert(Success && NotCancelled);
-    FileView->SelectAll(smNone);
+    FileView2->SelectAll(smNone);
   }
   else
   {
@@ -637,7 +637,7 @@ void __fastcall TFileFindDialog::FileDownloadFinished(
   {
     DebugAssert(Success && NotCancelled);
     // Moved to queue, see call in TCustomScpExplorerForm::CopyParamDialog
-    FileView->SelectAll(smNone);
+    FileView2->SelectAll(smNone);
   }
   else
   {
@@ -655,13 +655,13 @@ void __fastcall TFileFindDialog::FileListOperation(
   std::unique_ptr<TStrings> FileList(new TStringList());
 
   DebugAssert(FFileItemMap.empty());
-  TListItem * Item = FileView->Selected;
+  TListItem * Item = FileView2->Selected;
   while (Item != NULL)
   {
     TRemoteFile * File = static_cast<TRemoteFile *>(Item->Data);
     FileList->AddObject(File->FullFileName, File);
     FFileItemMap.insert(std::make_pair(File->FullFileName, Item));
-    Item = FileView->GetNextItem(Item, sdAll, TItemStates() << isSelected);
+    Item = FileView2->GetNextItem(Item, sdAll, TItemStates() << isSelected);
   }
 
   try
@@ -684,7 +684,7 @@ void __fastcall TFileFindDialog::DeleteActionExecute(TObject * /*Sender*/)
 //---------------------------------------------------------------------------
 void __fastcall TFileFindDialog::SelectAllActionExecute(TObject * /*Sender*/)
 {
-  FileView->SelectAll(smAll);
+  FileView2->SelectAll(smAll);
 }
 //---------------------------------------------------------------------------
 void __fastcall TFileFindDialog::DownloadActionExecute(TObject * /*Sender*/)
@@ -699,7 +699,7 @@ void __fastcall TFileFindDialog::EditActionExecute(TObject * /*Sender*/)
 //---------------------------------------------------------------------------
 TIEListViewColProperties * TFileFindDialog::GetColProperties()
 {
-  return dynamic_cast<TIEListViewColProperties *>(FileView->ColProperties);
+  return dynamic_cast<TIEListViewColProperties *>(FileView2->ColProperties);
 }
 //---------------------------------------------------------------------------
 int TFileFindDialog::FilesCompare(const TRemoteFile * File1, const TRemoteFile * File2)
@@ -741,7 +741,7 @@ int TFileFindDialog::FilesCompare(const TRemoteFile * File1, const TRemoteFile *
   return Result;
 }
 //---------------------------------------------------------------------------
-void __fastcall TFileFindDialog::FileViewCompare(TObject *, TListItem * Item1, TListItem * Item2, int DebugUsedArg(Data), int & Compare)
+void __fastcall TFileFindDialog::FileView2Compare(TObject *, TListItem * Item1, TListItem * Item2, int DebugUsedArg(Data), int & Compare)
 {
   TRemoteFile * File1 = static_cast<TRemoteFile *>(Item1->Data);
   TRemoteFile * File2 = static_cast<TRemoteFile *>(Item2->Data);

source/forms/FileFind.dfm

@@ -1481,7 +1481,7 @@ object FileFindDialog: TFileFindDialog
     Anchors = [akLeft, akTop, akRight, akBottom]
     BevelOuter = bvNone
     TabOrder = 3
-    object FileView: TIEListView
+    object FileView2: TIEListView
       Left = 0
       Top = 0
       Width = 432
@@ -1492,7 +1492,7 @@ object FileFindDialog: TFileFindDialog
       RowSelect = True
       PopupMenu = FileViewPopupMenu
       TabOrder = 0
-      OnDblClick = FileViewDblClick
+      OnDblClick = FileView2DblClick
       OnEnter = ControlChange
       OnExit = ControlChange
       NortonLike = nlOff
@@ -1511,13 +1511,13 @@ object FileFindDialog: TFileFindDialog
           Width = 80
         end
         item
-          Caption = 'Changed'
+          Caption = 'Date modified'
           Width = 90
         end>
       ViewStyle = vsReport
-      OnCompare = FileViewCompare
-      OnContextPopup = FileViewContextPopup
-      OnSelectItem = FileViewSelectItem
+      OnCompare = FileView2Compare
+      OnContextPopup = FileView2ContextPopup
+      OnSelectItem = FileView2SelectItem
     end
   end
   object StatusBar: TStatusBar

source/forms/FileFind.h

@@ -31,7 +31,7 @@ __published:
   THistoryComboBox *MaskEdit;
   TButton *StartStopButton;
   TButton *HelpButton;
-  TIEListView *FileView;
+  TIEListView *FileView2;
   TStatusBar *StatusBar;
   TButton *FocusButton;
   TStaticText *MaskHintText;
@@ -68,19 +68,19 @@ __published:
   void __fastcall FormKeyDown(TObject *Sender, WORD &Key,
           TShiftState Shift);
   void __fastcall MaskEditExit(TObject *Sender);
-  void __fastcall FileViewDblClick(TObject *Sender);
-  void __fastcall FileViewSelectItem(TObject *Sender, TListItem *Item,
+  void __fastcall FileView2DblClick(TObject *Sender);
+  void __fastcall FileView2SelectItem(TObject *Sender, TListItem *Item,
           bool Selected);
   void __fastcall MaskButtonClick(TObject *Sender);
   void __fastcall FormClose(TObject *Sender, TCloseAction &Action);
-  void __fastcall FileViewContextPopup(TObject *Sender, TPoint &MousePos, bool &Handled);
+  void __fastcall FileView2ContextPopup(TObject *Sender, TPoint &MousePos, bool &Handled);
   void __fastcall DeleteActionExecute(TObject *Sender);
   void __fastcall CopyActionExecute(TObject *Sender);
   void __fastcall FocusActionExecute(TObject *Sender);
   void __fastcall SelectAllActionExecute(TObject *Sender);
   void __fastcall DownloadActionExecute(TObject *Sender);
   void __fastcall EditActionExecute(TObject *Sender);
-  void __fastcall FileViewCompare(TObject *Sender, TListItem *Item1, TListItem *Item2, int Data, int &Compare);
+  void __fastcall FileView2Compare(TObject *Sender, TListItem *Item1, TListItem *Item2, int Data, int &Compare);
   void __fastcall FormAfterMonitorDpiChanged(TObject *Sender, int OldDPI, int NewDPI);
 
 public:

source/forms/NonVisual.cpp

@@ -62,14 +62,14 @@ TNonVisualDataModule *NonVisualDataModule;
   SIDE ## SortAscendingAction ## NUM->Checked = COLPROPS(SIDE)->SortAscending; } else
 #define EXESORTA(SIDE, NUM) EXE(SIDE ## SortAscendingAction ## NUM, \
   COLPROPS(SIDE)->SortAscending = !COLPROPS(SIDE)->SortAscending; )
-#define UPDSHCOL(SIDE, NAME, LCOL, RCOL) \
-  UPDFUNC(ShowHide ## SIDE ## NAME ## ColumnAction2, \
+#define UPDSHCOL(SIDE, NAME, LCOL, RCOL, NUM) \
+  UPDFUNC(ShowHide ## SIDE ## NAME ## ColumnAction ## NUM, \
     int Col = (ScpExplorer->IsSideLocalBrowser(os ## SIDE) ? LCOL : RCOL); \
     Action->Enabled = (Col >= 0); \
     Action->Checked = Action->Enabled && COLPROPS(SIDE)->Visible[Col]; \
   )
-#define EXESHCOL(SIDE, NAME, LCOL, RCOL) \
-  EXE(ShowHide ## SIDE ## NAME ## ColumnAction2, \
+#define EXESHCOL(SIDE, NAME, LCOL, RCOL, NUM) \
+  EXE(ShowHide ## SIDE ## NAME ## ColumnAction ## NUM, \
     int Col = (ScpExplorer->IsSideLocalBrowser(os ## SIDE) ? LCOL : RCOL); \
     COLPROPS(SIDE)->Visible[Col] = !COLPROPS(SIDE)->Visible[Col])
 
@@ -369,19 +369,19 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
 
   // SORT
   UPDSORTA(Local, 2)
-  #define UPDSORTL(NAME, COL) UPDSORT(Local, NAME, COL, -1, 2)
-  UPDSORTL(Name, dvName)
-  UPDSORTL(Ext, dvExt)
-  UPDSORTL(Size, dvSize)
-  UPDSORTL(Type, dvType)
-  UPDSORTL(Changed, dvChanged)
-  UPDSORTL(Attr, dvAttr)
+  #define UPDSORTL(NAME, COL, NUM) UPDSORT(Local, NAME, COL, -1, NUM)
+  UPDSORTL(Name, dvName, 2)
+  UPDSORTL(Ext, dvExt, 2)
+  UPDSORTL(Size, dvSize, 2)
+  UPDSORTL(Type, dvType, 2)
+  UPDSORTL(Changed, dvChanged, 3)
+  UPDSORTL(Attr, dvAttr, 2)
   #undef UPDSORTL
   UPDSORTA(Remote, 2)
   UPDSORT(Remote, Name, dvName, uvName, 2)
   UPDSORT(Remote, Ext, dvExt, uvExt, 2)
   UPDSORT(Remote, Size, dvSize, uvSize, 2)
-  UPDSORT(Remote, Changed, dvChanged, uvChanged, 2)
+  UPDSORT(Remote, Changed, dvChanged, uvChanged, 3)
   UPDSORT(Remote, Rights, dvAttr, uvRights, 2)
   UPDSORT(Remote, Owner, -1, uvOwner, 2)
   UPDSORT(Remote, Group, -1, uvGroup, 2)
@@ -391,7 +391,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPDSORT(Current, Ext, dvExt, uvExt, )
   UPDSORT(Current, Size, dvSize, uvSize, )
   UPDSORT(Current, Type, dvType, uvType, 2)
-  UPDSORT(Current, Changed, dvChanged, uvChanged, )
+  UPDSORT(Current, Changed, dvChanged, uvChanged, 2)
   UPDSORT(Current, Rights, dvAttr, uvRights, )
   UPDSORT(Current, Owner, -1, uvOwner, )
   UPDSORT(Current, Group, -1, uvGroup, )
@@ -407,23 +407,23 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPD(ResetLayoutRemoteColumnsAction, true);
 
   // SHOW/HIDE COLUMN
-  #define UPDSHCOLL(NAME) UPDSHCOL(Local, NAME, dv ## NAME, -1)
-  UPDSHCOLL(Name)
-  UPDSHCOLL(Ext)
-  UPDSHCOLL(Size)
-  UPDSHCOLL(Type)
-  UPDSHCOLL(Changed)
-  UPDSHCOLL(Attr)
+  #define UPDSHCOLL(NAME, NUM) UPDSHCOL(Local, NAME, dv ## NAME, -1, NUM)
+  UPDSHCOLL(Name, 2)
+  UPDSHCOLL(Ext, 2)
+  UPDSHCOLL(Size, 2)
+  UPDSHCOLL(Type, 2)
+  UPDSHCOLL(Changed, 3)
+  UPDSHCOLL(Attr, 2)
   #undef UPDSHCOLL
-  UPDSHCOL(Remote, Name, dvName, uvName)
-  UPDSHCOL(Remote, Ext, dvExt, uvExt)
-  UPDSHCOL(Remote, Size, dvSize, uvSize)
-  UPDSHCOL(Remote, Changed, dvChanged, uvChanged)
-  UPDSHCOL(Remote, Rights, dvAttr, uvRights)
-  UPDSHCOL(Remote, Owner, -1, uvOwner)
-  UPDSHCOL(Remote, Group, -1, uvGroup)
-  UPDSHCOL(Remote, LinkTarget, -1, uvLinkTarget)
-  UPDSHCOL(Remote, Type, dvType, uvType)
+  UPDSHCOL(Remote, Name, dvName, uvName, 2)
+  UPDSHCOL(Remote, Ext, dvExt, uvExt, 2)
+  UPDSHCOL(Remote, Size, dvSize, uvSize, 2)
+  UPDSHCOL(Remote, Changed, dvChanged, uvChanged, 3)
+  UPDSHCOL(Remote, Rights, dvAttr, uvRights, 2)
+  UPDSHCOL(Remote, Owner, -1, uvOwner, 2)
+  UPDSHCOL(Remote, Group, -1, uvGroup, 2)
+  UPDSHCOL(Remote, LinkTarget, -1, uvLinkTarget, 2)
+  UPDSHCOL(Remote, Type, dvType, uvType, 2)
   UPD(HideColumnAction, (ListColumn != NULL))
 
   // SESSION
@@ -725,19 +725,19 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     #define COLVIEWPROPS ((TCustomDirViewColProperties*)(((TCustomDirView*)(((TListColumns*)(ListColumn->Collection))->Owner()))->ColProperties))
     // SORT
     EXESORTA(Local, 2)
-    #define EXESORTL(NAME, COL) EXESORT(Local, NAME, COL, COL, 2)
-    EXESORTL(Name, dvName)
-    EXESORTL(Ext, dvExt)
-    EXESORTL(Size, dvSize)
-    EXESORTL(Type, dvType)
-    EXESORTL(Changed, dvChanged)
-    EXESORTL(Attr, dvAttr)
+    #define EXESORTL(NAME, COL, NUM) EXESORT(Local, NAME, COL, COL, NUM)
+    EXESORTL(Name, dvName, 2)
+    EXESORTL(Ext, dvExt, 2)
+    EXESORTL(Size, dvSize, 2)
+    EXESORTL(Type, dvType, 2)
+    EXESORTL(Changed, dvChanged, 3)
+    EXESORTL(Attr, dvAttr, 2)
     #undef EXESORTL
     EXESORTA(Remote, 2)
     EXESORT(Remote, Name, dvName, uvName, 2)
     EXESORT(Remote, Ext, dvExt, uvExt, 2)
     EXESORT(Remote, Size, dvSize, uvSize, 2)
-    EXESORT(Remote, Changed, dvChanged, uvChanged, 2)
+    EXESORT(Remote, Changed, dvChanged, uvChanged, 3)
     EXESORT(Remote, Rights, dvAttr, uvRights, 2)
     EXESORT(Remote, Owner, -1, uvOwner, 2)
     EXESORT(Remote, Group, -1, uvGroup, 2)
@@ -747,7 +747,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXESORT(Current, Ext, dvExt, uvExt, )
     EXESORT(Current, Size, dvSize, uvSize, )
     EXESORT(Current, Type, dvType, uvType, 2)
-    EXESORT(Current, Changed, dvChanged, uvChanged, )
+    EXESORT(Current, Changed, dvChanged, uvChanged, 2)
     EXESORT(Current, Rights, dvAttr, uvRights, )
     EXESORT(Current, Owner, -1, uvOwner, )
     EXESORT(Current, Group, -1, uvGroup, )
@@ -761,23 +761,23 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXE(ResetLayoutRemoteColumnsAction, ScpExplorer->ResetLayoutColumns(osRemote))
 
     // SHOW/HIDE COLUMN
-    #define EXESHCOLL(NAME) EXESHCOL(Local, NAME, dv ## NAME, -1)
-    EXESHCOLL(Name)
-    EXESHCOLL(Ext)
-    EXESHCOLL(Size)
-    EXESHCOLL(Type)
-    EXESHCOLL(Changed)
-    EXESHCOLL(Attr)
+    #define EXESHCOLL(NAME, NUM) EXESHCOL(Local, NAME, dv ## NAME, -1, NUM)
+    EXESHCOLL(Name, 2)
+    EXESHCOLL(Ext, 2)
+    EXESHCOLL(Size, 2)
+    EXESHCOLL(Type, 2)
+    EXESHCOLL(Changed, 3)
+    EXESHCOLL(Attr, 2)
     #undef EXESHCOLL
-    EXESHCOL(Remote, Name, dvName, uvName)
-    EXESHCOL(Remote, Ext, dvExt, uvExt)
-    EXESHCOL(Remote, Size, dvSize, uvSize)
-    EXESHCOL(Remote, Changed, dvChanged, uvChanged)
-    EXESHCOL(Remote, Rights, dvAttr, uvRights)
-    EXESHCOL(Remote, Owner, -1, uvOwner)
-    EXESHCOL(Remote, Group, -1, uvGroup)
-    EXESHCOL(Remote, LinkTarget, -1, uvLinkTarget)
-    EXESHCOL(Remote, Type, dvType, uvType)
+    EXESHCOL(Remote, Name, dvName, uvName, 2)
+    EXESHCOL(Remote, Ext, dvExt, uvExt, 2)
+    EXESHCOL(Remote, Size, dvSize, uvSize, 2)
+    EXESHCOL(Remote, Changed, dvChanged, uvChanged, 3)
+    EXESHCOL(Remote, Rights, dvAttr, uvRights, 2)
+    EXESHCOL(Remote, Owner, -1, uvOwner, 2)
+    EXESHCOL(Remote, Group, -1, uvGroup, 2)
+    EXESHCOL(Remote, LinkTarget, -1, uvLinkTarget, 2)
+    EXESHCOL(Remote, Type, dvType, uvType, 2)
     EXE(HideColumnAction, DebugAssert(ListColumn);
       COLVIEWPROPS->Visible[ListColumn->Index] = false; ListColumn = NULL )
     #undef COLVIEWPROPS

source/forms/NonVisual.dfm

@@ -939,10 +939,10 @@ object NonVisualDataModule: TNonVisualDataModule
       Hint = 'Sort by type|Sort panel by file type'
       ImageIndex = 34
     end
-    object LocalSortByChangedAction2: TAction
+    object LocalSortByChangedAction3: TAction
       Tag = 9
       Category = 'Sort'
-      Caption = 'By &Modification'
+      Caption = 'By Date &modified'
       HelpKeyword = 'ui_file_panel#sorting_files'
       Hint = 'Sort by time|Sort panel by last modification time'
       ImageIndex = 33
@@ -996,10 +996,10 @@ object NonVisualDataModule: TNonVisualDataModule
       ImageIndex = 36
       ShortCut = 16502
     end
-    object RemoteSortByChangedAction2: TAction
+    object RemoteSortByChangedAction3: TAction
       Tag = 14
       Category = 'Sort'
-      Caption = 'By &Modification'
+      Caption = 'By Date &modified'
       HelpKeyword = 'ui_file_panel#sorting_files'
       Hint = 'Sort by time|Sort panel by last modification time'
       ImageIndex = 33
@@ -1087,10 +1087,10 @@ object NonVisualDataModule: TNonVisualDataModule
       ImageIndex = 36
       ShortCut = 16502
     end
-    object CurrentSortByChangedAction: TAction
+    object CurrentSortByChangedAction2: TAction
       Tag = 15
       Category = 'Sort'
-      Caption = 'By &Modification'
+      Caption = 'By Date &modified'
       HelpKeyword = 'ui_file_panel#sorting_files'
       Hint = 'Sort by time|Sort current panel by last modification time'
       ImageIndex = 33
@@ -1179,12 +1179,12 @@ object NonVisualDataModule: TNonVisualDataModule
       Hint = 'Show/hide size column'
       ImageIndex = 47
     end
-    object ShowHideRemoteChangedColumnAction2: TAction
+    object ShowHideRemoteChangedColumnAction3: TAction
       Tag = 15
       Category = 'Columns'
-      Caption = '&Modification'
+      Caption = '&Date modified'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide modification column'
+      Hint = 'Show/hide date modified column'
       ImageIndex = 48
     end
     object ShowHideRemoteRightsColumnAction2: TAction
@@ -1259,12 +1259,12 @@ object NonVisualDataModule: TNonVisualDataModule
       Hint = 'Show/hide size column'
       ImageIndex = 47
     end
-    object ShowHideLocalChangedColumnAction2: TAction
+    object ShowHideLocalChangedColumnAction3: TAction
       Tag = 15
       Category = 'Columns'
-      Caption = '&Modification'
+      Caption = '&Date modified'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide modification column'
+      Hint = 'Show/hide date modified column'
       ImageIndex = 48
     end
     object ShowHideLocalAttrColumnAction2: TAction
@@ -3026,7 +3026,7 @@ object NonVisualDataModule: TNonVisualDataModule
         Action = ShowHideLocalTypeColumnAction2
       end
       object Modification3: TTBXItem
-        Action = ShowHideLocalChangedColumnAction2
+        Action = ShowHideLocalChangedColumnAction3
       end
       object Attributes3: TTBXItem
         Action = ShowHideLocalAttrColumnAction2
@@ -3094,7 +3094,7 @@ object NonVisualDataModule: TNonVisualDataModule
         Action = ShowHideRemoteTypeColumnAction2
       end
       object Modification4: TTBXItem
-        Action = ShowHideRemoteChangedColumnAction2
+        Action = ShowHideRemoteChangedColumnAction3
       end
       object Permissions1: TTBXItem
         Action = ShowHideRemoteRightsColumnAction2

source/forms/NonVisual.h

@@ -137,13 +137,13 @@ __published:    // IDE-managed Components
   TAction *RemoteStatusBarAction2;
   TAction *LocalSortByAttrAction2;
   TAction *LocalSortByTypeAction2;
-  TAction *LocalSortByChangedAction2;
+  TAction *LocalSortByChangedAction3;
   TAction *CommanderSortBandAction;
   TAction *RemoteSortAscendingAction2;
   TAction *RemoteSortByNameAction2;
   TAction *RemoteSortBySizeAction2;
   TAction *RemoteSortByRightsAction2;
-  TAction *RemoteSortByChangedAction2;
+  TAction *RemoteSortByChangedAction3;
   TAction *RemoteSortByOwnerAction2;
   TAction *RemoteSortByGroupAction2;
   TAction *CurrentSortByTypeAction2;
@@ -151,7 +151,7 @@ __published:    // IDE-managed Components
   TAction *CurrentSortByNameAction;
   TAction *CurrentSortBySizeAction;
   TAction *CurrentSortByRightsAction;
-  TAction *CurrentSortByChangedAction;
+  TAction *CurrentSortByChangedAction2;
   TAction *CurrentSortByOwnerAction;
   TAction *CurrentSortByGroupAction;
   TAction *ExplorerSortBandAction;
@@ -166,7 +166,7 @@ __published:    // IDE-managed Components
   TAction *ShowHideRemoteNameColumnAction2;
   TAction *ShowHideRemoteExtColumnAction2;
   TAction *ShowHideRemoteSizeColumnAction2;
-  TAction *ShowHideRemoteChangedColumnAction2;
+  TAction *ShowHideRemoteChangedColumnAction3;
   TAction *ShowHideRemoteRightsColumnAction2;
   TAction *ShowHideRemoteOwnerColumnAction2;
   TAction *ShowHideRemoteGroupColumnAction2;
@@ -174,7 +174,7 @@ __published:    // IDE-managed Components
   TAction *ShowHideLocalExtColumnAction2;
   TAction *ShowHideLocalTypeColumnAction2;
   TAction *ShowHideLocalSizeColumnAction2;
-  TAction *ShowHideLocalChangedColumnAction2;
+  TAction *ShowHideLocalChangedColumnAction3;
   TAction *ShowHideLocalAttrColumnAction2;
   TAction *HideColumnAction;
   TAction *CompareDirectoriesAction2;

source/forms/ScpCommander.dfm

@@ -134,7 +134,7 @@ inherited ScpCommanderForm: TScpCommanderForm
             RadioItem = True
           end
           object TBXItem16: TTBXItem
-            Action = NonVisualDataModule.LocalSortByChangedAction2
+            Action = NonVisualDataModule.LocalSortByChangedAction3
             GroupIndex = 1
             RadioItem = True
           end
@@ -157,7 +157,7 @@ inherited ScpCommanderForm: TScpCommanderForm
             Action = NonVisualDataModule.ShowHideLocalTypeColumnAction2
           end
           object TBXItem22: TTBXItem
-            Action = NonVisualDataModule.ShowHideLocalChangedColumnAction2
+            Action = NonVisualDataModule.ShowHideLocalChangedColumnAction3
           end
           object TBXItem23: TTBXItem
             Action = NonVisualDataModule.ShowHideLocalAttrColumnAction2
@@ -779,7 +779,7 @@ inherited ScpCommanderForm: TScpCommanderForm
             RadioItem = True
           end
           object TBXItem96: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByChangedAction2
+            Action = NonVisualDataModule.RemoteSortByChangedAction3
             GroupIndex = 1
             RadioItem = True
           end
@@ -812,7 +812,7 @@ inherited ScpCommanderForm: TScpCommanderForm
             Action = NonVisualDataModule.ShowHideRemoteTypeColumnAction2
           end
           object TBXItem103: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteChangedColumnAction2
+            Action = NonVisualDataModule.ShowHideRemoteChangedColumnAction3
           end
           object TBXItem104: TTBXItem
             Action = NonVisualDataModule.ShowHideRemoteRightsColumnAction2
@@ -991,7 +991,7 @@ inherited ScpCommanderForm: TScpCommanderForm
         Action = NonVisualDataModule.CurrentSortByTypeAction2
       end
       object TBXItem149: TTBXItem
-        Action = NonVisualDataModule.CurrentSortByChangedAction
+        Action = NonVisualDataModule.CurrentSortByChangedAction2
       end
       object TBXItem151: TTBXItem
         Action = NonVisualDataModule.CurrentSortByRightsAction

source/forms/ScpExplorer.dfm

@@ -545,7 +545,7 @@ inherited ScpExplorerForm: TScpExplorerForm
             RadioItem = True
           end
           object TBXItem96: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByChangedAction2
+            Action = NonVisualDataModule.RemoteSortByChangedAction3
             GroupIndex = 1
           end
           object TBXItem98: TTBXItem
@@ -574,7 +574,7 @@ inherited ScpExplorerForm: TScpExplorerForm
             Action = NonVisualDataModule.ShowHideRemoteTypeColumnAction2
           end
           object TBXItem103: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteChangedColumnAction2
+            Action = NonVisualDataModule.ShowHideRemoteChangedColumnAction3
           end
           object TBXItem104: TTBXItem
             Action = NonVisualDataModule.ShowHideRemoteRightsColumnAction2
@@ -919,7 +919,7 @@ inherited ScpExplorerForm: TScpExplorerForm
         Action = NonVisualDataModule.CurrentSortByTypeAction2
       end
       object TBXItem149: TTBXItem
-        Action = NonVisualDataModule.CurrentSortByChangedAction
+        Action = NonVisualDataModule.CurrentSortByChangedAction2
       end
       object TBXItem150: TTBXItem
         Action = NonVisualDataModule.CurrentSortBySizeAction

source/forms/SynchronizeChecklist.cpp

@@ -67,7 +67,7 @@ __fastcall TSynchronizeChecklistDialog::TSynchronizeChecklistDialog(
   FOnQueueSynchronize = OnQueueSynchronize;
   FToken = Token;
   UseSystemSettings(this);
-  UseDesktopFont(ListView);
+  UseDesktopFont(ListView2);
   UseDesktopFont(StatusBar);
   FChecklist = NULL;
   FChangingItem = NULL;
@@ -79,8 +79,8 @@ __fastcall TSynchronizeChecklistDialog::TSynchronizeChecklistDialog(
 
   SelectScaledImageList(ActionImages);
 
-  FOrigListViewWindowProc = ListView->WindowProc;
-  ListView->WindowProc = ListViewWindowProc;
+  FOrigListViewWindowProc = ListView2->WindowProc;
+  ListView2->WindowProc = ListViewWindowProc;
   FOrigStatusBarWindowProc = StatusBar->WindowProc;
   StatusBar->WindowProc = StatusBarWindowProc;
 
@@ -102,7 +102,7 @@ __fastcall TSynchronizeChecklistDialog::TSynchronizeChecklistDialog(
 __fastcall TSynchronizeChecklistDialog::~TSynchronizeChecklistDialog()
 {
   StatusBar->WindowProc = FOrigStatusBarWindowProc;
-  ListView->WindowProc = FOrigListViewWindowProc;
+  ListView2->WindowProc = FOrigListViewWindowProc;
 }
 //---------------------------------------------------------------------
 bool __fastcall TSynchronizeChecklistDialog::Execute(TSynchronizeChecklist * Checklist)
@@ -115,7 +115,7 @@ bool __fastcall TSynchronizeChecklistDialog::Execute(TSynchronizeChecklist * Che
   {
     TSynchronizeChecklistConfiguration FormConfiguration =
       CustomWinConfiguration->SynchronizeChecklist;
-    FormConfiguration.ListParams = ListView->ColProperties->ParamsStr;
+    FormConfiguration.ListParams = ListView2->ColProperties->ParamsStr;
 
     UnicodeString WindowParams = FormConfiguration.WindowParams;
     // if there is no main window, keep previous "custom pos" indication,
@@ -316,7 +316,7 @@ void __fastcall TSynchronizeChecklistDialog::UpdateControls()
     }
   }
 
-  int SelCount = ListView->SelCount;
+  int SelCount = ListView2->SelCount;
   EnableControl(OkButton, (FChecked[0] > 0) && !FSynchronizing);
   EnableControl(CancelButton, !FSynchronizing);
   EnableControl(HelpButton, !FSynchronizing);
@@ -341,13 +341,13 @@ void __fastcall TSynchronizeChecklistDialog::UpdateControls()
   CalculateSizeAction->Enabled = (SelCount > 0) && AnyDirectory && DebugAlwaysTrue(!FSynchronizing);
   CalculateSizeAllAction->Enabled = (FDirectories > 0) && !FSynchronizing;
   TSynchronizeChecklist::TAction SelectedItemAction =
-    (SelCount == 1) ? GetChecklistItemAction(GetChecklistItem(ListView->Selected)) : TSynchronizeChecklist::saNone;
+    (SelCount == 1) ? GetChecklistItemAction(GetChecklistItem(ListView2->Selected)) : TSynchronizeChecklist::saNone;
   ExploreLocalAction2->Enabled = (SelCount == 1) && (SelectedItemAction != TSynchronizeChecklist::saDeleteRemote);
   ExploreRemoteAction2->Enabled = (SelCount == 1) && (SelectedItemAction != TSynchronizeChecklist::saDeleteLocal);
   LocalPathToClipboardAction->Enabled = (SelCount > 0);
   RemotePathToClipboardAction->Enabled = LocalPathToClipboardAction->Enabled;
 
-  int Count = ListView->Items->Count;
+  int Count = ListView2->Items->Count;
   DebugAssert(FTotals[0] == Count);
   SelectAllAction->Enabled = (SelCount < Count) && !FSynchronizing;
   FindMoveCandidateAction->Enabled = (Count > 0) && !FSynchronizing;
@@ -536,18 +536,18 @@ void __fastcall TSynchronizeChecklistDialog::LoadList()
   memset(&FCheckedSize, 0, sizeof(FCheckedSize));
   FDirectories = 0;
 
-  ListView->Items->BeginUpdate();
+  ListView2->Items->BeginUpdate();
   try
   {
-    ListView->Items->Clear();
+    ListView2->Items->Clear();
     for (int Index = 0; Index < FChecklist->Count; Index++)
     {
       const TSynchronizeChecklist::TItem * ChecklistItem =
-        FChecklist->Item[ListView->Items->Count];
+        FChecklist->Item[ListView2->Items->Count];
       FChangingItemIgnore = true;
       try
       {
-        TListItem * Item = ListView->Items->Add();
+        TListItem * Item = ListView2->Items->Add();
         TSynchronizeChecklist::TAction Action = ChecklistItem->Action;
         FActions.insert(std::make_pair(ChecklistItem, Action));
         FChecklistToListViewMap.insert(std::make_pair(ChecklistItem, Item));
@@ -569,10 +569,10 @@ void __fastcall TSynchronizeChecklistDialog::LoadList()
   }
   __finally
   {
-    ListView->Items->EndUpdate();
+    ListView2->Items->EndUpdate();
   }
 
-  ListView->AlphaSort();
+  ListView2->AlphaSort();
   UpdateControls();
 }
 //---------------------------------------------------------------------------
@@ -597,7 +597,7 @@ void __fastcall TSynchronizeChecklistDialog::FormShow(TObject * /*Sender*/)
     FlashOnBackground();
   }
 
-  ListView->ColProperties->ParamsStr = CustomWinConfiguration->SynchronizeChecklist.ListParams;
+  ListView2->ColProperties->ParamsStr = CustomWinConfiguration->SynchronizeChecklist.ListParams;
 
   LoadList();
   UpdateStatusBarSize();
@@ -605,7 +605,7 @@ void __fastcall TSynchronizeChecklistDialog::FormShow(TObject * /*Sender*/)
 //---------------------------------------------------------------------------
 TRect __fastcall TSynchronizeChecklistDialog::GetColumnHeaderRect(int Index)
 {
-  HWND HeaderHandle = ListView_GetHeader(ListView->Handle);
+  HWND HeaderHandle = ListView_GetHeader(ListView2->Handle);
   TRect R;
   Header_GetItemRect(HeaderHandle, Index, &R);
 
@@ -614,7 +614,7 @@ TRect __fastcall TSynchronizeChecklistDialog::GetColumnHeaderRect(int Index)
   ZeroMemory(&ScrollInfo, sizeof(ScrollInfo));
   ScrollInfo.cbSize = sizeof(ScrollInfo);
   ScrollInfo.fMask = SIF_POS;
-  GetScrollInfo(ListView->Handle, SB_HORZ, &ScrollInfo);
+  GetScrollInfo(ListView2->Handle, SB_HORZ, &ScrollInfo);
 
   R.Left -= ScrollInfo.nPos;
   R.Right -= ScrollInfo.nPos;
@@ -638,9 +638,9 @@ void __fastcall TSynchronizeChecklistDialog::ListViewWindowProc(TMessage & Messa
           FLAGSET(CustomDraw->nmcd.dwDrawStage, CDDS_SUBITEM) &&
           FLAGSET(CustomDraw->nmcd.dwDrawStage, CDDS_ITEMPOSTPAINT) &&
           (CustomDraw->iSubItem == ImageColumnIndex) &&
-          (ActionImages->Width <= ListView->Columns->Items[CustomDraw->iSubItem]->Width))
+          (ActionImages->Width <= ListView2->Columns->Items[CustomDraw->iSubItem]->Width))
       {
-        TListItem * Item = ListView->Items->Item[CustomDraw->nmcd.dwItemSpec];
+        TListItem * Item = ListView2->Items->Item[CustomDraw->nmcd.dwItemSpec];
         const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(Item);
 
         TRect HeaderR = GetColumnHeaderRect(CustomDraw->iSubItem);
@@ -676,10 +676,10 @@ void __fastcall TSynchronizeChecklistDialog::ListViewHintShow(TCMHintShow & Hint
 {
   TLVHitTestInfo HitTest;
   HitTest.pt = HintShow.HintInfo->CursorPos;
-  int Index = ListView_SubItemHitTest(ListView->Handle, &HitTest);
+  int Index = ListView_SubItemHitTest(ListView2->Handle, &HitTest);
   if ((Index >= 0) && (HitTest.iSubItem == ImageColumnIndex))
   {
-    TListItem * Item = ListView->Items->Item[Index];
+    TListItem * Item = ListView2->Items->Item[Index];
     const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(Item);
     int ActionHint = 0;
     switch (int(GetChecklistItemAction(ChecklistItem)))
@@ -706,7 +706,7 @@ void __fastcall TSynchronizeChecklistDialog::ListViewHintShow(TCMHintShow & Hint
     if (DebugAlwaysTrue(ActionHint != 0))
     {
       HintShow.HintInfo->HintStr = FORMAT(L"%s|%s", (LoadStr(ActionHint), LoadStr(SYNCHRONIZE_CHECKLIST_REVERSE)));
-      ListView_GetSubItemRect(ListView->Handle, Index, ImageColumnIndex, LVIR_BOUNDS, &HintShow.HintInfo->CursorRect);
+      ListView_GetSubItemRect(ListView2->Handle, Index, ImageColumnIndex, LVIR_BOUNDS, &HintShow.HintInfo->CursorRect);
       HintShow.Result = 0;
     }
   }
@@ -756,7 +756,7 @@ void __fastcall TSynchronizeChecklistDialog::StatusBarWindowProc(TMessage & Mess
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::ListViewAdvancedCustomDrawSubItem(
+void __fastcall TSynchronizeChecklistDialog::ListView2AdvancedCustomDrawSubItem(
   TCustomListView * /*Sender*/, TListItem * /*Item*/, int /*SubItem*/,
   TCustomDrawState /*State*/, TCustomDrawStage /*Stage*/, bool & /*DefaultDraw*/)
 {
@@ -870,7 +870,7 @@ int __fastcall TSynchronizeChecklistDialog::PanelAt(int X)
   return ((Result < StatusBar->Panels->Count - 1) ? Result : -1);
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::ListViewChange(
+void __fastcall TSynchronizeChecklistDialog::ListView2Change(
   TObject * /*Sender*/, TListItem * Item, TItemChange Change)
 {
   if ((Change == ctState) && (FChangingItem == Item) && (FChangingItem != NULL))
@@ -893,7 +893,7 @@ void __fastcall TSynchronizeChecklistDialog::ListViewChange(
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::ListViewChanging(
+void __fastcall TSynchronizeChecklistDialog::ListView2Changing(
   TObject * /*Sender*/, TListItem * Item, TItemChange Change,
   bool & /*AllowChange*/)
 {
@@ -914,9 +914,9 @@ void __fastcall TSynchronizeChecklistDialog::CheckAll(bool Check)
   FChangingItemMass = true;
   try
   {
-    for (int Index = 0; Index < ListView->Items->Count; Index++)
+    for (int Index = 0; Index < ListView2->Items->Count; Index++)
     {
-      ListView->Items->Item[Index]->Checked = Check;
+      ListView2->Items->Item[Index]->Checked = Check;
     }
   }
   __finally
@@ -938,7 +938,7 @@ void __fastcall TSynchronizeChecklistDialog::UncheckAllActionExecute(TObject * /
 //---------------------------------------------------------------------------
 bool TSynchronizeChecklistDialog::IterateItems(TListItem *& Item, TItemStates States)
 {
-  Item = ListView->GetNextItem(Item, sdAll, States);
+  Item = ListView2->GetNextItem(Item, sdAll, States);
   return (Item != NULL);
 }
 //---------------------------------------------------------------------------
@@ -975,7 +975,7 @@ void __fastcall TSynchronizeChecklistDialog::UncheckActionExecute(TObject * /*Se
   Check(false);
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::ListViewSelectItem(
+void __fastcall TSynchronizeChecklistDialog::ListView2SelectItem(
   TObject * /*Sender*/, TListItem * /*Item*/, bool /*Selected*/)
 {
   // Delayed update of button status in case many items are being selected at once
@@ -995,9 +995,9 @@ TListItem * __fastcall TSynchronizeChecklistDialog::SelectAll(bool Select, int A
   bool OnlyTheAction)
 {
   TListItem * Result = NULL;
-  for (int Index = 0; Index < ListView->Items->Count; Index++)
+  for (int Index = 0; Index < ListView2->Items->Count; Index++)
   {
-    TListItem * Item = ListView->Items->Item[Index];
+    TListItem * Item = ListView2->Items->Item[Index];
     if (Action == 0)
     {
       Item->Selected = Select;
@@ -1043,17 +1043,17 @@ void __fastcall TSynchronizeChecklistDialog::StatusBarMouseDown(
     {
       Item->MakeVisible(false);
       Item->Focused = true;
-      ListView->SetFocus();
+      ListView2->SetFocus();
     }
   }
 }
 //---------------------------------------------------------------------------
 TIEListViewColProperties * TSynchronizeChecklistDialog::GetColProperties()
 {
-  return dynamic_cast<TIEListViewColProperties *>(ListView->ColProperties);
+  return dynamic_cast<TIEListViewColProperties *>(ListView2->ColProperties);
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::ListViewCompare(
+void __fastcall TSynchronizeChecklistDialog::ListView2Compare(
   TObject * /*Sender*/, TListItem * Item1, TListItem * Item2, int /*Data*/,
   int & Compare)
 {
@@ -1107,7 +1107,7 @@ void __fastcall TSynchronizeChecklistDialog::ListViewCompare(
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::ListViewSecondaryColumnHeader(
+void __fastcall TSynchronizeChecklistDialog::ListView2SecondaryColumnHeader(
   TCustomIEListView * /*Sender*/, int Index, int & SecondaryColumn)
 {
   // "remote dir" column is sorting alias for "local dir" column
@@ -1121,7 +1121,7 @@ void __fastcall TSynchronizeChecklistDialog::ListViewSecondaryColumnHeader(
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::ListViewContextPopup(
+void __fastcall TSynchronizeChecklistDialog::ListView2ContextPopup(
   TObject * Sender, TPoint & MousePos, bool & Handled)
 {
   // to update source popup menu before TBX menu is created
@@ -1231,7 +1231,7 @@ void __fastcall TSynchronizeChecklistDialog::ReverseActionExecute(TObject * /*Se
   UpdateControls();
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::ListViewClick(TObject * /*Sender*/)
+void __fastcall TSynchronizeChecklistDialog::ListView2Click(TObject * /*Sender*/)
 {
   TKeyboardState KeyState;
   GetKeyboardState(KeyState);
@@ -1239,7 +1239,7 @@ void __fastcall TSynchronizeChecklistDialog::ListViewClick(TObject * /*Sender*/)
   // when selecting, do not reverse, even when user clicked on action column
   if (!ShiftState.Contains(ssShift) && !ShiftState.Contains(ssCtrl))
   {
-    TPoint P = ListView->ScreenToClient(Mouse->CursorPos);
+    TPoint P = ListView2->ScreenToClient(Mouse->CursorPos);
     TRect R = GetColumnHeaderRect(ImageColumnIndex);
     if ((R.Left <= P.x) && (P.x <= R.Right))
     {
@@ -1279,7 +1279,7 @@ void __fastcall TSynchronizeChecklistDialog::Dispatch(void * AMessage)
 //---------------------------------------------------------------------------
 void __fastcall TSynchronizeChecklistDialog::UpdateImages()
 {
-  ListView->SmallImages = ShellImageListForControl(this, ilsSmall);
+  ListView2->SmallImages = ShellImageListForControl(this, ilsSmall);
 }
 //---------------------------------------------------------------------------
 void __fastcall TSynchronizeChecklistDialog::FormAfterMonitorDpiChanged(TObject *, int OldDPI, int NewDPI)
@@ -1319,10 +1319,10 @@ void __fastcall TSynchronizeChecklistDialog::UpdatedSynchronizationChecklistItem
 //---------------------------------------------------------------------------
 void TSynchronizeChecklistDialog::DoSynchronize(bool Queue)
 {
-  ListView->SelectAll(smNone);
-  for (int Index = 0; Index < ListView->Items->Count; Index++)
+  ListView2->SelectAll(smNone);
+  for (int Index = 0; Index < ListView2->Items->Count; Index++)
   {
-    TListItem * Item = ListView->Items->Item[Index];
+    TListItem * Item = ListView2->Items->Item[Index];
     const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(Item);
     FChecklist->Update(ChecklistItem, Item->Checked, GetChecklistItemAction(ChecklistItem));
   }
@@ -1418,7 +1418,7 @@ void __fastcall TSynchronizeChecklistDialog::DeleteItem(const TSynchronizeCheckl
   if (Item->Focused)
   {
     int FocusIndex = Index;
-    if (FocusIndex == ListView->Items->Count - 1)
+    if (FocusIndex == ListView2->Items->Count - 1)
     {
       FocusIndex--;
     }
@@ -1426,9 +1426,9 @@ void __fastcall TSynchronizeChecklistDialog::DeleteItem(const TSynchronizeCheckl
     {
       FocusIndex++;
     }
-    ListView->ItemFocused = ListView->Items->Item[FocusIndex];
+    ListView2->ItemFocused = ListView2->Items->Item[FocusIndex];
   }
-  ListView->Items->Delete(Index);
+  ListView2->Items->Delete(Index);
   FMoveCandidatesValidForSort = MaxInt; // can be optimized
 }
 //---------------------------------------------------------------------------
@@ -1501,7 +1501,7 @@ void __fastcall TSynchronizeChecklistDialog::MoveActionExecute(TObject *)
       else
       {
         // The remaning "transfer" item
-        ListView->Selected->MakeVisible(false);
+        ListView2->Selected->MakeVisible(false);
       }
       UpdateControls();
     }
@@ -1520,9 +1520,9 @@ void __fastcall TSynchronizeChecklistDialog::CheckDirectory(bool Check)
   }
 
   TAutoFlag ChangingItemMassSwitch(FChangingItemMass);
-  for (int Index = 0; Index < ListView->Items->Count; Index++)
+  for (int Index = 0; Index < ListView2->Items->Count; Index++)
   {
-    TListItem * Item = ListView->Items->Item[Index];
+    TListItem * Item = ListView2->Items->Item[Index];
     const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(Item);
     UnicodeString Directory = IncludeTrailingBackslash(ChecklistItem->Local.Directory);
     for (int Index2 = 0; Index2 < Directories->Count; Index2++)
@@ -1549,7 +1549,7 @@ void __fastcall TSynchronizeChecklistDialog::UncheckDirectoryActionExecute(TObje
 //---------------------------------------------------------------------------
 void __fastcall TSynchronizeChecklistDialog::DoExplore(TOperationSide Side)
 {
-  const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(ListView->Selected);
+  const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(ListView2->Selected);
   TSynchronizeChecklist::TAction Action = GetChecklistItemAction(ChecklistItem);
   FOnSynchronizeExplore(Side, Action, ChecklistItem);
 }
@@ -1590,12 +1590,12 @@ void __fastcall TSynchronizeChecklistDialog::KeyDown(Word & Key, TShiftState Shi
   TForm::KeyDown(Key, Shift);
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::ListViewRecreate(TObject *)
+void __fastcall TSynchronizeChecklistDialog::ListView2Recreate(TObject *)
 {
   FChecklistToListViewMap.clear();
-  for (int Index = 0; Index < ListView->Items->Count; Index++)
+  for (int Index = 0; Index < ListView2->Items->Count; Index++)
   {
-    TListItem * Item = ListView->Items->Item[Index];
+    TListItem * Item = ListView2->Items->Item[Index];
     const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(Item);
     FChecklistToListViewMap.insert(std::make_pair(ChecklistItem, Item));
   }
@@ -1615,9 +1615,9 @@ void __fastcall TSynchronizeChecklistDialog::FindMoveCandidateActionExecute(TObj
   {
     FMoveCandidatesFileName.clear();
     FMoveCandidatesSize.clear();
-    for (int Index = 0; Index < ListView->Items->Count; Index++)
+    for (int Index = 0; Index < ListView2->Items->Count; Index++)
     {
-      const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(ListView->Items->Item[Index]);
+      const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(ListView2->Items->Item[Index]);
       if (ChecklistItem->IsLocalOnly() || ChecklistItem->IsRemoteOnly())
       {
         if (ChecklistItem->IsDirectory)
@@ -1637,20 +1637,20 @@ void __fastcall TSynchronizeChecklistDialog::FindMoveCandidateActionExecute(TObj
   bool Found = false;
   if (!FMoveCandidatesFileName.empty() || !FMoveCandidatesSize.empty())
   {
-    TListItem * ItemFocused = ListView->ItemFocused;
+    TListItem * ItemFocused = ListView2->ItemFocused;
     TListItem * Item;
     if (ItemFocused != NULL)
     {
       Item = ItemFocused;
     }
     // Can we have a selection without focus?
-    else if (DebugAlwaysFalse(ListView->Selected != NULL))
+    else if (DebugAlwaysFalse(ListView2->Selected != NULL))
     {
-      Item = ListView->Selected;
+      Item = ListView2->Selected;
     }
-    else if (ListView->Items->Count > 0)
+    else if (ListView2->Items->Count > 0)
     {
-      Item = ListView->Items->Item[0];
+      Item = ListView2->Items->Item[0];
     }
     else
     {
@@ -1738,12 +1738,12 @@ void __fastcall TSynchronizeChecklistDialog::FindMoveCandidateActionExecute(TObj
         if (!Candidates.empty())
         {
           const TSynchronizeChecklist::TItem * ChecklistItem2 = Candidates[0];
-          if ((FirstItem == NULL) && Item->Selected && (ListView->SelCount == 2))
+          if ((FirstItem == NULL) && Item->Selected && (ListView2->SelCount == 2))
           {
-            TListItem * NextSelected = ListView->GetNextItem(Item, sdAll, TItemStates() << isSelected);
+            TListItem * NextSelected = ListView2->GetNextItem(Item, sdAll, TItemStates() << isSelected);
             if (NextSelected == NULL)
             {
-              NextSelected = ListView->Selected; // Shorthand for GetNextItem(NULL, sdAll, isSelected)
+              NextSelected = ListView2->Selected; // Shorthand for GetNextItem(NULL, sdAll, isSelected)
             }
             TChecklistItems::const_iterator I = std::find(Candidates.begin(), Candidates.end(), GetChecklistItem(NextSelected));
             if (I < Candidates.end() - 1)
@@ -1760,20 +1760,20 @@ void __fastcall TSynchronizeChecklistDialog::FindMoveCandidateActionExecute(TObj
           {
             TListItem * Item2 = FChecklistToListViewMap[ChecklistItem2];
 
-            for (int Index = 0; Index < ListView->Items->Count; Index++)
+            for (int Index = 0; Index < ListView2->Items->Count; Index++)
             {
-              TListItem * ItemI = ListView->Items->Item[Index];
+              TListItem * ItemI = ListView2->Items->Item[Index];
               ItemI->Selected = (ItemI == Item) || (ItemI == Item2);
             }
-            ListView->ItemFocused = Item;
+            ListView2->ItemFocused = Item;
 
             // IsItemVisible returns true even on partial visibility,
             // so it is still worth trying MakeVisible to make them completelly visible
-            bool FlickerExpected = !ListView->IsItemVisible(Item) || !ListView->IsItemVisible(Item2);
+            bool FlickerExpected = !ListView2->IsItemVisible(Item) || !ListView2->IsItemVisible(Item2);
             if (FlickerExpected)
             {
               // does not seem to have any effect
-              ListView->LockDrawing();
+              ListView2->LockDrawing();
             }
             try
             {
@@ -1786,7 +1786,7 @@ void __fastcall TSynchronizeChecklistDialog::FindMoveCandidateActionExecute(TObj
             {
               if (FlickerExpected)
               {
-                ListView->UnlockDrawing();
+                ListView2->UnlockDrawing();
               }
             }
 
@@ -1807,10 +1807,10 @@ void __fastcall TSynchronizeChecklistDialog::FindMoveCandidateActionExecute(TObj
           FirstItem = Item;
         }
 
-        Item = ListView->GetNextItem(Item, sdAll, TItemStates());
+        Item = ListView2->GetNextItem(Item, sdAll, TItemStates());
         if (Item == NULL)
         {
-          Item = ListView->Items->Item[0];
+          Item = ListView2->Items->Item[0];
         }
       }
     }

source/forms/SynchronizeChecklist.dfm

@@ -1484,12 +1484,12 @@ object SynchronizeChecklistDialog: TSynchronizeChecklistDialog
       TabOrder = 8
     end
   end
-  object ListView: TIEListView
+  object ListView2: TIEListView
     Left = 0
     Top = 0
     Width = 562
     Height = 500
-    OnRecreate = ListViewRecreate
+    OnRecreate = ListView2Recreate
     Align = alClient
     Checkboxes = True
     Constraints.MinWidth = 240
@@ -1503,9 +1503,9 @@ object SynchronizeChecklistDialog: TSynchronizeChecklistDialog
     PopupMenu = ListViewPopupMenu
     ShowHint = True
     TabOrder = 0
-    OnChange = ListViewChange
-    OnChanging = ListViewChanging
-    OnClick = ListViewClick
+    OnChange = ListView2Change
+    OnChanging = ListView2Changing
+    OnClick = ListView2Click
     NortonLike = nlOff
     Columns = <
       item
@@ -1527,7 +1527,7 @@ object SynchronizeChecklistDialog: TSynchronizeChecklistDialog
         Width = 70
       end
       item
-        Caption = 'Changed'
+        Caption = 'Date modified'
         MaxWidth = 1000
         MinWidth = 20
         Width = 80
@@ -1551,17 +1551,17 @@ object SynchronizeChecklistDialog: TSynchronizeChecklistDialog
         Width = 70
       end
       item
-        Caption = 'Changed'
+        Caption = 'Date modified'
         MaxWidth = 1000
         MinWidth = 20
         Width = 80
       end>
     ViewStyle = vsReport
-    OnAdvancedCustomDrawSubItem = ListViewAdvancedCustomDrawSubItem
-    OnCompare = ListViewCompare
-    OnContextPopup = ListViewContextPopup
-    OnSelectItem = ListViewSelectItem
-    OnSecondaryColumnHeader = ListViewSecondaryColumnHeader
+    OnAdvancedCustomDrawSubItem = ListView2AdvancedCustomDrawSubItem
+    OnCompare = ListView2Compare
+    OnContextPopup = ListView2ContextPopup
+    OnSelectItem = ListView2SelectItem
+    OnSecondaryColumnHeader = ListView2SecondaryColumnHeader
   end
   object StatusBar: TStatusBar
     Left = 0

source/forms/SynchronizeChecklist.h

@@ -22,7 +22,7 @@ class TSynchronizeChecklistDialog : public TForm
 {
 __published:
   TPanel * Panel;
-  TIEListView *ListView;
+  TIEListView *ListView2;
   TStatusBar *StatusBar;
   TPngImageList *ActionImages;
   TButton *OkButton;
@@ -90,32 +90,32 @@ __published:
   void __fastcall FormShow(TObject * Sender);
   void __fastcall StatusBarDrawPanel(TStatusBar *StatusBar,
           TStatusPanel *Panel, const TRect &Rect);
-  void __fastcall ListViewChange(TObject *Sender, TListItem *Item,
+  void __fastcall ListView2Change(TObject *Sender, TListItem *Item,
           TItemChange Change);
-  void __fastcall ListViewChanging(TObject *Sender, TListItem *Item,
+  void __fastcall ListView2Changing(TObject *Sender, TListItem *Item,
           TItemChange Change, bool &AllowChange);
   void __fastcall CheckAllActionExecute(TObject *Sender);
   void __fastcall CheckActionExecute(TObject *Sender);
-  void __fastcall ListViewSelectItem(TObject *Sender, TListItem *Item,
+  void __fastcall ListView2SelectItem(TObject *Sender, TListItem *Item,
           bool Selected);
   void __fastcall UpdateTimerTimer(TObject *Sender);
   void __fastcall SelectAllActionExecute(TObject *Sender);
   void __fastcall StatusBarMouseDown(TObject *Sender, TMouseButton Button,
           TShiftState Shift, int X, int Y);
-  void __fastcall ListViewCompare(TObject *Sender, TListItem *Item1,
+  void __fastcall ListView2Compare(TObject *Sender, TListItem *Item1,
           TListItem *Item2, int Data, int &Compare);
-  void __fastcall ListViewSecondaryColumnHeader(TCustomIEListView *Sender,
+  void __fastcall ListView2SecondaryColumnHeader(TCustomIEListView *Sender,
           int Index, int &SecondaryColumn);
-  void __fastcall ListViewContextPopup(TObject *Sender, TPoint &MousePos,
+  void __fastcall ListView2ContextPopup(TObject *Sender, TPoint &MousePos,
           bool &Handled);
   void __fastcall CustomCommandsActionExecute(TObject *Sender);
-  void __fastcall ListViewAdvancedCustomDrawSubItem(TCustomListView *Sender, TListItem *Item,
+  void __fastcall ListView2AdvancedCustomDrawSubItem(TCustomListView *Sender, TListItem *Item,
           int SubItem, TCustomDrawState State, TCustomDrawStage Stage, bool &DefaultDraw);
   void __fastcall StatusBarResize(TObject *Sender);
   void __fastcall UncheckActionExecute(TObject *Sender);
   void __fastcall UncheckAllActionExecute(TObject *Sender);
   void __fastcall ReverseActionExecute(TObject *Sender);
-  void __fastcall ListViewClick(TObject *Sender);
+  void __fastcall ListView2Click(TObject *Sender);
   void __fastcall OkButtonClick(TObject *Sender);
   void __fastcall CalculateSizeActionExecute(TObject *Sender);
   void __fastcall CalculateSizeAllActionExecute(TObject *Sender);
@@ -124,7 +124,7 @@ __published:
   void __fastcall UncheckDirectoryActionExecute(TObject *Sender);
   void __fastcall ExploreLocalAction2Execute(TObject *Sender);
   void __fastcall ExploreRemoteAction2Execute(TObject *Sender);
-  void __fastcall ListViewRecreate(TObject *Sender);
+  void __fastcall ListView2Recreate(TObject *Sender);
   void __fastcall ToolsMenuButtonClick(TObject *Sender);
   void __fastcall FindMoveCandidateActionExecute(TObject *Sender);
   void __fastcall FormAfterMonitorDpiChanged(TObject *Sender, int OldDPI, int NewDPI);

source/packages/filemng/DirViewColProperties.pas

@@ -12,14 +12,14 @@ resourcestring
   SDirViewNameCol = 'Name';
   SDirViewSizeCol = 'Size';
   SDirViewTypeCol = 'Type';
-  SDirViewChangedCol = 'Changed';
+  SDirViewChangedCol2 = 'Date modified';
   SDirViewAttrCol = 'Attr';
   SDirViewExtCol = 'Ext';
 
 const
   DirViewColumns = 6;
   DefaultDirViewCaptions: array[0..DirViewColumns-1] of Pointer =
-    (@SDirViewNameCol, @SDirViewSizeCol, @SDirViewTypeCol, @SDirViewChangedCol,
+    (@SDirViewNameCol, @SDirViewSizeCol, @SDirViewTypeCol, @SDirViewChangedCol2,
      @SDirViewAttrCol, @SDirViewExtCol);
   DefaultDirViewWidths: array[0..DirViewColumns-1] of Integer =
     (150, 80, 125, 130, 45, 20);

source/packages/filemng/UnixDirViewColProperties.pas

@@ -15,7 +15,7 @@ resourcestring
 const
   UnixDirViewColumns = 9;
   DefaultUnixDirViewCaptions: array[0..UnixDirViewColumns-1] of Pointer =
-    (@SDirViewNameCol, @SDirViewSizeCol, @SDirViewChangedCol,
+    (@SDirViewNameCol, @SDirViewSizeCol, @SDirViewChangedCol2,
      @SUnixDirViewRightsCol, @SUnixDirViewOwnerCol, @SUnixDirViewGroupCol,
      @SDirViewExtCol, @SUnixDirViewLinkTargetCol, @SUnixDirViewTypeCol);
   DefaultUnixDirViewWidths: array[0..UnixDirViewColumns-1] of Integer =