mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Controls alignment

Browse source
This commit is contained in:
Alexander Koblov 2026-04-11 15:26:07 +03:00
commit bc7d7207fe
8 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/frames/foptionsfileassoc.lfm
View file

@ -529,7 +529,7 @@ inherited frmOptionsFileAssoc: TfrmOptionsFileAssoc
ClientHeight = 130
ClientWidth = 548
TabOrder = 2
object gbActionDescription: TGroupBox
object gbActionDescription: TKASGroupBox
AnchorSideLeft.Control = pnlBottomSettings
AnchorSideTop.Control = pnlBottomSettings
AnchorSideRight.Control = pnlBottomSettings
@ -547,7 +547,7 @@ inherited frmOptionsFileAssoc: TfrmOptionsFileAssoc
Caption = 'Action description'
ChildSizing.LeftRightSpacing = 6
ChildSizing.TopBottomSpacing = 6
ChildSizing.VerticalSpacing = 10
ChildSizing.VerticalSpacing = 2
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1
ClientHeight = 106
@ -620,6 +620,7 @@ inherited frmOptionsFileAssoc: TfrmOptionsFileAssoc
Alignment = taRightJustify
Caption = 'Action &name:'
FocusControl = edbActionName
Layout = tlCenter
ParentColor = False
end
object fneCommand: TFileNameEdit
@ -803,6 +804,7 @@ inherited frmOptionsFileAssoc: TfrmOptionsFileAssoc
Width = 71
Alignment = taRightJustify
Caption = 'Command:'
Layout = tlCenter
ParentColor = False
end
object edtParams: TEdit
@ -831,6 +833,7 @@ inherited frmOptionsFileAssoc: TfrmOptionsFileAssoc
Alignment = taRightJustify
Caption = 'Parameter&s:'
FocusControl = edtParams
Layout = tlCenter
ParentColor = False
end
object deStartPath: TDirectoryEdit
@ -962,6 +965,7 @@ inherited frmOptionsFileAssoc: TfrmOptionsFileAssoc
Alignment = taRightJustify
Caption = 'Start pat&h:'
FocusControl = deStartPath
Layout = tlCenter
ParentColor = False
end
end

4
src/frames/foptionsfileassoc.pas
View file

@ -31,7 +31,7 @@ uses
ExtCtrls, EditBtn, ExtDlgs, Menus, ActnList, Types,
//DC
uGlobs, uExts, fOptionsFrame;
KASControls, uGlobs, uExts, fOptionsFrame;
type
@ -62,7 +62,7 @@ type
edIconFileName: TEdit;
edtParams: TEdit;
fneCommand: TFileNameEdit;
gbActionDescription: TGroupBox;
gbActionDescription: TKASGroupBox;
gbFileTypes: TGroupBox;
gbIcon: TGroupBox;
gbExts: TGroupBox;

18
src/frames/foptionsfilesviews.lfm
View file

@ -6,7 +6,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
ClientWidth = 640
DesignLeft = 200
DesignTop = 261
object gbSorting: TGroupBox[0]
object gbSorting: TKASGroupBox[0]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
@ -22,7 +22,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
ChildSizing.LeftRightSpacing = 12
ChildSizing.TopBottomSpacing = 8
ChildSizing.HorizontalSpacing = 4
ChildSizing.VerticalSpacing = 12
ChildSizing.VerticalSpacing = 2
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ClientHeight = 143
ClientWidth = 624
@ -35,6 +35,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
Width = 104
Caption = '&Sort method:'
FocusControl = cbSortMethod
Layout = tlCenter
ParentColor = False
end
object cbSortMethod: TComboBox
@ -65,6 +66,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
Width = 104
Caption = 'Case s&ensitivity:'
FocusControl = cbCaseSensitivity
Layout = tlCenter
ParentColor = False
end
object cbCaseSensitivity: TComboBox
@ -96,6 +98,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
Width = 104
Caption = 'So&rting directories:'
FocusControl = cbSortFolderMode
Layout = tlCenter
ParentColor = False
end
object cbSortFolderMode: TComboBox
@ -127,6 +130,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
Width = 104
Caption = '&Insert new files:'
FocusControl = cbNewFilesPosition
Layout = tlCenter
ParentColor = False
end
object cbNewFilesPosition: TComboBox
@ -153,6 +157,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
Width = 104
Caption = '&Move updated files:'
FocusControl = cbUpdatedFilesPosition
Layout = tlCenter
ParentColor = False
end
object cbUpdatedFilesPosition: TComboBox
@ -173,7 +178,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
TabOrder = 4
end
end
object gbFormatting: TGroupBox[1]
object gbFormatting: TKASGroupBox[1]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = gbSorting
AnchorSideTop.Side = asrBottom
@ -190,7 +195,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
ChildSizing.LeftRightSpacing = 12
ChildSizing.TopBottomSpacing = 8
ChildSizing.HorizontalSpacing = 4
ChildSizing.VerticalSpacing = 12
ChildSizing.VerticalSpacing = 2
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ClientHeight = 116
ClientWidth = 624
@ -203,6 +208,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
Width = 117
Caption = '&Date and time format:'
FocusControl = cbDateTimeFormat
Layout = tlCenter
ParentColor = False
end
object cbFileSizeFormat: TComboBox
@ -230,6 +236,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
Width = 117
Caption = 'File si&ze format:'
FocusControl = cbFileSizeFormat
Layout = tlCenter
ParentColor = False
end
object pnlDateTime: TPanel
@ -311,6 +318,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
Width = 148
Caption = '&Header format:'
FocusControl = cbHeaderSizeFormat
Layout = tlCenter
ParentColor = False
end
object cbHeaderSizeFormat: TComboBox
@ -370,6 +378,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
Width = 148
Caption = '&Footer format:'
FocusControl = cbFooterSizeFormat
Layout = tlCenter
ParentColor = False
end
object cbFooterSizeFormat: TComboBox
@ -496,6 +505,7 @@ inherited frmOptionsFilesViews: TfrmOptionsFilesViews
Width = 117
Caption = 'O&peration size format:'
FocusControl = cbOperationSizeFormat
Layout = tlCenter
ParentColor = False
end
end

