Changeset 509

Timestamp:

Apr 3, 2018, 6:03:19 PM (6 years ago)

Author:

chronos

Message:

• Modified: Better color themning.
• Added: Files search function with filtering.

Location:

Common

Files:

• UCommon.pas (modified) (3 diffs)
• UTheme.pas (modified) (3 diffs)

Common/UCommon.pas

@@ -28 +28 @@
     unfDNSDomainName = 11);
 
+  TFilterMethodMethod = function (FileName: string): Boolean of object;
 var
   ExceptionHandler: TExceptionEvent;
@@ -71 +72 @@
 function MergeArray(A, B: array of string): TArrayOfString;
 function LoadFileToStr(const FileName: TFileName): AnsiString;
+procedure SearchFiles(AList: TStrings; Dir: string;
+  FilterMethod: TFilterMethodMethod);
 
 
@@ -514 +517 @@
 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;
 
 

Common/UTheme.pas

@@ -132 +132 @@
   I: Integer;
 begin
-  for I := 0 to Component.ComponentCount - 1 do
-    ApplyTheme(Component.Components[I]);
+  if Component is TWinControl then begin
+    for I := 0 to TWinControl(Component).ControlCount - 1 do
+      ApplyTheme(TWinControl(Component).Controls[I]);
+  end;
 
   if Component is TControl then begin
@@ -139 +141 @@
     if (Control is TEdit) or (Control is TSpinEdit) or (Control is TComboBox) and
     (Control is TMemo) or (Control is TListView) or (Control is TCustomDrawGrid) or
-    (Control is TCheckBox) then begin
+    (Control is TCheckBox) or (Control is TPageControl) or (Control is TRadioButton) then begin
       Control.Color := FTheme.ColorWindow;
       Control.Font.Color := FTheme.ColorWindowText;
@@ -150 +152 @@
       (Control as TCustomDrawGrid).Editor.Color := FTheme.ColorWindow;
       (Control as TCustomDrawGrid).Editor.Font.Color := FTheme.ColorWindowText;
+    end;
+
+    if Control is TPageControl then begin
+      for I := 0 to TPageControl(Component).PageCount - 1 do
+        ApplyTheme(TPageControl(Component).Pages[I]);
     end;
   end;