diff options
author | Felipe Menteiro de Carvalho <sekelsenmat@users.sourceforge.net> | 2007-04-09 09:01:13 +0000 |
---|---|---|
committer | Felipe Menteiro de Carvalho <sekelsenmat@users.sourceforge.net> | 2007-04-09 09:01:13 +0000 |
commit | 5720b4c6f5fd3c3e55ea2f531b9a0d6cdce662fe (patch) | |
tree | 2bea5efc11bc27a19cf6eac4f5cc1ce65871e71e /examples/gui | |
parent | 805144cfb6139d282b256b77517b9ae233f4cf99 (diff) | |
download | fpGUI-5720b4c6f5fd3c3e55ea2f531b9a0d6cdce662fe.tar.xz |
Started appending F to classes on fpgui, to make its namespace more unique
Diffstat (limited to 'examples/gui')
23 files changed, 385 insertions, 381 deletions
diff --git a/examples/gui/concepttest/OpenSoftStyle.pas b/examples/gui/concepttest/OpenSoftStyle.pas index 6d2b65f8..60a25f8d 100644 --- a/examples/gui/concepttest/OpenSoftStyle.pas +++ b/examples/gui/concepttest/OpenSoftStyle.pas @@ -20,7 +20,7 @@ type // Colors function GetGUIColor(Color: TColor): TGfxColor; override; // Buttons (todo) - procedure DrawButtonFace(Canvas: TGfxCanvas; const ARect: TRect; Flags: TButtonFlags); override; + procedure DrawButtonFace(Canvas: TGfxCanvas; const ARect: TRect; Flags: TFButtonFlags); override; // GroupBox procedure DrawGroupBox(Canvas: TGfxCanvas; const ARect: TRect; const ALabel: String; WidgetState: TWidgetState); override; end; @@ -180,7 +180,7 @@ end; procedure TOpenSoftStyle.DrawButtonFace(Canvas: TGfxCanvas; const ARect: TRect; - Flags: TButtonFlags); + Flags: TFButtonFlags); begin // inherited DrawButtonFace(Canvas, ARect, Flags); PaintGradient(Canvas, ARect, Flags); diff --git a/examples/gui/concepttest/compileroptform.frm b/examples/gui/concepttest/compileroptform.frm index 1aae5daa..054601db 100644 --- a/examples/gui/concepttest/compileroptform.frm +++ b/examples/gui/concepttest/compileroptform.frm @@ -1,137 +1,137 @@ -object CompilerOptForm: TCompilerOptForm - Text = 'Compiler Options - Code' - BorderWidth = 5 - object Box1: TBoxLayout - Spacing = 8 - Orientation = Vertical - object Box2: TBoxLayout - Orientation = Vertical - Spacing = 4 - object Box4: TBoxLayout - object grpBox1: TGroupBox - Text = 'Unit Style:' - object grpBox1VBox1: TBoxLayout - Orientation = Vertical - object cbSmartLink: TCheckbox - Checked = True - Text = 'Smart Linkable (-CX)' - end - end - end - object grpBox2: TGroupBox - Text = 'Checks:' - object grpBox2VBox1: TBoxLayout - Orientation = Vertical - object rbIO: TRadioButton - Checked = True - Text = 'I/O (-Ci)' - end - object rbOverflow: TRadioButton - Checked = True - Text = 'Overflow (-Co)' - end - object rbRange: TRadioButton - Checked = True - Text = 'Range (-Cr)' - end - object rbStack: TRadioButton - Checked = True - Text = 'Stack (-Ct)' - end - end - end - object grpBox3: TGroupBox - Text = 'Heap Size (-Ch):' - object grpBox3VBox1: TBoxLayout - Orientation = Vertical - object edHeapSize: TEdit - Text = '0' - CanExpandWidth = False - end - end - end - end - object Box5: TBoxLayout - object grpBox4: TGroupBox - Text = 'Generate:' - object grpBox4VBox1: TBoxLayout - Orientation = Vertical - object rbNormal: TRadioButton - Text = 'Normal Code (none)' - end - object rbFaster: TRadioButton - Checked = True - Text = 'Faster Code (-OG)' - end - object rbSmaller: TRadioButton - Text = 'Smaller Code (-Og)' - end - end - end - object grpBox5: TGroupBox - Text = 'Target Platform:' - CanExpandHeight = True - object grpBox5VBox1: TBoxLayout - Orientation = Vertical - VertAlign = vertTop - object lblTarget1: TLabel - Text = 'Target OS (-T)' - end - object lblTarget2: TLabel - Text = 'Target CPU (-P)' - end - object lblTarget3: TLabel - Text = 'Target i386' - end - end - end - end - object Box6: TBoxLayout - object grpBox6: TGroupBox - Text = 'Optimizations:' - object grpBox6VBox1: TBoxLayout - Orientation = Vertical - CanExpandWidth = True - object rbLevel0: TRadioButton - Text = 'Level 0 (no extra Optimizations) (none)' - end - object rbLevel1: TRadioButton - Checked = True - Text = 'Level 1 (Quick Optimizations) (-O1)' - end - object rbLevel2: TRadioButton - Text = 'Level 2 (Level 1 + Slower Optimizations) (-O2)' - end - object rbLevel3: TRadioButton - Text = 'Level 3 (Level 2 + Uncertain) (-O3)' - end - object rbKeepVarReg: TCheckbox - Text = 'Keep certain variables in registers (-Or)' - end - object rbUncOpt: TCheckbox - Text = 'Uncertain Optimizations (-Ou)' - end - end - end - end - end - object Box3: TBoxLayout - object btnOK: TButton - Text = 'OK' - OnClick = btnCloseClick - end - object btnCancel: TButton - Text = 'Cancel' - end - object btnShowOpt: TButton - Text = 'Show Options' - end - object btnTest: TButton - Text = 'Test' - end - object btnLoadSave: TButton - Text = 'Load/Save' - end - end - end -end +object CompilerOptForm: TCompilerOptForm
+ Text = 'Compiler Options - Code'
+ BorderWidth = 5
+ object Box1: TFBoxLayout
+ Spacing = 8
+ Orientation = Vertical
+ object Box2: TFBoxLayout
+ Orientation = Vertical
+ Spacing = 4
+ object Box4: TFBoxLayout
+ object grpBox1: TGroupBox
+ Text = 'Unit Style:'
+ object grpBox1VBox1: TFBoxLayout
+ Orientation = Vertical
+ object cbSmartLink: TCheckbox
+ Checked = True
+ Text = 'Smart Linkable (-CX)'
+ end
+ end
+ end
+ object grpBox2: TGroupBox
+ Text = 'Checks:'
+ object grpBox2VBox1: TFBoxLayout
+ Orientation = Vertical
+ object rbIO: TRadioButton
+ Checked = True
+ Text = 'I/O (-Ci)'
+ end
+ object rbOverflow: TRadioButton
+ Checked = True
+ Text = 'Overflow (-Co)'
+ end
+ object rbRange: TRadioButton
+ Checked = True
+ Text = 'Range (-Cr)'
+ end
+ object rbStack: TRadioButton
+ Checked = True
+ Text = 'Stack (-Ct)'
+ end
+ end
+ end
+ object grpBox3: TGroupBox
+ Text = 'Heap Size (-Ch):'
+ object grpBox3VBox1: TFBoxLayout
+ Orientation = Vertical
+ object edHeapSize: TEdit
+ Text = '0'
+ CanExpandWidth = False
+ end
+ end
+ end
+ end
+ object Box5: TFBoxLayout
+ object grpBox4: TGroupBox
+ Text = 'Generate:'
+ object grpBox4VBox1: TFBoxLayout
+ Orientation = Vertical
+ object rbNormal: TRadioButton
+ Text = 'Normal Code (none)'
+ end
+ object rbFaster: TRadioButton
+ Checked = True
+ Text = 'Faster Code (-OG)'
+ end
+ object rbSmaller: TRadioButton
+ Text = 'Smaller Code (-Og)'
+ end
+ end
+ end
+ object grpBox5: TGroupBox
+ Text = 'Target Platform:'
+ CanExpandHeight = True
+ object grpBox5VBox1: TFBoxLayout
+ Orientation = Vertical
+ VertAlign = vertTop
+ object lblTarget1: TFLabel
+ Text = 'Target OS (-T)'
+ end
+ object lblTarget2: TFLabel
+ Text = 'Target CPU (-P)'
+ end
+ object lblTarget3: TFLabel
+ Text = 'Target i386'
+ end
+ end
+ end
+ end
+ object Box6: TFBoxLayout
+ object grpBox6: TGroupBox
+ Text = 'Optimizations:'
+ object grpBox6VBox1: TFBoxLayout
+ Orientation = Vertical
+ CanExpandWidth = True
+ object rbLevel0: TRadioButton
+ Text = 'Level 0 (no extra Optimizations) (none)'
+ end
+ object rbLevel1: TRadioButton
+ Checked = True
+ Text = 'Level 1 (Quick Optimizations) (-O1)'
+ end
+ object rbLevel2: TRadioButton
+ Text = 'Level 2 (Level 1 + Slower Optimizations) (-O2)'
+ end
+ object rbLevel3: TRadioButton
+ Text = 'Level 3 (Level 2 + Uncertain) (-O3)'
+ end
+ object rbKeepVarReg: TCheckbox
+ Text = 'Keep certain variables in registers (-Or)'
+ end
+ object rbUncOpt: TCheckbox
+ Text = 'Uncertain Optimizations (-Ou)'
+ end
+ end
+ end
+ end
+ end
+ object Box3: TFBoxLayout
+ object btnOK: TFButton
+ Text = 'OK'
+ OnClick = btnCloseClick
+ end
+ object btnCancel: TFButton
+ Text = 'Cancel'
+ end
+ object btnShowOpt: TFButton
+ Text = 'Show Options'
+ end
+ object btnTest: TFButton
+ Text = 'Test'
+ end
+ object btnLoadSave: TFButton
+ Text = 'Load/Save'
+ end
+ end
+ end
+end
diff --git a/examples/gui/concepttest/frmCompilerOpt.pas b/examples/gui/concepttest/frmCompilerOpt.pas index b2f84a6f..b472e2ab 100644 --- a/examples/gui/concepttest/frmCompilerOpt.pas +++ b/examples/gui/concepttest/frmCompilerOpt.pas @@ -21,43 +21,43 @@ type procedure SmartLinkClick(Sender: TObject); published procedure btnCloseClick(Sender: TObject); - Box1: TBoxLayout; - Box2: TBoxLayout; - Box3: TBoxLayout; - Box4: TBoxLayout; - Box5: TBoxLayout; - Box6: TBoxLayout; - btnOK, btnCancel, btnShowOp, btnTest, btnLoadSave : TButton; + Box1: TFBoxLayout; + Box2: TFBoxLayout; + Box3: TFBoxLayout; + Box4: TFBoxLayout; + Box5: TFBoxLayout; + Box6: TFBoxLayout; + btnOK, btnCancel, btnShowOp, btnTest, btnLoadSave : TFButton; grpBox1: TGroupBox; - grpBox1VBox1: TBoxLayout; - cbSmartLink: TCheckbox; + grpBox1VBox1: TFBoxLayout; + cbSmartLink: TFCheckbox; grpBox2: TGroupBox; - grpBox2VBox1: TBoxLayout; + grpBox2VBox1: TFBoxLayout; rbIO: TRadioButton; rbOverflow: TRadioButton; rbRange: TRadioButton; rbStack: TRadioButton; grpBox3: TGroupBox; - grpBox3VBox1: TBoxLayout; + grpBox3VBox1: TFBoxLayout; edHeapSize: TEdit; grpBox4: TGroupBox; - grpBox4VBox1: TBoxLayout; + grpBox4VBox1: TFBoxLayout; rbNormal: TRadioButton; rbFaster: TRadioButton; rbSmaller: TRadioButton; grpBox5: TGroupBox; - grpBox5VBox1: TBoxLayout; - lblTarget1: TLabel; - lblTarget2: TLabel; - lblTarget3: TLabel; + grpBox5VBox1: TFBoxLayout; + lblTarget1: TFLabel; + lblTarget2: TFLabel; + lblTarget3: TFLabel; grpBox6: TGroupBox; - grpBox6VBox1: TBoxLayout; + grpBox6VBox1: TFBoxLayout; rbLevel0: TRadioButton; rbLevel1: TRadioButton; rbLevel2: TRadioButton; rbLevel3: TRadioButton; - rbKeepVarReg: TCheckbox; - rbUncOpt: TCheckbox; + rbKeepVarReg: TFCheckbox; + rbUncOpt: TFCheckbox; end; var diff --git a/examples/gui/dbftest/dbftest.pas b/examples/gui/dbftest/dbftest.pas index 32c70484..3a76cea7 100644 --- a/examples/gui/dbftest/dbftest.pas +++ b/examples/gui/dbftest/dbftest.pas @@ -25,12 +25,12 @@ type TMainForm = class(TForm) DataSet: TDBF; DataSource: TDataSource; - Box: TBoxLayout; + Box: TFBoxLayout; ListBox: TListBox; - CurDatasetLabel: TLabel; + CurDataseTFLabel: TFLabel; CurNameText, CurEMailText: TDBText; - Navi: TBoxLayout; - FirstDataset, PrevDataset, NextDataset, LastDataset: TButton; + Navi: TFBoxLayout; + FirstDataset, PrevDataset, NextDataset, LastDataset: TFButton; procedure FormCreate(Sender: TObject); procedure FirstDatasetClick(Sender: TObject); procedure PrevDatasetClick(Sender: TObject); diff --git a/examples/gui/dbftest/mainform.frm b/examples/gui/dbftest/mainform.frm index 9508c21e..602336d4 100644 --- a/examples/gui/dbftest/mainform.frm +++ b/examples/gui/dbftest/mainform.frm @@ -2,12 +2,12 @@ object MainForm: TMainForm Text = 'DBF test' BorderWidth = 8 OnCreate = FormCreate - object Box: TBoxLayout + object Box: TFBoxLayout Spacing = 8 Orientation = Vertical object ListBox: TListBox end - object CurDatasetLabel: TLabel + object CurDataseTFLabel: TFLabel Text = 'Current dataset:' end object CurNameText: TDBText @@ -16,20 +16,20 @@ object MainForm: TMainForm object CurEMailText: TDBText Text = '<e-mail>' end - object Navi: TBoxLayout - object FirstDataset: TButton + object Navi: TFBoxLayout + object FirstDataset: TFButton Text = 'First' OnClick = FirstDatasetClick end - object PrevDataset: TButton + object PrevDataset: TFButton Text = 'Previous' OnClick = PrevDatasetClick end - object NextDataset: TButton + object NextDataset: TFButton Text = 'Next' OnClick = NextDatasetClick end - object LastDataset: TButton + object LastDataset: TFButton Text = 'Last' OnClick = LastDatasetClick end diff --git a/examples/gui/helloworld/helloworld.pas b/examples/gui/helloworld/helloworld.pas index b09ec498..16af32f5 100644 --- a/examples/gui/helloworld/helloworld.pas +++ b/examples/gui/helloworld/helloworld.pas @@ -11,8 +11,8 @@ uses type TMainForm = class(TForm) private - BoxLayout: TBoxLayout; - btnHello: TButton; + BoxLayout: TFBoxLayout; + btnHello: TFButton; public procedure AfterConstruction; override; end; @@ -30,13 +30,13 @@ begin Text := 'fpGUI Application'; { every fpGUI app needs a layout manager } - BoxLayout := TBoxLayout.Create(self); + BoxLayout := TFBoxLayout.Create(self); BoxLayout.Spacing := 8; BoxLayout.VertAlign := vertFill; InsertChild(BoxLayout); { create our button } - btnHello := TButton.Create('Hello World!', self); + btnHello := TFButton.Create('Hello World!', self); btnHello.CanExpandWidth := True; btnHello.CanExpandHeight := True; BoxLayout.InsertChild(btnHello); diff --git a/examples/gui/helloworld/mainform.frm b/examples/gui/helloworld/mainform.frm index f7bc0544..2f36a8e7 100644 --- a/examples/gui/helloworld/mainform.frm +++ b/examples/gui/helloworld/mainform.frm @@ -1,10 +1,10 @@ object MainWindow: TMainWindow
BorderWidth = 8
WindowOptions = [woWindow]
- object TextLabel: TLabel
+ object TexTFLabel: TFLabel
Text = 'Hello, world!'
end
- object lblClose: TLabel
+ object lblClose: TFLabel
Text = '&Close'
end
end
diff --git a/examples/gui/interbasetest/interbasetest.pas b/examples/gui/interbasetest/interbasetest.pas index 18f67c83..b15aaee5 100644 --- a/examples/gui/interbasetest/interbasetest.pas +++ b/examples/gui/interbasetest/interbasetest.pas @@ -30,13 +30,13 @@ type Transaction: TIBTransaction; Query: TIBQuery; DataSource: TDataSource; - Box, ConnectionBox: TBoxLayout; - ConnectionLabel, ConnectionStateLabel: TLabel; + Box, ConnectionBox: TFBoxLayout; + ConnectionLabel, ConnectionStateLabel: TFLabel; ListBox: TListBox; - CurDatasetLabel: TLabel; + CurDataseTFLabel: TFLabel; CurNameText, CurEMailText: TDBText; - Navi: TBoxLayout; - FirstDataset, PrevDataset, NextDataset, LastDataset: TButton; + Navi: TFBoxLayout; + FirstDataset, PrevDataset, NextDataset, LastDataset: TFButton; procedure FormCreate(Sender: TObject); procedure FirstDatasetClick(Sender: TObject); procedure PrevDatasetClick(Sender: TObject); diff --git a/examples/gui/interbasetest/mainform.frm b/examples/gui/interbasetest/mainform.frm index 354c5b6e..c1e7917c 100644 --- a/examples/gui/interbasetest/mainform.frm +++ b/examples/gui/interbasetest/mainform.frm @@ -11,20 +11,20 @@ object MainForm: TMainForm end object DataSource: TDataSource end - object Box: TBoxLayout + object Box: TFBoxLayout Spacing = 8 Orientation = Vertical - object ConnectionBox: TBoxLayout - object ConnectionLabel: TLabel + object ConnectionBox: TFBoxLayout + object ConnectionLabel: TFLabel Text = 'Connected to database? ' end - object ConnectionStateLabel: TLabel + object ConnectionStateLabel: TFLabel Text = 'unknown' end end object ListBox: TListBox end - object CurDatasetLabel: TLabel + object CurDataseTFLabel: TFLabel Text = 'Current dataset:' end object CurNameText: TDBText @@ -33,20 +33,20 @@ object MainForm: TMainForm object CurEMailText: TDBText Text = '<e-mail>' end - object Navi: TBoxLayout - object FirstDataset: TButton + object Navi: TFBoxLayout + object FirstDataset: TFButton Text = 'First' OnClick = FirstDatasetClick end - object PrevDataset: TButton + object PrevDataset: TFButton Text = 'Previous' OnClick = PrevDatasetClick end - object NextDataset: TButton + object NextDataset: TFButton Text = 'Next' OnClick = NextDatasetClick end - object LastDataset: TButton + object LastDataset: TFButton Text = 'Last' OnClick = LastDatasetClick end diff --git a/examples/gui/layouttest/boxform.frm b/examples/gui/layouttest/boxform.frm index 2e03f217..b2dc8320 100644 --- a/examples/gui/layouttest/boxform.frm +++ b/examples/gui/layouttest/boxform.frm @@ -1,22 +1,22 @@ object BoxWindow: TBoxWindow Text = 'Box layout' BorderWidth = 8 - object Layout: TBoxLayout + object Layout: TFBoxLayout Spacing = 8 Orientation = Vertical - object BoxLayout: TBoxLayout + object BoxLayout: TFBoxLayout Spacing = 4 - object Button1: TButton + object Button1: TFButton Text = 'Button 1' end - object Button2: TButton + object Button2: TFButton Text = 'Button 2' end - object Button3: TButton + object Button3: TFButton Text = 'Button 3' end end - object FlipButton: TButton + object FlipButton: TFButton Text = 'Switch to vertical' OnClick = FlipOrientation end diff --git a/examples/gui/layouttest/layouttest.pas b/examples/gui/layouttest/layouttest.pas index 8e969e0b..a4fb879c 100644 --- a/examples/gui/layouttest/layouttest.pas +++ b/examples/gui/layouttest/layouttest.pas @@ -26,9 +26,9 @@ type constructor Create(AOwner: TComponent); override; destructor Destroy; override; published - Box: TBoxLayout; - Title: TLabel; - SimpleBtn, FixedBtn, BoxBtn, GridBtn, DockingBtn, ExitBtn: TButton; + Box: TFBoxLayout; + Title: TFLabel; + SimpleBtn, FixedBtn, BoxBtn, GridBtn, DockingBtn, ExitBtn: TFButton; Separator: TSeparator; procedure SimpleBtnClicked(Sender: TObject); procedure FixedBtnClicked(Sender: TObject); @@ -39,36 +39,36 @@ type end; TSimpleForm = class(TForm) - Button: TButton; + Button: TFButton; public constructor Create(AOwner: TComponent); override; end; { TFixedForm = class(TForm) Layout: TFixedLayout; - Button1, Button2: TButton; + Button1, Button2: TFButton; public constructor Create(AOwner: TComponent); override; end; } TDockingForm = Class(TForm) Layout : TDockingLayout; - Button1,Button2,Button3,Button4,Button5 : TButton; + Button1,Button2,Button3,Button4,Button5 : TFButton; public constructor Create(AOwner: TComponent); override; end; TGridForm = Class(TForm) - Layout : TGridLayout; - Button1,Button2,Button3,Button4,Button5, Button6 : TButton; + Layout : TFGridLayout; + Button1,Button2,Button3,Button4,Button5, Button6 : TFButton; public constructor Create(AOwner: TComponent); override; end; TBoxForm = Class(TForm) - Layout, BoxLayout: TBoxLayout; - Button1, Button2, Button3, FlipButton: TButton; + Layout, BoxLayout: TFBoxLayout; + Button1, Button2, Button3, FlipButton: TFButton; procedure FlipOrientation(Sender: TObject); public constructor Create(AOwner: TComponent); override; @@ -85,34 +85,34 @@ begin BorderWidth := 8; Text := 'Layout Demo'; - Box := TBoxLayout.Create(self); + Box := TFBoxLayout.Create(self); Box.Spacing := 8; Box.Orientation := Vertical; Box.VertAlign := vertFill; InsertChild(Box); - Title := TLabel.Create('Choose a test Window:', self); + Title := TFLabel.Create('Choose a test Window:', self); Box.InsertChild(Title); - SimpleBtn := TButton.Create('Simple layout', self); + SimpleBtn := TFButton.Create('Simple layout', self); SimpleBtn.OnClick := @SimpleBtnClicked; Box.InsertChild(SimpleBtn); - FixedBtn := TButton.Create('Fixed layout', self); + FixedBtn := TFButton.Create('Fixed layout', self); FixedBtn.OnClick := @FixedBtnClicked; FixedBtn.Enabled := False; Box.InsertChild(FixedBtn); - BoxBtn := TButton.Create('Boxed layout', self); + BoxBtn := TFButton.Create('Boxed layout', self); BoxBtn.OnClick := @BoxBtnClicked; Box.InsertChild(BoxBtn); - GridBtn := TButton.Create('Grid layout', self); + GridBtn := TFButton.Create('Grid layout', self); GridBtn.OnClick := @GridBtnClicked; GridBtn.Enabled := False; Box.InsertChild(GridBtn); - DockingBtn := TButton.Create('Docking layout', self); + DockingBtn := TFButton.Create('Docking layout', self); DockingBtn.OnClick := @DockingBtnClicked; DockingBtn.Enabled := False; Box.InsertChild(DockingBtn); @@ -120,7 +120,7 @@ begin Separator := TSeparator.Create(self); Box.InsertChild(Separator); - ExitBtn := TButton.Create('Exit', self); + ExitBtn := TFButton.Create('Exit', self); ExitBtn.OnClick := @ExitBtnClicked; Box.InsertChild(ExitBtn); @@ -212,7 +212,7 @@ begin Text := 'Simple Layout'; BorderWidth := 8; - Button := TButton.Create(Self); + Button := TFButton.Create(Self); Button.Text := 'A button...'; Child := Button; end; @@ -231,11 +231,11 @@ begin Layout := TFixedLayout.Create(Self); Layout.Name := 'Layout'; - Button1 := TButton.Create(Self); + Button1 := TFButton.Create(Self); Button1.Name := 'Button1'; Button1.Text := 'A button'; Layout.AddControl(Button1, 20, 20); - Button2 := TButton.Create(Self); + Button2 := TFButton.Create(Self); Button2.Name := 'Button2'; Button2.Text := 'Another button'; Layout.AddControl(Button2, 50, 100); @@ -257,23 +257,23 @@ begin Layout := TDockingLayout.Create(Self); Layout.Name := 'Layout'; - Button1 := TButton.Create(Self); + Button1 := TFButton.Create(Self); Button1.Name := 'BTop'; Button1.Text := 'Top Alignment'; Layout.AddWidget(Button1, dmTop); - Button2 := TButton.Create(Self); + Button2 := TFButton.Create(Self); Button2.Name := 'BBottom'; Button2.Text := 'Bottom Alignment'; Layout.AddWidget(Button2, dmBottom); - Button3 := TButton.Create(Self); + Button3 := TFButton.Create(Self); Button3.Name := 'BLeft'; Button3.Text := 'Left Alignment'; Layout.AddWidget(Button3, dmLeft); - Button4 := TButton.Create(Self); + Button4 := TFButton.Create(Self); Button4.Name := 'BRight'; Button4.Text := 'Right Alignment'; Layout.AddWidget(Button4, dmRight); - Button5 := TButton.Create(Self); + Button5 := TFButton.Create(Self); Button5.Name := 'BCLient'; Button5.Text := 'Client Alignment'; Layout.AddWidget(Button5, dmClient); @@ -292,34 +292,34 @@ begin Text := 'Grid Layout'; BorderWidth := 8; - Layout := TGridLayout.Create(Self); + Layout := TFGridLayout.Create(Self); Layout.Name := 'Layout'; Layout.RowCount := 4; Layout.ColCount := 3; - Button1 := TButton.Create(Self); + Button1 := TFButton.Create(Self); Button1.Name := 'TopLeft'; Button1.Text := 'Top Left'; Layout.AddWidget(Button1, 0, 0, 1, 1); - Button2 := TButton.Create(Self); + Button2 := TFButton.Create(Self); Button2.Name := 'TopRight'; Button2.Text := 'Top Right'; Layout.AddWidget(Button2, 2,0,1,1); - Button3 := TButton.Create(Self); + Button3 := TFButton.Create(Self); Button3.Name := 'CenterCenter'; Button3.Text := 'Center Center'; // Button3.CanExpandWidth := False; // Button3.CanExpandHeight := False; Layout.AddWidget(Button3, 1,1,1,1); - Button4 := TButton.Create(Self); + Button4 := TFButton.Create(Self); Button4.Name := 'BottomLeft'; Button4.Text := 'Bottom Left'; Layout.AddWidget(Button4,0,2,1,1); - Button5 := TButton.Create(Self); + Button5 := TFButton.Create(Self); Button5.Name := 'BottomRight'; Button5.Text := 'Bottom Right'; Layout.AddWidget(Button5, 2,2,1,1); - Button6 := TButton.Create(Self); + Button6 := TFButton.Create(Self); Button6.Name := 'BottomSpan'; Button6.Text := 'Span Columns'; Layout.AddWidget(Button6, 0,3,3,1); @@ -354,25 +354,25 @@ begin Text := 'Box Layout'; BorderWidth := 8; - Layout := TBoxLayout.Create(self); + Layout := TFBoxLayout.Create(self); Layout.Spacing := 8; Layout.Orientation := Vertical; InsertChild(Layout); - BoxLayout := TBoxLayout.Create(self); + BoxLayout := TFBoxLayout.Create(self); BoxLayout.Spacing := 4; Layout.InsertChild(BoxLayout); - Button1 := TButton.Create('Button 1', self); + Button1 := TFButton.Create('Button 1', self); BoxLayout.InsertChild(Button1); - Button2 := TButton.Create('Button 2', self); + Button2 := TFButton.Create('Button 2', self); BoxLayout.InsertChild(Button2); - Button3 := TButton.Create('Button 3', self); + Button3 := TFButton.Create('Button 3', self); BoxLayout.InsertChild(Button3); - FlipButton := TButton.Create('Switch to vertical', self); + FlipButton := TFButton.Create('Switch to vertical', self); FlipButton.OnClick := @FlipOrientation; Layout.InsertChild(FlipButton); end; diff --git a/examples/gui/utfdemo/utfdemo.lpi b/examples/gui/utfdemo/utfdemo.lpi index c9a9e885..35240ae6 100644 --- a/examples/gui/utfdemo/utfdemo.lpi +++ b/examples/gui/utfdemo/utfdemo.lpi @@ -1,7 +1,7 @@ <?xml version="1.0"?> <CONFIG> <ProjectOptions> - <PathDelim Value="/"/> + <PathDelim Value="\"/> <Version Value="5"/> <General> <Flags> @@ -9,7 +9,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> + <IconPath Value=".\"/> <TargetFileExt Value=".exe"/> </General> <PublishOptions> @@ -20,7 +20,7 @@ <RunParams> <local> <FormatVersion Value="1"/> - <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> + <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> </local> </RunParams> <RequiredPackages Count="1"> @@ -39,11 +39,15 @@ </ProjectOptions> <CompilerOptions> <Version Value="5"/> + <PathDelim Value="\"/> <CodeGeneration> <Generate Value="Faster"/> + <TargetCPU Value="i386"/> + <TargetOS Value="Win32"/> </CodeGeneration> <Other> - <CustomOptions Value="-FUunits"/> + <CustomOptions Value="-FUunits +"/> <CompilerPath Value="$(CompPath)"/> </Other> </CompilerOptions> diff --git a/examples/gui/utfdemo/utfdemo.lpr b/examples/gui/utfdemo/utfdemo.lpr index b59f7f96..47db2a89 100644 --- a/examples/gui/utfdemo/utfdemo.lpr +++ b/examples/gui/utfdemo/utfdemo.lpr @@ -16,14 +16,14 @@ type { TMainForm } - TMainForm = class(TForm) + TMainForm = class(TFForm) private - FLayout: TBoxLayout; + FLayout: TFBoxLayout; procedure MainFormActivate(Sender: TObject); public constructor Create(AOwner: TComponent); override; published - TextLabel: TLabel; + TextLabel: TFLabel; end; @@ -47,11 +47,11 @@ begin Text := 'UTF Demo'; OnActivate := @MainFormActivate; - FLayout := TBoxLayout.Create(self); + FLayout := TFBoxLayout.Create(self); FLayout.Parent := self; InsertChild(FLayout); - TextLabel := TLabel.Create(self); + TextLabel := TFLabel.Create(self); TextLabel.Text := '&Gráficas Magnificacion! Teste'; FLayout.InsertChild(TextLabel); end; diff --git a/examples/gui/widgettest/checkboxform.frm b/examples/gui/widgettest/checkboxform.frm index cc03310d..3d45576f 100644 --- a/examples/gui/widgettest/checkboxform.frm +++ b/examples/gui/widgettest/checkboxform.frm @@ -1,7 +1,7 @@ object CheckBoxForm: TCheckBoxForm BorderWidth = 8 Text = 'Check box test' - object Box: TBoxLayout + object Box: TFBoxLayout Orientation = Vertical object GrayCheckBox: TCheckBox Text = 'Gray other check boxes' diff --git a/examples/gui/widgettest/comboboxform.frm b/examples/gui/widgettest/comboboxform.frm index 23dd1f07..f26f79b7 100644 --- a/examples/gui/widgettest/comboboxform.frm +++ b/examples/gui/widgettest/comboboxform.frm @@ -2,13 +2,13 @@ object ComboBoxForm: TComboBoxForm BorderWidth = 8 Text = 'Combo box test' OnCreate = FormCreate - object VertBox: TBoxLayout + object VertBox: TFBoxLayout Orientation = Vertical object GrayCheckBox: TCheckBox Text = 'Gray combo boxes' OnClick = GrayCheckBoxClick end - object BetaLabel: TLabel + object BetaLabel: TFLabel Text = '(the drop-down lists are work in progress)' end object ComboBox1: TComboBox diff --git a/examples/gui/widgettest/editform.frm b/examples/gui/widgettest/editform.frm index 51c2b888..627a81d9 100644 --- a/examples/gui/widgettest/editform.frm +++ b/examples/gui/widgettest/editform.frm @@ -40,7 +40,7 @@ object EditForm: TEditForm y = 3 Widget = PasswordDisplay end> - object Label1: TLabel + object Label1: TFLabel Text = 'Normal edit field:' CanExpandWidth = False end @@ -53,7 +53,7 @@ object EditForm: TEditForm end object Separator: TSeparator end - object Label2: TLabel + object Label2: TFLabel Text = 'Password edit field:' CanExpandWidth = False end @@ -66,7 +66,7 @@ object EditForm: TEditForm Text = 'Disabled' OnClick = GrayCheckBox2Click end - object PasswordDisplay: TLabel + object PasswordDisplay: TFLabel Text = '(Password field)' CanExpandWidth = False end diff --git a/examples/gui/widgettest/groupboxform.frm b/examples/gui/widgettest/groupboxform.frm index 85ddff8f..73334564 100644 --- a/examples/gui/widgettest/groupboxform.frm +++ b/examples/gui/widgettest/groupboxform.frm @@ -1,17 +1,17 @@ object GroupBoxForm: TGroupBoxForm BorderWidth = 8 Text = 'Group box test' - object HorzBox: TBoxLayout + object HorzBox: TFBoxLayout VertAlign = vertTop object GroupBox1: TGroupBox Text = 'Group box #1' - object VertBox1: TBoxLayout + object VertBox1: TFBoxLayout Orientation = Vertical object GrayCheckBox: TCheckBox Text = 'Gray other group box' OnClick = GrayCheckBoxClick end - object Button: TButton + object Button: TFButton Enabled = False Text = 'Reset radio buttons' OnClick = ButtonClick @@ -20,7 +20,7 @@ object GroupBoxForm: TGroupBoxForm end object GroupBox2: TGroupBox Text = 'Group box #2' - object VertBox2: TBoxLayout + object VertBox2: TFBoxLayout Orientation = Vertical object Radio1: TRadioButton Checked = True diff --git a/examples/gui/widgettest/mainform.frm b/examples/gui/widgettest/mainform.frm index 6b03bb49..165907a1 100644 --- a/examples/gui/widgettest/mainform.frm +++ b/examples/gui/widgettest/mainform.frm @@ -2,77 +2,77 @@ object MainForm: TMainForm Text = 'Widget tests'
BorderWidth = 8
WindowOptions = [woWindow]
- object Box: TBoxLayout
+ object Box: TFBoxLayout
CanExpandWidth = False
Spacing = 8
Orientation = Vertical
- object Label: TLabel
+ object Label: TFLabel
CanExpandWidth = True
Text = 'Choose a test form:'
end
- object CheckboxBtn: TButton
+ object CheckboxBtn: TFButton
CanExpandWidth = True
Text = 'Check boxes'
OnClick = CheckboxBtnClick
end
- object RadioButtonBtn: TButton
+ object RadioButtonBtn: TFButton
CanExpandWidth = True
Text = 'Radio buttons'
OnClick = RadioButtonBtnClick
end
- object GroupBoxBtn: TButton
+ object GroupBoxBtn: TFButton
CanExpandWidth = True
Text = 'Group boxes'
OnClick = GroupBoxBtnClick
end
- object EditBtn: TButton
+ object EditBtn: TFButton
CanExpandWidth = True
Text = 'Edit fields'
OnClick = EditBtnClick
end
- object ScrollBarBtn: TButton
+ object ScrollBarBtn: TFButton
CanExpandWidth = True
Text = 'Scroll bars'
OnClick = ScrollBarBtnClick
end
- object ScrollBoxBtn: TButton
+ object ScrollBoxBtn: TFButton
CanExpandWidth = True
Text = 'Scroll boxes'
OnClick = ScrollBoxBtnClick
end
- object ListBoxBtn: TButton
+ object ListBoxBtn: TFButton
CanExpandWidth = True
Text = 'List boxes'
OnClick = ListBoxBtnClick
end
- object ComboBoxBtn: TButton
+ object ComboBoxBtn: TFButton
CanExpandWidth = True
Text = 'Combo boxes'
OnClick = ComboBoxBtnClick
end
- object GridBtn: TButton
+ object GridBtn: TFButton
CanExpandWidth = True
Text = 'Grids'
OnClick = GridBtnClick
end
- object MenuBtn: TButton
+ object MenuBtn: TFButton
CanExpandWidth = True
Text = 'Menus'
OnClick = MenuBtnClick
end
- object PanelBtn: TButton
+ object PanelBtn: TFButton
CanExpandWidth = True
Text = 'Panel'
OnClick = PanelBtnClick
end
- object ProgressBarBtn: TButton
+ object ProgressBarBtn: TFButton
CanExpandWidth = True
Text = 'Progress Bar'
OnClick = ProgressBarBtnClick
end
object Separator: TSeparator
end
- object ExitBtn: TButton
+ object ExitBtn: TFButton
CanExpandWidth = True
Text = 'Exit'
OnClick = ExitBtnClick
diff --git a/examples/gui/widgettest/radiobuttonform.frm b/examples/gui/widgettest/radiobuttonform.frm index eac18c90..018f8c4e 100644 --- a/examples/gui/widgettest/radiobuttonform.frm +++ b/examples/gui/widgettest/radiobuttonform.frm @@ -1,14 +1,14 @@ object RadioButtonForm: TRadioButtonForm BorderWidth = 8 Text = 'Radio button test' - object Box: TBoxLayout + object Box: TFBoxLayout Orientation = Vertical object GrayCheckbox: TCheckbox Text = 'Gray radio buttons' OnClick = GrayCheckboxClick end - object HorzBox: TBoxLayout - object ButtonBox1: TBoxLayout + object HorzBox: TFBoxLayout + object ButtonBox1: TFBoxLayout Orientation = Vertical object Radio1a: TRadioButton Checked = True @@ -18,7 +18,7 @@ object RadioButtonForm: TRadioButtonForm Text = 'Button 1 b' end end - object ButtonBox2: TBoxLayout + object ButtonBox2: TFBoxLayout Orientation = Vertical object Radio2a: TRadioButton Text = 'Button 2 a' diff --git a/examples/gui/widgettest/scrollbarform.frm b/examples/gui/widgettest/scrollbarform.frm index 5c238e23..be61a217 100644 --- a/examples/gui/widgettest/scrollbarform.frm +++ b/examples/gui/widgettest/scrollbarform.frm @@ -1,13 +1,13 @@ object ScrollBarForm: TScrollBarForm BorderWidth = 8 Text = 'Scroll bar test' - object VertBox: TBoxLayout + object VertBox: TFBoxLayout Orientation = Vertical object GrayCheckBox: TCheckBox Text = 'Gray everything' OnClick = GrayCheckBoxClick end - object HorzBox: TBoxLayout + object HorzBox: TFBoxLayout object HorzGrid: TGridLayout ColCount = 3 RowCount = 6 @@ -87,11 +87,11 @@ object ScrollBarForm: TScrollBarForm y = 5 Widget = PosLabel5 end> - object Col3Label: TLabel + object Col3Label: TFLabel Alignment = taCenter Text = 'Position' end - object Label1: TLabel + object Label1: TFLabel Alignment = taRightJustify Text = '0..1, PageSize=0:' end @@ -100,11 +100,11 @@ object ScrollBarForm: TScrollBarForm Max = 1 OnChange = ScrollBar1Change end - object PosLabel1: TLabel + object PosLabel1: TFLabel Alignment = taCenter Text = '---' end - object Label2: TLabel + object Label2: TFLabel Alignment = taRightJustify Text = '0..1, PageSize=1:' end @@ -113,11 +113,11 @@ object ScrollBarForm: TScrollBarForm PageSize = 1 OnChange = ScrollBar2Change end - object PosLabel2: TLabel + object PosLabel2: TFLabel Alignment = taCenter Text = '---' end - object Label3: TLabel + object Label3: TFLabel Alignment = taRightJustify Text = '-2..3, PageSize=0:' end @@ -126,11 +126,11 @@ object ScrollBarForm: TScrollBarForm Max = 3 OnChange = ScrollBar3Change end - object PosLabel3: TLabel + object PosLabel3: TFLabel Alignment = taCenter Text = '---' end - object Label4: TLabel + object Label4: TFLabel Alignment = taRightJustify Text = '-5..9, PageSize=4:' end @@ -140,11 +140,11 @@ object ScrollBarForm: TScrollBarForm PageSize = 4 OnChange = ScrollBar4Change end - object PosLabel4: TLabel + object PosLabel4: TFLabel Alignment = taCenter Text = '---' end - object Label5: TLabel + object Label5: TFLabel Alignment = taRightJustify Text = '-100..200, PageSize=7:' end @@ -154,7 +154,7 @@ object ScrollBarForm: TScrollBarForm PageSize = 7 OnChange = ScrollBar5Change end - object PosLabel5: TLabel + object PosLabel5: TFLabel Alignment = taCenter Text = '---' end @@ -162,7 +162,7 @@ object ScrollBarForm: TScrollBarForm object VertBar: TSeparator Orientation = Vertical end - object VertLabel: TLabel + object VerTFLabel: TFLabel Text = 'Vertical:' end object VertScrollBar: TScrollBar diff --git a/examples/gui/widgettest/scrollboxform.frm b/examples/gui/widgettest/scrollboxform.frm index b7e5412d..8bb79b34 100644 --- a/examples/gui/widgettest/scrollboxform.frm +++ b/examples/gui/widgettest/scrollboxform.frm @@ -2,9 +2,9 @@ object ScrollBoxForm: TScrollBoxForm BorderWidth = 8
Text = 'Scroll box test'
WindowOptions = [woWindow]
- object VertLayout: TBoxLayout
+ object VertLayout: TFBoxLayout
Orientation = Vertical
- object Label1: TLabel
+ object Label1: TFLabel
CanExpandWidth = True
Text = 'ScrollBox should be transparent in this demo.'
end
diff --git a/examples/gui/widgettest/widgettest.lpi b/examples/gui/widgettest/widgettest.lpi index efbb9314..80296df0 100644 --- a/examples/gui/widgettest/widgettest.lpi +++ b/examples/gui/widgettest/widgettest.lpi @@ -1,7 +1,7 @@ <?xml version="1.0"?> <CONFIG> <ProjectOptions> - <PathDelim Value="/"/> + <PathDelim Value="\"/> <Version Value="5"/> <General> <Flags> @@ -9,7 +9,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> + <IconPath Value=".\"/> <TargetFileExt Value=""/> </General> <PublishOptions> @@ -20,7 +20,7 @@ <RunParams> <local> <FormatVersion Value="1"/> - <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> + <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> </local> </RunParams> <RequiredPackages Count="1"> @@ -39,9 +39,7 @@ </ProjectOptions> <CompilerOptions> <Version Value="5"/> - <SearchPaths> - <OtherUnitFiles Value="/home/graemeg/programming/fpGUI/gui/"/> - </SearchPaths> + <PathDelim Value="\"/> <Parsing> <SyntaxOptions> <IncludeAssertionCode Value="True"/> @@ -50,6 +48,8 @@ </Parsing> <CodeGeneration> <Generate Value="Faster"/> + <TargetCPU Value="i386"/> + <TargetOS Value="Win32"/> </CodeGeneration> <Other> <CustomOptions Value="-FUunits -dTraceEventsX -dDebugX diff --git a/examples/gui/widgettest/widgettest.pas b/examples/gui/widgettest/widgettest.pas index b70b20a4..0846d44f 100644 --- a/examples/gui/widgettest/widgettest.pas +++ b/examples/gui/widgettest/widgettest.pas @@ -10,7 +10,7 @@ uses type // forward declarations - TCheckBoxForm = class; + TFCheckboxForm = class; TRadioButtonForm = class; TGroupBoxForm = class; TEditForm = class; @@ -25,9 +25,9 @@ type { TMainForm } - TMainForm = class(TForm) + TMainForm = class(TFForm) private - _frmCheckBox: TCheckBoxForm; + _frmCheckBox: TFCheckboxForm; _frmRadioButton: TRadioButtonForm; _frmGroupBox: TGroupBoxForm; _frmEdit: TEditForm; @@ -43,22 +43,22 @@ type constructor Create(AOwner: TComponent); override; destructor Destroy; override; published - Box: TBoxLayout; - Title: TLabel; - CheckboxBtn: TButton; - RadioButtonBtn: TButton; - GroupBoxBtn: TButton; - EditBtn: TButton; - ScrollBarBtn: TButton; - ScrollBoxBtn: TButton; - ListBoxBtn: TButton; - ComboBoxBtn: TButton; - GridBtn: TButton; - MenuBtn: TButton; - PanelBtn: TButton; - ProgressBarBtn: TButton; + Box: TFBoxLayout; + Title: TFLabel; + CheckboxBtn: TFButton; + RadioButtonBtn: TFButton; + GroupBoxBtn: TFButton; + EditBtn: TFButton; + ScrollBarBtn: TFButton; + ScrollBoxBtn: TFButton; + ListBoxBtn: TFButton; + ComboBoxBtn: TFButton; + GridBtn: TFButton; + MenuBtn: TFButton; + PanelBtn: TFButton; + ProgressBarBtn: TFButton; Separator: TSeparator; - ExitBtn: TButton; + ExitBtn: TFButton; procedure CheckBoxBtnClick(Sender: TObject); procedure RadioButtonBtnClick(Sender: TObject); procedure GroupBoxBtnClick(Sender: TObject); @@ -75,13 +75,13 @@ type end; - TTestForm = class(TForm) + TTestForm = class(TFForm) end; - TCheckBoxForm = class(TTestForm) - Box: TBoxLayout; - GrayCheckBox, CheckBox1, CheckBox2: TCheckBox; + TFCheckboxForm = class(TTestForm) + Box: TFBoxLayout; + GrayCheckBox, CheckBox1, CheckBox2: TFCheckbox; procedure GrayCheckBoxClick(Sender: TObject); public constructor Create(AOwner: TComponent); override; @@ -89,8 +89,8 @@ type TRadioButtonForm = class(TTestForm) - Box, HorzBox, ButtonBox1, ButtonBox2: TBoxLayout; - GrayCheckBox: TCheckBox; + Box, HorzBox, ButtonBox1, ButtonBox2: TFBoxLayout; + GrayCheckBox: TFCheckbox; Radio1a, Radio1b, Radio2a, Radio2b: TRadioButton; procedure GrayCheckBoxClick(Sender: TObject); public @@ -99,10 +99,10 @@ type TGroupBoxForm = class(TTestForm) - HorzBox, VertBox1, VertBox2: TBoxLayout; - GroupBox1, GroupBox2: TGroupBox; - GrayCheckBox: TCheckBox; - Button: TButton; + HorzBox, VertBox1, VertBox2: TFBoxLayout; + GroupBox1, GroupBox2: TFGroupBox; + GrayCheckBox: TFCheckbox; + Button: TFButton; Radio1, Radio2, Radio3, Radio4, Radio5: TRadioButton; procedure GrayCheckBoxClick(Sender: TObject); procedure ButtonClick(Sender: TObject); @@ -113,11 +113,11 @@ type TEditForm = class(TTestForm) - Grid: TGridLayout; - VertBox, HorzBox1, HorzBox2: TBoxLayout; - Label1, Label2, PasswordDisplay: TLabel; - Edit1, Edit2: TEdit; - GrayCheckBox1, GrayCheckBox2: TCheckBox; + Grid: TFGridLayout; + VertBox, HorzBox1, HorzBox2: TFBoxLayout; + Label1, Label2, PasswordDisplay: TFLabel; + Edit1, Edit2: TFEdit; + GrayCheckBox1, GrayCheckBox2: TFCheckbox; Separator: TSeparator; procedure GrayCheckBox1Click(Sender: TObject); procedure GrayCheckBox2Click(Sender: TObject); @@ -128,15 +128,15 @@ type TScrollBarForm = class(TTestForm) - VertLayout: TBoxLayout; - GrayCheckBox: TCheckBox; - HorzBox: TBoxLayout; - HorzGrid, VertGrid: TGridLayout; + VertLayout: TFBoxLayout; + GrayCheckBox: TFCheckbox; + HorzBox: TFBoxLayout; + HorzGrid, VertGrid: TFGridLayout; VertBar: TSeparator; - VertLabel, Label1, Label2, Label3, Label4, Label5: TLabel; - PosLabel1, PosLabel2, PosLabel3, PosLabel4, PosLabel5: TLabel; - VertScrollBar, ScrollBar1, ScrollBar2, ScrollBar3, - ScrollBar4, ScrollBar5: TScrollBar; + VerTFLabel, Label1, Label2, Label3, Label4, Label5: TFLabel; + PosLabel1, PosLabel2, PosLabel3, PosLabel4, PosLabel5: TFLabel; + VerTFScrollBar, ScrollBar1, ScrollBar2, ScrollBar3, + ScrollBar4, ScrollBar5: TFScrollBar; procedure GrayCheckBoxClick(Sender: TObject); procedure ScrollBar1Change(Sender: TObject); procedure ScrollBar2Change(Sender: TObject); @@ -149,16 +149,16 @@ type TScrollBoxForm = class(TTestForm) - VertLayout: TBoxLayout; - Label1: TLabel; - ScrollBox: TScrollBox; + VertLayout: TFBoxLayout; + Label1: TFLabel; + ScrollBox: TFScrollBox; public constructor Create(AOwner: TComponent); override; end; TListBoxForm = class(TTestForm) - ListBox: TListBox; + ListBox: TFListBox; public constructor Create(AOwner: TComponent); override; end; @@ -166,11 +166,11 @@ type TComboBoxForm = class(TTestForm) published - VertLayout: TBoxLayout; - GrayCheckBox: TCheckBox; - BetaLabel: TLabel; - ComboBox1: TComboBox; - ComboBox2: TComboBox; + VertLayout: TFBoxLayout; + GrayCheckBox: TFCheckbox; + BetaLabel: TFLabel; + ComboBox1: TFComboBox; + ComboBox2: TFComboBox; procedure GrayCheckBoxClick(Sender: TObject); procedure FormCreate(Sender: TObject); public @@ -179,7 +179,7 @@ type TGridForm = class(TTestForm) - StringGrid: TStringGrid; + StringGrid: TFStringGrid; procedure FormCreate(Sender: TObject); public constructor Create(AOwner: TComponent); override; @@ -195,11 +195,11 @@ type public constructor Create(AOwner: TComponent); override; published - BoxLayout: TBoxLayout; - MainMenu: TMenuBar; - Title: TLabel; - p1, p2, p3, p4, p5, p6: TPanel; - MenuBox: TBoxLayout; + BoxLayout: TFBoxLayout; + MainMenu: TFMenuBar; + Title: TFLabel; + p1, p2, p3, p4, p5, p6: TFPanel; + MenuBox: TFBoxLayout; end; @@ -210,11 +210,11 @@ type constructor Create(AOwner: TComponent); override; destructor Destroy; override; published - MainLayout: TBoxLayout; - StyleGroup: TGroupBox; + MainLayout: TFBoxLayout; + StyleGroup: TFGroupBox; rbPlain, rbLowered, rbRaised: TRadioButton; - VBox1: TBoxLayout; - Panel: TPanel; + VBox1: TFBoxLayout; + Panel: TFPanel; Separator: TSeparator; end; @@ -228,16 +228,16 @@ type constructor Create(AOwner: TComponent); override; destructor Destroy; override; published - MainLayout: TGridLayout; - VBox: TBoxLayout; - PB: TProgressBar; - cbShowPercent: TCheckBox; - gbColor: TGroupBox; + MainLayout: TFGridLayout; + VBox: TFBoxLayout; + PB: TFProgressBar; + cbShowPercent: TFCheckbox; + gbColor: TFGroupBox; rbBlue: TRadioButton; rbRed: TRadioButton; rbGreen: TRadioButton; Separator: TSeparator; - btnRandom: TButton; + btnRandom: TFButton; end; { TListBoxForm } @@ -268,22 +268,22 @@ end; procedure TMenuForm.AboutMenuClicked(Sender: TObject); begin writeln(' About menu clicked from <' + Sender.ClassName + '>'); - if Sender is TMenuItem then - writeln(' from: ' + TMenuItem(Sender).Text); + if Sender is TFMenuItem then + writeln(' from: ' + TFMenuItem(Sender).Text); end; constructor TMenuForm.Create(AOwner: TComponent); var - lMenuItem: TMenuItem; + lMenuItem: TFMenuItem; begin inherited Create(AOwner); Name := 'MenuForm'; Text := 'Menu Test'; - BoxLayout := TBoxLayout.Create(self); + BoxLayout := TFBoxLayout.Create(self); BoxLayout.Orientation := Vertical; - MainMenu := TMenuBar.Create(self); + MainMenu := TFMenuBar.Create(self); BoxLayout.InsertChild(MainMenu); MainMenu.AddMenu('Close', 'C', @CloseMenuClicked); @@ -296,7 +296,7 @@ begin lMenuItem.SubMenu.AddMenu('Tutorials'); lMenuItem.SubMenu.AddMenu('About', '', @AboutMenuClicked); - Title := TLabel.Create(self); + Title := TFLabel.Create(self); Title.CanExpandWidth := True; Title.Alignment := taCenter; Title.Text := 'This is work in progress...'; @@ -325,14 +325,14 @@ begin Text := 'Panel Test'; BorderWidth := 8; - MainLayout := TBoxLayout.Create(self); + MainLayout := TFBoxLayout.Create(self); MainLayout.Orientation := Vertical; - StyleGroup := TGroupBox.Create('Bevel Style:', self); + StyleGroup := TFGroupBox.Create('Bevel Style:', self); StyleGroup.CanExpandWidth := True; MainLayout.InsertChild(StyleGroup); - VBox1 := TBoxLayout.Create(self); + VBox1 := TFBoxLayout.Create(self); VBox1.Orientation := Vertical; StyleGroup.InsertChild(VBox1); @@ -353,7 +353,7 @@ begin Separator := TSeparator.Create(self); MainLayout.InsertChild(Separator); - Panel := TPanel.Create('My Panel', self); + Panel := TFPanel.Create('My Panel', self); MainLayout.InsertChild(Panel); Child := MainLayout; @@ -392,14 +392,14 @@ begin Text := 'Progress Bar Demo'; BorderWidth := 8; - MainLayout := TGridLayout.Create(self); + MainLayout := TFGridLayout.Create(self); MainLayout.RowCount := 4; MainLayout.ColCount := 2; - VBox := TBoxLayout.Create(self); + VBox := TFBoxLayout.Create(self); VBox.Orientation := Vertical; - gbColor := TGroupBox.Create('Fill Color', self); + gbColor := TFGroupBox.Create('Fill Color', self); rbRed := TRadioButton.Create('Red', self); rbRed.Tag := 1; rbRed.OnClick := @RadioButtonClick; @@ -419,20 +419,20 @@ begin gbColor.InsertChild(VBox); MainLayout.AddWidget(gbColor, 0, 0, 1, 2); - cbShowPercent := TCheckbox.Create('Show Percentage', self); + cbShowPercent := TFCheckbox.Create('Show Percentage', self); cbShowPercent.Checked := True; cbShowPercent.OnClick := @cbShowPercentClick; cbShowPercent.CanExpandWidth := True; MainLayout.AddWidget(cbShowPercent, 1, 0, 1, 1); - btnRandom := TButton.Create('Randomize', self); + btnRandom := TFButton.Create('Randomize', self); btnRandom.OnClick := @GeneratePercentage; MainLayout.AddWidget(btnRandom, 1, 1, 1, 1); Separator := TSeparator.Create(self); MainLayout.AddWidget(Separator, 0, 2, 2, 1); - PB := TProgressBar.Create('', self); + PB := TFProgressBar.Create('', self); PB.Position := 75; MainLayout.AddWidget(PB, 0, 3, 2, 1); @@ -476,7 +476,7 @@ end; procedure TMainForm.CheckBoxBtnClick(Sender: TObject); begin if not Assigned(_frmCheckBox) then - _frmCheckBox := TCheckBoxForm.Create(self); + _frmCheckBox := TFCheckboxForm.Create(self); _frmCheckBox.Show; end; @@ -577,16 +577,16 @@ end; // ------------------------------------------------------------------- -// TCheckBoxForm +// TFCheckboxForm // ------------------------------------------------------------------- -procedure TCheckBoxForm.GrayCheckBoxClick(Sender: TObject); +procedure TFCheckboxForm.GrayCheckBoxClick(Sender: TObject); begin CheckBox1.Enabled := not GrayCheckBox.Checked; CheckBox2.Enabled := not GrayCheckBox.Checked; end; -constructor TCheckBoxForm.Create(AOwner: TComponent); +constructor TFCheckboxForm.Create(AOwner: TComponent); begin inherited Create(AOwner); LoadForm(self); |