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

IDE: Use FileNameEdit in CodeTemplates dialog. Issue #28087, patch from Alexey Torgashin.

Browse Source 
git-svn-id: trunk@49021 -
This commit is contained in:
juha 2015-05-14 11:58:52 +00:00
parent a964ffb7de
commit 673bafe26d
2 changed files with 18 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ide/codetemplatesdlg.lfm
View File

@ -3,7 +3,6 @@ object CodeTemplateDialog: TCodeTemplateDialog
Height = 540 Height = 540
Top = 174 Top = 174
Width = 729 Width = 729
ActiveControl = FilenameEdit
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
Caption = 'CodeTemplateDialog' Caption = 'CodeTemplateDialog'
ClientHeight = 540 ClientHeight = 540
@ -24,31 +23,25 @@ object CodeTemplateDialog: TCodeTemplateDialog
ClientHeight = 31 ClientHeight = 31
ClientWidth = 713 ClientWidth = 713
TabOrder = 0 TabOrder = 0
object FilenameEdit: TEdit object FilenameEdit: TFileNameEdit
AnchorSideRight.Control = FilenameButton AnchorSideLeft.Control = FilenameGroupBox
Left = 9
Height = 23
Top = 4
Width = 667
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 5
TabOrder = 0
Text = 'FilenameEdit'
end
object FilenameButton: TButton
AnchorSideRight.Control = FilenameGroupBox AnchorSideRight.Control = FilenameGroupBox
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = FilenameEdit Left = 6
AnchorSideBottom.Side = asrBottom
Left = 681
Height = 23 Height = 23
Top = 4 Top = 4
Width = 26 Width = 701
Anchors = [akRight, akBottom] FileName = 'FilenameEdit'
FilterIndex = 0
HideDirectories = False
ButtonWidth = 45
NumGlyphs = 1
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
Caption = '...' MaxLength = 0
OnClick = FilenameButtonClick TabOrder = 0
TabOrder = 1 Text = 'FilenameEdit'
end end
end end
object TemplatesGroupBox: TGroupBox object TemplatesGroupBox: TGroupBox

26
ide/codetemplatesdlg.pas
View File

@ -33,7 +33,7 @@ interface
uses uses
Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs,
ClipBrd, StdCtrls, Buttons, ExtCtrls, Menus, FileUtil, lazutf8classes, ClipBrd, StdCtrls, Buttons, ExtCtrls, Menus, FileUtil, lazutf8classes,
ButtonPanel, ButtonPanel, EditBtn,
// synedit // synedit
SynEdit, SynHighlighterPas, SynEditAutoComplete, SynRegExpr, SynEdit, SynHighlighterPas, SynEditAutoComplete, SynRegExpr,
// codetools // codetools
@ -76,6 +76,7 @@ type
AutoOnOptionsCheckGroup: TCheckGroup; AutoOnOptionsCheckGroup: TCheckGroup;
ButtonPanel: TButtonPanel; ButtonPanel: TButtonPanel;
EditTemplateGroupBox: TGroupBox; EditTemplateGroupBox: TGroupBox;
FilenameEdit: TFileNameEdit;
InsertMacroButton: TButton; InsertMacroButton: TButton;
KeepSubIndentCheckBox: TCheckBox; KeepSubIndentCheckBox: TCheckBox;
OptionsPanel: TPanel; OptionsPanel: TPanel;
@ -85,15 +86,12 @@ type
TemplateListBox: TListBox; TemplateListBox: TListBox;
TemplateSynEdit: TSynEdit; TemplateSynEdit: TSynEdit;
TemplatesGroupBox: TGroupBox; TemplatesGroupBox: TGroupBox;
FilenameButton: TButton;
FilenameEdit: TEdit;
FilenameGroupBox: TGroupBox; FilenameGroupBox: TGroupBox;
MainPopupMenu: TPopupMenu; MainPopupMenu: TPopupMenu;
procedure AddButtonClick(Sender: TObject); procedure AddButtonClick(Sender: TObject);
procedure DeleteButtonClick(Sender: TObject); procedure DeleteButtonClick(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure RenameButtonClick(Sender: TObject); procedure RenameButtonClick(Sender: TObject);
procedure FilenameButtonClick(Sender: TObject);
procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure HelpButtonClick(Sender: TObject); procedure HelpButtonClick(Sender: TObject);
@ -966,6 +964,8 @@ begin
AutoOnOptionsCheckGroup.Items.Add(lisAutomaticallyRemoveCharacter); AutoOnOptionsCheckGroup.Items.Add(lisAutomaticallyRemoveCharacter);
FilenameEdit.Text:=EditorOpts.CodeTemplateFileName; FilenameEdit.Text:=EditorOpts.CodeTemplateFileName;
FilenameEdit.DialogTitle:=dlgChsCodeTempl;
FilenameEdit.Filter:=dlgDCIFileDci + '|*.dci|' + dlgAllFiles + '|' + GetAllFilesMask;
// init synedit // init synedit
ColorScheme:=EditorOpts.ReadColorScheme(ASynPasSyn.GetLanguageName); ColorScheme:=EditorOpts.ReadColorScheme(ASynPasSyn.GetLanguageName);
@ -1131,24 +1131,6 @@ begin
end; end;
end; end;
procedure TCodeTemplateDialog.FilenameButtonClick(Sender: TObject);
var OpenDialog:TOpenDialog;
begin
OpenDialog:=TOpenDialog.Create(nil);
try
InputHistories.ApplyFileDialogSettings(OpenDialog);
with OpenDialog do begin
Title:=dlgChsCodeTempl;
Filter:=dlgDCIFileDci + '|*.dci|' + dlgAllFiles + '|' + GetAllFilesMask;
if Execute then
FilenameEdit.Text:=FileName;
end;
InputHistories.StoreFileDialogSettings(OpenDialog);
finally
OpenDialog.Free;
end;
end;
procedure TCodeTemplateDialog.FormClose(Sender: TObject; procedure TCodeTemplateDialog.FormClose(Sender: TObject;
var CloseAction: TCloseAction); var CloseAction: TCloseAction);
begin begin