[GExperts-Checkins] SF.net SVN: gexperts:[878] trunk

[<eb...@us...>]

Revision: 878
          http://sourceforge.net/p/gexperts/code/878
Author:   eberry
Date:     2014-06-09 03:57:33 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
Case insensitive compare for grep directory exclusions
Add (disabled) XE6 build script support
Revert some untested unicode typecast changes
Slightly modified XE6 icon workaround code comment from Achim

Modified Paths:
--------------
    trunk/BuildInstall/GExperts.fbp7
    trunk/ExternalSource/mwBCBTokenList.pas
    trunk/ExternalSource/mwPasTokenList.pas
    trunk/Source/Framework/GX_ActionBroker.pas
    trunk/Source/GExpertsRSXE6.dproj
    trunk/Source/Grep/GX_GrepBackend.pas

Modified: trunk/BuildInstall/GExperts.fbp7
===================================================================
(Binary files differ)

Modified: trunk/ExternalSource/mwBCBTokenList.pas
===================================================================
--- trunk/ExternalSource/mwBCBTokenList.pas	2014-06-08 21:42:05 UTC (rev 877)
+++ trunk/ExternalSource/mwBCBTokenList.pas	2014-06-09 03:57:33 UTC (rev 878)
@@ -247,7 +247,11 @@
   FFoundList.Clear;
   SearchLen := FBCBTokenList.PCharSize;
   FSearchOrigin := FBCBTokenList.Origin;
-  Pat := AnsiString(NewPattern);
+  // This unicode warning is left here as a reminder that this typecast has not
+  // been fully tested. Once tested, the following line can potentially be
+  // replaced by this to remove the warning:
+  // Pat := AnsiString(NewPattern);
+  Pat := NewPattern;
   PatLen := Length(Pat);
   PatLenPlus := PatLen + 1;
   HalfLen := PatLen div 2;
@@ -403,7 +407,11 @@
   StringCount, NewSize: Longint;
   aString: string;
 begin
-  aString := Item + string(FOrigin + DelPos);
+  // This unicode warning is left here as a reminder that this typecast has not
+  // been fully tested. Once tested, the following line can potentially be
+  // replaced by this to remove the warning:
+  // aString := Item + string(FOrigin + DelPos);
+  aString := Item + (FOrigin + DelPos);
   StringCount := Length(aString);
   if (InsPos >= 0) and (StringCount >= 0) then
   begin

Modified: trunk/ExternalSource/mwPasTokenList.pas
===================================================================
--- trunk/ExternalSource/mwPasTokenList.pas	2014-06-08 21:42:05 UTC (rev 877)
+++ trunk/ExternalSource/mwPasTokenList.pas	2014-06-09 03:57:33 UTC (rev 878)
@@ -609,7 +609,11 @@
   StringCount, NewSize: Longint;
   aString: AnsiString;
 begin
-  aString := AnsiString(Item + string(FOrigin + DelPos));
+  // This unicode warning is left here as a reminder that this typecast has not
+  // been fully tested. Once tested, the following line can potentially be
+  // replaced by this to remove the warning:
+  // aString := AnsiString(Item + string(FOrigin + DelPos));
+  aString := Item + (FOrigin + DelPos);
   StringCount := Length(aString);
   if (InsPos >= 0) and (StringCount >= 0) then
   begin
@@ -783,7 +787,11 @@
   Result := TempHelper.Count;
   StartPos := FTokenPositionsList[StartIndex];
   ResetLines(StartIndex, ItemLen);
-  WriteTo(StartPos, StartPos, String(ToInsert));
+  // This unicode warning is left here as a reminder that this typecast has not
+  // been fully tested. Once tested, the following line can potentially be
+  // replaced by this to remove the warning:
+  // WriteTo(StartPos, StartPos, String(ToInsert));
+  WriteTo(StartPos, StartPos, ToInsert);
   ResetPositionsFrom(StartIndex + 1, ItemLen);
   for I := 0 to TempHelper.Count -1 do
   begin
