Changeset 233

Timestamp:

Apr 14, 2011, 12:51:20 PM (14 years ago)

Author:

george

Message:

• Modified: Unit UStreamHelper no longer define TThreadStreamHelper.

Files:

• CoolStreaming/CoolStreaming.lpk (modified) (2 diffs)
• CoolStreaming/UStreamHelper.pas (modified) (7 diffs)
• CoolTranslator/ReadMe.txt (modified) (1 diff)
• CoolTranslator/UCoolTranslator.pas (modified) (2 diffs)
• Docking/CoolDocking/Managers/UCDManagerTabs.pas (modified) (3 diffs)

CoolStreaming/CoolStreaming.lpk

@@ -6 +6 @@
     <Author Value="Chronos"/>
     <CompilerOptions>
-      <Version Value="10"/>
+      <Version Value="9"/>
       <PathDelim Value="\"/>
       <SearchPaths>
@@ -49 +49 @@
     </Files>
     <Type Value="RunAndDesignTime"/>
-    <RequiredPkgs Count="3">
+    <RequiredPkgs Count="2">
       <Item1>
-        <PackageName Value="MicroThreading"/>
+        <PackageName Value="TemplateGenerics"/>
       </Item1>
       <Item2>
-        <PackageName Value="TemplateGenerics"/>
-      </Item2>
-      <Item3>
         <PackageName Value="FCL"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item3>
+      </Item2>
     </RequiredPkgs>
     <UsageOptions>

CoolStreaming/UStreamHelper.pas

@@ -6 +6 @@
 
 uses
-  Classes, DateUtils, syncobjs, UMicroThreading;
+  Classes, DateUtils, syncobjs;
 
 type
@@ -19 +19 @@
     FEndianness: TEndianness;
     SwapData: Boolean;
+    function GetItem(Index: Integer): Byte;
     procedure SetEndianness(const AValue: TEndianness);
+    procedure SetItem(Index: Integer; const AValue: Byte);
   public
     procedure WriteByte(Data: Byte);
@@ -50 +52 @@
     constructor Create; overload;
     constructor Create(AStream: TStream); overload;
+    procedure Clear;
     destructor Destroy; override;
     function GetSize: Int64; override;
@@ -58 +61 @@
     property Endianness: TEndianness read FEndianness write SetEndianness;
     property Stream: TStream read FStream write FStream;
-  end;
-
-  { TThreadStreamHelper }
-
-  TThreadStreamHelper = class(TStreamHelper)
-    Lock: TMicroThreadCriticalSection;
-    procedure Clear;
-    constructor Create;
-    destructor Destroy; override;
+    property Items[Index: Integer]: Byte read GetItem write SetItem; default;
   end;
 
@@ -195 +190 @@
 end;
 
+procedure TStreamHelper.Clear;
+begin
+  Stream.Size := 0;
+end;
+
 destructor TStreamHelper.Destroy;
 begin
@@ -273 +273 @@
 end;
 
+function TStreamHelper.GetItem(Index: Integer): Byte;
+begin
+  Position := Index;
+  Result := ReadByte;
+end;
+
+procedure TStreamHelper.SetItem(Index: Integer; const AValue: Byte);
+begin
+ Position := Index;
+ WriteByte(AValue);
+end;
+
 procedure TStreamHelper.WriteAnsiString(Data: string);
 var
@@ -348 +360 @@
 end;
 
-{ TThreadStreamHelper }
-
-procedure TThreadStreamHelper.Clear;
-begin
-  try
-    Lock.Acquire;
-    Size := 0;
-  finally
-    Lock.Release;
-  end;
-end;
-
-constructor TThreadStreamHelper.Create;
-begin
-  inherited Create;
-  Lock := TMicroThreadCriticalSection.Create;
-end;
-
-destructor TThreadStreamHelper.Destroy;
-begin
-  Lock.Free;
-  inherited Destroy;
-end;
 
 end.

CoolTranslator/ReadMe.txt

@@ -31 +31 @@
 
 * TCollection: TListView.Columns
-* TStrings: TRadioGroup.
+* TStrings: TRadioGroup.Items, TPageControl.Pages, TComboBox.Items, TMemo.Lines
 
 ==Other constants==

CoolTranslator/UCoolTranslator.pas

@@ -217 +217 @@
               with TCollection(Obj).Items[I] do
                 TranslateComponent(TCollection(Obj).Items[I]);
-          if Obj is TStrings then
+          (*if Obj is TStrings then
             for I := 0 to TStrings(Obj).Count - 1 do
               with TStrings(Obj) do
                 Strings[I] := TranslateText(Strings[I], Strings[I]);
+          *)
         end;
       end;
@@ -327 +328 @@
 destructor TCoolTranslator.Destroy;
 begin
+  FPOFile.Free;
   Languages.Free;
+  ComponentExcludes.Free;
   inherited Destroy;
 end;

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -28 +28 @@
     MouseButton: TMouseButton;
     FDockItems: TObjectList; // TList<TCDManagerRegionsItem>
+    FUpdating: Boolean;
     procedure TabControlMouseLeave(Sender: TObject);
     procedure TabControlMouseDown(Sender: TObject; Button: TMouseButton;
@@ -335 +336 @@
   for I := 0 to DockItems.Count - 1 do
   with TCDManagerTabsItem(DockItems[I]) do begin
+    //Control.Tag := Integer(dhtTemporal);
     //Control.Visible := False;
     //Control.Parent := nil;
@@ -369 +371 @@
     end;
     PageControl.Pages[I].TabVisible := Control.Visible or (HideType = dhtTemporal);
+
     //TCDClientPanel(DockPanels[I]).ClientAreaPanel.Width := DockSite.Width;
     //TCDClientPanel(DockPanels[I]).ClientAreaPanel.Height := DockSite.Height - PageControl.Height;