Merge branch 'a12_2_a13'

README.md

@@ -24,6 +24,8 @@ Current features
 Missing features before the first beta
 --------------------------------------
 - Options editor.
+- Shortcuts editor.
+- a few context menus and toolbars.
 
 Project information
 -------------------

src/ce_editoroptions.pas

@@ -221,7 +221,7 @@ end;
 
 function TCEEditorOptions.optionedWantEditorKind: TOptionEditorKind;
 begin
-  exit(oekAbstract);
+  exit(oekGeneric);
 end;
 
 function TCEEditorOptions.optionedWantContainer: TPersistent;

src/ce_interfaces.pas

@@ -118,7 +118,7 @@ type
 
 
   (**
-   * An implementer can expose some customizable shortcuts
+   * An implementer can expose some customizable shortcuts to be edited in a dedicated widget.
    *)
   ICEEditableShortCut = interface
   ['ICEEditableShortCut']
@@ -141,7 +141,7 @@ type
 
 
 
-  TOptionEditorKind = (oekAbstract, oekForm);
+  TOptionEditorKind = (oekGeneric, oekForm);
   TOptionEditorEvent = (oeeCancel, oeeAccept, oeeChange);
   (**
    * An implementer can expose some options to be edited in a dedicated widget.
@@ -249,7 +249,7 @@ type
 
 
 {
-  Service assignators:
+  Service getters:
 
   Lazily get the interface of a service when needed or for a punctual usage.
   The first overload assign the variable only when not yet set, the second is
@@ -402,7 +402,7 @@ begin
 end;
 {$ENDREGION}
 
-{$REGION ICESingleService assignators ------------------------------------------}
+{$REGION ICESingleService getters ----------------------------------------------}
 function getMessageDisplay(var obj: ICEMessagesDisplay): ICEMessagesDisplay;
 begin
   if obj = nil then

src/ce_main.pas

@@ -858,6 +858,8 @@ begin
     TCEEditorHintWindow.FontSize := fDoc.Font.Size;
     HintInfo.HintWindowClass := TCEEditorHintWindow;
     HintInfo.HideTimeout := 120000;
+    HintInfo.CursorRect.Left := fDoc.CaretXPix;
+    HintInfo.CursorRect.Top := fDoc.CaretYPix;
     // note: non-default color allows non-themed draw() which allows custom font-size to be handled.
     HintInfo.HintColor := clInfoBk + $01010100;
     //

src/ce_messages.pas

@@ -235,7 +235,7 @@ end;
 
 function TCEMessagesWidget.optionedWantEditorKind: TOptionEditorKind;
 begin
-  exit(oekAbstract);
+  exit(oekGeneric);
 end;
 
 function TCEMessagesWidget.optionedWantContainer: TPersistent;

src/ce_optionseditor.pas

@@ -123,7 +123,7 @@ begin
         TForm(dt^.container).Align := alClient;
         TForm(dt^.container).BorderStyle:= bsNone;
       end;
-    oekAbstract:
+    oekGeneric:
       begin
         inspector.Parent := pnlEd;
         inspector.Align := alClient;