--- ibx/trunk/design/ibdataseteditor.lfm	2017/12/31 14:53:21	79
+++ ibx/trunk/design/ibdataseteditor.lfm	2018/01/01 11:31:07	80
@@ -1,7 +1,7 @@
 object IBDataSetEditorForm: TIBDataSetEditorForm
-  Left = 475
+  Left = 442
   Height = 410
-  Top = 327
+  Top = 421
   Width = 662
   ActiveControl = PageControl
   BorderIcons = [biSystemMenu]
@@ -12,7 +12,7 @@ object IBDataSetEditorForm: TIBDataSetEd
   OnClose = FormClose
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '1.8.1.0'
   object PageControl: TPageControl
     Left = 8
     Height = 352
@@ -42,16 +42,14 @@ object IBDataSetEditorForm: TIBDataSetEd
           Top = 18
           Width = 73
           Caption = 'Table &Name:'
-          FocusControl = TableNamesCombo
           ParentColor = False
         end
         object Label3: TLabel
-          Left = 315
+          Left = 288
           Height = 14
-          Top = 18
+          Top = 16
           Width = 62
           Caption = '&Key Fields:'
-          FocusControl = PrimaryKeyList
           ParentColor = False
         end
         object Label4: TLabel
@@ -60,47 +58,8 @@ object IBDataSetEditorForm: TIBDataSetEd
           Top = 18
           Width = 85
           Caption = 'Update &Fields:'
-          FocusControl = FieldList
           ParentColor = False
         end
-        object TableNamesCombo: TComboBox
-          Left = 9
-          Height = 27
-          Top = 35
-          Width = 171
-          AutoComplete = True
-          AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending]
-          ItemHeight = 0
-          OnCloseUp = TableNamesComboCloseUp
-          TabOrder = 0
-        end
-        object PrimaryKeyList: TListBox
-          Left = 315
-          Height = 239
-          Top = 35
-          Width = 136
-          Anchors = [akTop, akLeft, akBottom]
-          ItemHeight = 0
-          MultiSelect = True
-          ScrollWidth = 134
-          TabOrder = 3
-          TopIndex = -1
-        end
-        object FieldList: TListBox
-          Left = 458
-          Height = 239
-          Hint = 'Select Fields to include in Update Statements, or leave unselected to select all'
-          Top = 35
-          Width = 136
-          Anchors = [akTop, akLeft, akBottom]
-          ItemHeight = 0
-          MultiSelect = True
-          ParentShowHint = False
-          ScrollWidth = 134
-          ShowHint = True
-          TabOrder = 4
-          TopIndex = -1
-        end
         object GenerateButton: TButton
           Left = 9
           Height = 25
@@ -108,7 +67,7 @@ object IBDataSetEditorForm: TIBDataSetEd
           Width = 168
           Caption = '&Generate SQL'
           OnClick = GenerateButtonClick
-          TabOrder = 1
+          TabOrder = 0
         end
         object QuoteFields: TCheckBox
           Left = 9
@@ -116,18 +75,15 @@ object IBDataSetEditorForm: TIBDataSetEd
           Top = 160
           Width = 125
           Caption = '&Quote Identifiers'
-          TabOrder = 2
+          TabOrder = 1
         end
         object IncludePrimaryKeys: TCheckBox
           Left = 9
           Height = 22
           Top = 192
-          Width = 221
-          Caption = 'Include Primary keys in Field List'
-          Checked = True
-          OnClick = TableNamesComboCloseUp
-          State = cbChecked
-          TabOrder = 5
+          Width = 241
+          Caption = 'Include Primary keys in Update SQL'
+          TabOrder = 2
         end
         object GenerateParams: TCheckBox
           Left = 9
@@ -135,7 +91,116 @@ object IBDataSetEditorForm: TIBDataSetEd
           Top = 128
           Width = 171
           Caption = 'Allow DSQL Placeholders'
+          TabOrder = 3
+        end
+        object SelectTableNames: TIBLookupComboEditBox
+          Left = 12
+          Height = 27
+          Top = 32
+          Width = 209
+          OwnerDrawEditable = False
+          KeyField = 'RDB$RELATION_ID'
+          ListField = 'RDB$RELATION_NAME'
+          ListFieldIndex = 0
+          LookupCache = False
+          ScrollListDataset = True
+          TabOrder = 4
+          AutoInsert = False
+          AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending]
+          ItemHeight = 0
+        end
+        object IncludeSysTables: TCheckBox
+          Left = 13
+          Height = 22
+          Top = 59
+          Width = 158
+          Caption = 'Include System Tables'
+          OnChange = IncludeSysTablesChange
+          TabOrder = 5
+        end
+        object PrimaryKeysGrid: TIBDynamicGrid
+          Left = 288
+          Height = 181
+          Top = 35
+          Width = 144
+          Color = clWindow
+          Columns = <          
+            item
+              ButtonStyle = cbsCheckboxColumn
+              Title.Caption = 'SELECTED'
+              Width = 30
+              FieldName = 'SELECTED'
+              AutoSizeColumn = False
+              InitialSortColumn = False
+              DBLookupProperties.ItemHeight = 0
+              DBLookupProperties.ItemWidth = 0
+              DBLookupProperties.AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending]
+            end          
+            item
+              Title.Caption = 'COLUMNNAME'
+              Width = 64
+              FieldName = 'COLUMNNAME'
+              AutoSizeColumn = True
+              InitialSortColumn = False
+              DBLookupProperties.ItemHeight = 0
+              DBLookupProperties.ItemWidth = 0
+              DBLookupProperties.AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending]
+            end>
+          FixedCols = 0
+          Options = [dgEditing, dgColumnResize, dgColumnMove, dgRowLines, dgConfirmDelete, dgCancelOnExit, dgDisableDelete, dgDisableInsert]
+          Scrollbars = ssAutoVertical
           TabOrder = 6