@@ -824,7 +832,11 @@
     EndPos := FTokenPositionsList[OldStartIndex + GroupCount];
     TempStringLen := EndPos - StartPos;
     SetString(TempString, (FOrigin + StartPos), TempStringLen);
-    InsertString(NewStartIndex, AnsiString(TempString));
+    // This unicode warning is left here as a reminder that this typecast has not
+    // been fully tested. Once tested, the following line can potentially be
+    // replaced by this to remove the warning:
+    // InsertString(NewStartIndex, AnsiString(TempString));
+    InsertString(NewStartIndex, TempString);
     OldStartIndex := OldStartIndex + GroupCount;
     DeleteGroup(OldStartIndex, GroupCount);
     TempString := '';
@@ -837,7 +849,11 @@
     EndPos := FTokenPositionsList[OldStartIndex + GroupCount];
     TempStringLen := EndPos - StartPos;
     SetString(TempString, (FOrigin + StartPos), TempStringLen);
-    InsertString(NewStartIndex, AnsiString(TempString));
+    // This unicode warning is left here as a reminder that this typecast has not
+    // been fully tested. Once tested, the following line can potentially be
+    // replaced by this to remove the warning:
+    // InsertString(NewStartIndex, AnsiString(TempString));
+    InsertString(NewStartIndex, TempString);
     DeleteGroup(OldStartIndex, GroupCount);
     TempString := '';
   end;

Modified: trunk/Source/Framework/GX_ActionBroker.pas
===================================================================
--- trunk/Source/Framework/GX_ActionBroker.pas	2014-06-08 21:42:05 UTC (rev 877)
+++ trunk/Source/Framework/GX_ActionBroker.pas	2014-06-09 03:57:33 UTC (rev 878)
@@ -285,10 +285,9 @@
     ReadyBitmap := CreateScaledBitmap(Bitmap);
     try
       BitmapName := AAction.Name + GxBitmapSuffix;
-{$ifdef GX_VER170_up}
-      // Workaround by Achim Kalwa
-      ReadyBitmap.Transparent := False;  // prevent invisible icons on XE6
-{$endif}
+      {$IFDEF GX_VER170_up}
+      ReadyBitmap.Transparent := False; // Prevent invisible enabled icons in XE6 (disabled ones might still be invisible/ghosted)
+      {$ENDIF}
       if ReadyBitmap.Transparent then
         AAction.ImageIndex := NTAServices.AddMasked(ReadyBitmap, ReadyBitmap.TransparentColor, BitmapName)
       else

Modified: trunk/Source/GExpertsRSXE6.dproj
===================================================================
--- trunk/Source/GExpertsRSXE6.dproj	2014-06-08 21:42:05 UTC (rev 877)
+++ trunk/Source/GExpertsRSXE6.dproj	2014-06-09 03:57:33 UTC (rev 878)
@@ -72,6 +72,8 @@
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+        <Debugger_HostApplication>D:\IDE\Delphi XE6\bin\bds.exe</Debugger_HostApplication>
+        <Debugger_RunParams>-ns</Debugger_RunParams>
         <DCC_DcuOutput>.</DCC_DcuOutput>
         <VerInfo_Release>0</VerInfo_Release>
         <VerInfo_MinorVer>0</VerInfo_MinorVer>

Modified: trunk/Source/Grep/GX_GrepBackend.pas
===================================================================
--- trunk/Source/Grep/GX_GrepBackend.pas	2014-06-08 21:42:05 UTC (rev 877)
+++ trunk/Source/Grep/GX_GrepBackend.pas	2014-06-09 03:57:33 UTC (rev 878)
@@ -513,6 +513,7 @@
       SetLength(lExcludedDirs, i);
       lExcludedDirs := QuoteRegExprMetaChars(lExcludedDirs);
       FExcludedDirsRegEx.Expression := StringReplace(lExcludedDirs, ';', '|', [rfReplaceAll]);
+      FExcludedDirsRegEx.ModifierI := True;
       try
         FExcludedDirsRegEx.Compile;
       except

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.