add-itens-in-setting

Author: Cesar4D

Src/CodeCompletion/DelphiAIDev.CodeCompletion.Search.pas

@@ -66,7 +66,6 @@ procedure TDelphiAIDevCodeCompletionSearch.Process(const AContext: IOTAKeyContex
 begin
   FSettings.ValidateFillingSelectedAI(TShowMsg.No);
 
-
   FQuestions.Clear;
   FQuestions.Add(FSettings.LanguageQuestions.GetLanguageDefinition);
   FQuestions.Add(FSettings.LanguageQuestions.GetMsgCodeCompletionSuggestion);
@@ -80,15 +79,13 @@ procedure TDelphiAIDevCodeCompletionSearch.Process(const AContext: IOTAKeyContex
     LIOTAEditPosition.BackspaceDelete(TConsts.TAG_CODE_COMPLETION.Length);
   end;
 
-  //TUtils.ShowMsg('CodeCompletionSearch.Process - FQuestions.Text', FQuestions.Text);
   try
     FChat.ProcessSend(FQuestions.Text);
   except
     Abort;
   end;
 
   FVars.Contents.Text := TUtils.ConfReturnAI(FChat.Response.Text);
-  //TUtils.ShowMsg('CodeCompletionSearch.Process - FVars.Contents.Text', FVars.Contents.Text);
 
   LRow := LIOTAEditPosition.Row;
   LColumn := LIOTAEditPosition.Column;
@@ -105,7 +102,6 @@ procedure TDelphiAIDevCodeCompletionSearch.Process(const AContext: IOTAKeyContex
   LIOTAEditPosition.InsertText(LText); //.TrimRight + sLineBreak);
   LIOTAEditPosition.Move(FVars.LineIni, LColumn);
 
-
   //LIOTAEditPositionMoveBOL;
   //  //LTextCurrentLineOrBlock := Context.EditBuffer.EditBlock.Text;
   //  LTextCurrentLineOrBlock := GetCurrentLineOrBlock(CnOtaGetTopMostEditView);

Src/KeyboardBinding/DelphiAIDev.KeyboardBinding.pas

@@ -21,7 +21,7 @@   TDelphiAIDevKeyboardBinding = class(TNotifierObject, IOTAKeyboardBinding)
     procedure KeyAltHome(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
     procedure KeyTab(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
     //procedure KeyProcBlockReturn(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
-    procedure KeyProcBlockReturnAndAlt(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
+    procedure CodeCompletionSearch(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
   protected
     function GetBindingType: TBindingType;
     function GetDisplayName: string;
@@ -96,34 +96,34 @@ procedure TDelphiAIDevKeyboardBinding.BindKeyboard(const BindingServices: IOTAKe
   if not(Trim(TDelphiAIDevSettings.GetInstance.CodeCompletionShortcutInvoke).IsEmpty) then
     LShortcut := TDelphiAIDevSettings.GetInstance.CodeCompletionShortcutInvoke;
 
-  TUtils.ShowMsg(LShortcut);
-  BindingServices.AddKeyBinding([TextToShortCut(LShortcut)], Self.KeyProcBlockReturnAndAlt, nil);
+  BindingServices.AddKeyBinding([TextToShortCut(LShortcut)], Self.CodeCompletionSearch, nil);
 
   BindingServices.AddKeyBinding([Shortcut(VK_TAB, [])], Self.KeyTab, nil);
   BindingServices.AddKeyBinding([Shortcut(VK_HOME, [ssAlt])], Self.KeyAltHome, nil);
 end;
 
-procedure TDelphiAIDevKeyboardBinding.KeyProcBlockReturnAndAlt(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
+procedure TDelphiAIDevKeyboardBinding.CodeCompletionSearch(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
 begin
   try
-    TDelphiAIDevCodeCompletionSearch.New.Process(Context);
+    if TDelphiAIDevSettings.GetInstance.CodeCompletionUse then
+      TDelphiAIDevCodeCompletionSearch.New.Process(Context);
   finally
     BindingResult := TKeyBindingResult.krUnhandled;
   end;
 end;
 
 procedure TDelphiAIDevKeyboardBinding.KeyTab(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
 begin
-  if KeyCode <> Shortcut(VK_TAB, []) then
-    Exit;
+//  if KeyCode <> Shortcut(VK_TAB, []) then
+//    Exit;
+
+  BindingResult := TKeyBindingResult.krUnhandled;
 
   if TDelphiAIDevCodeCompletionVars.GetInstance.LineIni > 0 then
   begin
     TDelphiAIDevCodeCompletionKeyTab.New.Process(Context);
     BindingResult := TKeyBindingResult.krHandled;
-  end
-  else
-    BindingResult := TKeyBindingResult.krUnhandled;
+  end;
 end;
 
 procedure TDelphiAIDevKeyboardBinding.KeyAltHome(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);

Src/Settings/DelphiAIDev.Settings.View.dfm

@@ -10,6 +10,7 @@ object DelphiAIDevSettingsView: TDelphiAIDevSettingsView
   Font.Height = -11
   Font.Name = 'Tahoma'
   Font.Style = []
+  KeyPreview = True
   OldCreateOrder = False
   Position = poScreenCenter
   OnClose = FormClose
@@ -1056,10 +1057,6 @@ object DelphiAIDevSettingsView: TDelphiAIDevSettingsView
             BevelOuter = bvNone
             ParentBackground = False
             TabOrder = 0
-            ExplicitLeft = 3
-            ExplicitTop = 9
-            ExplicitWidth = 655
-            ExplicitHeight = 476
             object Label15: TLabel
               Left = 16
               Top = 29
@@ -1070,14 +1067,27 @@ object DelphiAIDevSettingsView: TDelphiAIDevSettingsView
             object Label16: TLabel
               Left = 16
               Top = 138
-              Width = 92
+              Width = 231
               Height = 13
-              Caption = 'Shortcut for invoke'
+              Caption = 'Shortcut for invoke (Delphi IDE restart required)'
+            end
+            object Label17: TLabel
+              Left = 16
+              Top = 443
+              Width = 316
+              Height = 13
+              Caption = '* Attention! This feature is in Beta and may be unstable.'
+              Font.Charset = DEFAULT_CHARSET
+              Font.Color = clWindowText
+              Font.Height = -11
+              Font.Name = 'Tahoma'
+              Font.Style = [fsBold]
+              ParentFont = False
             end
             object ckCodeCompletionUse: TCheckBox
               Left = 16
               Top = 5
-              Width = 97
+              Width = 111
               Height = 17
               Cursor = crHandPoint
               Caption = 'Code Completion'
@@ -1096,7 +1106,7 @@ object DelphiAIDevSettingsView: TDelphiAIDevSettingsView
             object ColorBoxCodeCompletionSuggestionColor: TColorBox
               Left = 16
               Top = 102
-              Width = 133
+              Width = 333
               Height = 22
               TabOrder = 2
             end
@@ -1108,20 +1118,13 @@ object DelphiAIDevSettingsView: TDelphiAIDevSettingsView
               Cursor = crHandPoint
               Caption = 'Suggestion Code Color'
               TabOrder = 3
-              OnClick = ckColorHighlightCodeDelphiUseClick
+              OnClick = ckCodeCompletionSuggestionColorUseClick
             end
-            object hotKeyCodeCompletionShortcutInvoke: THotKey
+            object edtCodeCompletionShortcutInvoke: TEdit
               Left = 16
-              Top = 154
-              Width = 150
-              Height = 19
-              Cursor = crArrow
-              Hint = 'Customize Shortcut'
-              HotKey = 0
-              InvalidKeys = [hcNone]
-              Modifiers = []
-              ParentShowHint = False
-              ShowHint = True
+              Top = 155
+              Width = 333
+              Height = 21
               TabOrder = 4
             end
           end

Src/Settings/DelphiAIDev.Settings.View.pas

@@ -18,7 +18,8 @@ interface
   Vcl.ComCtrls,
   Vcl.Menus,
   DelphiAIDev.Settings,
-  DelphiAIDev.Types;
+  DelphiAIDev.Types,
+  DelphiAIDev.Consts;
 
 type
   TDelphiAIDevSettingsView = class(TForm)
@@ -109,10 +110,11 @@   TDelphiAIDevSettingsView = class(TForm)
     cBoxCodeCompletionAIDefault: TComboBox;
     ColorBoxCodeCompletionSuggestionColor: TColorBox;
     ckCodeCompletionSuggestionColorUse: TCheckBox;
-    hotKeyCodeCompletionShortcutInvoke: THotKey;
     Label16: TLabel;
     gboxData: TGroupBox;
     btnOpenDataFolder: TButton;
+    edtCodeCompletionShortcutInvoke: TEdit;
+    Label17: TLabel;
     procedure FormCreate(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure btnCloseClick(Sender: TObject);
@@ -131,6 +133,7 @@   TDelphiAIDevSettingsView = class(TForm)
     procedure btnIAsOfflineClick(Sender: TObject);
     procedure btnCodeCompletionClick(Sender: TObject);
     procedure btnOpenDataFolderClick(Sender: TObject);
+    procedure ckCodeCompletionSuggestionColorUseClick(Sender: TObject);
   private
     FSettings: TDelphiAIDevSettings;
     procedure SaveSettings;
@@ -142,6 +145,8 @@   TDelphiAIDevSettingsView = class(TForm)
     procedure FillcBoxCodeCompletionAIDefault;
     procedure ShowPanel(const AButton: TButton; const APanel: TPanel);
     procedure PanelsSetParent;
+    procedure ValidateCodeCompletionShortcutInvoke;
+    procedure ConfigFieldsCodeCompletionSuggestionColor;
   public
 
   end;
@@ -289,11 +294,38 @@ procedure TDelphiAIDevSettingsView.lbRestoreDefaultsClick(Sender: TObject);
 
 procedure TDelphiAIDevSettingsView.btnConfirmClick(Sender: TObject);
 begin
+  Self.ValidateCodeCompletionShortcutInvoke;
+
   Self.SaveSettings;
   Self.Close;
   Self.ModalResult := mrOk;
 end;
 
+procedure TDelphiAIDevSettingsView.ValidateCodeCompletionShortcutInvoke;
+var
+  LShortcutStr: string;
+  LShortCut: TShortCut;
+begin
+  LShortcutStr := Trim(edtCodeCompletionShortcutInvoke.Text);
+  if LShortcutStr.Length = 1 then
+    raise Exception.Create('Invalid CodeCompletion shortcut');
+
+  LShortCut := TextToShortCut(LShortcutStr);
+
+  if ShortCutToText(LShortCut).Trim.IsEmpty then
+    edtCodeCompletionShortcutInvoke.Text := TConsts.CODE_COMPLETION_SHORTCUT_INVOKE;
+end;
+
+procedure TDelphiAIDevSettingsView.ckCodeCompletionSuggestionColorUseClick(Sender: TObject);
+begin
+  Self.ConfigFieldsCodeCompletionSuggestionColor;
+end;
+
+procedure TDelphiAIDevSettingsView.ConfigFieldsCodeCompletionSuggestionColor;
+begin
+  ColorBoxCodeCompletionSuggestionColor.Enabled := ckCodeCompletionSuggestionColorUse.Checked;
+end;
+
 procedure TDelphiAIDevSettingsView.ckColorHighlightCodeDelphiUseClick(Sender: TObject);
 begin
   Self.ConfigFieldsColorHighlightDelphi;
@@ -317,7 +349,7 @@ procedure TDelphiAIDevSettingsView.LoadSettings;
   cBoxCodeCompletionAIDefault.ItemIndex := Integer(FSettings.CodeCompletionAIDefault);
   ckCodeCompletionSuggestionColorUse.Checked := FSettings.CodeCompletionSuggestionColorUse;
   ColorBoxCodeCompletionSuggestionColor.Selected := FSettings.CodeCompletionSuggestionColor;
-  hotKeyCodeCompletionShortcutInvoke.HotKey := TextToShortCut(FSettings.CodeCompletionShortcutInvoke);
+  edtCodeCompletionShortcutInvoke.Text := FSettings.CodeCompletionShortcutInvoke;
 
   edtBaseUrlGemini.Text := FSettings.BaseUrlGemini;
   cBoxModelGemini.ItemIndex := cBoxModelGemini.Items.IndexOf(FSettings.ModelGemini);
@@ -356,7 +388,7 @@ procedure TDelphiAIDevSettingsView.SaveSettings;
   FSettings.CodeCompletionAIDefault := TC4DAiAvailable(cBoxCodeCompletionAIDefault.ItemIndex);
   FSettings.CodeCompletionSuggestionColorUse := ckCodeCompletionSuggestionColorUse.Checked;
   FSettings.CodeCompletionSuggestionColor := ColorBoxCodeCompletionSuggestionColor.Selected;
-  FSettings.CodeCompletionShortcutInvoke := ShortCutToText(hotKeyCodeCompletionShortcutInvoke.HotKey);
+  FSettings.CodeCompletionShortcutInvoke := edtCodeCompletionShortcutInvoke.Text;
 
   FSettings.BaseUrlGemini := edtBaseUrlGemini.Text;
   FSettings.ModelGemini := cBoxModelGemini.Text;
@@ -374,8 +406,6 @@ procedure TDelphiAIDevSettingsView.SaveSettings;
   FSettings.ModelOllama := cBoxModelOllama.Text;
   FSettings.ApiKeyOllama := edtApiKeyOllama.Text;
 
-
-
   FSettings.SaveData;
 end;