paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 01:38:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Scale dialog: use SpinEdt. Issue #28111, patch from Alexey Torgashin.

Browse Source 
git-svn-id: trunk@49062 -
This commit is contained in:
juha 2015-05-17 11:41:35 +00:00
parent 71acdc189d
commit 240949a096
2 changed files with 55 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
designer/scalecompsdlg.lfm
View File

@ -1,65 +1,75 @@
object ScaleComponentsDialog: TScaleComponentsDialog object ScaleComponentsDialog: TScaleComponentsDialog
Left = 642 Left = 391
Height = 87 Height = 107
Top = 378 Top = 430
Width = 256 Width = 301
BorderIcons = [biSystemMenu, biMinimize] ActiveControl = PercentEdit
BorderStyle = bsToolWindow BorderIcons = [biSystemMenu]
BorderStyle = bsDialog
Caption = 'ScaleComponentsDialog' Caption = 'ScaleComponentsDialog'
ClientHeight = 87 ClientHeight = 107
ClientWidth = 256 ClientWidth = 301
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '0.9.27' LCLVersion = '1.5'
object PercentLabel: TLabel object PercentLabel: TLabel
AnchorSideLeft.Control = PercentEdit
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = PercentEdit AnchorSideTop.Control = PercentEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 187 Left = 186
Height = 14 Height = 15
Top = 10 Top = 35
Width = 63 Width = 68
Anchors = [akTop, akRight] BorderSpacing.Left = 6
BorderSpacing.Right = 6
Caption = 'PercentLabel' Caption = 'PercentLabel'
ParentColor = False ParentColor = False
end end
object ScaleLabel: TLabel object ScaleLabel: TLabel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = PercentEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 14 Height = 15
Top = 10 Top = 10
Width = 51 Width = 55
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'ScaleLabel' Caption = 'ScaleLabel'
ParentColor = False ParentColor = False
end end
object PercentEdit: TEdit
AnchorSideLeft.Control = ScaleLabel
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Owner
AnchorSideRight.Control = PercentLabel
Left = 63
Height = 23
Top = 6
Width = 118
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
TabOrder = 0
Text = 'PercentEdit'
end
object ButtonPanel1: TButtonPanel object ButtonPanel1: TButtonPanel
AnchorSideTop.Control = PercentEdit
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 34 Height = 26
Top = 47 Top = 75
Width = 244 Width = 289
OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True
HelpButton.Name = 'HelpButton'
HelpButton.DefaultCaption = True
CloseButton.Name = 'CloseButton'
CloseButton.DefaultCaption = True
CancelButton.Name = 'CancelButton'
CancelButton.DefaultCaption = True
TabOrder = 1 TabOrder = 1
ShowButtons = [pbOK, pbCancel] ShowButtons = [pbOK, pbCancel]
ShowBevel = False
end
object PercentEdit: TSpinEdit
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ScaleLabel
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
Left = 112
Height = 23
Top = 31
Width = 68
Anchors = [akTop]
BorderSpacing.Top = 6
Increment = 10
MaxValue = 2000
MinValue = 5
TabOrder = 0
Value = 5
end end
end end

16
designer/scalecompsdlg.pp
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LCLIntf, LCLProc, Forms, Controls, Buttons, StdCtrls, Classes, SysUtils, LCLIntf, LCLProc, Forms, Controls, Buttons, StdCtrls,
ExtCtrls, LazarusIDEStrConsts, ButtonPanel; ExtCtrls, LazarusIDEStrConsts, ButtonPanel, Spin;
type type
@ -39,8 +39,8 @@ type
TScaleComponentsDialog = class(TForm) TScaleComponentsDialog = class(TForm)
ButtonPanel1: TButtonPanel; ButtonPanel1: TButtonPanel;
PercentEdit: TSpinEdit;
ScaleLabel: TLabel; ScaleLabel: TLabel;
PercentEdit: TEdit;
PercentLabel: TLabel; PercentLabel: TLabel;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
@ -53,15 +53,13 @@ implementation
{$R *.lfm} {$R *.lfm}
function ShowScaleComponentsDialog(out ScaleInPercent: integer): TModalResult; function ShowScaleComponentsDialog(out ScaleInPercent: integer): TModalResult;
var
ScaleComponentsDialog: TScaleComponentsDialog;
begin begin
ScaleComponentsDialog:=TScaleComponentsDialog.Create(nil); with TScaleComponentsDialog.Create(nil) do
with ScaleComponentsDialog do try
begin PercentEdit.Value:=100;
PercentEdit.Text:='100';
Result:=ShowModal; Result:=ShowModal;
ScaleInPercent:=StrToIntDef(ScaleComponentsDialog.PercentEdit.Text,100); ScaleInPercent:=PercentEdit.Value;
finally
Free; Free;
end; end;
end; end;