Use DBtree's events in a similar tree, to remove redundant code. Fixes wrong node icons for routines and triggers.

source/selectdbobject.dfm

@@ -68,27 +68,36 @@ object frmSelectDBObject: TfrmSelectDBObject
     Width = 216
     Height = 184
     Anchors = [akLeft, akTop, akRight, akBottom]
-    Header.AutoSizeIndex = -1
+    Header.AutoSizeIndex = 0
     Header.DefaultHeight = 17
     Header.Font.Charset = DEFAULT_CHARSET
     Header.Font.Color = clWindowText
     Header.Font.Height = -11
     Header.Font.Name = 'Tahoma'
     Header.Font.Style = []
-    Header.MainColumn = -1
+    Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs]
-    Header.Options = [hoColumnResize, hoDrag]
     Images = MainForm.PngImageListMain
     Indent = 16
     Margin = 2
     TabOrder = 0
-    TreeOptions.PaintOptions = [toHideFocusRect, toHotTrack, toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toThemeAware, toUseBlendedImages, toUseExplorerTheme, toHideTreeLinesIfThemed]
+    TreeOptions.PaintOptions = [toHideFocusRect, toHotTrack, toShowButtons, toShowDropmark, toShowTreeLines, toThemeAware, toUseBlendedImages, toUseExplorerTheme, toHideTreeLinesIfThemed]
     OnFocusChanged = TreeDBOFocusChanged
     OnGetText = TreeDBOGetText
     OnGetImageIndex = TreeDBOGetImageIndex
     OnGetNodeDataSize = TreeDBOGetNodeDataSize
     OnInitChildren = TreeDBOInitChildren
     OnInitNode = TreeDBOInitNode
-    Columns = <>
+    Columns = <
+      item
+        Position = 0
+        Width = 212
+        WideText = 'Name'
+      end
+      item
+        Options = [coAllowClick, coDraggable, coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coAllowFocus]
+        Position = 1
+        WideText = 'Size'
+      end>
   end
   object btnOK: TButton
     Left = 68

source/selectdbobject.pas

@@ -106,7 +106,7 @@ end;
 procedure TfrmSelectDBObject.FormShow(Sender: TObject);
 begin
   TreeDBO.Clear;
-  TreeDBO.RootNodeCount := Mainform.Databases.Count;
+  TreeDBO.RootNodeCount := Mainform.DBtree.RootNodeCount;
   SetLength(FColumns, Mainform.Databases.Count);
 //  TreeDBO.OnFocusChanged(TreeDBO, TreeDBO.FocusedNode, 0);
   editDB.Clear;
@@ -135,12 +135,12 @@ begin
   editTable.Clear;
   editCol.Clear;
   if Assigned(Node) then case TreeDBO.GetNodeLevel(Node) of
-    0: editDB.Text := TreeDBO.Text[Node, 0];
+    1: editDB.Text := TreeDBO.Text[Node, 0];
-    1: begin
+    2: begin
       editDB.Text := TreeDBO.Text[Node.Parent, 0];
       editTable.Text := TreeDBO.Text[Node, 0];
     end;
-    2: begin
+    3: begin
       editDB.Text := TreeDBO.Text[Node.Parent.Parent, 0];
       editTable.Text := TreeDBO.Text[Node.Parent, 0];
       editCol.Text := TreeDBO.Text[Node, 0];
@@ -162,21 +162,10 @@ end;
 procedure TfrmSelectDBObject.TreeDBOGetImageIndex(Sender: TBaseVirtualTree;
     Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; var Ghosted:
     Boolean; var ImageIndex: Integer);
-var
-  DBObjects: TDBObjectList;
 begin
-  case Sender.GetNodeLevel(Node) of
+  Mainform.DBtreeGetImageIndex(Sender, Node, Kind, Column, Ghosted, ImageIndex);
-    0: ImageIndex := ICONINDEX_DB;
+  if Sender.GetNodeLevel(Node) = 3 then
-    1: begin
+    ImageIndex := ICONINDEX_FIELD;
-        DBObjects := Mainform.Connection.GetDBObjects(Mainform.Databases[Node.Parent.Index]);
-        case DBObjects[Node.Index].NodeType of
-          lntCrashedTable: ImageIndex := ICONINDEX_CRASHED_TABLE;
-          lntTable: ImageIndex := ICONINDEX_TABLE;
-          lntView: ImageIndex := ICONINDEX_VIEW;
-        end;
-      end;
-    2: ImageIndex := ICONINDEX_FIELD;
-  end;
 end;
 
 
@@ -194,13 +183,10 @@ var
   cols: TWideStringList;
 begin
   // Fetch sub nodes
+  Mainform.DBtreeInitChildren(Sender, Node, ChildCount);
   case Sender.GetNodeLevel(Node) of
-    0: begin // DB expanding
+    1: SetLength(FColumns[Node.Index], ChildCount);
-        DBObjects := Mainform.Connection.GetDBObjects(Mainform.Databases[Node.Index]);
+    2: begin // Table expanding
-        ChildCount := DBObjects.Count;
-        SetLength(FColumns[Node.Index], DBObjects.Count);
-      end;
-    1: begin // Table expanding
         DBObjects := Mainform.Connection.GetDBObjects(Mainform.Databases[Node.Parent.Index]);
         cols := Mainform.Connection.GetCol('SHOW COLUMNS FROM '
           + Mainform.mask(Mainform.Databases[Node.Parent.Index])+'.'
@@ -216,17 +202,10 @@ end;
 procedure TfrmSelectDBObject.TreeDBOGetText(Sender: TBaseVirtualTree; Node:
     PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; var CellText:
     WideString);
-var
-  DBObjects: TDBObjectList;
 begin
-  case Sender.GetNodeLevel(Node) of
+  Mainform.DBtreeGetText(Sender, Node, Column, TextType, CellText);
-    0: CellText := Mainform.Databases[Node.Index];
+  if Sender.GetNodeLevel(Node) = 3 then
-    1: begin
+    CellText := FColumns[Node.Parent.Parent.Index][Node.Parent.Index][Node.Index];
-        DBObjects := Mainform.Connection.GetDBObjects(Mainform.Databases[Node.Parent.Index]);
-        CellText := DBObjects[Node.Index].Name
-      end;
-    2: CellText := FColumns[Node.Parent.Parent.Index][Node.Parent.Index][Node.Index];
-  end;
 end;
 
 
@@ -234,7 +213,8 @@ procedure TfrmSelectDBObject.TreeDBOInitNode(Sender: TBaseVirtualTree;
     ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates);
 begin
   // Ensure plus sign is visible for dbs and tables
-  if Sender.GetNodeLevel(Node) in [0,1] then
+  Mainform.DBtreeInitNode(Sender, ParentNode, Node, InitialStates);
+  if Sender.GetNodeLevel(Node) = 2 then
     InitialStates := InitialStates + [ivsHasChildren];
 end;