Index: FindFile.cpp
===================================================================
--- FindFile.cpp	(nonexistent)
+++ FindFile.cpp	(kopia robocza)
@@ -0,0 +1,93 @@
+#include "ide.h"
+
+static int CharFilterFindFileMask(int c)
+{
+	return ToUpper(ToAscii(c));
+}
+
+class FindFileWindow final : public WithFindFileLayout<TopWindow> {
+private:
+	struct FindFileFileDisplay : public Display {
+		void Paint(Draw& w, const Rect& r, const Value& q,
+				   Color ink, Color paper, dword style) const override
+		{
+			String txt = q;
+			Image fileImage = IdeFileImage(txt, false, false);
+		
+			int cellHeight = r.bottom - r.top;
+		
+			w.DrawRect(r, paper);
+			w.DrawImage(r.left, r.top + ((cellHeight - fileImage.GetHeight()) / 2), fileImage);
+			w.DrawText(r.left + fileImage.GetWidth() + Zx(5), r.top + ((cellHeight - StdFont().GetCy()) / 2), txt, StdFont(), ink);
+		}
+	};
+
+public:
+	FindFileWindow(const Workspace& wspc, const String& serachString);
+	
+	String GetFile() const;
+	String GetPackage() const;
+	
+private:
+	void OnSearch();
+
+private:
+	const Workspace& wspc;
+};
+
+FindFileWindow::FindFileWindow(const Workspace& wspc, const String& serachString)
+	: wspc(wspc)
+{
+	CtrlLayoutOKCancel(*this, "Find File");
+	
+	Sizeable().Zoomable();
+	list.AutoHideSb();
+	list.AddColumn("File").SetDisplay(Single<FindFileFileDisplay>());
+	list.AddColumn("Package");
+	list.WhenLeftDouble = Acceptor(IDOK);
+	mask.NullText("Search");
+	mask.SetText(serachString);
+	mask.SelectAll();
+	mask.SetFilter(CharFilterFindFileMask);
+	mask << [=] { OnSearch(); };
+	
+	OnSearch();
+}
+
+String FindFileWindow::GetFile() const
+{
+	return list.Get(0);
+}
+
+String FindFileWindow::GetPackage() const
+{
+	return list.Get(1);
+}
+
+void FindFileWindow::OnSearch()
+{
+	list.Clear();
+	String maskValue = ~mask;
+	for(int p = 0; p < wspc.GetCount(); p++) {
+		String packname = wspc[p];
+		const Package& pack = wspc.GetPackage(p);
+		for(const auto& file : pack.file)
+			if(!file.separator && (ToUpper(packname).Find(maskValue) >= 0 || ToUpper(file).Find(maskValue) >= 0))
+				list.Add(file, packname);
+	}
+	if(list.GetCount() > 0)
+		list.SetCursor(0);
+
+	ok.Enable(list.IsCursor());
+}
+
+void Ide::FindFileName()
+{
+	FindFileWindow findFileWindow(IdeWorkspace(), find_file_search_string);
+	if(findFileWindow.Execute() == IDOK) {
+		if(findFileWindow.list.IsCursor()) {
+			find_file_search_string = ~findFileWindow.mask;
+			EditFile(SourcePath(findFileWindow.GetPackage(), findFileWindow.GetFile()));
+		}
+	}
+}
Index: FindInFiles.cpp
===================================================================
--- FindInFiles.cpp	(wersja 10191)
+++ FindInFiles.cpp	(kopia robocza)
@@ -183,53 +183,6 @@
 	return true;
 }
 
-int CharFilterFindFileMask(int c)
-{
-	return ToUpper(ToAscii(c));
-}
-
-void Ide::FindFileName() {
-	const Workspace& wspc = IdeWorkspace();
-
-	WithFindFileLayout<TopWindow> ffdlg;
-	CtrlLayoutOKCancel(ffdlg, "Find file");
-	ffdlg.list.AutoHideSb();
-	ffdlg.list.AddColumn("Package");
-	ffdlg.list.AddColumn("File");
-	ffdlg.list.WhenLeftDouble = ffdlg.Acceptor(IDOK);
-	ffdlg.mask.NullText("Search");
-	ffdlg.mask.SetText(find_file_search_string);
-	ffdlg.mask.SelectAll();
-	ffdlg.mask.SetFilter(CharFilterFindFileMask);
-	ffdlg.mask <<= ffdlg.Breaker(IDYES);
-	for(;;) {
-		ffdlg.list.Clear();
-		String mask = ~ffdlg.mask;
-		for(int p = 0; p < wspc.GetCount(); p++) {
-			String packname = wspc[p];
-			const Package& pack = wspc.GetPackage(p);
-			for(const auto& file : pack.file)
-				if(!file.separator && (ToUpper(packname).Find(mask) >= 0 || ToUpper(file).Find(mask) >= 0))
-					ffdlg.list.Add(packname, file);
-		}
-		if(ffdlg.list.GetCount() > 0)
-			ffdlg.list.SetCursor(0);
-		switch(ffdlg.Run()) {
-		case IDCANCEL:
-			return;
-		case IDOK:
-			if(ffdlg.list.IsCursor()) {
-				find_file_search_string = ~ffdlg.mask;
-				EditFile(SourcePath(ffdlg.list.Get(0),  ffdlg.list.Get(1)));
-				return;
-			}
-			break;
-		case IDYES:
-			break;
-		}
-	}
-}
-
 void Ide::FindInFiles(bool replace) {
 	CodeEditor::FindReplaceData d = editor.GetFindReplaceData();
 	CtrlRetriever rf;
Index: ide.upp
===================================================================
--- ide.upp	(wersja 10191)
+++ ide.upp	(kopia robocza)
@@ -38,6 +38,7 @@
 	Template.cpp,
 	ide.key,
 	Console.cpp,
+	FindFile.cpp,
 	FindInFiles.cpp,
 	Config.cpp,
 	ide.cpp,