jvcllaz: Improvements in the JvFullColorCircle and JvFullColor dialogs for Linux.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6882 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-04-28 20:37:08 +00:00
parent c04df98dba
commit 451f4586af
6 changed files with 169 additions and 50 deletions

View File

@@ -1,15 +1,16 @@
object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
Left = 836
Height = 394
Height = 315
Top = 214
Width = 343
Width = 274
BorderStyle = bsDialog
Caption = 'JvFullColorCircleDlgMainFrm'
ClientHeight = 394
ClientWidth = 343
ClientHeight = 315
ClientWidth = 274
Color = clBtnFace
Font.Color = clWindowText
KeyPreview = True
OnActivate = FormActivate
OnCreate = FormCreate
Position = poScreenCenter
LCLVersion = '2.1.0.0'
@@ -18,12 +19,12 @@ object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = ComboBoxFileName
AnchorSideTop.Side = asrBottom
Left = 30
Height = 108
Top = 39
Width = 108
BorderSpacing.Left = 8
BorderSpacing.Top = 8
Left = 33
Height = 86
Top = 35
Width = 86
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Style = bsRaised
end
object Image: TImage
@@ -31,24 +32,26 @@ object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = Bevel
AnchorSideTop.Side = asrCenter
Left = 34
Height = 100
Top = 43
Width = 100
Left = 36
Height = 80
Top = 38
Width = 80
Center = True
end
object LabelImage: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ComboBoxFileName
AnchorSideTop.Side = asrCenter
Left = 8
Left = 6
Height = 15
Top = 12
Top = 10
Width = 39
BorderSpacing.Left = 8
BorderSpacing.Left = 6
Caption = 'Image :'
Font.Color = clWindowText
Layout = tlCenter
ParentColor = False
ParentFont = False
end
object Memo: TMemo
AnchorSideLeft.Control = Owner
@@ -56,20 +59,22 @@ object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Bevel
AnchorSideRight.Side = asrBottom
Left = 8
Height = 72
Top = 155
Width = 152
Left = 6
Height = 70
Top = 127
Width = 141
Alignment = taCenter
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderStyle = bsNone
Font.Color = clWindowText
Lines.Strings = (
'Original image'
)
OnKeyDown = MemoKeyDown
OnKeyPress = MemoKeyPress
ParentColor = True
ParentFont = False
TabOrder = 0
end
object ComboBoxFileName: TComboBox
@@ -77,17 +82,19 @@ object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 55
Left = 51
Height = 23
Top = 8
Width = 225
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Right = 8
Top = 6
Width = 206
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
DropDownCount = 24
Font.Color = clWindowText
ItemHeight = 15
OnClick = ComboBoxFileNameSelect
OnSelect = ComboBoxFileNameSelect
ParentFont = False
Style = csDropDownList
TabOrder = 1
end

View File

@@ -46,6 +46,7 @@ type
LabelImage: TLabel;
ComboBoxFileName: TComboBox;
JvFullColorCircleDialog: TJvFullColorCircleDialog;
procedure FormActivate(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure MemoKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
@@ -89,12 +90,6 @@ var
procedure TJvFullColorCircleDlgMainFrm.FormCreate(Sender: TObject);
var
X, Y: Integer;
PitchX, PitchY: Integer;
LImage: TImage;
LMemo: TMemo;
LBevel: TBevel;
Index: Integer;
LSearchRec: TSearchRec;
begin
ImgDir := IncludeTrailingPathDelimiter(GetCurrentDir) + '../../design/JvCtrls/images/';
@@ -103,7 +98,17 @@ begin
ComboBoxFileName.Items.Add(LSearchRec.Name);
until FindNext(LSearchRec) <> 0;
FindClose(LSearchRec);
end;
procedure TJvFullColorCircleDlgMainFrm.FormActivate(Sender: TObject);
var
X, Y: Integer;
PitchX, PitchY: Integer;
LImage: TImage;
LMemo: TMemo;
LBevel: TBevel;
Index: Integer;
begin
PitchX := Memo.Width + 32;
PitchY := Memo.Top + Memo.Height - Image.Top + 31;
Index := 0;
@@ -135,7 +140,7 @@ begin
LImage.OnDblClick := @CustomizeDblClick;
LMemo.OnDblClick := @CustomizeDblClick;
ClientWidth := LMemo.Left+LMemo.Width-1+Memo.Left;
ClientHeight := LMemo.Top+LMemo.Height-1+Image.Top;
ClientHeight := LMemo.Top+LMemo.Height-1+ComboboxFileName.Top;
end;
Memos[Index] := LMemo;
Images[Index] := LImage;