Merge branch 'develop'

Author: Cesar4D

Src/Chat/DelphiAIDev.Chat.View.dfm

@@ -81,7 +81,6 @@ object DelphiAIDevChatView: TDelphiAIDevChatView
       ShowHint = True
       TabOrder = 1
       Zoom = 100
-      ExplicitTop = 18
     end
     object pnBackQuestion: TPanel
       Left = 18
@@ -188,7 +187,7 @@ object DelphiAIDevChatView: TDelphiAIDevChatView
           Margins.Bottom = 0
           Align = alRight
           Caption = '* Use current unit code in query * '
-          ImageIndex = 1
+          ImageIndex = 0
           Images = ImageList1
           TabOrder = 0
           OnClick = btnUseCurrentUnitCodeClick
@@ -229,7 +228,6 @@ object DelphiAIDevChatView: TDelphiAIDevChatView
           PopupMenu = pMenuQuestions
           TabOrder = 2
           OnClick = btnDefaultsQuestionsClick
-          ExplicitLeft = 126
         end
       end
     end

Src/Chat/DelphiAIDev.Chat.View.pas

@@ -106,8 +106,9 @@   TDelphiAIDevChatView = class(TDockableForm)
     FbtnUseCurrentUnitCodeWidth: Integer;
     FbtnCodeOnlyWidth: Integer;
     FbtnDefaultsQuestionsWidth: Integer;
-    procedure ReadFromFile;
-    procedure WriteToFile;
+    FQuestionOnShow: string;
+    procedure FillMemoReturnWithFile;
+    procedure SaveMemoReturnInFile;
     procedure InitializeRichEditReturn;
     procedure ProcessSend;
     procedure AddResponseSimple(const AString: string);
@@ -125,9 +126,11 @@   TDelphiAIDevChatView = class(TDockableForm)
     procedure AddItemsPopupMenuQuestion;
     procedure DoProcessClickInItemDefaultQuestions(ACodeOnly: Boolean; AQuestion: string);
     procedure ProcessWordWrap;
+    procedure ConfScreenOnCreate;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
+    property QuestionOnShow: string write FQuestionOnShow;
   end;
 
 var
@@ -186,15 +189,15 @@ constructor TDelphiAIDevChatView.Create(AOwner: TComponent);
   FChat := TDelphiAIDevChat.Create;
   FSettings := FChat.Settings.GetInstance;
   FPopupMenuQuestions := TDelphiAIDevDefaultsQuestionsPopupMenu.Create;
+  FQuestionOnShow := '';
 
-  pnWait.Visible := False;
-  FbtnUseCurrentUnitCodeWidth := btnUseCurrentUnitCode.Width;
-  FbtnCodeOnlyWidth := btnCodeOnly.Width;
-  FbtnDefaultsQuestionsWidth := btnDefaultsQuestions.Width;
+  Self.ConfScreenOnCreate;
+  Self.FillMemoReturnWithFile; ////
 end;
 
 destructor TDelphiAIDevChatView.Destroy;
 begin
+  Self.SaveMemoReturnInFile; ////
   FPopupMenuQuestions.Free;
   FChat.Free;
   inherited;
@@ -204,49 +207,65 @@ procedure TDelphiAIDevChatView.FormShow(Sender: TObject);
 begin
   Self.ConfScreenOnShow;
   Self.InitializeRichEditReturn;
-  Self.ReadFromFile;
+  ////Self.FillMemoReturnWithFile;
   Self.ProcessWordWrap;
-  //Self.GetSelectedBlockForQuestion;
 
   Self.AddItemsPopupMenuQuestion;
+
   TUtils.MemoFocusOnTheEnd(mmQuestion);
 end;
 
-procedure TDelphiAIDevChatView.AddItemsPopupMenuQuestion;
+procedure TDelphiAIDevChatView.FormActivate(Sender: TObject);
 begin
-  FPopupMenuQuestions
-    .ProcessClickInItem(DoProcessClickInItemDefaultQuestions)
-    .CreateMenus(pMenuQuestions);
+  Self.ConfLabelCurrentAI;
+
+  if not FQuestionOnShow.Trim.IsEmpty then
+  begin
+    mmQuestion.Lines.Clear;
+    mmQuestion.Lines.Add(FQuestionOnShow);
+    FQuestionOnShow := '';
+  end;
 end;
 
