mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Bug [0001876] Dialog "No files found" when opening Viewer from Search Results

Browse source
This commit is contained in:
Alexander Koblov 2017-07-22 20:29:51 +00:00
commit 500263a67e
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/fFindDlg.lfm
View file

@ -1387,6 +1387,7 @@ object frmFindDlg: TfrmFindDlg
object PopupMenuFind: TPopupMenu
left = 312
top = 48
OnPopup = PopupMenuFindPopup
object miOpenInNewTab: TMenuItem
Caption = 'Open In New Tab(s)'
OnClick = miOpenInNewTabClick

24
src/fFindDlg.pas
View file

@ -257,6 +257,7 @@ type
procedure ZVDateToChange(Sender: TObject);
procedure ZVTimeFromChange(Sender: TObject);
procedure ZVTimeToChange(Sender: TObject);
procedure PopupMenuFindPopup(Sender: TObject);
procedure CancelCloseAndFreeMem;
procedure LoadHistory;
procedure SaveHistory;
@ -1560,7 +1561,12 @@ procedure TfrmFindDlg.cm_View(const Params: array of string);
begin
if pgcSearch.ActivePage = tsResults then
if lsFoundedFiles.ItemIndex <> -1 then
ShowViewerByGlob(lsFoundedFiles.Items[lsFoundedFiles.ItemIndex]);
begin
if (lsFoundedFiles.Items.Objects[lsFoundedFiles.ItemIndex] <> nil) then
msgError(rsMsgErrNotSupported)
else
ShowViewerByGlob(lsFoundedFiles.Items[lsFoundedFiles.ItemIndex]);
end;
end;
{ TfrmFindDlg.cm_Edit }
@ -1568,7 +1574,12 @@ procedure TfrmFindDlg.cm_Edit(const Params: array of string);
begin
if pgcSearch.ActivePage = tsResults then
if lsFoundedFiles.ItemIndex <> -1 then
ShowEditorByGlob(lsFoundedFiles.Items[lsFoundedFiles.ItemIndex]);
begin
if (lsFoundedFiles.Items.Objects[lsFoundedFiles.ItemIndex] <> nil) then
msgError(rsMsgErrNotSupported)
else
ShowEditorByGlob(lsFoundedFiles.Items[lsFoundedFiles.ItemIndex]);
end;
end;
{ TfrmFindDlg.cm_GoToFile }
@ -2316,6 +2327,15 @@ begin
cbTimeTo.Checked := True;
end;
procedure TfrmFindDlg.PopupMenuFindPopup(Sender: TObject);
begin
if (lsFoundedFiles.ItemIndex <> -1) then
begin
miShowInViewer.Enabled:= (lsFoundedFiles.Items.Objects[lsFoundedFiles.ItemIndex] = nil);
miShowInEditor.Enabled:= (lsFoundedFiles.Items.Objects[lsFoundedFiles.ItemIndex] = nil);
end;
end;
{ TfrmFindDlg.OnAddAttribute }
procedure TfrmFindDlg.OnAddAttribute(Sender: TObject);
var