Issue #2131: add grid editor links unit

heidisql.lpi

@@ -328,6 +328,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit>
+      <Unit>
+        <Filename Value="source\grideditlinks.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

heidisql.lpr

@@ -21,7 +21,7 @@ uses
   exportgrid, usermanager, selectdbobject, reformatter, searchreplace,
   connections, jsonregistry, sqlhelp, updatecheck, insertfiles, texteditor,
   customize_highlighter, preferences, table_editor, view, routine_editor,
-  trigger_editor, event_editor, tabletools, bineditor;
+  trigger_editor, event_editor, tabletools, bineditor, grideditlinks;
 
 {$R *.res}
 {.$R resources.rc}

source/connections.pas

@@ -238,7 +238,7 @@ type
 
 implementation
 
-uses Main, apphelpers, dbstructures.sqlite;
+uses Main, apphelpers, dbstructures.sqlite, grideditlinks;
 
 {$I const.inc}
 
@@ -870,7 +870,7 @@ procedure Tconnform.ListSessionsCreateEditor(Sender: TBaseVirtualTree; Node: PVi
   Column: TColumnIndex; out EditLink: IVTEditLink);
 begin
   // Use our own text editor to rename a session
-  //EditLink := TInplaceEditorLink.Create(Sender as TVirtualStringTree, True, nil);
+  EditLink := TInplaceEditorLink.Create(Sender as TVirtualStringTree, True, nil);
 end;
 
 

source/extra_controls.pas

@@ -8,7 +8,7 @@ uses
   Classes, SysUtils, Forms, Types, StdCtrls, Clipbrd, apphelpers,
   Graphics, Dialogs, ImgList, ComCtrls, Generics.Collections, Generics.Defaults,
   ExtCtrls, laz.VirtualTrees, RegExpr, Controls, EditBtn, Menus,
-  GraphUtil, Math;
+  GraphUtil, Math, LCLIntf;
 
 type
   // Form with a sizegrip in the lower right corner, without the need for a statusbar
@@ -37,7 +37,7 @@ type
       class function ScaleSize(x: Extended; Control: TControl): Integer; overload;
       class procedure PageControlTabHighlight(PageControl: TPageControl);
       property PixelsPerInchDesigned: Integer read FPixelsPerInchDesigned;
-      procedure ShowPopup(ClickedControl: TControl; PopupMenu: TPopupMenu);
+      class procedure ShowPopup(ClickedControl: TControl; PopupMenu: TPopupMenu);
   end;
 
   // Modern file-open-dialog with high DPI support and encoding selector
@@ -93,7 +93,7 @@ type
       property OnExit: TNotifyEvent read FOnExit write FOnExit;
   end;}
 
-  {TExtComboBox = class(TComboBox)
+  TExtComboBox = class(TComboBox)
     private
       FcbHintIndex: Integer;
       FHintWindow: THintWindow;
@@ -102,7 +102,7 @@ type
       procedure DropDown; override;
       procedure CloseUp; override;
       procedure InitiateAction; override;
-  end;}
+  end;
 
   {TExtHintWindow = class(THintWindow)
     private
@@ -476,7 +476,7 @@ begin
   end;;
 end;
 
-procedure TExtForm.ShowPopup(ClickedControl: TControl; PopupMenu: TPopupMenu);
+class procedure TExtForm.ShowPopup(ClickedControl: TControl; PopupMenu: TPopupMenu);
 begin
   PopupMenu.Popup(ClickedControl.ClientOrigin.X, ClickedControl.ClientOrigin.Y + ClickedControl.Height);
 end;
@@ -696,7 +696,7 @@ end;}
 
 { TExtComboBox }
 
-{procedure TExtComboBox.Change;
+procedure TExtComboBox.Change;
 var
   P: TPoint;
   HintRect: TRect;
@@ -747,7 +747,7 @@ begin
     FcbHintIndex := ItemIndex;
     Change;
   end;
-end;}
+end;
 
 
 

source/insertfiles.pas

@@ -99,7 +99,7 @@ type
 
 implementation
 
-uses main;
+uses main, grideditlinks;
 
 const
   ColColname = 0;
@@ -260,12 +260,12 @@ procedure TfrmInsertFiles.ListColumnsCreateEditor(Sender: TBaseVirtualTree; Node
   Column: TColumnIndex; out EditLink: IVTEditLink);
 var
   Grid: TVirtualStringTree;
