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

UPD: Use icons from image list

Browse source
This commit is contained in:
Alexander Koblov 2026-04-20 18:29:49 +03:00
commit b95e3a0aa4
12 changed files with 30 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/dmcommondata.pas
View file

@ -136,8 +136,9 @@ const
'choose-encoding'
);
ButtonNames: array[0..5] of String = (
ButtonNames: array[0..6] of String = (
'list-add',
'list-remove',
'auto-complete',
'choose-filter',
'choose-variable',

2
src/fbuttonform.lfm
View file

@ -44,7 +44,7 @@ object frmButtonForm: TfrmButtonForm
Constraints.MinHeight = 34
Constraints.MinWidth = 88
Images = dmComData.ilButtons
ImageIndex = 5
ImageIndex = 6
ModalResult = 1
OnClick = btnAddToQueueClick
TabOrder = 0

2
src/fcopymovedlg.lfm
View file

@ -114,7 +114,7 @@ object frmCopyDlg: TfrmCopyDlg
Constraints.MinHeight = 34
Constraints.MinWidth = 88
Images = dmComData.ilButtons
ImageIndex = 5
ImageIndex = 6
ModalResult = 1
TabOrder = 1
end

2
src/filesources/filesystem/ffilesystemcopymoveoperationoptions.lfm
View file

@ -279,7 +279,7 @@ object FileSystemCopyMoveOperationOptionsUI: TFileSystemCopyMoveOperationOptions
BorderSpacing.Right = 5
GlyphShowMode = gsmAlways
Images = dmComData.ilButtons
ImageIndex = 2
ImageIndex = 3
OnClick = btnSearchTemplateClick
ParentShowHint = False
ShowHint = True

2
src/fmkdir.lfm
View file

@ -75,7 +75,7 @@ object frmMkDir: TfrmMkDir
AllowAllUp = True
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 1
ImageIndex = 2
GroupIndex = 1
OnClick = btnAutoCompleteClick
end

10
src/foptionshotkeysedithotkey.lfm
View file

@ -183,12 +183,15 @@ object frmEditHotkey: TfrmEditHotkey
object btnAddShortcut: TSpeedButton
AnchorSideTop.Control = btnRemoveShortcut
AnchorSideRight.Control = btnRemoveShortcut
Left = 406
Left = 404
Height = 22
Hint = 'Add new shortcut to sequence'
Top = 6
Width = 22
Anchors = [akTop, akRight]
BorderSpacing.Right = 2
Images = dmComData.ilButtons
ImageIndex = 0
OnClick = btnAddShortcutClick
ShowHint = True
ParentShowHint = False
@ -204,6 +207,8 @@ object frmEditHotkey: TfrmEditHotkey
Width = 22
Anchors = [akTop, akRight]
BorderSpacing.Top = 6
Images = dmComData.ilButtons
ImageIndex = 1
OnClick = btnRemoveShortcutClick
ShowHint = True
ParentShowHint = False
@ -211,12 +216,13 @@ object frmEditHotkey: TfrmEditHotkey
object btnSelectFromList: TSpeedButton
AnchorSideTop.Control = btnRemoveShortcut
AnchorSideRight.Control = btnAddShortcut
Left = 382
Left = 378
Height = 22
Hint = 'Select shortcut from list of remaining free available keys'
Top = 6
Width = 24
Anchors = [akTop, akRight]
BorderSpacing.Right = 2
Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100
2000000000000004000064000000640000000000000000000000000000140000

24
src/foptionshotkeysedithotkey.pas
View file

@ -87,7 +87,6 @@ type
function GetTranslatedControlName(const AName: String): String;
function GetTranslatedFormName(const AName: String): String;
procedure RemoveLastShortcutEditor;
procedure SetBitmapOrCaption(Button: TSpeedButton; const AIconName, ACaption: String);
procedure SetCommand(NewCommand: String);
procedure SetControls(const NewControls: TDynamicStringArray);
procedure SetHotkey(Hotkey: THotkey);
@ -533,9 +532,6 @@ begin
FFormsTranslated := TStringList.Create;
TFormCommands.GetCategoriesList(FForms, FFormsTranslated);
SetBitmapOrCaption(btnAddShortcut, 'list-add', '+');
SetBitmapOrCaption(btnRemoveShortcut, 'list-remove', '-');
AddShortcutEditor;
end;
@ -599,26 +595,6 @@ begin
pnlShortcuts.Controls[pnlShortcuts.ControlCount - 1].Free;
end;
procedure TfrmEditHotkey.SetBitmapOrCaption(Button: TSpeedButton; const AIconName, ACaption: String);
var
Bmp: TBitmap = nil;
IconIndex: PtrInt;
begin
IconIndex := PixMapManager.GetIconByName(AIconName);
if IconIndex <> -1 then
Bmp := PixMapManager.GetBitmap(IconIndex);
if Assigned(Bmp) then
begin
Button.Glyph := Bmp;
Bmp.Free;
end
else
begin
Button.Caption := ACaption;
end;
end;
procedure TfrmEditHotkey.SetCommand(NewCommand: String);
begin
FCommand := NewCommand;

14
src/frames/foptionsarchivers.lfm
View file

@ -455,7 +455,7 @@ inherited frmOptionsArchivers: TfrmOptionsArchivers
Width = 27
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
OnClick = btnHelperClick
end
object lblArchiverListStart: TLabel
@ -600,7 +600,7 @@ inherited frmOptionsArchivers: TfrmOptionsArchivers
Width = 27
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
OnClick = btnHelperClick
end
object lblArchiverAdd: TLabel
@ -649,7 +649,7 @@ inherited frmOptionsArchivers: TfrmOptionsArchivers
Width = 27
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
OnClick = btnHelperClick
end
end
@ -702,7 +702,7 @@ inherited frmOptionsArchivers: TfrmOptionsArchivers
Width = 27
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
OnClick = btnHelperClick
end
object lblArchiverTest: TLabel
@ -749,7 +749,7 @@ inherited frmOptionsArchivers: TfrmOptionsArchivers
Width = 27
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
OnClick = btnHelperClick
end
object lblArchiverExtractWithoutPath: TLabel
@ -796,7 +796,7 @@ inherited frmOptionsArchivers: TfrmOptionsArchivers
Width = 27
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
OnClick = btnHelperClick
end
object lblArchiverSelfExtract: TLabel
@ -843,7 +843,7 @@ inherited frmOptionsArchivers: TfrmOptionsArchivers
Width = 27
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
OnClick = btnHelperClick
end
object lblArchiverPasswordQuery: TLabel

6
src/frames/foptionsfileassoc.lfm
View file

@ -227,7 +227,7 @@ inherited frmOptionsFileAssoc: TfrmOptionsFileAssoc
Width = 23
Anchors = [akTop, akRight]
Images = dmComData.ilButtons
ImageIndex = 4
ImageIndex = 5
OnClick = sbtnIconClick
end
object edIconFileName: TEdit
@ -588,7 +588,7 @@ inherited frmOptionsFileAssoc: TfrmOptionsFileAssoc
Width = 23
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
OnClick = btnParametersHelperClick
end
object lblCommand: TLabel
@ -666,7 +666,7 @@ inherited frmOptionsFileAssoc: TfrmOptionsFileAssoc
Width = 23
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
OnClick = btnStartPathVarHelperClick
end
object btnStartPathPathHelper: TSpeedButton

6
src/frames/foptionstoolbarbase.lfm
View file

@ -338,7 +338,7 @@ inherited frmOptionsToolbarBase: TfrmOptionsToolbarBase
Width = 32
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 4
ImageIndex = 5
Visible = False
OnClick = btnOpenIconClick
end
@ -726,7 +726,7 @@ inherited frmOptionsToolbarBase: TfrmOptionsToolbarBase
Width = 32
Anchors = [akTop, akRight, akBottom]
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
Visible = False
OnClick = btnParametersHelperClick
end
@ -741,7 +741,7 @@ inherited frmOptionsToolbarBase: TfrmOptionsToolbarBase
Anchors = [akTop, akRight]
BorderSpacing.Left = 3
Images = dmComData.ilButtons
ImageIndex = 3
ImageIndex = 4
Visible = False
OnClick = btnInternalParametersHelperClick
end

4
src/fselectduplicates.lfm
View file

@ -28,7 +28,7 @@ object frmSelectDuplicates: TfrmSelectDuplicates
Anchors = [akTop, akLeft, akBottom]
BorderSpacing.Left = 4
Images = dmComData.ilButtons
ImageIndex = 2
ImageIndex = 3
OnClick = btnIncludeMaskClick
end
object cmbIncludeMask: TComboBox
@ -102,7 +102,7 @@ object frmSelectDuplicates: TfrmSelectDuplicates
Anchors = [akTop, akLeft, akBottom]
BorderSpacing.Left = 4
Images = dmComData.ilButtons
ImageIndex = 2
ImageIndex = 3
OnClick = btnIncludeMaskClick
end
object chkLeaveUnselected: TCheckBox

2
src/fsyncdirsdlg.lfm
View file

@ -77,7 +77,7 @@ object frmSyncDirsDlg: TfrmSyncDirsDlg
Anchors = [akTop, akLeft, akBottom]
BorderSpacing.Left = 3
Images = dmComData.ilButtons
ImageIndex = 2
ImageIndex = 3
OnClick = btnSearchTemplateClick
end
end