summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--prototypes/textedit/demo_textedit.lpi4
-rw-r--r--prototypes/textedit/demo_textedit.lpr281
-rw-r--r--prototypes/textedit/fpg_textedit.pas2
-rw-r--r--src/fpmake.pas23
-rw-r--r--uidesigner/newformdesigner.pas8
-rw-r--r--uidesigner/vfdeditors.pas3
-rw-r--r--uidesigner/vfdforms.pas2
-rw-r--r--uidesigner/vfdpropeditgrid.pas5
8 files changed, 84 insertions, 244 deletions
diff --git a/prototypes/textedit/demo_textedit.lpi b/prototypes/textedit/demo_textedit.lpi
index bde04ec6..3e74aa03 100644
--- a/prototypes/textedit/demo_textedit.lpi
+++ b/prototypes/textedit/demo_textedit.lpi
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
- <PathDelim Value="/"/>
- <Version Value="6"/>
+ <Version Value="7"/>
<General>
<Flags>
<SaveOnlyProjectUnits Value="True"/>
+ <LRSInOutputDirectory Value="False"/>
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
diff --git a/prototypes/textedit/demo_textedit.lpr b/prototypes/textedit/demo_textedit.lpr
index 6bb8a069..0af5e4ec 100644
--- a/prototypes/textedit/demo_textedit.lpr
+++ b/prototypes/textedit/demo_textedit.lpr
@@ -3,34 +3,15 @@ program demo_textedit;
{$mode objfpc}{$H+}
uses
-// {$IFDEF UNIX}{$IFDEF UseCThreads}
- cthreads,
-// {$ENDIF}{$ENDIF}
Classes,
typinfo,
Sysutils,
- fpg_base,
- fpg_main,
- fpg_form,
- fpg_button,
- fpg_label,
+ fpg_base, fpg_main, fpg_form, fpg_button, fpg_label,
fpg_memo, fpg_dialogs, fpg_utils, fpg_radiobutton,
- fpg_progressbar, fpg_textedit, fpg_checkbox;
+ fpg_textedit, fpg_checkbox, fpg_panel;
type
- TMyThread = class(TThread)
- private
- bar: TfpgProgressBar;
- pos: integer;
- procedure UpdateGUI;
- protected
- procedure Execute; override;
- public
- constructor CreateCustom(pb: TfpgProgressBar);
- end;
-
-
TMainForm = class(TfpgForm)
private
{@VFD_HEAD_BEGIN: MainForm}
@@ -42,62 +23,26 @@ type
rbRight: TfpgRadioButton;
rbBoth: TfpgRadioButton;
Label1: TfpgLabel;
- ProgressBar2: TfpgProgressBar;
- ProgressBar1: TfpgProgressBar;
- ProgressBar3: TfpgProgressBar;
- Button1: TfpgButton;
- Button2: TfpgButton;
- Button3: TfpgButton;
chkShowGutter: TfpgCheckBox;
chkLineNumbers: TfpgCheckBox;
Label2: TfpgLabel;
btnChangeFont: TfpgButton;
+ Label3: TfpgLabel;
+ Label4: TfpgLabel;
+ Bevel2: TfpgBevel;
{@VFD_HEAD_END: MainForm}
- t1: TMyThread;
- t2: TMyThread;
- t3: TMyThread;
procedure ShowGutterChanged(Sender: TObject);
procedure ShowLineNumbers(Sender: TObject);
procedure AppExceptions(Sender: TObject; E: Exception);
procedure btnQuitClick(Sender: TObject);
procedure HandleResize(awidth, aheight: TfpgCoord); override;
procedure btnLoadClicked(Sender: TObject);
- procedure btn1(Sender: TObject);
- procedure btn2(Sender: TObject);
- procedure btn3(Sender: TObject);
procedure ChangeFontClicked(Sender: TObject);
public
constructor Create(AOwner: TComponent); override;
procedure AfterCreate; override;
end;
-{ TMyThread }
-
-procedure TMyThread.UpdateGUI;
-begin
- bar.Position := pos;
-end;
-
-procedure TMyThread.Execute;
-begin
- pos := -1;
- while not Terminated do
- begin
- inc(pos);
- Synchronize(@UpdateGUI);
- sleep(200);
- if pos >= 100 then
- break;
- end;
-end;
-
-constructor TMyThread.CreateCustom(pb: TfpgProgressBar);
-begin
- Create(True);
- bar := pb;
- FreeOnTerminate := True;
- Suspended := False;
-end;
{ TMainForm }
@@ -180,21 +125,6 @@ begin
fpgApplication.ProcessMessages;
end;
-procedure TMainForm.btn1(Sender: TObject);
-begin
- t1 := TMyThread.CreateCustom(ProgressBar1);
-end;
-
-procedure TMainForm.btn2(Sender: TObject);
-begin
- t2 := TMyThread.CreateCustom(ProgressBar2);
-end;
-
-procedure TMainForm.btn3(Sender: TObject);
-begin
- t3 := TMyThread.CreateCustom(ProgressBar3);
-end;
-
procedure TMainForm.ChangeFontClicked(Sender: TObject);
var
fnt: string;
@@ -218,7 +148,7 @@ begin
{@VFD_BODY_BEGIN: MainForm}
Name := 'MainForm';
SetPosition(319, 180, 594, 455);
- WindowTitle := 'Memo test';
+ WindowTitle := 'TextEdit (new Memo) test';
WindowPosition := wpScreenCenter;
memo := TfpgMemo.Create(self);
@@ -233,7 +163,6 @@ begin
Lines.Add('Memo Test3');
Lines.Add('Memo Test4');
FontDesc := '#Edit1';
- ParentShowHint := True;
TabOrder := 0;
// FontDesc := 'Arial-15';
// Lines.Insert(1,'0 Before 1 after');
@@ -243,21 +172,12 @@ begin
with btnQuit do
begin
Name := 'btnQuit';
- SetPosition(310, 10, 80, 23);
- Text := 'Button';
- AllowAllUp := False;
- Embedded := False;
- Flat := False;
+ SetPosition(492, 64, 92, 23);
+ Anchors := [anRight,anTop];
+ Text := 'Quit';
FontDesc := '#Label1';
- GroupIndex := 0;
Hint := '';
- ImageLayout := ilImageLeft;
- ImageMargin := 3;
ImageName := 'stdimg.quit';
- ImageSpacing := -1;
- ModalResult := 0;
- ParentShowHint := True;
- ShowImage := True;
TabOrder := 1;
OnClick := @btnQuitClick;
end;
@@ -283,21 +203,12 @@ begin
with btnLoad do
begin
Name := 'btnLoad';
- SetPosition(312, 44, 80, 24);
- Text := 'Load';
- AllowAllUp := False;
- Embedded := False;
- Flat := False;
+ SetPosition(492, 8, 92, 24);
+ Anchors := [anRight,anTop];
+ Text := 'Load File...';
FontDesc := '#Label1';
- GroupIndex := 0;
Hint := '';
- ImageLayout := ilImageLeft;
- ImageMargin := 3;
ImageName := '';
- ImageSpacing := -1;
- ModalResult := 0;
- ParentShowHint := True;
- ShowImage := True;
TabOrder := 3;
OnClick := @btnLoadClicked;
end;
@@ -306,10 +217,9 @@ begin
with rbLeft do
begin
Name := 'rbLeft';
- SetPosition(416, 8, 120, 20);
+ SetPosition(20, 28, 120, 20);
FontDesc := '#Label1';
GroupIndex := 0;
- ParentShowHint := True;
TabOrder := 4;
Text := 'Left';
end;
@@ -318,10 +228,9 @@ begin
with rbRight do
begin
Name := 'rbRight';
- SetPosition(416, 32, 120, 20);
+ SetPosition(20, 52, 120, 20);
FontDesc := '#Label1';
GroupIndex := 0;
- ParentShowHint := True;
TabOrder := 5;
Text := 'Right';
end;
@@ -330,11 +239,10 @@ begin
with rbBoth do
begin
Name := 'rbBoth';
- SetPosition(416, 56, 120, 20);
+ SetPosition(20, 76, 120, 20);
Checked := True;
FontDesc := '#Label1';
GroupIndex := 0;
- ParentShowHint := True;
TabOrder := 6;
Text := 'Both';
end;
@@ -348,124 +256,15 @@ begin
Alignment := taCenter;
FontDesc := '#Label2';
Hint := '';
- Layout := tlTop;
- ParentShowHint := True;
Text := 'Label';
- WrapText := False;
- end;
-
- ProgressBar2 := TfpgProgressBar.Create(self);
- with ProgressBar2 do
- begin
- Name := 'ProgressBar2';
- SetPosition(12, 48, 254, 22);
- Min := 0;
- Max := 100;
- ParentShowHint := True;
- Position := 0;
- ShowCaption := False;
- end;
-
- ProgressBar1 := TfpgProgressBar.Create(self);
- with ProgressBar1 do
- begin
- Name := 'ProgressBar1';
- SetPosition(12, 20, 254, 22);
- Min := 0;
- Max := 100;
- ParentShowHint := True;
- Position := 0;
- ShowCaption := False;
- end;
-
- ProgressBar3 := TfpgProgressBar.Create(self);
- with ProgressBar3 do
- begin
- Name := 'ProgressBar3';
- SetPosition(12, 76, 254, 22);
- Min := 0;
- Max := 100;
- ParentShowHint := True;
- Position := 0;
- ShowCaption := False;
- end;
-
- Button1 := TfpgButton.Create(self);
- with Button1 do
- begin
- Name := 'Button1';
- SetPosition(276, 20, 20, 20);
- Text := '';
- AllowAllUp := False;
- Embedded := False;
- Flat := False;
- FontDesc := '#Label1';
- GroupIndex := 0;
- Hint := '';
- ImageLayout := ilImageLeft;
- ImageMargin := 3;
- ImageName := '';
- ImageSpacing := -1;
- ModalResult := 0;
- ParentShowHint := True;
- ShowImage := True;
- TabOrder := 11;
- OnClick := @btn1;
- end;
-
- Button2 := TfpgButton.Create(self);
- with Button2 do
- begin
- Name := 'Button2';
- SetPosition(276, 48, 20, 20);
- Text := '';
- AllowAllUp := False;
- Embedded := False;
- Flat := False;
- FontDesc := '#Label1';
- GroupIndex := 0;
- Hint := '';
- ImageLayout := ilImageLeft;
- ImageMargin := 3;
- ImageName := '';
- ImageSpacing := -1;
- ModalResult := 0;
- ParentShowHint := True;
- ShowImage := True;
- TabOrder := 12;
- OnClick := @btn2;
- end;
-
- Button3 := TfpgButton.Create(self);
- with Button3 do
- begin
- Name := 'Button3';
- SetPosition(276, 76, 20, 20);
- Text := '';
- AllowAllUp := False;
- Embedded := False;
- Flat := False;
- FontDesc := '#Label1';
- GroupIndex := 0;
- Hint := '';
- ImageLayout := ilImageLeft;
- ImageMargin := 3;
- ImageName := '';
- ImageSpacing := -1;
- ModalResult := 0;
- ParentShowHint := True;
- ShowImage := True;
- TabOrder := 13;
- OnClick := @btn3;
end;
chkShowGutter := TfpgCheckBox.Create(self);
with chkShowGutter do
begin
Name := 'chkShowGutter';
- SetPosition(416, 84, 120, 20);
+ SetPosition(168, 28, 120, 20);
FontDesc := '#Label1';
- ParentShowHint := True;
TabOrder := 14;
Text := 'Show Gutter';
OnChange :=@ShowGutterChanged;
@@ -475,10 +274,9 @@ begin
with chkLineNumbers do
begin
Name := 'chkLineNumbers';
- SetPosition(416, 108, 120, 20);
+ SetPosition(168, 52, 120, 20);
Checked := True;
FontDesc := '#Label1';
- ParentShowHint := True;
TabOrder := 15;
Text := 'Show Line Numbers';
OnChange := @ShowLineNumbers;
@@ -489,38 +287,55 @@ begin
begin
Name := 'Label2';
SetPosition(348, 416, 176, 16);
+ Anchors := [anLeft,anRight,anBottom];
Alignment := taCenter;
FontDesc := '#Label2';
Hint := '';
- Layout := tlTop;
- ParentShowHint := True;
Text := 'Label';
- WrapText := False;
end;
btnChangeFont := TfpgButton.Create(self);
with btnChangeFont do
begin
Name := 'btnChangeFont';
- SetPosition(312, 76, 80, 24);
+ SetPosition(492, 36, 92, 24);
+ Anchors := [anRight,anTop];
Text := 'Font...';
- AllowAllUp := False;
- Embedded := False;
- Flat := False;
FontDesc := '#Label1';
- GroupIndex := 0;
Hint := '';
- ImageLayout := ilImageLeft;
- ImageMargin := 3;
ImageName := '';
- ImageSpacing := -1;
- ModalResult := 0;
- ParentShowHint := True;
- ShowImage := True;
TabOrder := 17;
OnClick := @ChangeFontClicked;
end;
+ Label3 := TfpgLabel.Create(self);
+ with Label3 do
+ begin
+ Name := 'Label3';
+ SetPosition(8, 8, 112, 16);
+ FontDesc := '#Label2';
+ Hint := '';
+ Text := 'Side to Load';
+ end;
+
+ Label4 := TfpgLabel.Create(self);
+ with Label4 do
+ begin
+ Name := 'Label4';
+ SetPosition(156, 8, 124, 16);
+ FontDesc := '#Label2';
+ Hint := '';
+ Text := 'General Options';
+ end;
+
+ Bevel2 := TfpgBevel.Create(self);
+ with Bevel2 do
+ begin
+ Name := 'Bevel2';
+ SetPosition(140, 8, 16, 148);
+ Shape := bsLeftLine;
+ end;
+
{@VFD_BODY_END: MainForm}
end;
diff --git a/prototypes/textedit/fpg_textedit.pas b/prototypes/textedit/fpg_textedit.pas
index 035e4ba7..862aff24 100644
--- a/prototypes/textedit/fpg_textedit.pas
+++ b/prototypes/textedit/fpg_textedit.pas
@@ -1,7 +1,7 @@
{
fpGUI - Free Pascal GUI Library
- Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+ Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this
distribution, for details of the copyright.
See the file COPYING.modifiedLGPL, included in this distribution,
diff --git a/src/fpmake.pas b/src/fpmake.pas
index 80e0be3d..d6f9383d 100644
--- a/src/fpmake.pas
+++ b/src/fpmake.pas
@@ -48,7 +48,13 @@ var
begin
with Installer do begin
P := AddPackage('fpgui');
- P.Version := '0.6_svn';
+ P.Version := '0.6.3';
+ P.Author := 'Graeme Geldenhuys';
+ P.Email := 'graemeg@gmail.com';
+ P.License := 'Modified LGPL';
+ P.Description := 'fpGUI Toolkit - a custom written GUI toolkit for Free Pascal.';
+
+// P.Dependencies.Add('fcl');
{ Fill in more package details here }
{ This shouldn't really be here. fpmake will install to the local
@@ -88,9 +94,19 @@ begin
P.IncludePath.Add('gui');
{ todo: add unit and include dependency for all }
+ P.Sources.AddSrcFiles('corelib/*.pas');
+ P.Sources.AddSrcFiles('gui/*.pas');
+ if Defaults.OS in AllUnixOSes
+ then P.Sources.AddSrcFiles('corelib/x11/*.pas')
+ else P.Sources.AddSrcFiles('corelib/gdi/*.pas');
{ x11 and gdi common }
- T := P.Targets.AddUnit('fpg_impl.pas');
+// if Defaults.OS in AllUnixOSes
+// then
+ P.Targets.AddUnit('corelib/x11/fpg_impl.pas', AllWindowsOSes);
+// else
+ P.Targets.AddUnit('corelib/gdi/fpg_impl.pas', AllUnixOSes);
+// T := P.Targets.AddUnit('fpg_impl.pas');
{ corelib/x11 }
T := P.Targets.AddUnit('fpg_keyconv_x11.pas', AllUnixOSes);
@@ -128,6 +144,9 @@ begin
T := P.Targets.AddUnit('fpg_pofiles.pas');
T := P.Targets.AddUnit('fpg_stringutils.pas');
+ { corelib include files }
+// T := P.Sources.AddSrc('keys.inc');
+
{ gui/db }
T := P.Targets.AddUnit('fpgui_db.pas');
diff --git a/uidesigner/newformdesigner.pas b/uidesigner/newformdesigner.pas
index 037f46b7..c5ab3029 100644
--- a/uidesigner/newformdesigner.pas
+++ b/uidesigner/newformdesigner.pas
@@ -184,6 +184,7 @@ uses
procedure TfrmAbout.AfterCreate;
begin
+ {%region 'Auto-generated GUI code' -fold}
{@VFD_BODY_BEGIN: frmAbout}
Name := 'frmAbout';
SetPosition(378, 267, 276, 180);
@@ -259,6 +260,7 @@ begin
end;
{@VFD_BODY_END: frmAbout}
+ {%endregion}
end;
class procedure TfrmAbout.Execute;
@@ -275,7 +277,6 @@ begin
end;
end;
-
procedure TfrmMain.AfterCreate;
var
n: integer;
@@ -283,6 +284,7 @@ var
wgc: TVFDWidgetClass;
btn: TwgPaletteButton;
begin
+ {%region 'Auto-generated GUI code' -fold}
{@VFD_BODY_BEGIN: frmMain}
Name := 'frmMain';
SetPosition(84, 123, 754, 92);
@@ -431,7 +433,7 @@ begin
end;
{@VFD_BODY_END: frmMain}
-
+ {%endregion}
x := 0;
y := 0;
@@ -504,6 +506,7 @@ procedure TfrmProperties.AfterCreate;
var
x, x2, w, y, gap: integer;
begin
+ {%region 'Auto-generated GUI code' -fold}
inherited;
Name := 'frmProperties';
WindowPosition := wpUser;
@@ -664,6 +667,7 @@ begin
edOther.Anchors := [anLeft, anRight, anBottom];
edOther.FontDesc := '#Edit2';
edOther.OnChange := @(maindsgn.OnOtherChange);
+ {%endregion}
end;
procedure TfrmProperties.BeforeDestruction;
diff --git a/uidesigner/vfdeditors.pas b/uidesigner/vfdeditors.pas
index 5d8492f2..9e65245f 100644
--- a/uidesigner/vfdeditors.pas
+++ b/uidesigner/vfdeditors.pas
@@ -56,6 +56,7 @@ uses
procedure TItemEditorForm.AfterCreate;
begin
+ {%region 'Auto-generated GUI code' -fold}
inherited;
WindowTitle := 'Items';
SetPosition(0, 0, 360, 230);
@@ -77,7 +78,7 @@ begin
btnCancel := CreateButton(self, Width-84, 200, 80, 'Cancel', @OnButtonClick);
btnCancel.Anchors := [anRight, anBottom];
-
+ {%endregion}
end;
procedure TItemEditorForm.btnClearClicked(Sender: TObject);
diff --git a/uidesigner/vfdforms.pas b/uidesigner/vfdforms.pas
index 3dd53115..3fcbc62e 100644
--- a/uidesigner/vfdforms.pas
+++ b/uidesigner/vfdforms.pas
@@ -140,6 +140,7 @@ uses
procedure TInsertCustomForm.AfterCreate;
begin
+ {%region 'Auto-generated GUI code' -fold}
inherited;
WindowPosition := wpScreenCenter;
WindowTitle := 'Insert Custom Widget';
@@ -152,6 +153,7 @@ begin
edName := CreateEdit(self, 8, 68, 150, 0);
btnOK := CreateButton(self, 180, 20, 100, 'OK', @OnButtonClick);
btnCancel := CreateButton(self, 180, 52, 100, 'Cancel', @OnButtonClick);
+ {%endregion}
end;
procedure TInsertCustomForm.OnButtonClick(Sender: TObject);
diff --git a/uidesigner/vfdpropeditgrid.pas b/uidesigner/vfdpropeditgrid.pas
index 75ccd196..e9f0be4b 100644
--- a/uidesigner/vfdpropeditgrid.pas
+++ b/uidesigner/vfdpropeditgrid.pas
@@ -30,13 +30,10 @@ uses
fpg_label,
fpg_edit,
fpg_button,
- fpg_listbox,
- fpg_memo,
fpg_combobox,
fpg_customgrid,
fpg_basegrid,
fpg_grid,
- fpg_checkbox,
vfdwidgetclass,
vfdprops,
vfdformparser;
@@ -115,6 +112,7 @@ end;
procedure TColumnEditForm.AfterCreate;
begin
+ {%region 'Auto-generated GUI code' -fold}
{@VFD_BODY_BEGIN: ColumnEditForm}
Name := 'ColumnEditForm';
SetPosition(270, 267, 511, 269);
@@ -282,6 +280,7 @@ begin
end;
{@VFD_BODY_END: ColumnEditForm}
+ {%endregion}
end;
procedure TColumnEditForm.GridRowChange(Sender: TObject; row: Integer);
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-10-17 18:38:51 +0000