--- ibx/trunk/design/ibselectsqleditor.pas	2018/01/18 14:37:35	106
+++ ibx/trunk/design/ibselectsqleditor.pas	2018/01/18 14:37:40	107
@@ -42,7 +42,9 @@ type
   TIBSelectSQLEditorForm = class(TForm)
     Button1: TButton;
     Button2: TButton;
+    PackageNames: TIBLookupComboEditBox;
     InputProcGrid: TIBDynamicGrid;
+    PackageNameLabel: TLabel;
     OutputProcGrid: TIBDynamicGrid;
     IncludeSysTables: TCheckBox;
     GenerateBtn: TButton;
@@ -51,7 +53,6 @@ type
     PrimaryKeysGrid: TIBDynamicGrid;
     IBSQLEditFrame1: TIBSQLEditFrame;
     ProcedureNames: TIBLookupComboEditBox;
-    SelectProcedure: TLabel;
     SelectSelectAll: TCheckBox;
     SelectTableNames: TIBLookupComboEditBox;
     TestBtn: TButton;
@@ -71,6 +72,7 @@ type
     procedure IncludeSysTablesChange(Sender: TObject);
     procedure InputProcGridDblClick(Sender: TObject);
     procedure OutputProcGridDblClick(Sender: TObject);
+    procedure PackageNamesDblClick(Sender: TObject);
     procedure PrimaryKeysGridDblClick(Sender: TObject);
     procedure ProcedureNamesDblClick(Sender: TObject);
     procedure SelectSelectAllChange(Sender: TObject);
@@ -81,7 +83,6 @@ type
     procedure FormShow(Sender: TObject);
     procedure PrimaryKeyListDblClick(Sender: TObject);
     procedure SelectPageShow(Sender: TObject);
-    procedure UserProceduresAfterScroll(DataSet: TDataSet);
   private
     { private declarations }
     procedure HandleUserTablesOpened(Sender: TObject);
@@ -117,6 +118,7 @@ begin
       GenerateParams.Checked := DataSet.GenerateParamNames;
     end;
     IBSQLEditFrame1.SQLText.Lines.Assign(SelectSQL);
+    IBSQLEditFrame1.SelectProcs := true;
     Result := ShowModal = mrOK;
     if Result then
     begin
@@ -155,11 +157,6 @@ begin
     IBSQLEditFrame1.UserTables.Active := true;
 end;
 
-procedure TIBSelectSQLEditorForm.UserProceduresAfterScroll(DataSet: TDataSet);
-begin
-  SelectProcedure.Visible := DataSet.FieldByName('RDB$PROCEDURE_TYPE').AsInteger = 2;
-end;
-
 procedure TIBSelectSQLEditorForm.FieldListDblClick(Sender: TObject);
 begin
   IBSQLEditFrame1.InsertSelectedFieldName;
@@ -193,6 +190,11 @@ begin
   IBSQLEditFrame1.InsertSelectedOutputParam;
 end;
 
+procedure TIBSelectSQLEditorForm.PackageNamesDblClick(Sender: TObject);
+begin
+  IBSQLEditFrame1.InsertPackageName;
+end;
+
 procedure TIBSelectSQLEditorForm.PrimaryKeysGridDblClick(Sender: TObject);
 begin
   IBSQLEditFrame1.InsertSelectedPrimaryKey;
@@ -221,13 +223,12 @@ end;
 procedure TIBSelectSQLEditorForm.ExecutePageShow(Sender: TObject);
 begin
   if (IBSQLEditFrame1.Database <> nil) and IBSQLEditFrame1.Database.Connected then
-    IBSQLEditFrame1.UserProcedures.Active := true;
+    IBSQLEditFrame1.OpenUserProcedures;
 end;
 
 procedure TIBSelectSQLEditorForm.HandleUserTablesOpened(Sender: TObject);
 begin
   SelectSelectAll.Checked := true;
-  SelectProcedure.Visible := false;
 end;
 
 procedure TIBSelectSQLEditorForm.Loaded;
@@ -244,6 +245,8 @@ begin
       FieldNamesGrid.DataSource := IBSQLEditFrame1.FieldsSource;
     if PrimaryKeysGrid <> nil then
       PrimaryKeysGrid.DataSource := IBSQLEditFrame1.PrimaryKeySource;
+    if PackageNames <> nil then
+      PackageNames.ListSource := IBSQLEditFrame1.PackageNameSource;
     if ProcedureNames <> nil then
       ProcedureNames.ListSource := IBSQLEditFrame1.UserProcSource;
     if InputProcGrid <> nil then