-procedure TDelphiAIDevChatView.DoProcessClickInItemDefaultQuestions(
-  ACodeOnly: Boolean; AQuestion: string);
+procedure TDelphiAIDevChatView.ConfScreenOnCreate;
 begin
-  if ACodeOnly then
-    btnCodeOnly.ImageIndex := CodeOnly_ImageIndex_ON
-  else
-    btnCodeOnly.ImageIndex := CodeOnly_ImageIndex_OFF;
+  mmReturn.Lines.Clear;
 
-  mmQuestion.Lines.Add(AQuestion);
+  pnWait.Visible := False;
+  FbtnUseCurrentUnitCodeWidth := btnUseCurrentUnitCode.Width;
+  FbtnCodeOnlyWidth := btnCodeOnly.Width;
+  FbtnDefaultsQuestionsWidth := btnDefaultsQuestions.Width;
+
+  ShapeCommands.Left := 0;
+  ShapeCommands.Top := 0;
+  ShapeCommands.Width := ShapeCommands.Parent.Width;
+  ShapeCommands.Height := ShapeCommands.Parent.Height;
 end;
 
 procedure TDelphiAIDevChatView.ConfScreenOnShow;
 begin
   TUtilsOTA.IDEThemingAll(TDelphiAIDevChatView, Self);
-  Self.Constraints.MinWidth := 150;
-  Self.Constraints.MinHeight := 150;
-
   btnMoreActions.Font.Color := TUtilsOTA.ActiveThemeColorDefault;
 
-  ShapeCommands.Left := 0;
-  ShapeCommands.Top := 0;
-  ShapeCommands.Width := ShapeCommands.Parent.Width;
-  ShapeCommands.Height := ShapeCommands.Parent.Height;
+  Self.Constraints.MinWidth := 200;
+  Self.Constraints.MinHeight := 300;
 end;
 
-procedure TDelphiAIDevChatView.FormActivate(Sender: TObject);
+procedure TDelphiAIDevChatView.AddItemsPopupMenuQuestion;
 begin
-  Self.ConfLabelCurrentAI;
+  FPopupMenuQuestions
+    .ProcessClickInItem(DoProcessClickInItemDefaultQuestions)
+    .CreateMenus(pMenuQuestions);
+end;
+
+procedure TDelphiAIDevChatView.DoProcessClickInItemDefaultQuestions(ACodeOnly: Boolean; AQuestion: string);
+begin
+  if ACodeOnly then
+    btnCodeOnly.ImageIndex := CodeOnly_ImageIndex_ON
+  else
+    btnCodeOnly.ImageIndex := CodeOnly_ImageIndex_OFF;
+
+  mmQuestion.Lines.Add(AQuestion);
 end;
 
 procedure TDelphiAIDevChatView.mmQuestionChange(Sender: TObject);
