From 207e04056c98e402fd06c751cf157fc100e3315d Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sun, 15 Mar 2015 07:38:45 +0100 Subject: [PATCH] fix, copy paste cut etc broken in widget since e4656ca9e7f0516ce4407dc12275bc53d53fe057 --- src/ce_main.lfm | 18 +++++++++--------- src/ce_main.pas | 9 +++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/ce_main.lfm b/src/ce_main.lfm index 2974acfc..f20112a8 100644 --- a/src/ce_main.lfm +++ b/src/ce_main.lfm @@ -2074,7 +2074,7 @@ object CEMainForm: TCEMainForm Caption = 'Copy' ImageIndex = 4 OnExecute = actEdCopyExecute - OnUpdate = updateDocumentBasedAction + OnUpdate = updateDocEditBasedAction ShortCut = 16451 end object actEdCut: TAction @@ -2082,7 +2082,7 @@ object CEMainForm: TCEMainForm Caption = 'Cut' ImageIndex = 6 OnExecute = actEdCutExecute - OnUpdate = updateDocumentBasedAction + OnUpdate = updateDocEditBasedAction ShortCut = 16472 end object actEdPaste: TAction @@ -2090,7 +2090,7 @@ object CEMainForm: TCEMainForm Caption = 'Paste' ImageIndex = 5 OnExecute = actEdPasteExecute - OnUpdate = updateDocumentBasedAction + OnUpdate = updateDocEditBasedAction ShortCut = 16470 end object actEdUndo: TAction @@ -2098,7 +2098,7 @@ object CEMainForm: TCEMainForm Caption = 'Undo' ImageIndex = 0 OnExecute = actEdUndoExecute - OnUpdate = updateDocumentBasedAction + OnUpdate = updateDocEditBasedAction ShortCut = 16474 end object actEdRedo: TAction @@ -2106,7 +2106,7 @@ object CEMainForm: TCEMainForm Caption = 'Redo' ImageIndex = 1 OnExecute = actEdRedoExecute - OnUpdate = updateDocumentBasedAction + OnUpdate = updateDocEditBasedAction ShortCut = 24666 end object actEdMacStartStop: TAction @@ -2114,7 +2114,7 @@ object CEMainForm: TCEMainForm Caption = 'Start/stop macro recording' ImageIndex = 10 OnExecute = actEdMacStartStopExecute - OnUpdate = updateDocumentBasedAction + OnUpdate = updateDocEditBasedAction ShortCut = 24658 end object actEdMacPlay: TAction @@ -2122,7 +2122,7 @@ object CEMainForm: TCEMainForm Caption = 'Play macro' ImageIndex = 11 OnExecute = actEdMacPlayExecute - OnUpdate = updateDocumentBasedAction + OnUpdate = updateDocEditBasedAction ShortCut = 24656 end object actFileSave: TAction @@ -2229,7 +2229,7 @@ object CEMainForm: TCEMainForm Caption = 'Indent' ImageIndex = 16 OnExecute = actEdIndentExecute - OnUpdate = updateDocumentBasedAction + OnUpdate = updateDocEditBasedAction ShortCut = 24649 end object actEdUnIndent: TAction @@ -2237,7 +2237,7 @@ object CEMainForm: TCEMainForm Caption = 'Unindent' ImageIndex = 17 OnExecute = actEdUnIndentExecute - OnUpdate = updateDocumentBasedAction + OnUpdate = updateDocEditBasedAction ShortCut = 24661 end object actProjOptView: TAction diff --git a/src/ce_main.pas b/src/ce_main.pas index dc815f0b..de3f4e59 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -137,6 +137,7 @@ type MenuItem9: TMenuItem; procedure updateDocumentBasedAction(sender: TObject); procedure updateProjectBasedAction(sender: TObject); + procedure updateDocEditBasedAction(sender: TObject); procedure actFileCompileAndRunOutExecute(Sender: TObject); procedure actEdFindExecute(Sender: TObject); procedure actEdFindNextExecute(Sender: TObject); @@ -718,6 +719,14 @@ begin TAction(sender).Enabled := fProject <> nil; end; +procedure TCEMainForm.updateDocEditBasedAction(sender: TObject); +begin + if (fDoc <> nil) and fDoc.Focused then + TAction(sender).Enabled := true + else + TAction(sender).Enabled := false; +end; + procedure TCEMainForm.ActionsUpdate(AAction: TBasicAction; var Handled: Boolean); begin Handled := false;