Changeset 554 for trunk/Packages

Timestamp:

Apr 24, 2024, 11:19:11 AM (10 days ago)

Author:

chronos

Message:

• Added: TButtonG class as a button class component referencing TGraphicSet item.
• Modified: Code cleanup.

Location:

trunk/Packages

Files:

• CevoComponents/ButtonA.pas (modified) (2 diffs)
• CevoComponents/ButtonB.pas (modified) (2 diffs)
• CevoComponents/ButtonBase.pas (modified) (2 diffs)
• CevoComponents/ButtonC.pas (modified) (2 diffs)
• CevoComponents/ButtonG.pas (added)
• CevoComponents/ButtonN.pas (modified) (2 diffs)
• CevoComponents/CevoComponents.lpk (modified) (3 diffs)
• CevoComponents/CevoComponents.pas (modified) (2 diffs)
• CevoComponents/DrawDlg.pas (modified) (2 diffs)
• CevoComponents/EOTButton.pas (modified) (1 diff)
• CevoComponents/GraphicSet.pas (modified) (6 diffs)
• Common/Common.pas (modified) (1 diff)

trunk/Packages/CevoComponents/ButtonA.pas

@@ -9 +9 @@
 type
   TButtonA = class(TButtonBase)
-    constructor Create(aOwner: TComponent); override;
+    constructor Create(AOwner: TComponent); override;
   private
     FCaption: string;
-    procedure SetCaption(Text: string); override;
     procedure SetFont(const Font: TFont);
   protected
+    procedure SetCaption(Text: string); override;
     procedure Paint; override;
   public
@@ -34 +34 @@
 end;
 
-constructor TButtonA.Create(aOwner: TComponent);
+constructor TButtonA.Create(AOwner: TComponent);
 begin
   inherited;

trunk/Packages/CevoComponents/ButtonB.pas

@@ -9 +9 @@
 type
   TButtonB = class(TButtonBase)
-    constructor Create(aOwner: TComponent); override;
+    constructor Create(AOwner: TComponent); override;
   private
     FMask: TBitmap;
@@ -37 +37 @@
 end;
 
-constructor TButtonB.Create(aOwner: TComponent);
+constructor TButtonB.Create(AOwner: TComponent);
 begin
   inherited;

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -32 +32 @@
     procedure SetGraphic(AValue: TBitmap);
   public
-    constructor Create(aOwner: TComponent); override;
+    constructor Create(AOwner: TComponent); override;
     property Graphic: TBitmap read FGraphic write SetGraphic;
     // property DownSound: string read FDownSound write FDownSound;
@@ -50 +50 @@
 // MMSystem;
 
-constructor TButtonBase.Create(aOwner: TComponent);
+constructor TButtonBase.Create(AOwner: TComponent);
 begin
   inherited;

trunk/Packages/CevoComponents/ButtonC.pas

@@ -8 +8 @@
 type
   TButtonC = class(TButtonBase)
-    constructor Create(aOwner: TComponent); override;
+    constructor Create(AOwner: TComponent); override;
   private
     FIndex: Integer;
@@ -30 +30 @@
 end;
 
-constructor TButtonC.Create(aOwner: TComponent);
+constructor TButtonC.Create(AOwner: TComponent);
 begin
   inherited;

trunk/Packages/CevoComponents/ButtonN.pas

@@ -9 +9 @@
 type
   TButtonN = class(TGraphicControl)
-    constructor Create(aOwner: TComponent); override;
+    constructor Create(AOwner: TComponent); override;
   private
     FPossible, FLit: Boolean;
@@ -45 +45 @@
 end;
 
-constructor TButtonN.Create(aOwner: TComponent);
+constructor TButtonN.Create(AOwner: TComponent);
 begin
   inherited;

trunk/Packages/CevoComponents/CevoComponents.lpk

@@ -37 +37 @@
     <Description Value="C-evo components"/>
     <Version Major="1" Minor="2"/>
