瀏覽代碼

* Grep improoved

pierre 25 年之前
父節點
當前提交
1c21c0f968
共有 2 個文件被更改,包括 18 次插入3 次删除
  1. 13 2
      ide/text/fpmtools.inc
  2. 5 1
      ide/text/weditor.pas

+ 13 - 2
ide/text/fpmtools.inc

@@ -204,6 +204,9 @@ begin
       Insert(IL2);
       R2.Move(0,-1);
       Insert(New(PLabel, Init(R2, '~G~rep arguments', IL2)));
+      R1.Assign(R2.B.X, R2.A.Y+1, R2.B.X+3, R2.B.Y+1);
+      Control := New(PHistory, Init(R1, IL2, GrepArgsId));
+      Insert(Control);
     end;
 
     InsertButtons(PGrepDialog);
@@ -219,6 +222,12 @@ begin
          { Linux ? }
          AddToolCommand(GrepExe+' -n '+GrepArgs);
          ToFocus:=ToolMessages^.count-1;
+         UpdateToolMessages;
+         if Assigned(MessagesWindow) then
+           MessagesWindow^.FocusItem(ToFocus);
+         showmsg:=true;
+         Messages;
+
          if not ExecuteRedir(GrepExe,'-n '+GrepArgs,'',GrepOutName,GrepErrName) then
            Begin
               { 2 as exit code just means that
@@ -231,7 +240,6 @@ begin
                 end;
            End;
          {$I-}
-         showmsg:=true;
          Assign(GrepOut,GrepOutName);
          Reset(GrepOut);
          error_in_reading:=false;
@@ -283,7 +291,10 @@ end;
 
 {
   $Log$
-  Revision 1.17  2000-02-10 00:48:02  pierre
+  Revision 1.18  2000-03-02 22:33:36  pierre
+   * Grep improoved
+
+  Revision 1.17  2000/02/10 00:48:02  pierre
    * avoid crash for empty string
 
   Revision 1.16  2000/02/02 22:49:44  pierre

+ 5 - 1
ide/text/weditor.pas

@@ -488,6 +488,7 @@ const
      TextReplaceID = 106;
      GotoID        = 107;
      TextGrepId    = 108;
+     GrepArgsId    = 109;
 
      { used for ShiftDel and ShiftIns to avoid
        GetShiftState to be considered for extending
@@ -5613,7 +5614,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.81  2000-02-09 12:56:54  pierre
+  Revision 1.82  2000-03-02 22:33:36  pierre
+   * Grep improoved
+
+  Revision 1.81  2000/02/09 12:56:54  pierre
    * fix for DelChar past end of line
 
   Revision 1.80  2000/02/07 12:11:15  pierre