|
@@ -287,6 +287,7 @@ type
|
|
procedure ShowSearchPanel(Char : TUTF8Char = #0);
|
|
procedure ShowSearchPanel(Char : TUTF8Char = #0);
|
|
procedure CloseSearchPanel;
|
|
procedure CloseSearchPanel;
|
|
procedure ShowFilterPanel(Char : TUTF8Char = #0);
|
|
procedure ShowFilterPanel(Char : TUTF8Char = #0);
|
|
|
|
+ procedure FilterPanelVisible;
|
|
procedure CloseFilterPanel;
|
|
procedure CloseFilterPanel;
|
|
|
|
|
|
procedure CalculateSpaceOfAllDirectories;
|
|
procedure CalculateSpaceOfAllDirectories;
|
|
@@ -1569,6 +1570,12 @@ begin
|
|
SetActive(False);
|
|
SetActive(False);
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
+procedure TColumnsFileView.FilterPanelVisible;
|
|
|
|
+begin
|
|
|
|
+ pnlFilter.Visible := True;
|
|
|
|
+ edtFilter.Width := pnlFilter.Width div 2;
|
|
|
|
+end;
|
|
|
|
+
|
|
procedure TColumnsFileView.CloseFilterPanel;
|
|
procedure TColumnsFileView.CloseFilterPanel;
|
|
begin
|
|
begin
|
|
edtFilter.Text := ''; // Automatically triggers edtFilterChange.
|
|
edtFilter.Text := ''; // Automatically triggers edtFilterChange.
|
|
@@ -1605,8 +1612,7 @@ procedure TColumnsFileView.ShowFilterPanel(Char : TUTF8Char = #0);
|
|
begin
|
|
begin
|
|
frmMain.EnableHotkeys(False);
|
|
frmMain.EnableHotkeys(False);
|
|
|
|
|
|
- pnlFilter.Visible := True;
|
|
|
|
- edtFilter.Width := pnlFilter.Width div 2;
|
|
|
|
|
|
+ FilterPanelVisible;
|
|
edtFilter.SetFocus;
|
|
edtFilter.SetFocus;
|
|
|
|
|
|
if Char <> #0 then
|
|
if Char <> #0 then
|
|
@@ -2592,6 +2598,12 @@ begin
|
|
fPrevious : Boolean;
|
|
fPrevious : Boolean;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if Self.FileFilter <> '' then
|
|
|
|
+ begin
|
|
|
|
+ edtFilter.Text := Self.FileFilter; // will trigger assiging to FileFilter
|
|
|
|
+ FilterPanelVisible;
|
|
|
|
+ end;
|
|
|
|
+
|
|
FSorting := Self.FSorting.Clone;
|
|
FSorting := Self.FSorting.Clone;
|
|
FSortColumn := Self.FSortColumn;
|
|
FSortColumn := Self.FSortColumn;
|
|
FSortDirection := Self.FSortDirection;
|
|
FSortDirection := Self.FSortDirection;
|