diff --git a/components/ideintf/changeparentdlg.pas b/components/ideintf/changeparentdlg.pas index 449e7c516a..cdbfe44289 100644 --- a/components/ideintf/changeparentdlg.pas +++ b/components/ideintf/changeparentdlg.pas @@ -17,8 +17,8 @@ unit ChangeParentDlg; interface uses - Classes, SysUtils, strutils, FileUtil, ListFilterEdit, PropEditUtils, Forms, - Controls, Graphics, Dialogs, StdCtrls, ButtonPanel; + Classes, SysUtils, strutils, FileUtil, ListFilterEdit, PropEditUtils, + IDEImagesIntf, Forms, Controls, Graphics, Dialogs, StdCtrls, ButtonPanel; type @@ -103,6 +103,8 @@ begin Caption := oisChangeParent; chShowClasses.Caption := oisShowClasses; + + TIDEImages.AssignImage(ListFilterEdit.Glyph, 'btnfiltercancel'); end; {$HINTS OFF} diff --git a/ide/componentlist.lfm b/ide/componentlist.lfm index cb99f5a0c1..4d5af1baeb 100644 --- a/ide/componentlist.lfm +++ b/ide/componentlist.lfm @@ -9,6 +9,7 @@ object ComponentListForm: TComponentListForm KeyPreview = True OnActivate = FormActivate OnClose = FormClose + OnCreate = FormCreate OnKeyDown = FormKeyDown OnShow = FormShow LCLVersion = '1.7' diff --git a/ide/componentlist.pas b/ide/componentlist.pas index 6ab1ee231d..ca29c1a8c0 100644 --- a/ide/componentlist.pas +++ b/ide/componentlist.pas @@ -68,6 +68,7 @@ type TreeFilterEd: TTreeFilterEdit; procedure chbKeepOpenChange(Sender: TObject); procedure FormActivate(Sender: TObject); + procedure FormCreate(Sender: TObject); procedure FormShow(Sender: TObject); procedure ListTreeSelectionChanged(Sender: TObject); procedure miCollapseAllClick(Sender: TObject); @@ -235,6 +236,11 @@ begin UpdateComponents; end; +procedure TComponentListForm.FormCreate(Sender: TObject); +begin + TIDEImages.AssignImage(TreeFilterEd.Glyph, 'btnfiltercancel'); +end; + procedure TComponentListForm.ClearSelection; begin ListTree.Selected := Nil; diff --git a/ide/editorfilemanager.pas b/ide/editorfilemanager.pas index ac64184427..8fff51d3f1 100644 --- a/ide/editorfilemanager.pas +++ b/ide/editorfilemanager.pas @@ -118,6 +118,7 @@ begin OpenButton.Hint:=lisActivateSelected; SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically; TIDEImages.AssignImage(SortAlphabeticallyButton.Glyph, 'pkg_sortalphabetically'); + TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel'); end; procedure TEditorFileManagerForm.CheckListBox1Click(Sender: TObject); diff --git a/ide/frames/compiler_messages_options.pas b/ide/frames/compiler_messages_options.pas index c780806c4f..3f17095e63 100644 --- a/ide/frames/compiler_messages_options.pas +++ b/ide/frames/compiler_messages_options.pas @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, FileUtil, LazFileCache, LazLoggerBase, ListFilterEdit, StdCtrls, CheckLst, Dialogs, IDEOptionsIntf, IDEExternToolIntf, - IDEDialogs, CompOptsIntf, CodeToolsFPCMsgs, CompilerOptions, + IDEDialogs, CompOptsIntf, IDEImagesIntf, CodeToolsFPCMsgs, CompilerOptions, LazarusIDEStrConsts, etFPCMsgParser; type @@ -102,6 +102,7 @@ begin UseMsgFileCheckBox.Visible:=false; MsgFileEdit.Visible:=false; MsgFileBrowseButton.Visible:=false; + TIDEImages.AssignImage(editMsgFilter.Glyph, 'btnfiltercancel'); end; destructor TCompilerMessagesOptionsFrame.Destroy; diff --git a/ide/frames/editor_keymapping_options.pas b/ide/frames/editor_keymapping_options.pas index 6e2dfd2b10..08abf802a5 100644 --- a/ide/frames/editor_keymapping_options.pas +++ b/ide/frames/editor_keymapping_options.pas @@ -188,6 +188,7 @@ begin EditButton.Enabled:=false; ClearButton.Enabled:=false; fModified:=False; + TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel'); end; destructor TEditorKeymappingOptionsFrame.Destroy; diff --git a/ide/ideoptionsdlg.lfm b/ide/ideoptionsdlg.lfm index 4745bb6a24..4ce1c1c061 100644 --- a/ide/ideoptionsdlg.lfm +++ b/ide/ideoptionsdlg.lfm @@ -9,6 +9,7 @@ object IDEOptionsDialog: TIDEOptionsDialog ClientWidth = 800 Constraints.MinHeight = 350 Constraints.MinWidth = 500 + OnCreate = FormCreate OnShow = FormShow Position = poScreenCenter LCLVersion = '1.9.0.0' diff --git a/ide/ideoptionsdlg.pas b/ide/ideoptionsdlg.pas index 735fa40b7d..37b3a2d41f 100644 --- a/ide/ideoptionsdlg.pas +++ b/ide/ideoptionsdlg.pas @@ -35,6 +35,7 @@ uses Dialogs, TreeFilterEdit, // IdeIntf IDEWindowIntf, IDEOptionsIntf, IDECommands, IDEHelpIntf, ProjectIntf, + IDEImagesIntf, // IDE EnvironmentOpts, EditorOptions, BuildModesManager, Compiler_ModeMatrix, Project, LazarusIDEStrConsts, @@ -64,6 +65,7 @@ type EditorsPanel: TScrollBox; FilterEdit: TTreeFilterEdit; SettingsPanel: TPanel; + procedure FormCreate(Sender: TObject); procedure UseBuildModeCheckBoxChange(Sender: TObject); procedure BuildModeComboBoxSelect(Sender: TObject); procedure BuildModeManageButtonClick(Sender: TObject); @@ -233,6 +235,11 @@ begin UpdateBuildModeButtons; end; +procedure TIDEOptionsDialog.FormCreate(Sender: TObject); +begin + TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel'); +end; + procedure TIDEOptionsDialog.BuildModeComboBoxSelect(Sender: TObject); begin if AllBuildModes then begin diff --git a/ide/projectinspector.lfm b/ide/projectinspector.lfm index c8a81773ac..905782105e 100644 --- a/ide/projectinspector.lfm +++ b/ide/projectinspector.lfm @@ -8,6 +8,7 @@ object ProjectInspectorForm: TProjectInspectorForm Caption = 'ProjectInspectorForm' ClientHeight = 456 ClientWidth = 299 + OnCreate = FormCreate OnDropFiles = FormDropFiles LCLVersion = '1.7' object ItemsTreeView: TTreeView diff --git a/ide/projectinspector.pas b/ide/projectinspector.pas index 7ac463a1e4..b7714c34fb 100644 --- a/ide/projectinspector.pas +++ b/ide/projectinspector.pas @@ -111,6 +111,7 @@ type procedure CopyMoveToDirMenuItemClick(Sender: TObject); procedure DirectoryHierarchyButtonClick(Sender: TObject); procedure FilterEditKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState); + procedure FormCreate(Sender: TObject); procedure FormDropFiles(Sender: TObject; const FileNames: array of String); procedure ItemsPopupMenuPopup(Sender: TObject); procedure ItemsTreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView; @@ -542,6 +543,11 @@ begin end; end; +procedure TProjectInspectorForm.FormCreate(Sender: TObject); +begin + TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel'); +end; + procedure TProjectInspectorForm.FormDropFiles(Sender: TObject; const FileNames: array of String); var diff --git a/ide/restrictionbrowser.pas b/ide/restrictionbrowser.pas index 99347bf862..194d0300a4 100644 --- a/ide/restrictionbrowser.pas +++ b/ide/restrictionbrowser.pas @@ -112,6 +112,7 @@ begin end; end; FilterEdit.OnAfterFilter := @SelectFirstVisible; + TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel'); UpdateIssueList; end; diff --git a/ide/searchresultview.pp b/ide/searchresultview.pp index a192a14056..1808fc6b9a 100644 --- a/ide/searchresultview.pp +++ b/ide/searchresultview.pp @@ -283,8 +283,6 @@ end; procedure TSearchResultsView.Form1Create(Sender: TObject); var CloseCommand: TIDECommand; - ScaledIcon: TGraphic; - NewScaledIcon: Boolean; begin FMaxItems:=50000; ResultsNoteBook.Options:= ResultsNoteBook.Options+[nboShowCloseButtons]; @@ -320,17 +318,7 @@ begin ClosePageButton.ImageIndex := IDEImages.LoadImage('menu_close'); ActionList.Images := IDEImages.Images_16; actClosePage.ImageIndex := IDEImages.LoadImage('menu_close'); - - ScaledIcon := TIDEImages.ScaleImage(SearchInListEdit.Glyph, NewScaledIcon, - MulDiv(SearchInListEdit.Glyph.Width, TIDEImages.GetScalePercent, 100), - MulDiv(SearchInListEdit.Glyph.Height, TIDEImages.GetScalePercent, 100), - TIDEImages.GetScalePercent / 100); - try - SearchInListEdit.Glyph.Assign(ScaledIcon); - finally - if NewScaledIcon then - ScaledIcon.Free; - end; + TIDEImages.AssignImage(SearchInListEdit.Glyph, 'btnfiltercancel'); end; procedure TSearchResultsView.FormClose(Sender: TObject; var CloseAction: TCloseAction); diff --git a/ide/toolbarconfig.pas b/ide/toolbarconfig.pas index 5860ac0da5..84ad2aa426 100644 --- a/ide/toolbarconfig.pas +++ b/ide/toolbarconfig.pas @@ -195,6 +195,7 @@ begin TIDEImages.AssignImage(btnMoveUp.Glyph, 'arrow__darkgreen_up'); TIDEImages.AssignImage(btnMoveDown.Glyph, 'arrow__darkgreen_down'); TIDEImages.AssignImage(btnAddDivider.Glyph, 'menu_divider16'); + TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel'); btnAddDivider.Caption := '---'; diff --git a/ide/useunitdlg.pas b/ide/useunitdlg.pas index c28bfa23d6..22d961681f 100644 --- a/ide/useunitdlg.pas +++ b/ide/useunitdlg.pas @@ -194,6 +194,7 @@ begin ButtonPanel1.OKButton.Caption:=lisMenuOk; ButtonPanel1.CancelButton.Caption:=lisCancel; UnitImgInd := IDEImages.LoadImage('item_unit'); + TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel'); FProjUnits:=TStringList.Create; end; diff --git a/ide/viewunit_dlg.pp b/ide/viewunit_dlg.pp index 2d0dff5284..376cd7d761 100644 --- a/ide/viewunit_dlg.pp +++ b/ide/viewunit_dlg.pp @@ -323,6 +323,7 @@ begin ButtonPanel.CancelButton.Caption:=lisCancel; SortAlphabeticallySpeedButton.Hint:=lisPESortFilesAlphabetically; TIDEImages.AssignImage(SortAlphabeticallySpeedButton.Glyph, 'pkg_sortalphabetically'); + TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel'); end; procedure TViewUnitDialog.FormDestroy(Sender: TObject); diff --git a/packager/addpkgdependencydlg.pas b/packager/addpkgdependencydlg.pas index 81b6913e7e..434980c7d5 100644 --- a/packager/addpkgdependencydlg.pas +++ b/packager/addpkgdependencydlg.pas @@ -11,7 +11,7 @@ uses // LazControls ListFilterEdit, // IDEIntf - IDEWindowIntf, PackageDependencyIntf, PackageIntf, IDEDialogs, + IDEWindowIntf, PackageDependencyIntf, PackageIntf, IDEDialogs, IDEImagesIntf, // IDE LazarusIDEStrConsts, PackageDefs, PackageSystem, ProjPackCommon, ProjPackChecks; @@ -80,6 +80,7 @@ begin Caption:=lisProjAddNewRequirement; fPackages:=TAVLTree.Create(@CompareLazPackageIDNames); IDEDialogLayoutList.ApplyLayout(Self,400,360); + TIDEImages.AssignImage(DependPkgNameFilter.Glyph, 'btnfiltercancel'); DependPkgNameLabel.Caption:=lisProjAddPackageName; DependMinVersionLabel.Caption:=lisProjAddMinimumVersionOptional; diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas index 2a6a8225a7..e681ab2400 100644 --- a/packager/installpkgsetdlg.pas +++ b/packager/installpkgsetdlg.pas @@ -227,6 +227,8 @@ begin SaveAndExitButton.Caption:=lisSaveAndExitDialog; HelpButton.Caption:=lisMenuHelp; CancelButton.Caption:=lisCancel; + TIDEImages.AssignImage(AvailableFilterEdit.Glyph, 'btnfiltercancel'); + TIDEImages.AssignImage(InstalledFilterEdit.Glyph, 'btnfiltercancel'); FNewInstalledPackages:=TObjectList.Create(true); PkgInfoMemo.Clear; diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas index 3b874c3af3..2134a8fcc7 100644 --- a/packager/packageeditor.pas +++ b/packager/packageeditor.pas @@ -1443,6 +1443,7 @@ begin SetupComponents; SortAlphabetically := EnvironmentOptions.PackageEditorSortAlphabetically; ShowDirectoryHierarchy := EnvironmentOptions.PackageEditorShowDirHierarchy; + TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel'); end; procedure TPackageEditorForm.FormDestroy(Sender: TObject);