@@ -268,7 +287,7 @@ procedure TDelphiAIDevChatView.mmQuestionKeyDown(Sender: TObject; var Key: Word;
 
 procedure TDelphiAIDevChatView.mmQuestionKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
 begin
-  if (ssCtrl in Shift)and(Key = 65)then
+  if (ssCtrl in Shift)and(Key = 65) then
   begin
     mmQuestion.SelectAll;
     Key := 0;
@@ -277,7 +296,7 @@ procedure TDelphiAIDevChatView.mmQuestionKeyUp(Sender: TObject; var Key: Word; S
 
 procedure TDelphiAIDevChatView.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Self.WriteToFile;
+  ////Self.SaveMemoReturnInFile;
   Self.WaitingFormOFF;
 end;
 
@@ -323,20 +342,20 @@ procedure TDelphiAIDevChatView.FormResize(Sender: TObject);
   end;
 end;
 
-procedure TDelphiAIDevChatView.ReadFromFile;
+procedure TDelphiAIDevChatView.FillMemoReturnWithFile;
 begin
   if(FileExists(TUtils.GetPathFileChat))then
     mmReturn.Lines.LoadFromFile(TUtils.GetPathFileChat)
 end;
 
-procedure TDelphiAIDevChatView.SelectAll1Click(Sender: TObject);
+procedure TDelphiAIDevChatView.SaveMemoReturnInFile;
 begin
-  mmReturn.SelectAll;
+  mmReturn.Lines.SaveToFile(TUtils.GetPathFileChat);
 end;
 
-procedure TDelphiAIDevChatView.WriteToFile;
+procedure TDelphiAIDevChatView.SelectAll1Click(Sender: TObject);
 begin
-  mmReturn.Lines.SaveToFile(TUtils.GetPathFileChat);
+  mmReturn.SelectAll;
 end;
 
 procedure TDelphiAIDevChatView.cBoxSizeFontKeyPress(Sender: TObject; var Key: Char);
@@ -678,7 +697,7 @@ procedure TDelphiAIDevChatView.btnMoreActionsClick(Sender: TObject);
 
 procedure TDelphiAIDevChatView.InitializeRichEditReturn;
 begin
-  mmReturn.Lines.Clear;
+  //mmReturn.Lines.Clear;
   mmReturn.SelAttributes.Name := 'Courier New';
   mmReturn.SelAttributes.Size := 10;
 

Src/Consts/DelphiAIDev.Consts.pas

@@ -5,7 +5,7 @@ interface
 type
   TConsts = class
   public const
-    SEMANTIC_VERSION = '1.5.0';
+    SEMANTIC_VERSION = '1.6.0';
     SEMANTIC_VERSION_LB = 'Version: ' + SEMANTIC_VERSION;
     WIN_CONTROL_FOCU_NIL = nil;
     DELPHI_AI_DEVELOPER_DPROJ = 'DelphiAIDeveloper.dproj';

Src/IDE/Shortcuts/DelphiAIDev.IDE.Shortcuts.pas

@@ -8,7 +8,8 @@ interface
   Winapi.Windows,
   Vcl.Menus,
   ToolsAPI,
-  DelphiAIDev.Utils.CnWizard;
+  DelphiAIDev.Utils.CnWizard,
+  DelphiAIDev.Chat.View;
 
 type
   TDelphiAIDevIDEShortcuts = class(TNotifierObject, IOTAKeyboardBinding)
@@ -37,13 +38,13 @@ implementation
 
 procedure RegisterSelf;
 begin
-//  if(Index < 0)and(true)then
+//  if Index < 0 then
 //    Index := TUtilsOTA.GetIOTAKeyboardServices.AddKeyboardBinding(TDelphiAIDevIDEShortcuts.New);
 end;
 
 procedure UnRegisterSelf;
 begin
-  if(Index >= 0)then
+  if Index >= 0 then
   begin
     TUtilsOTA.GetIOTAKeyboardServices.RemoveKeyboardBinding(Index);
     Index := -1;
@@ -81,21 +82,35 @@ procedure TDelphiAIDevIDEShortcuts.BindKeyboard(const BindingServices: IOTAKeyBi
   if TUtilsOTA.CurrentProjectIsDelphiAIDeveloperDPROJ then
     Exit;
 
+  Exit;
   BindingServices.AddKeyBinding([Shortcut(VK_RETURN, [])], Self.KeyProcBlockReturn, nil);
   BindingServices.AddKeyBinding([Shortcut(VK_RETURN, [ssAlt])], Self.KeyProcBlockReturnAndAlt, nil);
 end;
 
 procedure TDelphiAIDevIDEShortcuts.KeyProcBlockReturn(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
 begin
+  Exit;
+
   TUtils.AddLog(GetCurrentLineOrBlock(CnOtaGetTopMostEditView));
   BindingResult := krNextProc; //krUnhandled;
 end;
 
 procedure TDelphiAIDevIDEShortcuts.KeyProcBlockReturnAndAlt(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
+var
+  LTextCurrentLineOrBlock: string;
 begin
-  TUtils.AddLog('Enter and Alt' + GetCurrentLineOrBlock(CnOtaGetTopMostEditView));
+  //TUtils.AddLog('Enter and Alt' + GetCurrentLineOrBlock(CnOtaGetTopMostEditView));
+
+  LTextCurrentLineOrBlock := GetCurrentLineOrBlock(CnOtaGetTopMostEditView);
+  if LTextCurrentLineOrBlock.Trim.IsEmpty then
+    Exit;
+
+  DelphiAIDev.Chat.View.DelphiAIDevChatView.QuestionOnShow := LTextCurrentLineOrBlock;
+  DelphiAIDev.Chat.View.DelphiAIDevChatViewShowDockableForm;
+
   BindingResult := krNextProc; //krUnhandled;
 end;
+
 initialization
 
 finalization