-    <Files Count="16">
+    <Files Count="17">
       <Item1>
         <Filename Value="Area.pas"/>
@@ -104 +104 @@
       <Item15>
         <Filename Value="GraphicSet.pas"/>
+        <HasRegisterProc Value="True"/>
         <UnitName Value="GraphicSet"/>
       </Item15>
@@ -110 +111 @@
         <UnitName Value="Texture"/>
       </Item16>
+      <Item17>
+        <Filename Value="ButtonG.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="ButtonG"/>
+      </Item17>
     </Files>
     <CompatibilityMode Value="True"/>

trunk/Packages/CevoComponents/CevoComponents.pas

@@ -10 +10 @@
 uses
   Area, ButtonA, ButtonB, ButtonC, ButtonN, EOTButton, ButtonBase, DrawDlg, 
-  Sound, BaseWin, AsyncProcess2, GraphicSet, Texture, LazarusPackageIntf;
+  Sound, BaseWin, AsyncProcess2, GraphicSet, Texture, ButtonG, 
+  LazarusPackageIntf;
 
 implementation
@@ -24 +25 @@
   RegisterUnit('DrawDlg', @DrawDlg.Register);
   RegisterUnit('BaseWin', @BaseWin.Register);
+  RegisterUnit('GraphicSet', @GraphicSet.Register);
+  RegisterUnit('ButtonG', @ButtonG.Register);
 end;
 

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -132 +132 @@
   MousePos2: TPoint;
 {$IFDEF UNIX}
-  MousePosNew: TPoint;
   NewFormPos: TPoint;
 {$ENDIF}
@@ -149 +148 @@
       MoveMousePos := ClientToScreen(Point(X, Y));
       MoveFormPos := Point(Left, Top);
-      MousePosNew := Mouse.CursorPos;
       // Activate move only if mouse position was not changed during inherited call
       if (MousePos1.X = MousePos2.X) and (MousePos1.Y = MousePos2.Y) then begin

trunk/Packages/CevoComponents/EOTButton.pas

@@ -25 +25 @@
     procedure Paint; override;
   public
-    constructor Create(aOwner: TComponent); override;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     procedure SetButtonIndexFast(X: Integer);

trunk/Packages/CevoComponents/GraphicSet.pas

@@ -43 +43 @@
   { TGraphicSet }
 
-  TGraphicSet = class
+  TGraphicSet = class(TComponent)
+  public
     Name: string;
     Data: TBitmap;
@@ -53 +54 @@
     procedure LoadFromFile(FileName: string);
     procedure SaveToFile(FileName: string);
-    constructor Create;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   end;
@@ -71 +72 @@
   GraphicSetFileExt = '.grs';
 
+procedure Register;
+
 
 implementation
@@ -77 +80 @@
   SWrongFileFormat = 'Wrong file format.';
   SGraphicItemNotFound = 'Graphic item %s not found in graphic set %s.';
+
+procedure Register;
+begin
+  RegisterComponents('C-evo', [TGraphicSet]);
+end;
 
 { TGraphicSetItem }
@@ -227 +235 @@
 end;
 
-constructor TGraphicSet.Create;
-begin
+constructor TGraphicSet.Create(AOwner: TComponent);
+begin
+  inherited;
   Data := TBitmap.Create;
   Data.PixelFormat := TPixelFormat.pf24bit;
@@ -259 +268 @@
 function TGraphicSets.AddNew(Name: string): TGraphicSet;
 begin
-  Result := TGraphicSet.Create;
+  Result := TGraphicSet.Create(nil);
   Result.Name := Name;
   Add(Result);

trunk/Packages/Common/Common.pas

@@ -185 +185 @@
 var
   SHFileOpStruct: TSHFileOpStruct;
-  DirBuf: array [0..255] of char;
+  DirBuf: array [0..255] of Char;
 begin
   DirName := UTF8Decode(DirName);