8
src/frames/foptionsfilesviews.pas
View file

@ -27,7 +27,7 @@ interface
uses
uTypes, Classes, SysUtils, StdCtrls, Graphics, ExtCtrls, Spin,
fOptionsFrame;
KASControls, fOptionsFrame;
type
@ -50,8 +50,8 @@ type
edMega: TEdit;
edGiga: TEdit;
edTera: TEdit;
gbFormatting: TGroupBox;
gbSorting: TGroupBox;
gbFormatting: TKASGroupBox;
gbSorting: TKASGroupBox;
gbPersonalizedAbbreviationToUse: TGroupBox;
lblByte: TLabel;
lblKilobyte: TLabel;
@ -154,8 +154,6 @@ begin
begin
cbDateTimeFormat.Items.Insert(0, DefaultDateTimeFormat);
end;
AlignControlsEx(gbSorting, cbCaseSensitivity, lblCaseSensitivity);
AlignControlsEx(gbFormatting, cbFileSizeFormat, lblFileSizeFormat);
end;
procedure TfrmOptionsFilesViews.Load;

7
src/frames/foptionskeyboard.lfm
View file

@ -7,7 +7,7 @@ inherited frmOptionsKeyboard: TfrmOptionsKeyboard
ClientHeight = 223
ClientWidth = 429
DesignTop = 20
object gbTyping: TGroupBox[0]
object gbTyping: TKASGroupBox[0]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
@ -21,7 +21,7 @@ inherited frmOptionsKeyboard: TfrmOptionsKeyboard
Caption = 'Typing'
ChildSizing.LeftRightSpacing = 8
ChildSizing.TopBottomSpacing = 8
ChildSizing.VerticalSpacing = 12
ChildSizing.VerticalSpacing = 2
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1
ClientHeight = 89
@ -35,6 +35,7 @@ inherited frmOptionsKeyboard: TfrmOptionsKeyboard
Alignment = taRightJustify
Caption = '&Letters:'
FocusControl = cbNoModifier
Layout = tlCenter
ParentColor = False
end
object cbNoModifier: TComboBox
@ -68,6 +69,7 @@ inherited frmOptionsKeyboard: TfrmOptionsKeyboard
Alignment = taRightJustify
Caption = 'Alt+L&etters:'
FocusControl = cbAlt
Layout = tlCenter
ParentColor = False
end
object lblCtrlAlt: TLabel
@ -78,6 +80,7 @@ inherited frmOptionsKeyboard: TfrmOptionsKeyboard
Alignment = taRightJustify
Caption = 'Ctrl+Alt+Le&tters:'
FocusControl = cbCtrlAlt
Layout = tlCenter
ParentColor = False
end
object cbAlt: TComboBox

5
src/frames/foptionskeyboard.pas
View file

@ -27,7 +27,7 @@ unit fOptionsKeyboard;
interface
uses
Classes, SysUtils, StdCtrls,
Classes, SysUtils, StdCtrls, KASControls,
{$IFDEF DARWIN}
uDarwinApplication,
{$ENDIF}
@ -43,7 +43,7 @@ type
cbAlt: TComboBox;
cbCtrlAlt: TComboBox;
cbFNKey: TCheckBox;
gbTyping: TGroupBox;
gbTyping: TKASGroupBox;
lblNoModifier: TLabel;
lblAlt: TLabel;
lblCtrlAlt: TLabel;
@ -90,7 +90,6 @@ begin
ParseLineToList(rsOptLetters, cbNoModifier.Items);
cbAlt.Items.Assign(cbNoModifier.Items);
cbCtrlAlt.Items.Assign(cbNoModifier.Items);
AlignControlsEx(gbTyping, cbNoModifier, lblNoModifier);
{$IFDEF DARWIN}
cbFNKey.Visible:= True;
cbFNKey.OnChange:= @cbFNKeyChange;

