From 6b823ed766287afe62195c87afb42ed8dc2eaf10 Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 21 Nov 2007 08:00:22 +0000 Subject: [PATCH] ToggleForm menu should change enabled state (issue #0009752) from Stephano git-svn-id: trunk@12952 - --- ide/main.pp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/ide/main.pp b/ide/main.pp index db049b3956..966e9b9560 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -11942,8 +11942,10 @@ begin if ActiveUnitInfo = nil then Exit; UpdateSaveMenuItemsAndButtons(false); - MainIDEBar.ToggleFormSpeedBtn.Enabled := Assigned(ActiveUnitInfo.Component) - or (ActiveUnitInfo.ComponentName<>''); + MainIDEBar.ToggleFormSpeedBtn.Enabled := Assigned(ActiveUnitInfo.Component); + MainIDEBar.itmViewToggleFormUnit.Enabled := Assigned(ActiveUnitInfo.Component) + or (ActiveUnitInfo.ComponentName<>''); + MainIDEBar.ToggleFormSpeedBtn.Enabled := MainIDEBar.itmViewToggleFormUnit.Enabled; end; //this is fired when the editor is focused, changed, ?. Anything that causes the status change @@ -12609,14 +12611,19 @@ begin FormEditor1.PaintAllDesignerItems; GetCurrentUnit(SrcEdit,AnUnitInfo); UpdateSaveMenuItemsAndButtons(true); - if Screen.ActiveForm<>nil then begin + if Screen.ActiveForm<>nil then + begin AnIDesigner:=Screen.ActiveForm.Designer; - if AnIDesigner is TDesigner then begin - MainIDEBar.ToggleFormSpeedBtn.Enabled:=true; - end else begin - MainIDEBar.ToggleFormSpeedBtn.Enabled:=(AnUnitInfo<>nil) + if AnIDesigner is TDesigner then + begin + MainIDEBar.itmViewToggleFormUnit.Enabled := true; + end + else + begin + MainIDEBar.itmViewToggleFormUnit.Enabled := (AnUnitInfo<>nil) and AnUnitInfo.HasResources; end; + MainIDEBar.ToggleFormSpeedBtn.Enabled := MainIDEBar.itmViewToggleFormUnit.Enabled; end; if FCheckFilesOnDiskNeeded then