cleaning

src/ce_customtools.pas

@@ -148,4 +148,6 @@ begin
   saveCompToTxtFile(self, aFilename);
 end;
 
+initialization
+  RegisterClasses([TCEToolItem, TCETools]);
 end.

src/ce_interfaces.pas

@@ -26,7 +26,6 @@ type
 
   (**
    * An implementer declares some actions on demand.
-   * TODO-cfeature: improve the interface so that a widget can declare a complete main menu category.
    *)
   ICEContextualActions = interface
   ['ICEContextualActions']
@@ -43,10 +42,10 @@ type
    *)
   ICEMultiDocObserver = interface
   ['ICEMultiDocObserver']
-    // the new document aDoc has been created (empty, runnable, project source, ...).
+    // aDoc has been created (empty, runnable, project source, ...).
     procedure docNew(const aDoc: TCESynMemo);
     // aDoc is the document being edited.
-    procedure docFocused(const aDoc: TCESynMemo); // rename to: docSelected or docActivated
+    procedure docFocused(const aDoc: TCESynMemo);
     // aDoc content has just been modified (edited, saved).
     procedure docChanged(const aDoc: TCESynMemo);
     // aDoc is about to be closed.
@@ -66,14 +65,14 @@ type
    *)
   ICEProjectObserver = interface
   ['ICEProjectObserver']
-    // the new project aProject has been created/opened
+    // aProject has been created/opened
     procedure projNew(const aProject: TCEProject);
     // aProject has been modified: switches, source name, ...
     procedure projChanged(const aProject: TCEProject);
     // aProject is about to be closed.
     procedure projClosing(const aProject: TCEProject);
     // not used yet: the active project is now aProject
-    procedure projFocused(const aProject: TCEProject); // rename: projSelected or projActivated
+    procedure projFocused(const aProject: TCEProject);
     // aProject is about to be compiled.
     //procedure projCompile(const aProject: TCEProject);
     // aProject is about to be executed.
@@ -81,7 +80,7 @@ type
   end;
 
   (**
-   * An implementer informs some ICEMultiDocObserver about the current file(s)
+   * An implementer informs some ICEProjectObserver about the current project(s)
    *)
   TCEProjectSubject = class(TCECustomSubject)
   protected
@@ -95,6 +94,8 @@ type
   ['ICEMainMenuProvider']
     // item must contain the full items tree to be added
     procedure menuDeclare(out item: TMenuItem);
+    // the implementer can update the actions used in the menu declared before.
+    procedure menuActionsUpdate;
   end;
 
 

src/ce_main.pas

@@ -290,9 +290,6 @@ type
     //
     property WidgetList: TCEWidgetList read fWidgList;
     property MessageWidget: TCEMessagesWidget read fMesgWidg;
-    property EditWidget: TCEEditorWidget read fEditWidg;
-    property ProjectWidget: TCEProjectInspectWidget read fProjWidg;
-    property ProjectConfWidget: TCEProjectConfigurationWidget read fPrjCfWidg;
     property LibraryManager: TLibraryManager read fLibMan;
   end;
 

src/ce_staticexplorer.pas

@@ -139,7 +139,6 @@ begin
   EntitiesConnector.removeObserver(self);
   inherited;
 end;
-
 {$ENDREGION}
 
 {$REGION ICEWidgetPersist ------------------------------------------------------}

src/ce_widget.pas

@@ -1,6 +1,7 @@
 unit ce_widget;
 
 {$MODE OBJFPC}{$H+}
+{$INTERFACES CORBA}
 
 interface
 
@@ -101,10 +102,6 @@ type
 implementation
 {$R *.lfm}
 
-(*******************************************************************************
- * TCEWidget
- *)
-
 {$REGION Standard Comp/Obj------------------------------------------------------}
 constructor TCEWidget.create(aOwner: TComponent);
 var

src/ce_widgettypes.pas

