Changeset 109 for trunk/Packages/Common

Timestamp:

Jul 26, 2016, 11:22:43 PM (8 years ago)

Author:

chronos

Message:

• Modified: Update new packages files.

Location:

trunk/Packages/Common

Files:

• UCommon.pas (modified) (2 diffs)
• UFindFile.pas (modified) (3 diffs)
• UListViewSort.pas (modified) (2 diffs)
• UPersistentForm.pas (modified) (5 diffs)
• UXMLUtils.pas (modified) (7 diffs)

trunk/Packages/Common/UCommon.pas

@@ -64 +64 @@
 procedure ExecuteProgram(CommandLine: string);
 procedure FreeThenNil(var Obj);
+function RemoveQuotes(Text: string): string;
 
 
@@ -440 +441 @@
 end;
 
+function RemoveQuotes(Text: string): string;
+begin
+  Result := Text;
+  if (Pos('"', Text) = 1) and (Text[Length(Text)] = '"') then
+    Result := Copy(Text, 2, Length(Text) - 2);
+end;
+
+
 initialization
 

trunk/Packages/Common/UFindFile.pas

@@ -55 +55 @@
   end;
 
+const
+{$IFDEF WINDOWS}
+  FilterAll = '*.*';
+{$ENDIF}
+{$IFDEF LINUX}
+  FilterAll = '*';
+{$ENDIF}
+
 procedure Register;
 
@@ -71 +79 @@
   inherited Create(AOwner);
   Path := IncludeTrailingBackslash(UTF8Encode(GetCurrentDir));
-  FileMask := '*.*';
+  FileMask := FilterAll;
   FileAttr := [ffaAnyFile];
   s := TStringList.Create;
@@ -127 +135 @@
   If not InSubFolders then Exit;
 
-  if SysUtils.FindFirst(UTF8Decode(inPath + '*.*'), faDirectory, Rec) = 0 then
+  if SysUtils.FindFirst(UTF8Decode(inPath + FilterAll), faDirectory, Rec) = 0 then
   try
     repeat

trunk/Packages/Common/UListViewSort.pas

@@ -73 +73 @@
     procedure UpdateFromListView(ListView: TListView);
     function TextEntered: Boolean;
+    function TextEnteredColumn(Index: Integer): Boolean;
     function GetColValue(Index: Integer): string;
     property StringGrid: TStringGrid read FStringGrid1 write FStringGrid1;
@@ -142 +143 @@
     end;
   end;
+end;
+
+function TListViewFilter.TextEnteredColumn(Index: Integer): Boolean;
+begin
+  Result := FStringGrid1.Cells[Index, 0] <> '';
 end;
 

trunk/Packages/Common/UPersistentForm.pas

@@ -3 +3 @@
 {$mode delphi}
 
-// Date: 2010-06-01
+// Date: 2015-04-18
 
 interface
@@ -20 +20 @@
     FRegistryContext: TRegistryContext;
   public
+    FormNormalSize: TRect;
+    FormRestoredSize: TRect;
+    FormWindowState: TWindowState;
+    Form: TForm;
+    procedure LoadFromRegistry(RegistryContext: TRegistryContext);
+    procedure SaveToRegistry(RegistryContext: TRegistryContext);
     function CheckEntireVisible(Rect: TRect): TRect;
     function CheckPartVisible(Rect: TRect; Part: Integer): TRect;
@@ -44 +50 @@
 { TPersistentForm }
 
