Changeset 15 for trunk/Packages/Common

Timestamp:

Feb 27, 2018, 6:11:44 PM (6 years ago)

Author:

chronos

Message:

• Added: Partial support for color theming.
• Added: Allow to edit contact properties in the list of all.

Location:

trunk/Packages/Common

Files:

• Common.lpk (modified) (2 diffs)
• Common.pas (modified) (2 diffs)
• UCommon.pas (modified) (7 diffs)
• UListViewSort.pas (modified) (10 diffs)
• UTheme.pas (added)

trunk/Packages/Common/Common.lpk

@@ -11 +11 @@
       <PathDelim Value="\"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
       </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <SyntaxMode Value="Delphi"/>
+          <CStyleOperator Value="False"/>
+          <AllowLabel Value="False"/>
+          <CPPInline Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
+      <CodeGeneration>
+        <Optimizations>
+          <OptimizationLevel Value="0"/>
+        </Optimizations>
+      </CodeGeneration>
+      <Linking>
+        <Debugging>
+          <GenerateDebugInfo Value="False"/>
+        </Debugging>
+      </Linking>
+      <Other>
+        <CompilerMessages>
+          <IgnoredMessages idx5024="True"/>
+        </CompilerMessages>
+      </Other>
     </CompilerOptions>
     <Description Value="Various libraries"/>
     <License Value="GNU/GPL"/>
     <Version Minor="7"/>
-    <Files Count="20">
+    <Files Count="21">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -106 +129 @@
         <UnitName Value="UScaleDPI"/>
       </Item20>
+      <Item21>
+        <Filename Value="UTheme.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="UTheme"/>
+      </Item21>
     </Files>
     <i18n>

trunk/Packages/Common/Common.pas

@@ -8 +8 @@
 
 uses
-  StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, UThreading, 
-  UMemory, UResetableThread, UPool, ULastOpenedList, URegistry, 
-  UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort, 
-  UPersistentForm, UFindFile, UScaleDPI, LazarusPackageIntf;
+  StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, UThreading,
+  UMemory, UResetableThread, UPool, ULastOpenedList, URegistry,
+  UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort,
+  UPersistentForm, UFindFile, UScaleDPI, UTheme, LazarusPackageIntf;
 
 implementation
@@ -25 +25 @@
   RegisterUnit('UFindFile', @UFindFile.Register);
   RegisterUnit('UScaleDPI', @UScaleDPI.Register);
+  RegisterUnit('UTheme', @UTheme.Register);
 end;
 

trunk/Packages/Common/UCommon.pas

@@ -28 +28 @@
     unfDNSDomainName = 11);
 
+  TFilterMethodMethod = function (FileName: string): Boolean of object;
 var
   ExceptionHandler: TExceptionEvent;
@@ -63 +64 @@
 procedure OpenWebPage(URL: string);
 procedure OpenFileInShell(FileName: string);
-procedure ExecuteProgram(CommandLine: string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string);
 procedure FreeThenNil(var Obj);
 function RemoveQuotes(Text: string): string;
@@ -70 +71 @@
 function GetDirCount(Dir: string): Integer;
 function MergeArray(A, B: array of string): TArrayOfString;
+function LoadFileToStr(const FileName: TFileName): AnsiString;
+procedure SearchFiles(AList: TStrings; Dir: string;
+  FilterMethod: TFilterMethodMethod);
 
 
@@ -111 +115 @@
   Path := IncludeTrailingPathDelimiter(APath);
 
-  Find := FindFirst(UTF8Decode(Path + AFileSpec), faAnyFile xor faDirectory, SearchRec);
+  Find := FindFirst(Path + AFileSpec, faAnyFile xor faDirectory, SearchRec);
   while Find = 0 do begin
-    DeleteFile(Path + UTF8Encode(SearchRec.Name));
+    DeleteFile(Path + SearchRec.Name);
 
     Find := SysUtils.FindNext(SearchRec);
@@ -428 +432 @@
 end;
 
-procedure ExecuteProgram(CommandLine: string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string);
 var
   Process: TProcess;
+  I: Integer;
 begin
   try
     Process := TProcess.Create(nil);
-    Process.CommandLine := CommandLine;
+    Process.Executable := Executable;
+    for I := 0 to Length(Parameters) - 1 do
+      Process.Parameters.Add(Parameters[I]);
     Process.Options := [poNoConsole];
     Process.Execute;
@@ -455 +462 @@
 procedure OpenFileInShell(FileName: string);
 begin
-  ExecuteProgram('cmd.exe /c start "' + FileName + '"');
+  ExecuteProgram('cmd.exe', ['/c', 'start', FileName]);
 end;
 
