Changeset 518 for Common

Timestamp:

Aug 31, 2018, 3:28:41 PM (6 years ago)

Author:

chronos

Message:

• Modified: Updated Common package files.

Location:

Common

Files:

• UCommon.pas (modified) (4 diffs)
• ULastOpenedList.pas (modified) (2 diffs)
• UScaleDPI.pas (modified) (2 diffs)
• UXMLUtils.pas (modified) (2 diffs)

Common/UCommon.pas

@@ -72 +72 @@
 function MergeArray(A, B: array of string): TArrayOfString;
 function LoadFileToStr(const FileName: TFileName): AnsiString;
+procedure SaveStringToFile(S, FileName: string);
 procedure SearchFiles(AList: TStrings; Dir: string;
   FilterMethod: TFilterMethodMethod = nil);
 function GetStringPart(var Text: string; Separator: string): string;
+function StripTags(const S: string): string;
 function PosFromIndex(SubStr: string; Text: string;
   StartIndex: Integer): Integer;
@@ -527 +529 @@
 end;
 
+procedure SaveStringToFile(S, FileName: string);
+var
+  F: TextFile;
+begin
+  AssignFile(F, FileName);
+  try
+    ReWrite(F);
+    Write(F, S);
+  finally
+    CloseFile(F);
+  end;
+end;
+
 procedure SearchFiles(AList: TStrings; Dir: string;
   FilterMethod: TFilterMethodMethod = nil);
@@ -561 +576 @@
   Result := Trim(Result);
   Text := Trim(Text);
+end;
+
+function StripTags(const S: string): string;
+var
+  Len: Integer;
+
+  function ReadUntil(const ReadFrom: Integer; const C: Char): Integer;
+  var
+    J: Integer;
+  begin
+    for J := ReadFrom to Len do
+      if (S[j] = C) then
+      begin
+        Result := J;
+        Exit;
+      end;
+    Result := Len + 1;
+  end;
+
+var
+  I, APos: Integer;
+begin
+  Len := Length(S);
+  I := 0;
+  Result := '';
+  while (I <= Len) do begin
+    Inc(I);
+    APos := ReadUntil(I, '<');
+    Result := Result + Copy(S, I, APos - i);
+    I := ReadUntil(APos + 1, '>');
+  end;
 end;
 
@@ -608 +654 @@
 end;
 
+
 initialization
 

Common/ULastOpenedList.pas

@@ -30 +30 @@
     procedure SaveToXMLConfig(XMLConfig: TXMLConfig; Path: string);
     procedure AddItem(FileName: string);
+    function GetFirstFileName: string;
   published
     property MaxCount: Integer read FMaxCount write SetMaxCount;
@@ -185 +186 @@
 end;
 
+function TLastOpenedList.GetFirstFileName: string;
+begin
+  if Items.Count > 0 then Result := Items[0]
+    else Result := '';
+end;
+
 end.
 

Common/UScaleDPI.pas

@@ -289 +289 @@
   //OldAutoSize: Boolean;
 begin
+  //if not (Control is TCustomPage) then
+  // Resize childs first
+  if Control is TWinControl then begin
+    WinControl := TWinControl(Control);
+    if WinControl.ControlCount > 0 then begin
+      for I := 0 to WinControl.ControlCount - 1 do begin
+        if WinControl.Controls[I] is TControl then begin
+          ScaleControl(WinControl.Controls[I], FromDPI);
+        end;
+      end;
+    end;
+  end;
+
   //if Control is TMemo then Exit;
   //if Control is TForm then
@@ -340 +353 @@
   end;
 
-  //if not (Control is TCustomPage) then
-  if Control is TWinControl then begin
-    WinControl := TWinControl(Control);
-    if WinControl.ControlCount > 0 then begin
-      for I := 0 to WinControl.ControlCount - 1 do begin
-        if WinControl.Controls[I] is TControl then begin
-          ScaleControl(WinControl.Controls[I], FromDPI);
-        end;
-      end;
-    end;
-  end;
   //if Control is TForm then
   //  Control.EnableAutoSizing;

Common/UXMLUtils.pas

@@ -7 +7 @@
 uses
   {$IFDEF WINDOWS}Windows,{$ENDIF}
-  Classes, SysUtils, DateUtils, DOM;
+  Classes, SysUtils, DateUtils, DOM, xmlread;
 
 function XMLTimeToDateTime(XMLDateTime: string): TDateTime;
@@ -21 +21 @@
 function ReadString(Node: TDOMNode; Name: string; DefaultValue: string): string;
 function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime): TDateTime;
+procedure ReadXMLFileParser(out Doc: TXMLDocument; FileName: string);
 
 
 implementation
+
+procedure ReadXMLFileParser(out Doc: TXMLDocument; FileName: string);
+var
+  Parser: TDOMParser;
+  Src: TXMLInputSource;
+  InFile: TFileStream;
+begin
+  try
+    InFile := TFileStream.Create(FileName, fmOpenRead);
+    Src := TXMLInputSource.Create(InFile);
+    Parser := TDOMParser.Create;
+    Parser.Options.PreserveWhitespace := True;
+    Parser.Parse(Src, Doc);
+  finally
+    Src.Free;
+    Parser.Free;
+    InFile.Free;
+  end;
+end;
 
 function GetTimeZoneBias: Integer;