-  //EnumEditor: TEnumEditorLink;
+  EnumEditor: TEnumEditorLink;
 begin
   // Start cell editor
   Grid := Sender as TVirtualStringTree;
   if Column = ColValue then begin
-    {EnumEditor := TEnumEditorLink.Create(Grid, True, nil);
+    EnumEditor := TEnumEditorLink.Create(Grid, True, nil);
     EnumEditor.AllowCustomText := True;
     EnumEditor.ValueList := TStringList.Create;
     EnumEditor.ValueList.Text := 'NULL'+CRLF+
@@ -281,7 +281,7 @@ begin
       'UPPER(''%filenname%'')'+CRLF+
       'UNIX_TIMESTAMP(''%filedatetime%'')'+CRLF+
       'ENCODE(''%filename%'', ''password'')';
-    EditLink := EnumEditor;}
+    EditLink := EnumEditor;
   end;
 end;
 

source/main.pas

@@ -1421,7 +1421,7 @@ implementation
 uses
   FileInfo, winpeimagereader, elfreader, machoreader, About, data_sorting, column_selection, loaddata, editvar,
   copytable, csv_detector, exportgrid, usermanager, selectdbobject, reformatter, connections, sqlhelp, updatecheck,
-  insertfiles, texteditor, preferences, table_editor, view, routine_editor, trigger_editor, event_editor;
+  insertfiles, texteditor, preferences, table_editor, view, routine_editor, trigger_editor, event_editor, grideditlinks;
 
 {$R *.lfm}
 
@@ -10848,11 +10848,11 @@ const
   ForeignItemsLimit: Integer = 10000;
 var
   VT: TVirtualStringTree;
-  {HexEditor: THexEditorLink;
+  HexEditor: THexEditorLink;
   DateTimeEditor: TDateTimeEditorLink;
   EnumEditor: TEnumEditorLink;
   SetEditor: TSetEditorLink;
-  InplaceEditor: TInplaceEditorLink;}
+  InplaceEditor: TInplaceEditorLink;
   TypeCat: TDBDatatypeCategoryIndex;
   ForeignKey: TForeignKey;
   TblColumn: TTableColumn;
@@ -10912,7 +10912,7 @@ begin
 
         ForeignResults := Conn.GetResults(SQL);
         if ForeignResults.RecordCount < ForeignItemsLimit then begin
-          {EnumEditor := TEnumEditorLink.Create(VT, AllowEdit, TblColumn);
+          EnumEditor := TEnumEditorLink.Create(VT, AllowEdit, TblColumn);
           EditLink := EnumEditor;
           DisplayHex := (not actBlobAsText.Checked) and (ForeignResults.DataType(0).Category in [dtcBinary, dtcSpatial]);
           while not ForeignResults.Eof do begin
@@ -10927,7 +10927,7 @@ begin
                 EnumEditor.DisplayList.Add(ForeignResults.Col(0)+': '+ForeignResults.Col(1));
             end;
             ForeignResults.Next;
-          end;}
+          end;
         end else begin
           LogSQL(f_('Connected table has too many rows. Foreign key drop-down is limited to %d items.', [ForeignItemsLimit]), lcInfo);
         end;
@@ -10941,11 +10941,11 @@ begin
 
   FGridEditFunctionMode := FGridEditFunctionMode or Results.IsFunction(ResultCol);
   if FGridEditFunctionMode then begin
-    {EnumEditor := TEnumEditorLink.Create(VT, AllowEdit, TblColumn);
+    EnumEditor := TEnumEditorLink.Create(VT, AllowEdit, TblColumn);
     for SQLFunc in Conn.SQLFunctions do
       EnumEditor.ValueList.Add(SQLFunc.Name + SQLFunc.Declaration);
     EnumEditor.AllowCustomText := True;
-    EditLink := EnumEditor;}
+    EditLink := EnumEditor;
   end;
 
   TypeCat := Results.DataType(ResultCol).Category;
@@ -10953,20 +10953,20 @@ begin
   if Assigned(EditLink) then
     // Editor was created above, do nothing now
   else if (Results.DataType(ResultCol).Index in [dbdtEnum, dbdtBool]) and AppSettings.ReadBool(asFieldEditorEnum) then begin
