From 03d59dbb30d2af208c3e4d75c3ab0401e6eaf12b Mon Sep 17 00:00:00 2001 From: lainz Date: Tue, 25 Oct 2016 14:10:53 -0300 Subject: [PATCH] Renamed FXMaterialDesignButton to FXMaterialButton. --- README.md | 2 +- bgracontrolsfx.lpk | 12 ++-- bgracontrolsfx.pas | 5 +- ...aldesignbutton.pas => fxmaterialbutton.pas | 68 +++++++++---------- test/test_hybrid/umain.lfm | 16 +++-- test/test_hybrid/umain.pas | 6 +- test/test_multi_containers/umain.lfm | 12 ++-- test/test_multi_containers/umain.pas | 8 +-- test/test_panel/umain.lfm | 6 +- test/test_panel/umain.pas | 10 +-- test/test_receive_and_lock_paint/umain.lfm | 32 ++++----- test/test_receive_and_lock_paint/umain.pas | 18 ++--- 12 files changed, 100 insertions(+), 95 deletions(-) rename fxmaterialdesignbutton.pas => fxmaterialbutton.pas (87%) diff --git a/README.md b/README.md index 2a1fc9a..b8e8b19 100644 --- a/README.md +++ b/README.md @@ -19,5 +19,5 @@ A button control that's looks the same as the OS button. It contains ColorKind l # TFXContainer The control that contains the OpenGL window. Put all the controls in top of this control to get hardware acceleration. -# TFXMaterialDesignButton +# TFXMaterialButton A button with Material Design look, with shadow, rounded borders, text with shadow and "ripple effect". \ No newline at end of file diff --git a/bgracontrolsfx.lpk b/bgracontrolsfx.lpk index ac206bc..0904c88 100644 --- a/bgracontrolsfx.lpk +++ b/bgracontrolsfx.lpk @@ -17,7 +17,7 @@ - + @@ -35,14 +35,14 @@ + + + + + - - - - - diff --git a/bgracontrolsfx.pas b/bgracontrolsfx.pas index a8d1a4c..098cb44 100644 --- a/bgracontrolsfx.pas +++ b/bgracontrolsfx.pas @@ -4,10 +4,11 @@ unit BGRAControlsFX; +{$warn 5023 off : no warning about unused units} interface uses - FXButton, FXContainer, FXMaterialDesignButton, LazarusPackageIntf; + FXButton, FXContainer, fxmaterialbutton, LazarusPackageIntf; implementation @@ -15,7 +16,7 @@ procedure Register; begin RegisterUnit('FXButton', @FXButton.Register); RegisterUnit('FXContainer', @FXContainer.Register); - RegisterUnit('FXMaterialDesignButton', @FXMaterialDesignButton.Register); + RegisterUnit('fxmaterialbutton', @fxmaterialbutton.Register); end; initialization diff --git a/fxmaterialdesignbutton.pas b/fxmaterialbutton.pas similarity index 87% rename from fxmaterialdesignbutton.pas rename to fxmaterialbutton.pas index 3432d1a..d67da0b 100644 --- a/fxmaterialdesignbutton.pas +++ b/fxmaterialbutton.pas @@ -1,4 +1,4 @@ -unit FXMaterialDesignButton; +unit fxmaterialbutton; {$mode objfpc}{$H+} @@ -11,9 +11,9 @@ interface type - { TFXMaterialDesignButton } + { TFXMaterialButton } - TFXMaterialDesignButton = class(TFXGraphicControl) + TFXMaterialButton = class(TFXGraphicControl) private FColorKind: TMaterialColor; FFontColorAutomatic: boolean; @@ -141,12 +141,12 @@ implementation procedure Register; begin - RegisterComponents('BGRA Controls FX', [TFXMaterialDesignButton]); + RegisterComponents('BGRA Controls FX', [TFXMaterialButton]); end; -{ TFXMaterialDesignButton } +{ TFXMaterialButton } -procedure TFXMaterialDesignButton.SetFRoundBorders(AValue: single); +procedure TFXMaterialButton.SetFRoundBorders(AValue: single); begin if FRoundBorders = AValue then Exit; @@ -156,7 +156,7 @@ procedure TFXMaterialDesignButton.SetFRoundBorders(AValue: single); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFShadow(AValue: boolean); +procedure TFXMaterialButton.SetFShadow(AValue: boolean); begin if FShadow = AValue then Exit; @@ -168,7 +168,7 @@ procedure TFXMaterialDesignButton.SetFShadow(AValue: boolean); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFShadowColor(AValue: TColor); +procedure TFXMaterialButton.SetFShadowColor(AValue: TColor); begin if FShadowColor = AValue then Exit; @@ -178,7 +178,7 @@ procedure TFXMaterialDesignButton.SetFShadowColor(AValue: TColor); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFShadowSize(AValue: integer); +procedure TFXMaterialButton.SetFShadowSize(AValue: integer); begin if FShadowSize = AValue then Exit; @@ -190,7 +190,7 @@ procedure TFXMaterialDesignButton.SetFShadowSize(AValue: integer); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFTextColor(AValue: TColor); +procedure TFXMaterialButton.SetFTextColor(AValue: TColor); begin if FTextColor = AValue then Exit; @@ -200,7 +200,7 @@ procedure TFXMaterialDesignButton.SetFTextColor(AValue: TColor); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFTextFont(AValue: string); +procedure TFXMaterialButton.SetFTextFont(AValue: string); begin if FTextFont = AValue then Exit; @@ -212,7 +212,7 @@ procedure TFXMaterialDesignButton.SetFTextFont(AValue: string); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFTextQuality(AValue: TBGRAFontQuality); +procedure TFXMaterialButton.SetFTextQuality(AValue: TBGRAFontQuality); begin if FTextQuality = AValue then Exit; @@ -224,7 +224,7 @@ procedure TFXMaterialDesignButton.SetFTextQuality(AValue: TBGRAFontQuality); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFTextShadow(AValue: boolean); +procedure TFXMaterialButton.SetFTextShadow(AValue: boolean); begin if FTextShadow = AValue then Exit; @@ -236,7 +236,7 @@ procedure TFXMaterialDesignButton.SetFTextShadow(AValue: boolean); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFTextShadowColor(AValue: TColor); +procedure TFXMaterialButton.SetFTextShadowColor(AValue: TColor); begin if FTextShadowColor = AValue then Exit; @@ -246,7 +246,7 @@ procedure TFXMaterialDesignButton.SetFTextShadowColor(AValue: TColor); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFTextShadowOffsetX(AValue: integer); +procedure TFXMaterialButton.SetFTextShadowOffsetX(AValue: integer); begin if FTextShadowOffsetX = AValue then Exit; @@ -258,7 +258,7 @@ procedure TFXMaterialDesignButton.SetFTextShadowOffsetX(AValue: integer); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFTextShadowOffsetY(AValue: integer); +procedure TFXMaterialButton.SetFTextShadowOffsetY(AValue: integer); begin if FTextShadowOffsetY = AValue then Exit; @@ -270,7 +270,7 @@ procedure TFXMaterialDesignButton.SetFTextShadowOffsetY(AValue: integer); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFTextShadowSize(AValue: integer); +procedure TFXMaterialButton.SetFTextShadowSize(AValue: integer); begin if FTextShadowSize = AValue then Exit; @@ -282,7 +282,7 @@ procedure TFXMaterialDesignButton.SetFTextShadowSize(AValue: integer); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFTextSize(AValue: integer); +procedure TFXMaterialButton.SetFTextSize(AValue: integer); begin if FTextSize = AValue then Exit; @@ -294,7 +294,7 @@ procedure TFXMaterialDesignButton.SetFTextSize(AValue: integer); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFTextStyle(AValue: TFontStyles); +procedure TFXMaterialButton.SetFTextStyle(AValue: TFontStyles); begin if FTextStyle = AValue then Exit; @@ -306,7 +306,7 @@ procedure TFXMaterialDesignButton.SetFTextStyle(AValue: TFontStyles); FXInvalidate; end; -procedure TFXMaterialDesignButton.CalculatePreferredSize( +procedure TFXMaterialButton.CalculatePreferredSize( var PreferredWidth, PreferredHeight: integer; WithThemeSpace: boolean); var ts: TSize; @@ -334,7 +334,7 @@ procedure TFXMaterialDesignButton.CalculatePreferredSize( end; end; -procedure TFXMaterialDesignButton.SetFNormalColor(AValue: TColor); +procedure TFXMaterialButton.SetFNormalColor(AValue: TColor); begin if FNormalColor = AValue then Exit; @@ -344,7 +344,7 @@ procedure TFXMaterialDesignButton.SetFNormalColor(AValue: TColor); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFColorKind(AValue: TMaterialColor); +procedure TFXMaterialButton.SetFColorKind(AValue: TMaterialColor); begin if FColorKind = AValue then Exit; @@ -354,7 +354,7 @@ procedure TFXMaterialDesignButton.SetFColorKind(AValue: TMaterialColor); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFFontColorAutomatic(AValue: boolean); +procedure TFXMaterialButton.SetFFontColorAutomatic(AValue: boolean); begin if FFontColorAutomatic = AValue then Exit; @@ -364,7 +364,7 @@ procedure TFXMaterialDesignButton.SetFFontColorAutomatic(AValue: boolean); FXInvalidate; end; -procedure TFXMaterialDesignButton.SetFNormalColorEffect(AValue: TColor); +procedure TFXMaterialButton.SetFNormalColorEffect(AValue: TColor); begin if FNormalColorEffect = AValue then Exit; @@ -374,13 +374,13 @@ procedure TFXMaterialDesignButton.SetFNormalColorEffect(AValue: TColor); FXInvalidate; end; -procedure TFXMaterialDesignButton.OnStartTimer(Sender: TObject); +procedure TFXMaterialButton.OnStartTimer(Sender: TObject); begin FCircleAlpha := 255; FCircleSize := 0; end; -procedure TFXMaterialDesignButton.OnTimer(Sender: TObject); +procedure TFXMaterialButton.OnTimer(Sender: TObject); begin FNeedDraw := True; @@ -399,7 +399,7 @@ procedure TFXMaterialDesignButton.OnTimer(Sender: TObject); FXInvalidate; end; -procedure TFXMaterialDesignButton.MouseDown(Button: TMouseButton; +procedure TFXMaterialButton.MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: integer); begin if Button = mbLeft then @@ -411,13 +411,13 @@ procedure TFXMaterialDesignButton.MouseDown(Button: TMouseButton; inherited MouseDown(Button, Shift, X, Y); end; -class function TFXMaterialDesignButton.GetControlClassDefaultSize: TSize; +class function TFXMaterialButton.GetControlClassDefaultSize: TSize; begin Result.CX := 123; Result.CY := 33; end; -procedure TFXMaterialDesignButton.TextChanged; +procedure TFXMaterialButton.TextChanged; begin InvalidatePreferredSize; AdjustSize; @@ -426,7 +426,7 @@ procedure TFXMaterialDesignButton.TextChanged; FXInvalidate; end; -procedure TFXMaterialDesignButton.UpdateShadow; +procedure TFXMaterialButton.UpdateShadow; var temp: TBGRABitmap; begin @@ -444,7 +444,7 @@ procedure TFXMaterialDesignButton.UpdateShadow; FNeedDraw := True; end; -procedure TFXMaterialDesignButton.DrawTextShadow(AHeight: integer; ATextColor: TColor); +procedure TFXMaterialButton.DrawTextShadow(AHeight: integer; ATextColor: TColor); var bmpSdw: TBGRABitmap; OutTxtSize: TSize; @@ -482,7 +482,7 @@ procedure TFXMaterialDesignButton.DrawTextShadow(AHeight: integer; ATextColor: T FXLayers[1].BGRA.TextOut(OutX, OutY, Caption, ATextColor); end; -procedure TFXMaterialDesignButton.Draw; +procedure TFXMaterialButton.Draw; var temp: TBGRABitmap; round_rect_left: integer; @@ -563,7 +563,7 @@ procedure TFXMaterialDesignButton.Draw; end; end; -constructor TFXMaterialDesignButton.Create(AOwner: TComponent); +constructor TFXMaterialButton.Create(AOwner: TComponent); begin inherited Create(AOwner); with GetControlClassDefaultSize do @@ -593,7 +593,7 @@ constructor TFXMaterialDesignButton.Create(AOwner: TComponent); FFontColorAutomatic := True; end; -destructor TFXMaterialDesignButton.Destroy; +destructor TFXMaterialButton.Destroy; begin FTimer.Enabled := False; FTimer.OnStartTimer := nil; diff --git a/test/test_hybrid/umain.lfm b/test/test_hybrid/umain.lfm index 1709c55..10442d9 100644 --- a/test/test_hybrid/umain.lfm +++ b/test/test_hybrid/umain.lfm @@ -15,24 +15,28 @@ object frmMain: TfrmMain Align = alLeft AutoResizeViewport = True Color = clWhite - object FXMaterialDesignButton1: TFXMaterialDesignButton + object FXMaterialButton1: TFXMaterialButton Left = 8 Height = 42 Top = 8 - Width = 216 + Width = 168 + ColorKind = mcDefault + FontColorAutomatic = True TextFont = 'default' AutoSize = True - Caption = 'FXMaterialDesignButton1' + Caption = 'FXMaterialButton1' end end - object FXMaterialDesignButton2: TFXMaterialDesignButton + object FXMaterialButton2: TFXMaterialButton Left = 232 Height = 42 Top = 8 - Width = 216 + Width = 168 + ColorKind = mcDefault + FontColorAutomatic = True TextFont = 'default' AutoSize = True - Caption = 'FXMaterialDesignButton2' + Caption = 'FXMaterialButton2' end object Splitter1: TSplitter Left = 227 diff --git a/test/test_hybrid/umain.pas b/test/test_hybrid/umain.pas index 1348947..21e14e7 100644 --- a/test/test_hybrid/umain.pas +++ b/test/test_hybrid/umain.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls, - FXContainer, FXMaterialDesignButton; + FXContainer, FXMaterialButton; type @@ -14,8 +14,8 @@ interface TfrmMain = class(TForm) FXContainer1: TFXContainer; - FXMaterialDesignButton1: TFXMaterialDesignButton; - FXMaterialDesignButton2: TFXMaterialDesignButton; + FXMaterialDesignButton1: TFXMaterialButton; + FXMaterialDesignButton2: TFXMaterialButton; Splitter1: TSplitter; private diff --git a/test/test_multi_containers/umain.lfm b/test/test_multi_containers/umain.lfm index 721280d..9d84edf 100644 --- a/test/test_multi_containers/umain.lfm +++ b/test/test_multi_containers/umain.lfm @@ -15,14 +15,14 @@ object frmMain: TfrmMain Align = alLeft AutoResizeViewport = True Color = clWhite - object FXMaterialDesignButton1: TFXMaterialDesignButton + object FXMaterialButton1: TFXMaterialButton Left = 8 Height = 42 Top = 8 Width = 216 TextFont = 'default' AutoSize = True - Caption = 'FXMaterialDesignButton1' + Caption = 'FXMaterialButton1' end object FXContainer3: TFXContainer Left = 0 @@ -32,14 +32,14 @@ object frmMain: TfrmMain Align = alBottom AutoResizeViewport = True Color = clWhite - object FXMaterialDesignButton3: TFXMaterialDesignButton + object FXMaterialButton3: TFXMaterialButton Left = 8 Height = 42 Top = 8 Width = 216 TextFont = 'default' AutoSize = True - Caption = 'FXMaterialDesignButton3' + Caption = 'FXMaterialButton3' end end object Splitter2: TSplitter @@ -60,14 +60,14 @@ object frmMain: TfrmMain Align = alClient AutoResizeViewport = True Color = clWhite - object FXMaterialDesignButton2: TFXMaterialDesignButton + object FXMaterialButton2: TFXMaterialButton Left = 8 Height = 42 Top = 8 Width = 216 TextFont = 'default' AutoSize = True - Caption = 'FXMaterialDesignButton2' + Caption = 'FXMaterialButton2' end end object Splitter1: TSplitter diff --git a/test/test_multi_containers/umain.pas b/test/test_multi_containers/umain.pas index e01c2d9..0c4dd13 100644 --- a/test/test_multi_containers/umain.pas +++ b/test/test_multi_containers/umain.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls, - FXContainer, FXMaterialDesignButton; + FXContainer, FXMaterialButton; type @@ -16,9 +16,9 @@ TfrmMain = class(TForm) FXContainer1: TFXContainer; FXContainer2: TFXContainer; FXContainer3: TFXContainer; - FXMaterialDesignButton1: TFXMaterialDesignButton; - FXMaterialDesignButton2: TFXMaterialDesignButton; - FXMaterialDesignButton3: TFXMaterialDesignButton; + FXMaterialButton1: TFXMaterialButton; + FXMaterialButton2: TFXMaterialButton; + FXMaterialButton3: TFXMaterialButton; Splitter1: TSplitter; Splitter2: TSplitter; private diff --git a/test/test_panel/umain.lfm b/test/test_panel/umain.lfm index 35475e2..956b220 100644 --- a/test/test_panel/umain.lfm +++ b/test/test_panel/umain.lfm @@ -42,7 +42,7 @@ object frmMain: TfrmMain Caption = 'Third' Enabled = False end - object FXMaterialDesignButton2: TFXMaterialDesignButton + object FXMaterialButton2: TFXMaterialButton Left = 160 Height = 72 Top = 152 @@ -55,9 +55,9 @@ object frmMain: TfrmMain TextFont = 'default' Anchors = [akTop, akLeft, akRight, akBottom] AutoSize = True - Caption = 'FXMaterialDesignButton2' + Caption = 'FXMaterialButton2' end - object FXMaterialDesignButton3: TFXMaterialDesignButton + object FXMaterialButton3: TFXMaterialButton Left = 694 Height = 72 Top = 312 diff --git a/test/test_panel/umain.pas b/test/test_panel/umain.pas index a6831d7..df329d9 100644 --- a/test/test_panel/umain.pas +++ b/test/test_panel/umain.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls, - StdCtrls, FXContainer, FXButton, FXMaterialDesignButton, BGRABitmap, + StdCtrls, FXContainer, FXButton, FXMaterialButton, BGRABitmap, BGRABitmapTypes, BGRAOpenGL, FXMaterialColors, Math; type @@ -19,8 +19,8 @@ TfrmMain = class(TForm) FXButton2: TFXButton; FXButton3: TFXButton; FXContainer1: TFXContainer; - FXMaterialDesignButton2: TFXMaterialDesignButton; - FXMaterialDesignButton3: TFXMaterialDesignButton; + FXMaterialButton2: TFXMaterialButton; + FXMaterialButton3: TFXMaterialButton; Panel1: TPanel; procedure ComboBox1Change(Sender: TObject); procedure FormCreate(Sender: TObject); @@ -64,8 +64,8 @@ procedure TfrmMain.ComboBox1Change(Sender: TObject); begin if FXContainer1.Controls[i] is TFXButton then TFXButton(FXContainer1.Controls[i]).ColorKind := StrToMaterialColor(ComboBox1.Caption); - if FXContainer1.Controls[i] is TFXMaterialDesignButton then - TFXMaterialDesignButton(FXContainer1.Controls[i]).ColorKind := StrToMaterialColor(ComboBox1.Caption); + if FXContainer1.Controls[i] is TFXMaterialButton then + TFXMaterialButton(FXContainer1.Controls[i]).ColorKind := StrToMaterialColor(ComboBox1.Caption); end; end; diff --git a/test/test_receive_and_lock_paint/umain.lfm b/test/test_receive_and_lock_paint/umain.lfm index b31474e..08ee52f 100644 --- a/test/test_receive_and_lock_paint/umain.lfm +++ b/test/test_receive_and_lock_paint/umain.lfm @@ -20,7 +20,7 @@ object frmMain: TfrmMain ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 Color = clWhite - object FXMaterialDesignButton1: TFXMaterialDesignButton + object FXMaterialButton1: TFXMaterialButton Left = 0 Height = 67 Top = 0 @@ -30,9 +30,9 @@ object frmMain: TfrmMain TextFont = 'default' TextQuality = fqSystemClearType AutoSize = True - Caption = 'FXMaterialDesignButton1' + Caption = 'FXMaterialButton1' end - object FXMaterialDesignButton2: TFXMaterialDesignButton + object FXMaterialButton2: TFXMaterialButton Left = 0 Height = 67 Top = 67 @@ -42,9 +42,9 @@ object frmMain: TfrmMain TextFont = 'default' TextQuality = fqSystemClearType AutoSize = True - Caption = 'FXMaterialDesignButton2' + Caption = 'FXMaterialButton2' end - object FXMaterialDesignButton3: TFXMaterialDesignButton + object FXMaterialButton3: TFXMaterialButton Left = 0 Height = 67 Top = 134 @@ -54,9 +54,9 @@ object frmMain: TfrmMain TextFont = 'default' TextQuality = fqSystemClearType AutoSize = True - Caption = 'FXMaterialDesignButton3' + Caption = 'FXMaterialButton3' end - object FXMaterialDesignButton4: TFXMaterialDesignButton + object FXMaterialButton4: TFXMaterialButton Left = 0 Height = 67 Top = 201 @@ -66,9 +66,9 @@ object frmMain: TfrmMain TextFont = 'default' TextQuality = fqSystemClearType AutoSize = True - Caption = 'FXMaterialDesignButton4' + Caption = 'FXMaterialButton4' end - object FXMaterialDesignButton5: TFXMaterialDesignButton + object FXMaterialButton5: TFXMaterialButton Left = 0 Height = 67 Top = 268 @@ -78,9 +78,9 @@ object frmMain: TfrmMain TextFont = 'default' TextQuality = fqSystemClearType AutoSize = True - Caption = 'FXMaterialDesignButton5' + Caption = 'FXMaterialButton5' end - object FXMaterialDesignButton6: TFXMaterialDesignButton + object FXMaterialButton6: TFXMaterialButton Left = 0 Height = 67 Top = 335 @@ -90,9 +90,9 @@ object frmMain: TfrmMain TextFont = 'default' TextQuality = fqSystemClearType AutoSize = True - Caption = 'FXMaterialDesignButton6' + Caption = 'FXMaterialButton6' end - object FXMaterialDesignButton7: TFXMaterialDesignButton + object FXMaterialButton7: TFXMaterialButton Left = 0 Height = 67 Top = 402 @@ -102,9 +102,9 @@ object frmMain: TfrmMain TextFont = 'default' TextQuality = fqSystemClearType AutoSize = True - Caption = 'FXMaterialDesignButton7' + Caption = 'FXMaterialButton7' end - object FXMaterialDesignButton8: TFXMaterialDesignButton + object FXMaterialButton8: TFXMaterialButton Left = 0 Height = 62 Top = 469 @@ -114,7 +114,7 @@ object frmMain: TfrmMain TextFont = 'default' TextQuality = fqSystemClearType AutoSize = True - Caption = 'FXMaterialDesignButton8' + Caption = 'FXMaterialButton8' end end object Timer1: TTimer diff --git a/test/test_receive_and_lock_paint/umain.pas b/test/test_receive_and_lock_paint/umain.pas index 6b9a278..9a7d913 100644 --- a/test/test_receive_and_lock_paint/umain.pas +++ b/test/test_receive_and_lock_paint/umain.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls, - FXContainer, FXMaterialDesignButton, FXButton; + FXContainer, FXMaterialButton, FXButton; type @@ -14,14 +14,14 @@ interface TfrmMain = class(TForm) FXContainer1: TFXContainer; - FXMaterialDesignButton1: TFXMaterialDesignButton; - FXMaterialDesignButton2: TFXMaterialDesignButton; - FXMaterialDesignButton3: TFXMaterialDesignButton; - FXMaterialDesignButton4: TFXMaterialDesignButton; - FXMaterialDesignButton5: TFXMaterialDesignButton; - FXMaterialDesignButton6: TFXMaterialDesignButton; - FXMaterialDesignButton7: TFXMaterialDesignButton; - FXMaterialDesignButton8: TFXMaterialDesignButton; + FXMaterialButton1: TFXMaterialButton; + FXMaterialButton2: TFXMaterialButton; + FXMaterialButton3: TFXMaterialButton; + FXMaterialButton4: TFXMaterialButton; + FXMaterialButton5: TFXMaterialButton; + FXMaterialButton6: TFXMaterialButton; + FXMaterialButton7: TFXMaterialButton; + FXMaterialButton8: TFXMaterialButton; Timer1: TTimer; procedure Timer1StartTimer(Sender: TObject); procedure Timer1Timer(Sender: TObject);