diff --git a/MultiTool.Form/frmConfig.Designer.vb b/MultiTool.Form/frmConfig.Designer.vb index beba14c..d8e6666 100644 --- a/MultiTool.Form/frmConfig.Designer.vb +++ b/MultiTool.Form/frmConfig.Designer.vb @@ -55,6 +55,7 @@ Partial Class frmConfig Me.RepositoryItemMemoEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit() Me.SidePanel3 = New DevExpress.XtraEditors.SidePanel() Me.GridControlTables = New DevExpress.XtraGrid.GridControl() + Me.TBMT_TABLESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridViewTables = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colName = New DevExpress.XtraGrid.Columns.GridColumn() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() @@ -118,8 +119,11 @@ Partial Class frmConfig Me.TBMT_TEMPLATE_ITEMSTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBMT_TEMPLATE_ITEMSTableAdapter() Me.TBMT_CONFIGTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBMT_CONFIGTableAdapter() Me.TableAdapterManager = New MultiTool.Form.DS_DD_ECMTableAdapters.TableAdapterManager() - Me.TBMT_TABLESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBMT_TABLESTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBMT_TABLESTableAdapter() + Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem() + Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.tabPageSchema.SuspendLayout() @@ -132,6 +136,7 @@ Partial Class frmConfig CType(Me.RepositoryItemMemoEdit1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SidePanel3.SuspendLayout() CType(Me.GridControlTables, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBMT_TABLESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewTables, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SidePanel1.SuspendLayout() @@ -176,7 +181,10 @@ Partial Class frmConfig CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBMT_TABLESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'XtraTabControl1 @@ -240,7 +248,7 @@ Partial Class frmConfig 'colXML_NAME ' Me.colXML_NAME.Caption = "Name" - Me.colXML_NAME.FieldName = "XML_NAME" + Me.colXML_NAME.FieldName = "NAME" Me.colXML_NAME.MinWidth = 10 Me.colXML_NAME.Name = "colXML_NAME" Me.colXML_NAME.Visible = True @@ -250,8 +258,10 @@ Partial Class frmConfig 'colXML_TYPE_ID ' Me.colXML_TYPE_ID.Caption = "Typ" - Me.colXML_TYPE_ID.FieldName = "XML_TYPE_ID" + Me.colXML_TYPE_ID.FieldName = "TYPE_ID" Me.colXML_TYPE_ID.Name = "colXML_TYPE_ID" + Me.colXML_TYPE_ID.OptionsColumn.AllowEdit = False + Me.colXML_TYPE_ID.OptionsColumn.ReadOnly = True Me.colXML_TYPE_ID.Visible = True Me.colXML_TYPE_ID.VisibleIndex = 1 Me.colXML_TYPE_ID.Width = 55 @@ -276,6 +286,8 @@ Partial Class frmConfig Me.colORDER_KEY.ColumnEdit = Me.RepositoryItemSpinEdit1 Me.colORDER_KEY.FieldName = "ORDER_KEY" Me.colORDER_KEY.Name = "colORDER_KEY" + Me.colORDER_KEY.OptionsColumn.AllowEdit = False + Me.colORDER_KEY.OptionsColumn.ReadOnly = True Me.colORDER_KEY.Visible = True Me.colORDER_KEY.VisibleIndex = 2 Me.colORDER_KEY.Width = 80 @@ -316,7 +328,7 @@ Partial Class frmConfig Me.colFUNCTION_PARAMETERS.FieldName = "FUNCTION_PARAMETERS" Me.colFUNCTION_PARAMETERS.Name = "colFUNCTION_PARAMETERS" Me.colFUNCTION_PARAMETERS.Visible = True - Me.colFUNCTION_PARAMETERS.VisibleIndex = 3 + Me.colFUNCTION_PARAMETERS.VisibleIndex = 6 Me.colFUNCTION_PARAMETERS.Width = 401 ' 'RepositoryItemMemoExEdit1 @@ -330,8 +342,6 @@ Partial Class frmConfig Me.colPREFER_EXTERNAL.Caption = "Extern Bevorzugen" Me.colPREFER_EXTERNAL.FieldName = "PREFER_EXTERNAL" Me.colPREFER_EXTERNAL.Name = "colPREFER_EXTERNAL" - Me.colPREFER_EXTERNAL.Visible = True - Me.colPREFER_EXTERNAL.VisibleIndex = 4 ' 'colXML_TABLE_ID ' @@ -364,7 +374,7 @@ Partial Class frmConfig Me.colTABLE_NAME.FieldName = "TABLE_NAME" Me.colTABLE_NAME.Name = "colTABLE_NAME" Me.colTABLE_NAME.Visible = True - Me.colTABLE_NAME.VisibleIndex = 6 + Me.colTABLE_NAME.VisibleIndex = 3 ' 'colTEMPLATE_NAME ' @@ -372,7 +382,7 @@ Partial Class frmConfig Me.colTEMPLATE_NAME.FieldName = "TEMPLATE_NAME" Me.colTEMPLATE_NAME.Name = "colTEMPLATE_NAME" Me.colTEMPLATE_NAME.Visible = True - Me.colTEMPLATE_NAME.VisibleIndex = 7 + Me.colTEMPLATE_NAME.VisibleIndex = 4 ' 'RepositoryItemMemoEdit1 ' @@ -401,6 +411,11 @@ Partial Class frmConfig Me.GridControlTables.TabIndex = 0 Me.GridControlTables.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewTables}) ' + 'TBMT_TABLESBindingSource + ' + Me.TBMT_TABLESBindingSource.DataMember = "TBMT_TABLES" + Me.TBMT_TABLESBindingSource.DataSource = Me.DS_DD_ECM + ' 'GridViewTables ' Me.GridViewTables.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colName}) @@ -493,6 +508,8 @@ Partial Class frmConfig Me.LayoutControl2.Controls.Add(Me.CheckEdit4) Me.LayoutControl2.Controls.Add(Me.CheckEdit5) Me.LayoutControl2.Controls.Add(Me.CheckEdit6) + Me.LayoutControl2.Controls.Add(Me.TextEdit1) + Me.LayoutControl2.Controls.Add(Me.TextEdit2) Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControl2.Location = New System.Drawing.Point(1, 0) Me.LayoutControl2.Name = "LayoutControl2" @@ -577,10 +594,10 @@ Partial Class frmConfig ' 'LayoutControlGroup5 ' - Me.LayoutControlGroup5.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem12, Me.LayoutControlItem10, Me.LayoutControlItem11, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem7}) + Me.LayoutControlGroup5.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem12, Me.LayoutControlItem10, Me.LayoutControlItem11, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem13, Me.LayoutControlItem14}) Me.LayoutControlGroup5.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup5.Name = "LayoutControlGroup5" - Me.LayoutControlGroup5.Size = New System.Drawing.Size(242, 285) + Me.LayoutControlGroup5.Size = New System.Drawing.Size(242, 397) Me.LayoutControlGroup5.Text = "Einstellungen" ' 'LayoutControlItem12 @@ -646,9 +663,9 @@ Partial Class frmConfig 'EmptySpaceItem2 ' Me.EmptySpaceItem2.AllowHotTrack = False - Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 285) + Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 397) Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(242, 296) + Me.EmptySpaceItem2.Size = New System.Drawing.Size(242, 184) Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) ' 'tabPageConfig @@ -955,15 +972,52 @@ Partial Class frmConfig Me.TableAdapterManager.TBMT_TEMPLATESTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = MultiTool.Form.DS_DD_ECMTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' - 'TBMT_TABLESBindingSource - ' - Me.TBMT_TABLESBindingSource.DataMember = "TBMT_TABLES" - Me.TBMT_TABLESBindingSource.DataSource = Me.DS_DD_ECM - ' 'TBMT_TABLESTableAdapter ' Me.TBMT_TABLESTableAdapter.ClearBeforeFill = True ' + 'TextEdit1 + ' + Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBEDIXMLITEMSBindingSource, "ORDER_KEY", True)) + Me.TextEdit1.Location = New System.Drawing.Point(32, 309) + Me.TextEdit1.MenuManager = Me.RibbonControl1 + Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.Size = New System.Drawing.Size(198, 20) + Me.TextEdit1.StyleController = Me.LayoutControl2 + Me.TextEdit1.TabIndex = 10 + ' + 'LayoutControlItem13 + ' + Me.LayoutControlItem13.Control = Me.TextEdit1 + Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 240) + Me.LayoutControlItem13.Name = "LayoutControlItem13" + Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem13.Size = New System.Drawing.Size(218, 56) + Me.LayoutControlItem13.Text = "Sortierung" + Me.LayoutControlItem13.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem13.TextSize = New System.Drawing.Size(55, 13) + ' + 'TextEdit2 + ' + Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBEDIXMLITEMSBindingSource, "TYPE_ID", True)) + Me.TextEdit2.Location = New System.Drawing.Point(32, 365) + Me.TextEdit2.MenuManager = Me.RibbonControl1 + Me.TextEdit2.Name = "TextEdit2" + Me.TextEdit2.Size = New System.Drawing.Size(198, 20) + Me.TextEdit2.StyleController = Me.LayoutControl2 + Me.TextEdit2.TabIndex = 11 + ' + 'LayoutControlItem14 + ' + Me.LayoutControlItem14.Control = Me.TextEdit2 + Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 296) + Me.LayoutControlItem14.Name = "LayoutControlItem14" + Me.LayoutControlItem14.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem14.Size = New System.Drawing.Size(218, 56) + Me.LayoutControlItem14.Text = "Typ" + Me.LayoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem14.TextSize = New System.Drawing.Size(55, 13) + ' 'frmConfig ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -989,6 +1043,7 @@ Partial Class frmConfig CType(Me.RepositoryItemMemoEdit1, System.ComponentModel.ISupportInitialize).EndInit() Me.SidePanel3.ResumeLayout(False) CType(Me.GridControlTables, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBMT_TABLESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewTables, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SidePanel1.ResumeLayout(False) @@ -1033,7 +1088,10 @@ Partial Class frmConfig CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBMT_TABLESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -1133,4 +1191,8 @@ Partial Class frmConfig Friend WithEvents TBMT_TABLESBindingSource As BindingSource Friend WithEvents TBMT_TABLESTableAdapter As DS_DD_ECMTableAdapters.TBMT_TABLESTableAdapter Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents TextEdit1 As TextEdit + Friend WithEvents TextEdit2 As TextEdit + Friend WithEvents LayoutControlItem13 As LayoutControlItem + Friend WithEvents LayoutControlItem14 As LayoutControlItem End Class diff --git a/MultiTool.Form/frmConfig.resx b/MultiTool.Form/frmConfig.resx index 99e3734..e1b5df5 100644 --- a/MultiTool.Form/frmConfig.resx +++ b/MultiTool.Form/frmConfig.resx @@ -143,9 +143,6 @@ IC8+DQo8L3N2Zz4L - - 17, 17 - 613, 17 diff --git a/MultiTool.Form/frmConfig.vb b/MultiTool.Form/frmConfig.vb index e834272..eae58c3 100644 --- a/MultiTool.Form/frmConfig.vb +++ b/MultiTool.Form/frmConfig.vb @@ -180,8 +180,12 @@ Public Class frmConfig End Sub Private Sub GridViewTables_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewTables.FocusedRowChanged - Dim oRow As DataRow = GridViewTables.GetDataRow(GridViewTables.FocusedRowHandle) - Dim oTableId = oRow.Item("TABLE_ID") - TBMT_TEMPLATE_ITEMSTableAdapter.Fill(DS_DD_ECM.TBMT_TEMPLATE_ITEMS, oTableId) + Try + Dim oRow As DataRow = GridViewTables.GetDataRow(GridViewTables.FocusedRowHandle) + Dim oTableId = oRow.Item("GUID") + TBMT_TEMPLATE_ITEMSTableAdapter.Fill(DS_DD_ECM.TBMT_TEMPLATE_ITEMS, oTableId) + Catch ex As Exception + FormHelper.ShowError(ex, "Laden der Tabelle") + End Try End Sub End Class \ No newline at end of file