-    {EnumEditor := TEnumEditorLink.Create(VT, AllowEdit, TblColumn);
+    EnumEditor := TEnumEditorLink.Create(VT, AllowEdit, TblColumn);
     EnumEditor.ValueList := Results.ValueList(ResultCol);
-    EditLink := EnumEditor;}
+    EditLink := EnumEditor;
   end else if (TypeCat = dtcText) or ((TypeCat in [dtcBinary, dtcSpatial]) and actBlobAsText.Checked) then begin
-    {InplaceEditor := TInplaceEditorLink.Create(VT, AllowEdit, TblColumn);
+    InplaceEditor := TInplaceEditorLink.Create(VT, AllowEdit, TblColumn);
     InplaceEditor.MaxLength := Results.MaxLength(ResultCol);
     InplaceEditor.TitleText := Results.ColumnOrgNames[ResultCol];
     InplaceEditor.ButtonVisible := True;
-    EditLink := InplaceEditor;}
+    EditLink := InplaceEditor;
   end else if (TypeCat in [dtcBinary, dtcSpatial]) and AppSettings.ReadBool(asFieldEditorBinary) then begin
-    {HexEditor := THexEditorLink.Create(VT, AllowEdit, TblColumn);
+    HexEditor := THexEditorLink.Create(VT, AllowEdit, TblColumn);
     HexEditor.MaxLength := Results.MaxLength(ResultCol);
     HexEditor.TitleText := Results.ColumnOrgNames[ResultCol];
-    EditLink := HexEditor;}
+    EditLink := HexEditor;
   end else if (TypeCat = dtcTemporal)
     and AppSettings.ReadBool(asFieldEditorDatetime)
     and Assigned(TblColumn) // Editor crashes without a column object (on joins), see #1024
@@ -10988,22 +10988,22 @@ begin
         NowText := NowText + '.' + StringOfChar('0', MicroSecondsPrecision);
       VT.Text[Node, Column] := NowText;
     end;
-    {DateTimeEditor := TDateTimeEditorLink.Create(VT, AllowEdit, TblColumn);
+    DateTimeEditor := TDateTimeEditorLink.Create(VT, AllowEdit, TblColumn);
-    EditLink := DateTimeEditor;}
+    EditLink := DateTimeEditor;
   end else if AppSettings.ReadBool(asFieldEditorDatetime)
     and HandleUnixTimestampColumn(Sender, Column)
     and Assigned(TblColumn) // see above
     then begin
-    {DateTimeEditor := TDateTimeEditorLink.Create(VT, AllowEdit, TblColumn);
+    DateTimeEditor := TDateTimeEditorLink.Create(VT, AllowEdit, TblColumn);
-    EditLink := DateTimeEditor;}
+    EditLink := DateTimeEditor;
   end else if (Results.DataType(ResultCol).Index = dbdtSet) and AppSettings.ReadBool(asFieldEditorSet) then begin
-    {SetEditor := TSetEditorLink.Create(VT, AllowEdit, TblColumn);
+    SetEditor := TSetEditorLink.Create(VT, AllowEdit, TblColumn);
     SetEditor.ValueList := Results.ValueList(ResultCol);
-    EditLink := SetEditor;}
+    EditLink := SetEditor;
   end else begin
-    {InplaceEditor := TInplaceEditorLink.Create(VT, AllowEdit, TblColumn);
+    InplaceEditor := TInplaceEditorLink.Create(VT, AllowEdit, TblColumn);
     InplaceEditor.ButtonVisible := False;
-    EditLink := InplaceEditor;}
+    EditLink := InplaceEditor;
   end;
   Sender.FocusedNode := Node;
   Sender.FocusedColumn := Column;
@@ -14541,13 +14541,13 @@ end;
 procedure TMainForm.treeQueryHelpersCreateEditor(Sender: TBaseVirtualTree;
   Node: PVirtualNode; Column: TColumnIndex; out EditLink: IVTEditLink);
 var
- //InplaceEditor: TInplaceEditorLink;
+ InplaceEditor: TInplaceEditorLink;
  VT: TVirtualStringTree;
 begin
   VT := Sender as TVirtualStringTree;
-  //InplaceEditor := TInplaceEditorLink.Create(VT, True, nil);
+  InplaceEditor := TInplaceEditorLink.Create(VT, True, nil);
-  //InplaceEditor.ButtonVisible := true;
+  InplaceEditor.ButtonVisible := true;
-  //EditLink := InplaceEditor;
+  EditLink := InplaceEditor;
 end;
 
 

source/routine_editor.pas

