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

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

View File

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

View File

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