+procedure TPersistentForm.LoadFromRegistry(RegistryContext: TRegistryContext);
+begin
+  with TRegistryEx.Create do
+  try
+    RootKey := RegistryContext.RootKey;
+    OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
+    // Normal size
+    FormNormalSize.Left := ReadIntegerWithDefault('NormalLeft', FormNormalSize.Left);
+    FormNormalSize.Top := ReadIntegerWithDefault('NormalTop', FormNormalSize.Top);
+    FormNormalSize.Right := ReadIntegerWithDefault('NormalWidth', FormNormalSize.Right - FormNormalSize.Left)
+      + FormNormalSize.Left;
+    FormNormalSize.Bottom := ReadIntegerWithDefault('NormalHeight', FormNormalSize.Bottom - FormNormalSize.Top)
+      + FormNormalSize.Top;
+    // Restored size
+    FormRestoredSize.Left := ReadIntegerWithDefault('RestoredLeft', FormRestoredSize.Left);
+    FormRestoredSize.Top := ReadIntegerWithDefault('RestoredTop', FormRestoredSize.Top);
+    FormRestoredSize.Right := ReadIntegerWithDefault('RestoredWidth', FormRestoredSize.Right - FormRestoredSize.Left)
+      + FormRestoredSize.Left;
+    FormRestoredSize.Bottom := ReadIntegerWithDefault('RestoredHeight', FormRestoredSize.Bottom - FormRestoredSize.Top)
+      + FormRestoredSize.Top;
+    // Other state
+    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
+  finally
+    Free;
+  end;
+end;
+
+procedure TPersistentForm.SaveToRegistry(RegistryContext: TRegistryContext);
+begin
+  with Form, TRegistryEx.Create do
+  try
+    RootKey := RegistryContext.RootKey;
+    OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
+    // Normal state
+    WriteInteger('NormalWidth', FormNormalSize.Right - FormNormalSize.Left);
+    WriteInteger('NormalHeight', FormNormalSize.Bottom - FormNormalSize.Top);
+    WriteInteger('NormalTop', FormNormalSize.Top);
+    WriteInteger('NormalLeft', FormNormalSize.Left);
+    // Restored state
+    WriteInteger('RestoredWidth', FormRestoredSize.Right - FormRestoredSize.Left);
+    WriteInteger('RestoredHeight', FormRestoredSize.Bottom - FormRestoredSize.Top);
+    WriteInteger('RestoredTop', FormRestoredSize.Top);
+    WriteInteger('RestoredLeft', FormRestoredSize.Left);
+    // Other state
+    WriteInteger('WindowState', Integer(FormWindowState));
+  finally
+    Free;
+  end;
+end;
+
 function TPersistentForm.CheckEntireVisible(Rect: TRect): TRect;
 var
@@ -98 +154 @@
 procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False);
 var
-  Normal: TRect;
-  Restored: TRect;
   LoadDefaults: Boolean;
 begin
-  with TRegistryEx.Create do
-    try
-      RootKey := RegistryContext.RootKey;
-      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
-
-      //RestoredWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(Form.WindowState)));
-      //if RestoredWindowState = wsMinimized then
-      //  RestoredWindowState := wsNormal;
-      //Form.WindowState := RestoredWindowState;
-      LoadDefaults := not ValueExists('NormalLeft');
-      Normal := Bounds(ReadIntegerWithDefault('NormalLeft', (Screen.Width - Form.Width) div 2),
-        ReadIntegerWithDefault('NormalTop', (Screen.Height - Form.Height) div 2),
-        ReadIntegerWithDefault('NormalWidth', Form.Width),
-        ReadIntegerWithDefault('NormalHeight', Form.Height));
-      Restored := Bounds(ReadIntegerWithDefault('RestoredLeft', (Screen.Width - Form.Width) div 2),
-        ReadIntegerWithDefault('RestoredTop', (Screen.Height - Form.Height) div 2),
-        ReadIntegerWithDefault('RestoredWidth', Form.Width),
-        ReadIntegerWithDefault('RestoredHeight', Form.Height));
-
-      if not EqualRect(Normal, Restored) or
-        (LoadDefaults and DefaultMaximized) then begin
-        // Restore to maximized state
-        Form.WindowState := wsNormal;
-        if not EqualRect(Restored, Form.BoundsRect) then
-          Form.BoundsRect := Restored;
-        Form.WindowState := wsMaximized;
-      end else begin
-        // Restore to normal state
-        Form.WindowState := wsNormal;
-        if FEntireVisible then Normal := CheckEntireVisible(Normal)
-          else if FMinVisiblePart > 0 then
-        Normal := CheckPartVisible(Normal, FMinVisiblePart);
-        if not EqualRect(Normal, Form.BoundsRect) then
-          Form.BoundsRect := Normal;
-      end;
-
-      //if ReadBoolWithDefault('Visible', False) then Form.Show;
-    finally
-      Free;
-    end;
+  Self.Form := Form;
+  // Set default
+  FormNormalSize := Bounds((Screen.Width - Form.Width) div 2,
+    (Screen.Height - Form.Height) div 2, Form.Width, Form.Height);
+  FormRestoredSize := Bounds((Screen.Width - Form.Width) div 2,
+    (Screen.Height - Form.Height) div 2, Form.Width, Form.Height);
+
+  LoadFromRegistry(RegistryContext);
+
+  if not EqualRect(FormNormalSize, FormRestoredSize) or
+    (LoadDefaults and DefaultMaximized) then begin
+    // Restore to maximized state
+    Form.WindowState := wsNormal;
+    if not EqualRect(FormRestoredSize, Form.BoundsRect) then
+      Form.BoundsRect := FormRestoredSize;
+    Form.WindowState := wsMaximized;
+  end else begin
+    // Restore to normal state
+    Form.WindowState := wsNormal;
+    if FEntireVisible then FormNormalSize := CheckEntireVisible(FormNormalSize)
+      else if FMinVisiblePart > 0 then
+    FormNormalSize := CheckPartVisible(FormNormalSize, FMinVisiblePart);
+    if not EqualRect(FormNormalSize, Form.BoundsRect) then
+      Form.BoundsRect := FormNormalSize;
+  end;
 end;
 
 procedure TPersistentForm.Save(Form: TForm);
 begin