@@ -96,7 +96,7 @@ type
 
 implementation
 
-uses main, dbstructures, dbstructures.mysql;
+uses main, dbstructures, dbstructures.mysql, grideditlinks;
 
 {$R *.lfm}
 
@@ -389,14 +389,14 @@ procedure TfrmRoutineEditor.listParametersCreateEditor(Sender: TBaseVirtualTree;
   Node: PVirtualNode; Column: TColumnIndex; out EditLink: IVTEditLink);
 var
   VT: TLazVirtualStringTree;
-  //EnumEditor: TEnumEditorLink;
+  EnumEditor: TEnumEditorLink;
   Datatype: String;
   DBDatatype: TDBDatatype;
 begin
   VT := Sender as TLazVirtualStringTree;
   if Column = 1 then
     EditLink := TStringEditLink.Create
-  {else if Column = 2 then begin
+  else if Column = 2 then begin
     EnumEditor := TEnumEditorLink.Create(VT, True, nil);
     EnumEditor.AllowCustomText := True;
     EnumEditor.ValueList := TStringList.Create;
@@ -414,7 +414,7 @@ begin
     EnumEditor.ValueList.Add('OUT');
     EnumEditor.ValueList.Add('INOUT');
     EditLink := EnumEditor;
-  end;}
+  end;
 end;
 
 

source/table_editor.pas

@@ -254,7 +254,7 @@ type
 
 implementation
 
-uses main;
+uses main, grideditlinks;
 
 
 {$R *.lfm}
@@ -1730,56 +1730,56 @@ procedure TfrmTableEditor.listColumnsCreateEditor(Sender: TBaseVirtualTree;
   Node: PVirtualNode; Column: TColumnIndex; out EditLink: IVTEditLink);
 var
   VT: TLazVirtualStringTree;
-  //EnumEditor: TEnumEditorLink;
+  EnumEditor: TEnumEditorLink;
-  //DefaultEditor: TColumnDefaultEditorLink;
+  DefaultEditor: TColumnDefaultEditorLink;
-  //DatatypeEditor: TDatatypeEditorLink;
+  DatatypeEditor: TDatatypeEditorLink;
   Col: PTableColumn;
-  //Edit: TInplaceEditorLink;
+  Edit: TInplaceEditorLink;
 begin
   // Start cell editor
   VT := Sender as TLazVirtualStringTree;
   Col := Sender.GetNodeData(Node);
   case Column of
     ColNumDatatype: begin // Datatype pulldown
-      {DatatypeEditor := TDatatypeEditorLink.Create(VT, True, Col^);
+      DatatypeEditor := TDatatypeEditorLink.Create(VT, True, Col^);
-      EditLink := DataTypeEditor;}
+      EditLink := DataTypeEditor;
       end;
 
     ColNumCollation: begin // Collation pulldown
-      {EnumEditor := TEnumEditorLink.Create(VT, True, Col^);
+      EnumEditor := TEnumEditorLink.Create(VT, True, Col^);
       EnumEditor.AllowCustomText := True;
       EnumEditor.ItemMustExist := True;
       EnumEditor.ValueList := TStringList.Create;
       EnumEditor.ValueList.Text := DBObject.Connection.CollationList.Text;
       EnumEditor.ValueList.Sort;
       EnumEditor.ValueList.Insert(0, '');
-      EditLink := EnumEditor;}
+      EditLink := EnumEditor;
       end;
 
     ColNumDefault: begin
-      {DefaultEditor := TColumnDefaultEditorLink.Create(VT, True, Col^);
+      DefaultEditor := TColumnDefaultEditorLink.Create(VT, True, Col^);
       DefaultEditor.DefaultType := Col.DefaultType;
       DefaultEditor.DefaultText := Col.DefaultText;
       DefaultEditor.OnUpdateType := Col.OnUpdateType;
       DefaultEditor.OnUpdateText := Col.OnUpdateText;
-      EditLink := DefaultEditor;}
+      EditLink := DefaultEditor;
     end;
 
     ColNumVirtuality: begin // Virtuality pulldown
-      {EnumEditor := TEnumEditorLink.Create(VT, True, Col^);
+      EnumEditor := TEnumEditorLink.Create(VT, True, Col^);
       EnumEditor.ValueList := TStringList.Create;
       if DBObject.Connection.Parameters.IsMariaDB then
         EnumEditor.ValueList.CommaText := ',VIRTUAL,PERSISTENT'
       else
         EnumEditor.ValueList.CommaText := ',VIRTUAL,STORED';
-      EditLink := EnumEditor;}
+      EditLink := EnumEditor;
     end
 
     else begin