@@ -492 +499 @@
 end;
 
+function LoadFileToStr(const FileName: TFileName): AnsiString;
+var
+  FileStream: TFileStream;
+  Read: Integer;
+begin
+  Result := '';
+  FileStream := TFileStream.Create(FileName, fmOpenRead);
+  try
+    if FileStream.Size > 0 then begin
+      SetLength(Result, FileStream.Size);
+      Read := FileStream.Read(Pointer(Result)^, FileStream.Size);
+      SetLength(Result, Read);
+    end;
+  finally
+    FileStream.Free;
+  end;
+end;
+
+function DefaultSearchFilter(const FileName: string): Boolean;
+begin
+  Result := True;
+end;
+
+procedure SearchFiles(AList: TStrings; Dir: string;
+  FilterMethod: TFilterMethodMethod);
+var
+  SR: TSearchRec;
+begin
+  Dir := IncludeTrailingPathDelimiter(Dir);
+  if FindFirst(Dir + '*', faAnyFile, SR) = 0 then
+    try
+      repeat
+        if (SR.Name = '.') or (SR.Name = '..') or not FilterMethod(SR.Name) then Continue;
+        AList.Add(Dir + SR.Name);
+        if (SR.Attr and faDirectory) <> 0 then
+          SearchFiles(AList, Dir + SR.Name, FilterMethod);
+      until FindNext(SR) <> 0;
+    finally
+      FindClose(SR);
+    end;
+end;
 
 

trunk/Packages/Common/UListViewSort.pas

@@ -81 +81 @@
     FOnChange: TNotifyEvent;
     FStringGrid1: TStringGrid;
-    procedure DoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
-    procedure DoOnResize(Sender: TObject);
+    procedure GridDoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure GridDoOnResize(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
@@ -110 +110 @@
 { TListViewFilter }
 
-procedure TListViewFilter.DoOnKeyUp(Sender: TObject; var Key: Word;
+procedure TListViewFilter.GridDoOnKeyUp(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
@@ -117 +117 @@
 end;
 
-procedure TListViewFilter.DoOnResize(Sender: TObject);
+procedure TListViewFilter.GridDoOnResize(Sender: TObject);
 begin
   FStringGrid1.DefaultRowHeight := FStringGrid1.Height;
@@ -135 +135 @@
   FStringGrid1.Options := [goFixedHorzLine, goFixedVertLine, goVertLine,
     goHorzLine, goRangeSelect, goEditing, goAlwaysShowEditor, goSmoothScroll];
-  FStringGrid1.OnKeyUp := DoOnKeyUp;
-  FStringGrid1.OnResize := DoOnResize;
+  FStringGrid1.OnKeyUp := GridDoOnKeyUp;
+  FStringGrid1.OnResize := GridDoOnResize;
 end;
 
@@ -144 +144 @@
 begin
   with FStringGrid1 do begin
+    Options := Options - [goEditing, goAlwaysShowEditor];
     //Columns.Clear;
     while Columns.Count > ListView.Columns.Count do Columns.Delete(Columns.Count - 1);
@@ -150 +151 @@
       Columns[I].Width := ListView.Columns[I].Width;
     end;
+    Options := Options + [goEditing, goAlwaysShowEditor];
   end;
 end;
@@ -197 +199 @@
   if AMsg.Msg = WM_NOTIFY then
   begin
-    Code := PHDNotify(vMsgNotify.NMHdr)^.Hdr.Code;
+    Code := NMHDR(PHDNotify(vMsgNotify.NMHdr)^.Hdr).Code;
     case Code of
       HDN_ENDTRACKA, HDN_ENDTRACKW:
@@ -353 +355 @@
   TP1: TPoint;
   XBias, YBias: Integer;
-  OldColor: TColor;
+  PenColor: TColor;
+  BrushColor: TColor;
   BiasTop, BiasLeft: Integer;
   Rect1: TRect;
@@ -365 +368 @@
   Item.Left := 0;
   GetCheckBias(XBias, YBias, BiasTop, BiasLeft, ListView);
-  OldColor := ListView.Canvas.Pen.Color;
+  PenColor := ListView.Canvas.Pen.Color;
+  BrushColor := ListView.Canvas.Brush.Color;
   //TP1 := Item.GetPosition;
   lRect := Item.DisplayRect(drBounds); // Windows 7 workaround
@@ -408 +412 @@
   end;
   //ListView.Canvas.Brush.Color := ListView.Color;
-  ListView.Canvas.Brush.Color := clWindow;
-  ListView.Canvas.Pen.Color := OldColor;
+  ListView.Canvas.Brush.Color := BrushColor;
+  ListView.Canvas.Pen.Color := PenColor;
 end;