15
src/frames/foptionsterminal.lfm
View file

@ -7,7 +7,7 @@ inherited frmOptionsTerminal: TfrmOptionsTerminal
ClientWidth = 519
ParentShowHint = False
ShowHint = True
object gbRunInTerminalStayOpen: TGroupBox[0]
object gbRunInTerminalStayOpen: TKASGroupBox[0]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
@ -23,8 +23,7 @@ inherited frmOptionsTerminal: TfrmOptionsTerminal
ChildSizing.LeftRightSpacing = 12
ChildSizing.TopBottomSpacing = 8
ChildSizing.HorizontalSpacing = 4
ChildSizing.VerticalSpacing = 6
ChildSizing.EnlargeVertical = crsSameSize
ChildSizing.VerticalSpacing = 2
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ClientHeight = 62
ClientWidth = 503
@ -81,7 +80,7 @@ inherited frmOptionsTerminal: TfrmOptionsTerminal
TabOrder = 1
end
end
object gbRunInTerminalClose: TGroupBox[1]
object gbRunInTerminalClose: TKASGroupBox[1]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = gbRunInTerminalStayOpen
AnchorSideTop.Side = asrBottom
@ -98,8 +97,7 @@ inherited frmOptionsTerminal: TfrmOptionsTerminal
ChildSizing.LeftRightSpacing = 12
ChildSizing.TopBottomSpacing = 8
ChildSizing.HorizontalSpacing = 4
ChildSizing.VerticalSpacing = 6
ChildSizing.EnlargeVertical = crsSameSize
ChildSizing.VerticalSpacing = 2
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ClientHeight = 62
ClientWidth = 503
@ -156,7 +154,7 @@ inherited frmOptionsTerminal: TfrmOptionsTerminal
ParentColor = False
end
end
object gbJustRunTerminal: TGroupBox[2]
object gbJustRunTerminal: TKASGroupBox[2]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = gbRunInTerminalClose
AnchorSideTop.Side = asrBottom
@ -173,8 +171,7 @@ inherited frmOptionsTerminal: TfrmOptionsTerminal
ChildSizing.LeftRightSpacing = 12
ChildSizing.TopBottomSpacing = 8
ChildSizing.HorizontalSpacing = 4
ChildSizing.VerticalSpacing = 6
ChildSizing.EnlargeVertical = crsSameSize
ChildSizing.VerticalSpacing = 2
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ClientHeight = 62
ClientWidth = 503

17
src/frames/foptionsterminal.pas
View file

@ -28,30 +28,29 @@ interface
uses
Classes, SysUtils,
fOptionsFrame, StdCtrls, ExtCtrls, Buttons, Menus;
fOptionsFrame, StdCtrls, ExtCtrls, Buttons, Menus, KASControls;
type
{ TfrmOptionsTerminal }
TfrmOptionsTerminal = class(TOptionsEditor)
gbRunInTerminalStayOpen: TGroupBox;
gbRunInTerminalStayOpen: TKASGroupBox;
lbRunInTermStayOpenCmd: TLabel;
edRunInTermStayOpenCmd: TEdit;
lbRunInTermStayOpenParams: TLabel;
edRunInTermStayOpenParams: TEdit;
gbRunInTerminalClose: TGroupBox;
gbRunInTerminalClose: TKASGroupBox;
lbRunInTermCloseCmd: TLabel;
edRunInTermCloseCmd: TEdit;
lbRunInTermCloseParams: TLabel;
edRunInTermCloseParams: TEdit;
gbJustRunTerminal: TGroupBox;
gbJustRunTerminal: TKASGroupBox;
lbRunTermCmd: TLabel;
edRunTermCmd: TEdit;
lbRunTermParams: TLabel;
edRunTermParams: TEdit;
protected
procedure Init; override;
procedure Load; override;
function Save: TOptionsEditorSaveFlags; override;
public
@ -68,14 +67,6 @@ uses
{ TfrmOptionsTerminal }
procedure TfrmOptionsTerminal.Init;
begin
inherited Init;
AlignControlsEx(gbJustRunTerminal, edRunTermCmd, lbRunTermCmd);
AlignControlsEx(gbRunInTerminalClose, edRunInTermCloseCmd, lbRunInTermCloseCmd);
AlignControlsEx(gbRunInTerminalStayOpen, edRunInTermStayOpenCmd, lbRunInTermStayOpenCmd);
end;
procedure TfrmOptionsTerminal.Load;
begin
edRunInTermStayOpenCmd.Text := gRunInTermStayOpenCmd;