diff --git a/components/jujiboutils/changes.txt b/components/jujiboutils/changes.txt
index b57c75531..bcd3c9225 100644
--- a/components/jujiboutils/changes.txt
+++ b/components/jujiboutils/changes.txt
@@ -6,6 +6,7 @@ Note: Lazarus Trunk required
Version pre-1.0
--------------------------------------------------
2011-09-30 Added: ftString support to TJDBGridControl. MaxLength property.
+ Reorganize files, update examples.
2011-09-27 Added: ftDateTime support to TJDBGridControl
TJFloatEdit, TJLabeledFloatEdit,
TJDBFloatEdit, TJDBLabeledFloatEdit
diff --git a/components/jujiboutils/example1/main.lfm b/components/jujiboutils/example1/main.lfm
index 3a7a7e91c..66b42de3d 100644
--- a/components/jujiboutils/example1/main.lfm
+++ b/components/jujiboutils/example1/main.lfm
@@ -1,7 +1,7 @@
object Form1: TForm1
- Left = 285
+ Left = 576
Height = 332
- Top = 159
+ Top = 272
Width = 366
Caption = 'Form1'
ClientHeight = 332
@@ -32,39 +32,7 @@ object Form1: TForm1
ClientWidth = 241
DataSource = Datasource1
Options = []
- TabOrder = 5
- end
- object Label2: TLabel
- Left = 24
- Height = 18
- Top = 133
- Width = 14
- Caption = 'Id'
- ParentColor = False
- end
- object Label3: TLabel
- Left = 106
- Height = 18
- Top = 133
- Width = 29
- Caption = 'Date'
- ParentColor = False
- end
- object Label4: TLabel
- Left = 188
- Height = 18
- Top = 133
- Width = 21
- Caption = 'Id2'
- ParentColor = False
- end
- object Label5: TLabel
- Left = 272
- Height = 18
- Top = 133
- Width = 30
- Caption = 'Total'
- ParentColor = False
+ TabOrder = 4
end
object BitBtn1: TBitBtn
Left = 273
@@ -75,70 +43,89 @@ object Form1: TForm1
Caption = '&Cerrar'
Kind = bkClose
ModalResult = 11
- TabOrder = 6
+ TabOrder = 5
end
object JDBLabeledCurrencyEdit1: TJDBLabeledCurrencyEdit
Left = 272
Height = 27
- Top = 200
+ Top = 173
Width = 80
- DisplayFormat = '#,0.00€'
+ DisplayFormat = '#,0.00 €'
DataField = 'TOTAL'
DataSource = Datasource1
Decimals = 2
Alignment = taRightJustify
EditLabel.AnchorSideLeft.Control = JDBLabeledCurrencyEdit1
+ EditLabel.AnchorSideRight.Control = JDBLabeledCurrencyEdit1
+ EditLabel.AnchorSideRight.Side = asrBottom
EditLabel.AnchorSideBottom.Control = JDBLabeledCurrencyEdit1
EditLabel.Left = 272
EditLabel.Height = 18
- EditLabel.Top = 179
- EditLabel.Width = 84
- EditLabel.Caption = 'Total (labeled)'
+ EditLabel.Top = 152
+ EditLabel.Width = 80
+ EditLabel.Caption = 'Total'
EditLabel.ParentColor = False
- TabOrder = 4
+ TabOrder = 3
end
- object JDBIntegerEdit1: TJDBIntegerEdit
- Left = 24
+ object JDBLabeledIntegerEdit1: TJDBLabeledIntegerEdit
+ Left = 21
Height = 27
- Top = 152
+ Top = 174
Width = 80
DataField = 'ID'
DataSource = Datasource1
Alignment = taRightJustify
+ EditLabel.AnchorSideLeft.Control = JDBLabeledIntegerEdit1
+ EditLabel.AnchorSideRight.Control = JDBLabeledIntegerEdit1
+ EditLabel.AnchorSideRight.Side = asrBottom
+ EditLabel.AnchorSideBottom.Control = JDBLabeledIntegerEdit1
+ EditLabel.Left = 21
+ EditLabel.Height = 18
+ EditLabel.Top = 153
+ EditLabel.Width = 80
+ EditLabel.Caption = 'Id'
+ EditLabel.ParentColor = False
TabOrder = 0
end
- object JDBDateEdit1: TJDBDateEdit
+ object JDBLabeledDateEdit1: TJDBLabeledDateEdit
Left = 106
Height = 27
- Top = 152
+ Top = 173
Width = 80
DataField = 'DATE'
DataSource = Datasource1
+ EditLabel.AnchorSideLeft.Control = JDBLabeledDateEdit1
+ EditLabel.AnchorSideRight.Control = JDBLabeledDateEdit1
+ EditLabel.AnchorSideRight.Side = asrBottom
+ EditLabel.AnchorSideBottom.Control = JDBLabeledDateEdit1
+ EditLabel.Left = 106
+ EditLabel.Height = 18
+ EditLabel.Top = 152
+ EditLabel.Width = 80
+ EditLabel.Caption = 'Date'
+ EditLabel.ParentColor = False
TabOrder = 1
end
- object JDBIntegerEdit2: TJDBIntegerEdit
+ object JDBLabeledIntegerEdit2: TJDBLabeledIntegerEdit
Left = 188
Height = 27
- Top = 152
+ Top = 173
Width = 80
- DataField = 'ID2'
+ DataField = 'ID'
DataSource = Datasource1
- ReadOnly = True
Alignment = taRightJustify
+ EditLabel.AnchorSideLeft.Control = JDBLabeledIntegerEdit2
+ EditLabel.AnchorSideRight.Control = JDBLabeledIntegerEdit2
+ EditLabel.AnchorSideRight.Side = asrBottom
+ EditLabel.AnchorSideBottom.Control = JDBLabeledIntegerEdit2
+ EditLabel.Left = 188
+ EditLabel.Height = 18
+ EditLabel.Top = 152
+ EditLabel.Width = 80
+ EditLabel.Caption = 'Id2'
+ EditLabel.ParentColor = False
TabOrder = 2
end
- object JDBCurrencyEdit1: TJDBCurrencyEdit
- Left = 270
- Height = 27
- Top = 152
- Width = 80
- DisplayFormat = '#,0.00€'
- DataField = 'TOTAL'
- DataSource = Datasource1
- Decimals = 2
- Alignment = taRightJustify
- TabOrder = 3
- end
object Datasource1: TDatasource
DataSet = MemDataset1
left = 224
diff --git a/components/jujiboutils/example1/main.pas b/components/jujiboutils/example1/main.pas
index 8390faa3a..0f212f692 100644
--- a/components/jujiboutils/example1/main.pas
+++ b/components/jujiboutils/example1/main.pas
@@ -5,9 +5,9 @@ unit main;
interface
uses
- Classes, SysUtils, db, memds, FileUtil, Forms, Controls, Graphics,
- Dialogs, StdCtrls, DbCtrls, Buttons, jdbintegeredit, jdbdateedit,
- jdbcurrencyedit, jdblabeledcurrencyedit;
+ Classes, SysUtils, DB, memds, FileUtil, Forms, Controls, Graphics, Dialogs,
+ StdCtrls, DBCtrls, Buttons, jdblabeledcurrencyedit, jdblabeledintegeredit,
+ jdblabeleddateedit;
type
@@ -17,14 +17,11 @@ type
BitBtn1: TBitBtn;
Datasource1: TDatasource;
DBNavigator1: TDBNavigator;
- JDBCurrencyEdit1: TJDBCurrencyEdit;
- JDBDateEdit1: TJDBDateEdit;
- JDBIntegerEdit1: TJDBIntegerEdit;
- JDBIntegerEdit2: TJDBIntegerEdit;
JDBLabeledCurrencyEdit1: TJDBLabeledCurrencyEdit;
+ JDBLabeledDateEdit1: TJDBLabeledDateEdit;
+ JDBLabeledIntegerEdit1: TJDBLabeledIntegerEdit;
+ JDBLabeledIntegerEdit2: TJDBLabeledIntegerEdit;
Label1: TLabel;
- Label2: TLabel;
- Label3: TLabel;
Label4: TLabel;
Label5: TLabel;
MemDataset1: TMemDataset;
@@ -33,10 +30,10 @@ type
{ private declarations }
public
{ public declarations }
- end;
+ end;
var
- Form1: TForm1;
+ Form1: TForm1;
implementation
diff --git a/components/jujiboutils/example1/project1.lpi b/components/jujiboutils/example1/project1.lpi
index 6a2806e75..9c6dd8e2f 100644
--- a/components/jujiboutils/example1/project1.lpi
+++ b/components/jujiboutils/example1/project1.lpi
@@ -67,6 +67,10 @@
+
+
+
+
diff --git a/components/jujiboutils/examplenodb/main.lfm b/components/jujiboutils/examplenodb/main.lfm
index 4f3fb503f..07293e85b 100644
--- a/components/jujiboutils/examplenodb/main.lfm
+++ b/components/jujiboutils/examplenodb/main.lfm
@@ -1,10 +1,10 @@
object Form1: TForm1
Left = 365
- Height = 295
+ Height = 185
Top = 260
Width = 419
Caption = 'Example'
- ClientHeight = 295
+ ClientHeight = 185
ClientWidth = 419
LCLVersion = '0.9.31'
object Label1: TLabel
@@ -106,63 +106,15 @@ object Form1: TForm1
TabOrder = 3
end
end
- object GroupBox2: TGroupBox
- Left = 24
- Height = 105
- Top = 128
- Width = 376
- Caption = 'Normal Controls'
- ClientHeight = 86
- ClientWidth = 372
- TabOrder = 1
- object JIntegerEdit1: TJIntegerEdit
- Left = 14
- Height = 27
- Top = 23
- Width = 80
- DisplayFormat = '0º'
- Value = 0
- TabOrder = 0
- end
- object JCurrencyEdit1: TJCurrencyEdit
- Left = 102
- Height = 27
- Top = 23
- Width = 80
- DisplayFormat = '$ #,0.00'
- Decimals = 2
- Value = 0
- TabOrder = 1
- end
- object JDateEdit1: TJDateEdit
- Left = 190
- Height = 27
- Top = 23
- Width = 80
- DisplayFormat = 'dd/mm/yy'
- Value = 0
- TabOrder = 2
- end
- object JFloatEdit1: TJFloatEdit
- Left = 280
- Height = 27
- Top = 24
- Width = 80
- DisplayFormat = '#,0.00'
- Decimals = 2
- Value = 0
- TabOrder = 3
- end
- end
object BitBtn1: TBitBtn
Left = 308
Height = 30
- Top = 249
+ Top = 139
Width = 91
Anchors = [akRight, akBottom]
Caption = '&Cerrar'
Kind = bkClose
ModalResult = 11
- TabOrder = 2
+ TabOrder = 1
end
end
diff --git a/components/jujiboutils/examplenodb/main.pas b/components/jujiboutils/examplenodb/main.pas
index dcad2e6e8..ad98b7073 100644
--- a/components/jujiboutils/examplenodb/main.pas
+++ b/components/jujiboutils/examplenodb/main.pas
@@ -6,9 +6,8 @@ interface
uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
- Buttons, JIntegerEdit, JLabeledIntegerEdit, JCurrencyEdit,
- JLabeledCurrencyEdit, JDateEdit, JLabeledDateEdit, JFloatEdit,
- JLabeledFloatEdit;
+ Buttons, JLabeledCurrencyEdit, JLabeledDateEdit, JLabeledFloatEdit,
+ JLabeledIntegerEdit;
type
@@ -17,11 +16,6 @@ type
TForm1 = class(TForm)
BitBtn1: TBitBtn;
GroupBox1: TGroupBox;
- GroupBox2: TGroupBox;
- JCurrencyEdit1: TJCurrencyEdit;
- JDateEdit1: TJDateEdit;
- JFloatEdit1: TJFloatEdit;
- JIntegerEdit1: TJIntegerEdit;
JLabeledCurrencyEdit1: TJLabeledCurrencyEdit;
JLabeledDateEdit1: TJLabeledDateEdit;
JLabeledFloatEdit1: TJLabeledFloatEdit;
@@ -32,10 +26,10 @@ type
{ private declarations }
public
{ public declarations }
- end;
+ end;
var
- Form1: TForm1;
+ Form1: TForm1;
implementation