Преглед на файлове

FIX: OpenArchive condition
ADD: Show search results as FlatView

Alexander Koblov преди 11 години
родител
ревизия
18fb935c75
променени са 2 файла, в които са добавени 4 реда и са изтрити 3 реда
  1. 1 0
      src/fFindDlg.pas
  2. 3 3
      src/umaincommands.pas

+ 1 - 0
src/fFindDlg.pas

@@ -1049,6 +1049,7 @@ begin
   Notebook := frmMain.ActiveNotebook;
   Notebook := frmMain.ActiveNotebook;
   NewPage := Notebook.NewPage(Notebook.ActiveView);
   NewPage := Notebook.NewPage(Notebook.ActiveView);
   NewPage.FileView.AddFileSource(SearchResultFS, SearchResultFS.GetRootDir);
   NewPage.FileView.AddFileSource(SearchResultFS, SearchResultFS.GetRootDir);
+  NewPage.FileView.FlatView := True;
   NewPage.MakeActive;
   NewPage.MakeActive;
 
 
   Close;
   Close;

+ 3 - 3
src/umaincommands.pas

@@ -811,10 +811,10 @@ begin
   aFile := FrmMain.ActiveFrame.CloneActiveFile;
   aFile := FrmMain.ActiveFrame.CloneActiveFile;
   if Assigned(aFile) then
   if Assigned(aFile) then
   try
   try
-    if FileIsArchive(aFile.FullPath) then
-      OpenArchive(aFile)
-    else if aFile.IsNameValid and (aFile.IsDirectory or aFile.IsLinkToDirectory) then
+    if aFile.IsNameValid and (aFile.IsDirectory or aFile.IsLinkToDirectory) then
       OpenTab(aFile.FullPath)
       OpenTab(aFile.FullPath)
+    else if FileIsArchive(aFile.FullPath) then
+      OpenArchive(aFile)
     else
     else
       OpenTab(FrmMain.ActiveFrame.CurrentPath);
       OpenTab(FrmMain.ActiveFrame.CurrentPath);
   finally
   finally