+          ExpandEditorPanelBelowRow = False
+          Descending = False
+          EditorBorderStyle = bsSingle
+          DefaultPositionAtEnd = False
+        end
+        object FieldNamesGrid: TIBDynamicGrid
+          Left = 458
+          Height = 184
+          Top = 32
+          Width = 144
+          Color = clWindow
+          Columns = <          
+            item
+              ButtonStyle = cbsCheckboxColumn
+              Title.Caption = 'SELECTED'
+              Width = 30
+              FieldName = 'SELECTED'
+              AutoSizeColumn = False
+              InitialSortColumn = False
+              DBLookupProperties.ItemHeight = 0
+              DBLookupProperties.ItemWidth = 0
+              DBLookupProperties.AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending]
+            end          
+            item
+              Title.Caption = 'COLUMNNAME'
+              Width = 64
+              FieldName = 'COLUMNNAME'
+              AutoSizeColumn = True
+              InitialSortColumn = False
+              DBLookupProperties.ItemHeight = 0
+              DBLookupProperties.ItemWidth = 0
+              DBLookupProperties.AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending]
+            end>
+          DataSource = IBSQLEditFrame.FieldsSource
+          FixedCols = 0
+          Options = [dgEditing, dgColumnResize, dgColumnMove, dgRowLines, dgConfirmDelete, dgCancelOnExit, dgDisableDelete, dgDisableInsert]
+          Scrollbars = ssAutoVertical
+          TabOrder = 7
+          ExpandEditorPanelBelowRow = False
+          Descending = False
+          EditorBorderStyle = bsSingle
+          DefaultPositionAtEnd = False
+        end
+        object SelectSelectAll: TCheckBox
+          Left = 456
+          Height = 22
+          Top = 216
+          Width = 134
+          Caption = 'Select/Deselect All'
+          OnClick = SelectSelectAllClick
+          TabOrder = 8
         end
       end
     end
@@ -146,28 +211,17 @@ object IBDataSetEditorForm: TIBDataSetEd
       OnShow = SQLPageShow
       object Label2: TLabel
         Left = 10
-        Height = 15
+        Height = 14
         Top = 81
         Width = 56
         Caption = 'S&QL Text:'
-        FocusControl = SQLMemo
         ParentColor = False
       end
-      object SQLMemo: TMemo
-        Left = 9
-        Height = 203
-        Top = 105
-        Width = 613
-        Anchors = [akTop, akLeft, akRight, akBottom]
-        OnChange = SQLMemoChange
-        ScrollBars = ssAutoBoth
-        TabOrder = 0
-      end
       object StatementType: TRadioGroup
         Left = 10
-        Height = 53
+        Height = 49
         Top = 9
-        Width = 339
+        Width = 327
         AutoFill = True
         AutoSize = True
         Caption = 'Statement Type'
@@ -179,8 +233,8 @@ object IBDataSetEditorForm: TIBDataSetEd
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 5
-        ClientHeight = 38
-        ClientWidth = 337
+        ClientHeight = 34
+        ClientWidth = 325
         Columns = 5
         ItemIndex = 0
         Items.Strings = (
@@ -191,7 +245,7 @@ object IBDataSetEditorForm: TIBDataSetEd
           '&Refresh'
         )
         OnClick = StatementTypeClick
-        TabOrder = 1
+        TabOrder = 0
       end
       object TestBtn: TButton
         Left = 539
@@ -201,7 +255,57 @@ object IBDataSetEditorForm: TIBDataSetEd
         Anchors = [akTop, akRight]
         Caption = 'Test'
         OnClick = TestBtnClick
+        TabOrder = 1
+      end
+      inline IBSQLEditFrame1: TIBSQLEditFrame
+        Left = 12
+        Height = 217
+        Top = 95
+        Width = 616
+        Anchors = [akTop, akLeft, akRight, akBottom]
+        ClientHeight = 217
+        ClientWidth = 616
         TabOrder = 2
+        inherited SQLText: TSynEdit
+          Height = 191
+          Width = 616
+          OnChange = SQLMemoChange
+        end
+        inherited ToolBar1: TToolBar
+          Width = 616
+        end
+        inherited FieldNameList: TIBQuery
+          ParamData = <          
+            item
+              DataType = ftUnknown
+              Name = 'RDB$RELATION_NAME'
+              ParamType = ptInput
+            end>
+        end
+        inherited PrimaryKeys: TIBQuery
+          ParamData = <          
+            item
+              DataType = ftUnknown
+              Name = 'RDB$RELATION_NAME'
+              ParamType = ptInput
+            end>
+        end
+        inherited ProcInputParams: TIBQuery
+          ParamData = <          
+            item
+              DataType = ftUnknown
+              Name = 'RDB$PROCEDURE_NAME'
+              ParamType = ptInput
+            end>
+        end
+        inherited ProcOutputParams: TIBQuery
+          ParamData = <          
+            item
+              DataType = ftUnknown
+              Name = 'RDB$PROCEDURE_NAME'
+              ParamType = ptInput
+            end>
+        end
       end
     end
   end
@@ -227,9 +331,4 @@ object IBDataSetEditorForm: TIBDataSetEd
     ModalResult = 2
     TabOrder = 2
   end
-  object IBTransaction1: TIBTransaction
-    Active = False
-    left = 32
-    top = 368
-  end
 end