paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-22 16:39:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: mouse actions options: simplified and improved layout for Linux, patch #28961 from Alexey

Browse Source 
git-svn-id: trunk@50241 -
This commit is contained in:
mattias 2015-11-06 22:34:29 +00:00
parent 5fa48e6e5f
commit ad92302ba7
2 changed files with 132 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

275
ide/mouseactiondialog.lfm
View File

@ -1,25 +1,24 @@
object MouseaActionDialog: TMouseaActionDialog object MouseaActionDialog: TMouseaActionDialog
Left = 414 Left = 412
Height = 400 Height = 449
Top = 225 Top = 225
Width = 620 Width = 627
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'MouseaActionDialog' Caption = 'MouseaActionDialog'
ClientHeight = 400 ClientHeight = 449
ClientWidth = 620 ClientWidth = 627
OnCreate = FormCreate OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.5' LCLVersion = '1.5'
object BtnLabel: TLabel object BtnLabel: TLabel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Panel1
AnchorSideRight.Control = ActionLabel AnchorSideRight.Control = ActionLabel
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 15 Height = 17
Top = 134 Top = 159
Width = 63 Width = 90
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'BtnLabel' Caption = 'BtnLabel'
@ -30,11 +29,12 @@ object MouseaActionDialog: TMouseaActionDialog
AnchorSideTop.Control = ActionBox AnchorSideTop.Control = ActionBox
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 15 Height = 17
Top = 10 Top = 13
Width = 63 Width = 90
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'ActionLabel' Caption = 'ActionLabel'
Constraints.MinWidth = 90
ParentColor = False ParentColor = False
end end
object OptLabel: TLabel object OptLabel: TLabel
@ -43,10 +43,10 @@ object MouseaActionDialog: TMouseaActionDialog
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 75 Left = 102
Height = 16 Height = 16
Top = 60 Top = 73
Width = 539 Width = 519
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = False AutoSize = False
BorderSpacing.Top = 6 BorderSpacing.Top = 6
@ -59,37 +59,38 @@ object MouseaActionDialog: TMouseaActionDialog
AnchorSideTop.Control = PriorSpin AnchorSideTop.Control = PriorSpin
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 15 Height = 17
Top = 109 Top = 131
Width = 53 Width = 71
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'PriorLabel' Caption = 'PriorLabel'
ParentColor = False ParentColor = False
end end
object CapturePanel: TPanel object CapturePanel: TPanel
AnchorSideLeft.Control = chkUpRestrict AnchorSideLeft.Control = chkUpRestrict
AnchorSideTop.Control = BtnDefault AnchorSideTop.Control = chkUpRestrict
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = chkUpRestrict AnchorSideRight.Control = chkUpRestrict
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = ButtonPanel1 AnchorSideBottom.Control = ButtonPanel1
Left = 181 Left = 255
Height = 62 Height = 65
Top = 292 Top = 335
Width = 433 Width = 368
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BevelOuter = bvLowered BevelOuter = bvLowered
BevelWidth = 2 BevelWidth = 2
ClientHeight = 62 ClientHeight = 65
ClientWidth = 433 ClientWidth = 368
Color = clBtnShadow Color = clBtnShadow
ParentColor = False ParentColor = False
TabOrder = 11 TabOrder = 13
OnMouseDown = CapturePanelMouseDown OnMouseDown = CapturePanelMouseDown
object PaintBox1: TPaintBox object PaintBox1: TPaintBox
Left = 2 Left = 2
Height = 58 Height = 61
Top = 2 Top = 2
Width = 429 Width = 364
Align = alClient Align = alClient
Anchors = [akTop, akRight, akBottom] Anchors = [akTop, akRight, akBottom]
OnMouseDown = CapturePanelMouseDown OnMouseDown = CapturePanelMouseDown
@ -97,43 +98,40 @@ object MouseaActionDialog: TMouseaActionDialog
end end
end end
object ShiftCheck: TCheckBox object ShiftCheck: TCheckBox
AnchorSideLeft.Control = Panel1 AnchorSideLeft.Control = DirCheck
AnchorSideTop.Control = Panel1 AnchorSideTop.Control = DirCheck
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 75 Left = 102
Height = 19 Height = 24
Top = 217 Top = 257
Width = 77 Width = 98
AllowGrayed = True AllowGrayed = True
BorderSpacing.Top = 6
Caption = 'ShiftCheck' Caption = 'ShiftCheck'
TabOrder = 6 TabOrder = 8
end end
object AltCheck: TCheckBox object AltCheck: TCheckBox
AnchorSideLeft.Control = ShiftCheck AnchorSideLeft.Control = ShiftCheck
AnchorSideTop.Control = ShiftCheck AnchorSideTop.Control = ShiftCheck
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 75 Left = 102
Height = 19 Height = 24
Top = 242 Top = 281
Width = 68 Width = 86
AllowGrayed = True AllowGrayed = True
BorderSpacing.Top = 6
Caption = 'AltCheck' Caption = 'AltCheck'
TabOrder = 7 TabOrder = 9
end end
object CtrlCheck: TCheckBox object CtrlCheck: TCheckBox
AnchorSideLeft.Control = AltCheck AnchorSideLeft.Control = AltCheck
AnchorSideTop.Control = AltCheck AnchorSideTop.Control = AltCheck
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 75 Left = 102
Height = 19 Height = 24
Top = 267 Top = 305
Width = 72 Width = 91
AllowGrayed = True AllowGrayed = True
BorderSpacing.Top = 6
Caption = 'CtrlCheck' Caption = 'CtrlCheck'
TabOrder = 8 TabOrder = 10
end end
object BtnDefault: TButton object BtnDefault: TButton
AnchorSideLeft.Control = CtrlCheck AnchorSideLeft.Control = CtrlCheck
@ -142,24 +140,24 @@ object MouseaActionDialog: TMouseaActionDialog
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 75 Left = 102
Height = 25 Height = 29
Top = 292 Top = 335
Width = 82 Width = 85
AutoSize = True AutoSize = True
BorderSpacing.Top = 6 BorderSpacing.Top = 6
Caption = 'BtnDefault' Caption = 'BtnDefault'
OnClick = BtnDefaultClick OnClick = BtnDefaultClick
TabOrder = 9 TabOrder = 11
end end
object CaretCheck: TCheckBox object CaretCheck: TCheckBox
AnchorSideLeft.Control = ActionBox AnchorSideLeft.Control = ActionBox
AnchorSideTop.Control = ActionBox AnchorSideTop.Control = ActionBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 75 Left = 102
Height = 19 Height = 24
Top = 35 Top = 43
Width = 81 Width = 103
BorderSpacing.Top = 6 BorderSpacing.Top = 6
Caption = 'CaretCheck' Caption = 'CaretCheck'
TabOrder = 1 TabOrder = 1
@ -170,15 +168,13 @@ object MouseaActionDialog: TMouseaActionDialog
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 75 Left = 102
Height = 23 Height = 31
Top = 6 Top = 6
Width = 539 Width = 519
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Around = 6
BorderSpacing.Top = 6 ItemHeight = 0
BorderSpacing.Right = 6
ItemHeight = 15
OnChange = ActionBoxChange OnChange = ActionBoxChange
Style = csDropDownList Style = csDropDownList
TabOrder = 0 TabOrder = 0
@ -189,9 +185,9 @@ object MouseaActionDialog: TMouseaActionDialog
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 34 Height = 37
Top = 360 Top = 406
Width = 608 Width = 615
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True OKButton.DefaultCaption = True
HelpButton.Name = 'HelpButton' HelpButton.Name = 'HelpButton'
@ -200,7 +196,7 @@ object MouseaActionDialog: TMouseaActionDialog
CloseButton.DefaultCaption = True CloseButton.DefaultCaption = True
CancelButton.Name = 'CancelButton' CancelButton.Name = 'CancelButton'
CancelButton.DefaultCaption = True CancelButton.DefaultCaption = True
TabOrder = 12 TabOrder = 14
ShowButtons = [pbOK, pbCancel] ShowButtons = [pbOK, pbCancel]
end end
object OptBox: TComboBox object OptBox: TComboBox
@ -209,14 +205,14 @@ object MouseaActionDialog: TMouseaActionDialog
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 75 Left = 102
Height = 23 Height = 31
Top = 76 Top = 89
Width = 539 Width = 519
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6 BorderSpacing.Right = 6
Enabled = False Enabled = False
ItemHeight = 15 ItemHeight = 0
Style = csDropDownList Style = csDropDownList
TabOrder = 2 TabOrder = 2
end end
@ -224,9 +220,9 @@ object MouseaActionDialog: TMouseaActionDialog
AnchorSideLeft.Control = OptLabel AnchorSideLeft.Control = OptLabel
AnchorSideTop.Control = OptBox AnchorSideTop.Control = OptBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 75 Left = 102
Height = 23 Height = 27
Top = 105 Top = 126
Width = 60 Width = 60
BorderSpacing.Top = 6 BorderSpacing.Top = 6
MaxValue = 3 MaxValue = 3
@ -238,9 +234,9 @@ object MouseaActionDialog: TMouseaActionDialog
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 554 Left = 561
Height = 23 Height = 27
Top = 105 Top = 126
Width = 60 Width = 60
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Top = 6 BorderSpacing.Top = 6
@ -253,80 +249,71 @@ object MouseaActionDialog: TMouseaActionDialog
AnchorSideTop.Control = Opt2Spin AnchorSideTop.Control = Opt2Spin
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Opt2Spin AnchorSideRight.Control = Opt2Spin
Left = 494 Left = 484
Height = 15 Height = 17
Top = 109 Top = 131
Width = 54 Width = 71
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
Caption = 'Opt2Label' Caption = 'Opt2Label'
ParentColor = False ParentColor = False
end end
object Panel1: TPanel
AnchorSideLeft.Control = PriorSpin
AnchorSideTop.Control = PriorSpin
AnchorSideTop.Side = asrBottom
Left = 75
Height = 77
Top = 134
Width = 100
AutoSize = True
BorderSpacing.Top = 6
BevelOuter = bvNone
ClientHeight = 77
ClientWidth = 100
TabOrder = 5
object DirCheck: TCheckBox
AnchorSideTop.Control = ClickBox
AnchorSideTop.Side = asrBottom
Left = 0
Height = 19
Top = 58
Width = 68
BorderSpacing.Top = 6
Caption = 'DirCheck'
OnChange = DirCheckChange
TabOrder = 2
end
object ClickBox: TComboBox
AnchorSideTop.Control = ButtonBox
AnchorSideTop.Side = asrBottom
Left = 0
Height = 23
Top = 29
Width = 100
BorderSpacing.Top = 6
ItemHeight = 15
Style = csDropDownList
TabOrder = 1
end
object ButtonBox: TComboBox
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Side = asrBottom
Left = 0
Height = 23
Top = 0
Width = 100
ItemHeight = 15
OnChange = ButtonBoxChange
Style = csDropDownList
TabOrder = 0
end
end
object chkUpRestrict: TCheckListBox object chkUpRestrict: TCheckListBox
AnchorSideLeft.Control = Panel1 AnchorSideLeft.Control = ButtonBox
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideBottom.Control = BtnDefault AnchorSideBottom.Control = BtnDefault
Left = 181 Left = 255
Height = 152 Height = 170
Top = 134 Top = 159
Width = 433 Width = 368
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akRight, akBottom]
BorderSpacing.Left = 6 BorderSpacing.Around = 6
BorderSpacing.Right = 6
ItemHeight = 0 ItemHeight = 0
TabOrder = 10 TabOrder = 12
TopIndex = -1
end
object ButtonBox: TComboBox
AnchorSideLeft.Control = PriorSpin
AnchorSideTop.Control = chkUpRestrict
AnchorSideRight.Control = chkUpRestrict
Left = 102
Height = 31
Top = 159
Width = 147
Anchors = [akTop, akLeft, akRight]
ItemHeight = 0
OnChange = ButtonBoxChange
Style = csDropDownList
TabOrder = 5
end
object ClickBox: TComboBox
AnchorSideLeft.Control = ButtonBox
AnchorSideTop.Control = ButtonBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = ButtonBox
AnchorSideRight.Side = asrBottom
Left = 102
Height = 31
Top = 196
Width = 147
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
ItemHeight = 0
Style = csDropDownList
TabOrder = 6
end
object DirCheck: TCheckBox
AnchorSideLeft.Control = ButtonBox
AnchorSideTop.Control = ClickBox
AnchorSideTop.Side = asrBottom
Left = 102
Height = 24
Top = 233
Width = 86
BorderSpacing.Top = 6
Caption = 'DirCheck'
OnChange = DirCheckChange
TabOrder = 7
end end
end end

3
ide/mouseactiondialog.pas
View File

@ -28,12 +28,11 @@ type
CaretCheck: TCheckBox; CaretCheck: TCheckBox;
chkUpRestrict: TCheckListBox; chkUpRestrict: TCheckListBox;
ClickBox: TComboBox; ClickBox: TComboBox;
DirCheck: TCheckBox;
PaintBox1: TPaintBox; PaintBox1: TPaintBox;
Panel1: TPanel;
PriorLabel: TLabel; PriorLabel: TLabel;
OptBox: TComboBox; OptBox: TComboBox;
CtrlCheck: TCheckBox; CtrlCheck: TCheckBox;
DirCheck: TCheckBox;
CapturePanel: TPanel; CapturePanel: TPanel;
OptLabel: TLabel; OptLabel: TLabel;
Opt2Spin: TSpinEdit; Opt2Spin: TSpinEdit;