--- oup/current/Tools/Template.pas	2006/12/23 22:16:42	51
+++ oup/releases/0.33a/Tools/Template.pas	2007/01/11 23:38:49	76
@@ -54,6 +54,7 @@ type
     procedure popup_opentool(Sender: TObject);
     procedure filepopupPopup(Sender: TObject);
     procedure btn_sortClick(Sender: TObject);
+    procedure FormActivate(Sender: TObject);
   private
     FSortBy: TSortType;
     FOnNewFileSelected: TNewFileSelectedEvent;
@@ -83,11 +84,7 @@ procedure TForm_ToolTemplate.RecreateLis
 var
   i:    LongWord;
   exts: TStringArray;
-f, c1,c2: Int64;
-time1,time2,time3: Double;
 begin
-QueryPerformanceFrequency(f);
-QueryPerformanceCounter(c1);
   combo_extension.Items.Clear;
   combo_extension.Items.Add('_All files_ (' +
     IntToStr(OniDataConnection.GetFilesCount) + ')');
@@ -101,13 +98,8 @@ QueryPerformanceCounter(c1);
       end;
     end else
       combo_extension.Items.Add(exts[i]);
-QueryPerformanceCounter(c2);
-time1 := (c2 - c1) / f;
   combo_extension.ItemIndex := 0;
   combo_extensionClick(Self);
-QueryPerformanceCounter(c1);
-time2 := (c1 - c2) / f;
-ShowMessage(FloatToStr(time1) +#13+#10+ FloatToStr(time2));
 end;
 
 
@@ -286,8 +278,8 @@ var
 begin
   pt.X := x;
   pt.Y := y;
-  filelist.ItemIndex := filelist.ItemAtPos(pt, true);
-  Self.listClick(Self);
+//  filelist.ItemIndex := filelist.ItemAtPos(pt, true);
+//  Self.listClick(Self);
 end;
 
 
@@ -373,6 +365,15 @@ begin
   FAllowMultiSelect := False;
 end;
 
+procedure TForm_ToolTemplate.FormActivate(Sender: TObject);
+begin
+  if edit_filtername.CanFocus then
+    edit_filtername.SetFocus
+  else
+    if content.CanFocus then
+      content.SetFocus;
+end;
+
 procedure TForm_ToolTemplate.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   Action := caFree;