@@ -1,219 +0,0 @@
-unit ce_widgettypes;
-
-{$MODE OBJFPC}{$H+}
-{$INTERFACES CORBA}
-
-interface
-
-uses
-  Classes, SysUtils, actnList, menus, ce_synmemo, ce_project, ce_observer;
-
-
-type
-
-  (**
-   * An implementer can save and load some stuffs on application start/quit
-   *)
-  ICEWidgetPersist = interface(ICEObserver)
-    // Coedit options are about to be saved.
-    procedure beforeSave(sender: TObject);
-    // some custom properties can be declared to aFiler.
-    procedure declareProperties(aFiler: TFiler);
-    // Coedit options has just been reloaded.
-    procedure afterLoad(sender: TObject);
-  end;
-
-  (**
-   * An implementer declares some actions on demand.
-   * TODO-cfeature: improve the interface so that a widget can declare a complete main menu category.
-   *)
-  ICEContextualActions = interface(ICEObserver)
-    // declares a context name for the actions
-    function contextName: string;
-    // action count, called before contextAction()
-    function contextActionCount: integer;
-    // declares actions, called in loop, from 0 to contextActionCount-1
-    function contextAction(index: integer): TAction;
-  end;
-
-  (**
-   * An implementer is informed about the current file(s).
-   *)
-  ICEMultiDocObserver = interface(ICEObserver)
-    // the new document aDoc has been created (empty, runnable, project source, ...).
-    procedure docNew(const aDoc: TCESynMemo);
-    // aDoc is the document being edited.
-    procedure docFocused(const aDoc: TCESynMemo); // rename to: docSelected or docActivated
-    // aDoc content has just been modified (edited, saved).
-    procedure docChanged(const aDoc: TCESynMemo);
-    // aDoc is about to be closed.
-    procedure docClose(const aDoc: TCESynMemo);
-  end;
-
-  (**
-   * An implementer informs some ICEMultiDocObserver about the current file(s)
-   *)
-  TCEMultiDocSubject = class(TCECustomSubject)
-  protected
-    function acceptObserver(aObject: TObject): boolean; override;
-  end;
-
-  (**
-   * An implementer is informed about the current project(s).
-   *)
-  ICEProjectObserver = interface(ICEObserver)
-    // the new project aProject has been created/opened
-    procedure projNew(const aProject: TCEProject);
-    // aProject has been modified: switches, source name, ...
-    procedure projChange(const aProject: TCEProject);
-    // aProject is about to be closed.
-    procedure projClose(const aProject: TCEProject);
-    // not used yet: the active project is now aProject
-    procedure projFocused(const aProject: TCEProject); // rename: projSelected or projActivated
-    // aProject is about to be compiled.
-    procedure projCompile(const aProject: TCEProject);
-    // aProject is about to be executed.
-    procedure projRun(const aProject: TCEProject);
-  end;
-
-  (**
-   * An implementer informs some ICEMultiDocObserver about the current file(s)
-   *)
-  TCEProjectSubject = class(TCECustomSubject)
-  protected
-    function acceptObserver(aObject: TObject): boolean; override;
-  end;
-
-  (**
-   * An implementer can add a mainmenu entry.
-   *)
-  ICEMainMenuProvider = interface(ICEObserver)
-    // item must contain the full items tree to be added
-    procedure menuDeclare(out item: TMenuItem);
-  end;
-
-
-{
-  subject Primitives:
-
-  A subject has not necessarly all the informations the observers expect.
-  It can compose using the following "primitives".
-}
-
-  (**
-   * TCEMultiDocSubject primitives.
-   *)
-   procedure subjDocNew(aSubject: TCEMultiDocSubject; aDoc: TCESynMemo);      {$IFDEF RELEASE}inline;{$ENDIF}
-   procedure subjDocFocused(aSubject: TCEMultiDocSubject; aDoc: TCESynMemo);  {$IFDEF RELEASE}inline;{$ENDIF}
-   procedure subjDocChanged(aSubject: TCEMultiDocSubject; aDoc: TCESynMemo);  {$IFDEF RELEASE}inline;{$ENDIF}
-   procedure subjDocClosed(aSubject: TCEMultiDocSubject; aDoc: TCESynMemo);   {$IFDEF RELEASE}inline;{$ENDIF}
-
-  (**
-   * TCEProjectSubject primitives.
-   *)
-   procedure subjProjNew(aSubject: TCEProjectSubject; aProj: TCEProject);     {$IFDEF RELEASE}inline;{$ENDIF}
-   procedure subjProjFocused(aSubject: TCEProjectSubject; aProj: TCEProject); {$IFDEF RELEASE}inline;{$ENDIF}
-   procedure subjProjChanged(aSubject: TCEProjectSubject; aProj: TCEProject); {$IFDEF RELEASE}inline;{$ENDIF}
-   procedure subjProjClose(aSubject: TCEProjectSubject; aProj: TCEProject);   {$IFDEF RELEASE}inline;{$ENDIF}
-   procedure subjProjCompile(aSubject: TCEProjectSubject; aProj: TCEProject); {$IFDEF RELEASE}inline;{$ENDIF}
-   procedure subjProjRun(aSubject: TCEProjectSubject; aProj: TCEProject);     {$IFDEF RELEASE}inline;{$ENDIF}
-
-implementation
-
-
-
-function TCEMultiDocSubject.acceptObserver(aObject: TObject): boolean;
-begin
-  result := (aObject as ICEMultiDocObserver) <> nil;
-end;
-
-procedure subjDocNew(aSubject: TCEMultiDocSubject; aDoc: TCESynMemo);
-var
-  i: Integer;
-begin
-  with aSubject do for i:= 0 to fObservers.Count-1 do
-    (fObservers.Items[i] as ICEMultiDocObserver).docNew(aDoc);
-end;
-
-procedure subjDocFocused(aSubject: TCEMultiDocSubject; aDoc: TCESynMemo);
-var
-  i: Integer;
-begin
-  with aSubject do for i:= 0 to fObservers.Count-1 do
-    (fObservers.Items[i] as ICEMultiDocObserver).docFocused(aDoc);
-end;
-
-procedure subjDocChanged(aSubject: TCEMultiDocSubject; aDoc: TCESynMemo);
-var
-  i: Integer;
-begin
-  with aSubject do for i:= 0 to fObservers.Count-1 do
-    (fObservers.Items[i] as ICEMultiDocObserver).docChanged(aDoc);
-end;
-
-procedure subjDocClosed(aSubject: TCEMultiDocSubject; aDoc: TCESynMemo);
-var
-  i: Integer;
-begin
-  with aSubject do for i:= 0 to fObservers.Count-1 do
-    (fObservers.Items[i] as ICEMultiDocObserver).docClose(aDoc);
-end;
-
-
-
-
-function TCEProjectSubject.acceptObserver(aObject: TObject): boolean;
-begin
-  result := (aObject as ICEProjectObserver) <> nil;
-end;
-
-procedure subjProjNew(aSubject: TCEProjectSubject; aProj: TCEProject);
-var
-  i: Integer;
-begin
-  with aSubject do for i:= 0 to fObservers.Count-1 do
-    (fObservers.Items[i] as ICEProjectObserver).ProjNew(aProj);
-end;
-
-procedure subjProjFocused(aSubject: TCEProjectSubject; aProj: TCEProject);
-var
-  i: Integer;
-begin
-  with aSubject do for i:= 0 to fObservers.Count-1 do
-    (fObservers.Items[i] as ICEProjectObserver).projFocused(aProj);
-end;
-
-procedure subjProjChanged(aSubject: TCEProjectSubject; aProj: TCEProject);
-var
-  i: Integer;
-begin
-  with aSubject do for i:= 0 to fObservers.Count-1 do
-    (fObservers.Items[i] as ICEProjectObserver).projChange(aProj);
-end;
-
-procedure subjProjClose(aSubject: TCEProjectSubject; aProj: TCEProject);
-var
-  i: Integer;
-begin
-  with aSubject do for i:= 0 to fObservers.Count-1 do
-    (fObservers.Items[i] as ICEProjectObserver).projClose(aProj);
-end;
-
-procedure subjProjCompile(aSubject: TCEProjectSubject; aProj: TCEProject);
-var
-  i: Integer;
-begin
-  with aSubject do for i:= 0 to fObservers.Count-1 do
-    (fObservers.Items[i] as ICEProjectObserver).projCompile(aProj);
-end;
-
-procedure subjProjRun(aSubject: TCEProjectSubject; aProj: TCEProject);
-var
-  i: Integer;
-begin
-  with aSubject do for i:= 0 to fObservers.Count-1 do
-    (fObservers.Items[i] as ICEProjectObserver).projRun(aProj);
-end;
-
-
-end.