浏览代码

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;
   NewPage := Notebook.NewPage(Notebook.ActiveView);
   NewPage.FileView.AddFileSource(SearchResultFS, SearchResultFS.GetRootDir);
+  NewPage.FileView.FlatView := True;
   NewPage.MakeActive;
 
   Close;

+ 3 - 3
src/umaincommands.pas

@@ -811,10 +811,10 @@ begin
   aFile := FrmMain.ActiveFrame.CloneActiveFile;
   if Assigned(aFile) then
   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)
+    else if FileIsArchive(aFile.FullPath) then
+      OpenArchive(aFile)
     else
       OpenTab(FrmMain.ActiveFrame.CurrentPath);
   finally