-  with Form, TRegistryEx.Create do
-    try
-      RootKey := RegistryContext.RootKey;
-      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
-      WriteInteger('NormalWidth', Form.Width);
-      WriteInteger('NormalHeight', Form.Height);
-      WriteInteger('NormalTop', Form.Top);
-      WriteInteger('NormalLeft', Form.Left);
-      WriteInteger('RestoredWidth', Form.RestoredWidth);
-      WriteInteger('RestoredHeight', Form.RestoredHeight);
-      WriteInteger('RestoredTop', Form.RestoredTop);
-      WriteInteger('RestoredLeft', Form.RestoredLeft);
-      //WriteInteger('WindowState', Integer(Form.WindowState));
-      //WriteBool('Visible', Form.Visible);
-    finally
-      Free;
-    end;
+  Self.Form := Form;
+  FormNormalSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
+  FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
+    Form.RestoredHeight);
+  FormWindowState := Form.WindowState;
+  SaveToRegistry(RegistryContext);
 end;
 
@@ -168 +196 @@
 begin
   inherited;
+  if AOwner is TForm then Form := TForm(AOwner)
+    else Form := nil;
   FMinVisiblePart := 50;
   FRegistryContext.RootKey := HKEY_CURRENT_USER;

trunk/Packages/Common/UXMLUtils.pas

@@ -12 +12 @@
 function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): WideString;
 procedure WriteInteger(Node: TDOMNode; Name: string; Value: Integer);
+procedure WriteInt64(Node: TDOMNode; Name: string; Value: Int64);
 procedure WriteBoolean(Node: TDOMNode; Name: string; Value: Boolean);
 procedure WriteString(Node: TDOMNode; Name: string; Value: string);
+procedure WriteDateTime(Node: TDOMNode; Name: string; Value: TDateTime);
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
+function ReadInt64(Node: TDOMNode; Name: string; DefaultValue: Int64): Int64;
 function ReadBoolean(Node: TDOMNode; Name: string; DefaultValue: Boolean): Boolean;
 function ReadString(Node: TDOMNode; Name: string; DefaultValue: string): string;
+function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime): TDateTime;
 
 
@@ -72 +76 @@
   Minute: Integer;
   Second: Integer;
+  SecondFraction: Double;
   Millisecond: Integer;
 begin
@@ -94 +99 @@
       if Pos('Z', XMLDateTime) > 0 then
         LeftCutString(XMLDateTime, Part, 'Z');
-      Millisecond := StrToInt(Part);
+      SecondFraction := StrToFloat('0' + DecimalSeparator + Part);
+      Millisecond := Trunc(SecondFraction * 1000);
     end else begin
       if Pos('+', XMLDateTime) > 0 then
@@ -138 +144 @@
 end;
 
+procedure WriteInt64(Node: TDOMNode; Name: string; Value: Int64);
+var
+  NewNode: TDOMNode;
+begin
+  NewNode := Node.OwnerDocument.CreateElement(Name);
+  NewNode.TextContent := IntToStr(Value);
+  Node.AppendChild(NewNode);
+end;
+
 procedure WriteBoolean(Node: TDOMNode; Name: string; Value: Boolean);
 var
@@ -156 +171 @@
 end;
 
+procedure WriteDateTime(Node: TDOMNode; Name: string; Value: TDateTime);
+var
+  NewNode: TDOMNode;
+begin
+  NewNode := Node.OwnerDocument.CreateElement(Name);
+  NewNode.TextContent := DateTimeToXMLTime(Value);
+  Node.AppendChild(NewNode);
+end;
+
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
 var
@@ -166 +190 @@
 end;
 
+function ReadInt64(Node: TDOMNode; Name: string; DefaultValue: Int64): Int64;
+var
+  NewNode: TDOMNode;
+begin
+  Result := DefaultValue;
+  NewNode := Node.FindNode(Name);
+  if Assigned(NewNode) then
+    Result := StrToInt64(NewNode.TextContent);
+end;
+
 function ReadBoolean(Node: TDOMNode; Name: string; DefaultValue: Boolean): Boolean;
 var
@@ -186 +220 @@
 end;
 
+function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime
+  ): TDateTime;
+var
+  NewNode: TDOMNode;
+begin
+  Result := DefaultValue;
+  NewNode := Node.FindNode(Name);
+  if Assigned(NewNode) then
+    Result := XMLTimeToDateTime(NewNode.TextContent);
+end;
+
 end.