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

IDE: designer: break cycle

Browse Source 
git-svn-id: trunk@42889 -
This commit is contained in:
mattias 2013-09-19 19:52:39 +00:00
parent 2c615ca95a
commit ef779a623b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
designer/designer.pp
View File

@ -45,10 +45,10 @@ uses
IDEDialogs, PropEdits, PropEditUtils, ComponentEditors, MenuIntf, IDEImagesIntf,
FormEditingIntf, ComponentReg,
// IDE
LazarusIDEStrConsts, EnvironmentOpts, IDECommands,
NonControlDesigner, FrameDesigner, AlignCompsDlg, SizeCompsDlg, ScaleCompsDlg,
TabOrderDlg, AnchorEditor, DesignerProcs, CustomFormEditor, AskCompNameDlg,
ControlSelection, ChangeClassDialog, EditorOptions;
LazarusIDEStrConsts, EnvironmentOpts, IDECommands, LazIDEIntf, ProjectIntf,
LazFileUtils, NonControlDesigner, FrameDesigner, AlignCompsDlg, SizeCompsDlg,
ScaleCompsDlg, TabOrderDlg, AnchorEditor, DesignerProcs, CustomFormEditor,
AskCompNameDlg, ControlSelection, ChangeClassDialog, EditorOptions;
type
TDesigner = class;
@ -401,8 +401,6 @@ procedure RegisterStandardDesignerMenuItems;
implementation
uses SourceFileManager;
type
TCustomFormAccess = class(TCustomForm);
TControlAccess = class(TControl);
@ -3483,6 +3481,8 @@ var
MultiCompsAreSelected: boolean;
OneControlSelected: Boolean;
SelectionVisible: Boolean;
SrcFile: TLazProjectFile;
UnitIsVirtual: Boolean;
procedure UpdateChangeParentMenu;
var
@ -3537,6 +3537,7 @@ var
end;
begin
SrcFile:=LazarusIDE.GetProjectFileWithDesigner(Self);
ControlSelIsNotEmpty:=(ControlSelection.Count>0)
and (ControlSelection.SelectionForm=Form);
LookupRootIsSelected:=ControlSelection.LookupRootSelected;
@ -3546,6 +3547,7 @@ begin
and not LookupRootIsSelected;
OneControlSelected := ControlSelIsNotEmpty and ControlSelection[0].IsTControl;
MultiCompsAreSelected := CompsAreSelected and (ControlSelection.Count>1);
UnitIsVirtual:=(SrcFile=nil) or not FilenameIsAbsolute(SrcFile.Filename);
AddComponentEditorMenuItems(PopupMenuComponentEditor,true);
@ -3571,7 +3573,7 @@ begin
DesignerMenuChangeClass.Enabled := CompsAreSelected and (ControlSelection.Count = 1);
// Disable ViewLFM menu item for virtual units. There is no form file yet.
DesignerMenuViewLFM.Enabled := not SourceFileMgr.DesignerUnitIsVirtual(FLookupRoot);
DesignerMenuViewLFM.Enabled := UnitIsVirtual;
UpdateChangeParentMenu;
DesignerMenuSnapToGridOption.Checked := EnvironmentOptions.SnapToGrid;