-      {Edit := TInplaceEditorLink.Create(VT, True, Col^);
+      Edit := TInplaceEditorLink.Create(VT, True, Col^);
       Edit.TitleText := VT.Header.Columns[Column].Text;
       Edit.ButtonVisible := True;
-      EditLink := Edit;}
+      EditLink := Edit;
     end;
   end;
 end;
@@ -2128,25 +2128,25 @@ procedure TfrmTableEditor.listCheckConstraintsCreateEditor(
   out EditLink: IVTEditLink);
 var
   VT: TLazVirtualStringTree;
-  //Edit: TInplaceEditorLink;
+  Edit: TInplaceEditorLink;
-  //EnumEditor: TEnumEditorLink;
+  EnumEditor: TEnumEditorLink;
   SQLFunc: TSQLFunction;
 begin
   // Edit check constraint
   VT := Sender as TLazVirtualStringTree;
   case Column of
     0: begin
-      {Edit := TInplaceEditorLink.Create(VT, True, nil);
+      Edit := TInplaceEditorLink.Create(VT, True, nil);
       Edit.TitleText := VT.Header.Columns[Column].Text;
       Edit.ButtonVisible := True;
-      EditLink := Edit;}
+      EditLink := Edit;
     end;
     1: begin
-      {EnumEditor := TEnumEditorLink.Create(VT, True, nil);
+      EnumEditor := TEnumEditorLink.Create(VT, True, nil);
       for SQLFunc in DBObject.Connection.SQLFunctions do
         EnumEditor.ValueList.Add(SQLFunc.Name + SQLFunc.Declaration);
       EnumEditor.AllowCustomText := True;
-      EditLink := EnumEditor;}
+      EditLink := EnumEditor;
     end;
   end;
 end;
@@ -2242,7 +2242,7 @@ procedure TfrmTableEditor.treeIndexesCreateEditor(Sender: TBaseVirtualTree;
   Node: PVirtualNode; Column: TColumnIndex; out EditLink: IVTEditLink);
 var
   VT: TLazVirtualStringTree;
-  //EnumEditor: TEnumEditorLink;
+  EnumEditor: TEnumEditorLink;
   Level: Cardinal;
   ColNode: PVirtualNode;
   Col: PTableColumn;
@@ -2250,7 +2250,7 @@ begin
   // Start cell editor
   VT := Sender as TLazVirtualStringTree;
   Level := (Sender as TLazVirtualStringTree).GetNodeLevel(Node);
-  {if (Level = 0) and (Column = 1) then begin
+  if (Level = 0) and (Column = 1) then begin
     // Index type pulldown
     EnumEditor := TEnumEditorLink.Create(VT, True, nil);
     EnumEditor.ValueList := TStringList.Create;
@@ -2277,7 +2277,7 @@ begin
     EnumEditor.ValueList := Explode(',', ',ASC,DESC');
     EditLink := EnumEditor;
   end else
-    EditLink := TInplaceEditorLink.Create(VT, True, nil);}
+    EditLink := TInplaceEditorLink.Create(VT, True, nil);
 end;
 
 
@@ -2807,8 +2807,8 @@ procedure TfrmTableEditor.listForeignKeysCreateEditor(
   out EditLink: IVTEditLink);
 var
   VT: TLazVirtualStringTree;
-  //EnumEditor: TEnumEditorLink;
+  EnumEditor: TEnumEditorLink;
-  //SetEditor: TSetEditorLink;
+  SetEditor: TSetEditorLink;
   DBObjects: TDBObjectList;
   Key: TForeignKey;
   ColNode: PVirtualNode;
@@ -2819,7 +2819,7 @@ var
 begin
   // Init grid editor in foreign key list
   VT := Sender as TLazVirtualStringTree;
-  {case Column of
+  case Column of
     0: EditLink := TInplaceEditorLink.Create(VT, True, nil);
     1: begin
         SetEditor := TSetEditorLink.Create(VT, True, nil);
@@ -2858,7 +2858,7 @@ begin
         EnumEditor.ValueList := Explode(',', DBObject.Connection.GetSQLSpecifity(spForeignKeyEventAction));
         EditLink := EnumEditor;
       end;
-  end;}
+  end;
 end;