diff --git a/Controls.SQLEditor/My Project/Resources.Designer.vb b/Controls.SQLEditor/My Project/Resources.Designer.vb index 780b95e9..83360763 100644 --- a/Controls.SQLEditor/My Project/Resources.Designer.vb +++ b/Controls.SQLEditor/My Project/Resources.Designer.vb @@ -120,6 +120,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property autoarrange() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("autoarrange", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -190,6 +200,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property handtool() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("handtool", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/Controls.SQLEditor/My Project/Resources.resx b/Controls.SQLEditor/My Project/Resources.resx index 1bd97810..0a14f139 100644 --- a/Controls.SQLEditor/My Project/Resources.resx +++ b/Controls.SQLEditor/My Project/Resources.resx @@ -142,32 +142,38 @@ ..\Resources\cleartablestyle.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\handtool.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\electronics_desktopmac.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\editdatasource2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\clearall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_database2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\updatedataextract3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\updatedataextract1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\updatedataextract3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\clearall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -175,7 +181,7 @@ ..\Resources\actions_database1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\autoarrange.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/Controls.SQLEditor/Placeholders.vb b/Controls.SQLEditor/Placeholders.vb index 6a08e747..5ba62409 100644 --- a/Controls.SQLEditor/Placeholders.vb +++ b/Controls.SQLEditor/Placeholders.vb @@ -18,6 +18,53 @@ Public Class Placeholders Return oGroup1 End Function + Public Function GetManualPlaceholders() As GalleryItemGroup + Return GetManualPlaceholders(New List(Of String)) + End Function + + Public Function GetManualPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup + Dim oImage = My.Resources.handtool + Dim oItems As New List(Of GalleryItem)() + + If pPlaceholders.Count > 0 Then + For Each oManualPlaceholder In pPlaceholders + oItems.Add(GetGalleryItem(New Placeholder(oManualPlaceholder, "Manuelles Attribut", "ATTR_M", oManualPlaceholder), oImage)) + Next + + Else + oItems.Add(GetGalleryItem(New Placeholder("Attribut", "Manuelles Attribut", "ATTR_M", "ATTRIBUTE"), oImage)) + + End If + + Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Manuelle Attribute"} + oGroup1.Items.AddRange(oItems.ToArray) + Return oGroup1 + End Function + + Public Function GetAutomaticPlaceholders() As GalleryItemGroup + Return GetAutomaticPlaceholders(New List(Of String)) + End Function + + Public Function GetAutomaticPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup + Dim oImage = My.Resources.autoarrange + Dim oItems As New List(Of GalleryItem)() + + If pPlaceholders.Count > 0 Then + For Each oManualPlaceholder In pPlaceholders + oItems.Add(GetGalleryItem(New Placeholder(oManualPlaceholder, "Automatisches Attribut", "ATTR_A", oManualPlaceholder), oImage)) + Next + + Else + oItems.Add(GetGalleryItem(New Placeholder("Attribut", "Automatisches Attribut", "ATTR_A", "ATTRIBUTE"), oImage)) + + End If + + Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Automatisches Attribut"} + + oGroup1.Items.AddRange(oItems.ToArray) + Return oGroup1 + End Function + Public Function GetUserGroup() As GalleryItemGroup Dim oModule = "USER" Dim oImage = My.Resources.actions_user diff --git a/Controls.SQLEditor/Resources/autoarrange.svg b/Controls.SQLEditor/Resources/autoarrange.svg new file mode 100644 index 00000000..a736935b --- /dev/null +++ b/Controls.SQLEditor/Resources/autoarrange.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/Controls.SQLEditor/Resources/handtool.svg b/Controls.SQLEditor/Resources/handtool.svg new file mode 100644 index 00000000..1718d3f1 --- /dev/null +++ b/Controls.SQLEditor/Resources/handtool.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/Controls.SQLEditor/SQLEditor.vbproj b/Controls.SQLEditor/SQLEditor.vbproj index 3551da63..a0a3d920 100644 --- a/Controls.SQLEditor/SQLEditor.vbproj +++ b/Controls.SQLEditor/SQLEditor.vbproj @@ -255,5 +255,11 @@ + + + + + + \ No newline at end of file diff --git a/Controls.SQLEditor/frmSQLEditor.Designer.vb b/Controls.SQLEditor/frmSQLEditor.Designer.vb index 20e84532..13bf6e05 100644 --- a/Controls.SQLEditor/frmSQLEditor.Designer.vb +++ b/Controls.SQLEditor/frmSQLEditor.Designer.vb @@ -33,6 +33,8 @@ Partial Class frmSQLEditor Me.chkClearPlaceholders = New DevExpress.XtraBars.BarCheckItem() Me.btnClearPlaceholders = New DevExpress.XtraBars.BarButtonItem() Me.chkShowPlaceholders = New DevExpress.XtraBars.BarCheckItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -60,9 +62,9 @@ Partial Class frmSQLEditor 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.GalleryPlaceholders, Me.btnEditConnections, Me.btnSave, Me.btnExecuteSQL, Me.GalleryConnection, Me.chkClearPlaceholders, Me.btnClearPlaceholders, Me.chkShowPlaceholders}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.GalleryPlaceholders, Me.btnEditConnections, Me.btnSave, Me.btnExecuteSQL, Me.GalleryConnection, Me.chkClearPlaceholders, Me.btnClearPlaceholders, Me.chkShowPlaceholders, Me.BarButtonItem1, Me.BarButtonItem2}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 13 + Me.RibbonControl1.MaxItemId = 15 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -94,14 +96,14 @@ Partial Class frmSQLEditor ' 'btnSave ' - Me.btnSave.Caption = "Speichern" + Me.btnSave.Caption = "Speichern und Schließen" Me.btnSave.Id = 3 Me.btnSave.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.check Me.btnSave.Name = "btnSave" ' 'btnExecuteSQL ' - Me.btnExecuteSQL.Caption = "SQL Ausführen" + Me.btnExecuteSQL.Caption = "SQL Ausführen (F5)" Me.btnExecuteSQL.Id = 4 Me.btnExecuteSQL.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.updatedataextract3 Me.btnExecuteSQL.Name = "btnExecuteSQL" @@ -114,6 +116,7 @@ Partial Class frmSQLEditor ' Me.GalleryConnection.Gallery.CheckDrawMode = DevExpress.XtraBars.Ribbon.Gallery.CheckDrawMode.ImageAndText Me.GalleryConnection.Gallery.ItemCheckMode = DevExpress.XtraBars.Ribbon.Gallery.ItemCheckMode.SingleRadio + Me.GalleryConnection.Gallery.RowCount = 1 Me.GalleryConnection.Gallery.ShowItemText = True Me.GalleryConnection.Id = 5 Me.GalleryConnection.Name = "GalleryConnection" @@ -141,6 +144,20 @@ Partial Class frmSQLEditor Me.chkShowPlaceholders.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.togglefieldcodes Me.chkShowPlaceholders.Name = "chkShowPlaceholders" ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "BarButtonItem1" + Me.BarButtonItem1.Id = 13 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.handtool + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "BarButtonItem2" + Me.BarButtonItem2.Id = 14 + Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.autoarrange + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup4, Me.RibbonPageGroup1}) @@ -256,6 +273,7 @@ Partial Class frmSQLEditor Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.editdatasource2 + Me.KeyPreview = True Me.Name = "frmSQLEditor" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 @@ -297,4 +315,6 @@ Partial Class frmSQLEditor Friend WithEvents chkClearPlaceholders As DevExpress.XtraBars.BarCheckItem Friend WithEvents btnClearPlaceholders As DevExpress.XtraBars.BarButtonItem Friend WithEvents chkShowPlaceholders As DevExpress.XtraBars.BarCheckItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/Controls.SQLEditor/frmSQLEditor.resx b/Controls.SQLEditor/frmSQLEditor.resx index 1a6c0395..f722219e 100644 --- a/Controls.SQLEditor/frmSQLEditor.resx +++ b/Controls.SQLEditor/frmSQLEditor.resx @@ -120,7 +120,4 @@ 17, 17 - - 17, 17 - \ No newline at end of file diff --git a/Controls.SQLEditor/frmSQLEditor.vb b/Controls.SQLEditor/frmSQLEditor.vb index 57f4c008..3b70ddf3 100644 --- a/Controls.SQLEditor/frmSQLEditor.vb +++ b/Controls.SQLEditor/frmSQLEditor.vb @@ -18,14 +18,8 @@ Public Class frmSQLEditor Public Property SQLCommand As String = "" Public Property SQLConnection As Integer = 0 - Public Enum PlaceholderCollection - Globix - Zooflow - End Enum - - Public Sub SetPlaceholders(pCollection As PlaceholderCollection) - - End Sub + Public Property PlaceholdersManual As List(Of String) + Public Property PlaceholdersAutomatic As List(Of String) Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer) ' Dieser Aufruf ist für den Designer erforderlich. @@ -41,6 +35,14 @@ Public Class frmSQLEditor Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load FormLoading = True Try + If PlaceholdersAutomatic Is Nothing Then + PlaceholdersAutomatic = New List(Of String) + End If + + If PlaceholdersManual Is Nothing Then + PlaceholdersManual = New List(Of String) + End If + If SQLCommand <> String.Empty Then txtSQLCommand.Document.Text = SQLCommand End If @@ -63,8 +65,6 @@ Public Class frmSQLEditor Dim oPlaceholderGroups = LoadPlaceholders() GalleryPlaceholders.Gallery.Groups.AddRange(oPlaceholderGroups.ToArray) - - ConfigureRichEditControl() chkClearPlaceholders.Checked = ClearPlaceholdersAfterSuccessfulExecute @@ -86,15 +86,12 @@ Public Class frmSQLEditor SQLConnection = oConnection.Id End Sub - - Private Function LoadPlaceholders() As List(Of GalleryItemGroup) - Dim oInternalPlaceholders = Placeholders.GetInternalGroup() - Dim oUserPlaceholder = Placeholders.GetUserGroup() - Return New List(Of GalleryItemGroup)() From { - oInternalPlaceholders, - oUserPlaceholder + Placeholders.GetInternalGroup(), + Placeholders.GetUserGroup(), + Placeholders.GetAutomaticPlaceholders(PlaceholdersAutomatic), + Placeholders.GetManualPlaceholders(PlaceholdersManual) } End Function @@ -169,6 +166,15 @@ Public Class frmSQLEditor End Sub Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExecuteSQL.ItemClick + ExecuteSQL() + End Sub + + Private Class Connection + Public Property Id As Integer + Public Property Name As String + End Class + + Private Sub ExecuteSQL() Try Dim oSql = txtSQLCommand.Document.Text @@ -208,11 +214,6 @@ Public Class frmSQLEditor End Try End Sub - Private Class Connection - Public Property Id As Integer - Public Property Name As String - End Class - Private Sub BarCheckItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkClearPlaceholders.CheckedChanged If FormLoading = False Then ClearPlaceholdersAfterSuccessfulExecute = chkClearPlaceholders.Checked @@ -226,4 +227,15 @@ Public Class frmSQLEditor Private Sub chkShowPlaceholders_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkShowPlaceholders.CheckedChanged SplitContainerControl1.Collapsed = Not chkShowPlaceholders.Checked End Sub + + Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick + SQLCommand = txtSQLCommand.Text + Close() + End Sub + + Private Sub frmSQLEditor_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown + If e.KeyCode = Keys.F5 Then + ExecuteSQL() + End If + End Sub End Class diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb index 1925b2a4..f8caa18d 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb @@ -87,7 +87,6 @@ Partial Class frmAdmin_Globix Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageManIndexe = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlManIndexe = New DevExpress.XtraLayout.LayoutControl() - Me.OPTIONALCheckBox = New System.Windows.Forms.CheckBox() Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit() Me.CONNECTION_IDTextBox = New System.Windows.Forms.TextBox() Me.SQL_RESULTTextBox = New System.Windows.Forms.TextBox() @@ -96,7 +95,6 @@ Partial Class frmAdmin_Globix Me.VKT_ADD_ITEMCheckBox = New System.Windows.Forms.CheckBox() Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox = New System.Windows.Forms.CheckBox() Me.MULTISELECTCheckBox = New System.Windows.Forms.CheckBox() - Me.ACTIVECheckBox = New System.Windows.Forms.CheckBox() Me.btneditSQLmanIndex = New DevExpress.XtraEditors.SimpleButton() Me.TextEditAddedWho_ManIndex = New DevExpress.XtraEditors.TextEdit() Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() @@ -106,6 +104,8 @@ Partial Class frmAdmin_Globix Me.TextEdit11 = New DevExpress.XtraEditors.TextEdit() Me.SpinEdit1 = New DevExpress.XtraEditors.SpinEdit() Me.ComboBoxEdit4 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.ACTIVECheckBox2 = New DevExpress.XtraEditors.CheckEdit() + Me.OPTIONALCheckBox2 = New DevExpress.XtraEditors.CheckEdit() Me.LayoutControlGroupDoctype = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem17 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem() @@ -119,15 +119,13 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem27 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem29 = New DevExpress.XtraLayout.LayoutControlItem() - Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() Me.LayoutControlItem16 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem31 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem6 = New DevExpress.XtraLayout.EmptySpaceItem() Me.LayoutControlItem46 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem62 = New DevExpress.XtraLayout.LayoutControlItem() - Me.ListBoxAutoIndexe = New System.Windows.Forms.ListBox() + Me.LayoutControlItem63 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem64 = New DevExpress.XtraLayout.LayoutControlItem() Me.XtraTabPageRework = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlRework = New DevExpress.XtraLayout.LayoutControl() Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() @@ -248,6 +246,8 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem38 = New DevExpress.XtraLayout.LayoutControlItem() Me.TBGI_REGEX_DOCTYPETableAdapter = New DigitalData.GUIs.ZooFlow.GlobixDatasetTableAdapters.TBGI_REGEX_DOCTYPETableAdapter() Me.VWIDB_DOCTYPE_LANGUAGETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.VWIDB_DOCTYPE_LANGUAGETableAdapter() + Me.ListBoxAutoIndexe = New DevExpress.XtraEditors.ListBoxControl() + Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() SEQUENCELabel = New System.Windows.Forms.Label() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -306,6 +306,8 @@ Partial Class frmAdmin_Globix CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ACTIVECheckBox2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.OPTIONALCheckBox2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroupDoctype, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() @@ -319,14 +321,13 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem31, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem46, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem62, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem63, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem64, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageRework.SuspendLayout() CType(Me.LayoutControlRework, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -420,6 +421,8 @@ Partial Class frmAdmin_Globix CType(Me.viewAvailableGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem38, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ListBoxAutoIndexe, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SEQUENCELabel @@ -600,7 +603,7 @@ Partial Class frmAdmin_Globix 'GridLookUpEdit1 ' Me.GridLookUpEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "IDB_DOCTYPE_ID", True)) - Me.GridLookUpEdit1.Location = New System.Drawing.Point(166, 76) + Me.GridLookUpEdit1.Location = New System.Drawing.Point(156, 76) Me.GridLookUpEdit1.MenuManager = Me.RibbonControl1 Me.GridLookUpEdit1.Name = "GridLookUpEdit1" Me.GridLookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -608,7 +611,7 @@ Partial Class frmAdmin_Globix Me.GridLookUpEdit1.Properties.DisplayMember = "Doctype" Me.GridLookUpEdit1.Properties.PopupView = Me.GridLookUpEdit1View Me.GridLookUpEdit1.Properties.ValueMember = "Doctype_ID" - Me.GridLookUpEdit1.Size = New System.Drawing.Size(921, 20) + Me.GridLookUpEdit1.Size = New System.Drawing.Size(931, 20) Me.GridLookUpEdit1.StyleController = Me.LayoutControlProfile Me.GridLookUpEdit1.TabIndex = 61 ' @@ -630,19 +633,19 @@ Partial Class frmAdmin_Globix Me.IDB_DOCTYPE_IDComboBox.DataSource = Me.VWIDB_DOCTYPE_LANGUAGEBindingSource Me.IDB_DOCTYPE_IDComboBox.DisplayMember = "Doctype" Me.IDB_DOCTYPE_IDComboBox.FormattingEnabled = True - Me.IDB_DOCTYPE_IDComboBox.Location = New System.Drawing.Point(166, 45) + Me.IDB_DOCTYPE_IDComboBox.Location = New System.Drawing.Point(156, 45) Me.IDB_DOCTYPE_IDComboBox.Name = "IDB_DOCTYPE_IDComboBox" - Me.IDB_DOCTYPE_IDComboBox.Size = New System.Drawing.Size(379, 21) + Me.IDB_DOCTYPE_IDComboBox.Size = New System.Drawing.Size(389, 21) Me.IDB_DOCTYPE_IDComboBox.TabIndex = 60 Me.IDB_DOCTYPE_IDComboBox.ValueMember = "Doctype_ID" ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWANN", True)) - Me.TextEdit1.Location = New System.Drawing.Point(166, 257) + Me.TextEdit1.Location = New System.Drawing.Point(156, 257) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Size = New System.Drawing.Size(379, 20) + Me.TextEdit1.Size = New System.Drawing.Size(389, 20) Me.TextEdit1.StyleController = Me.LayoutControlProfile Me.TextEdit1.TabIndex = 59 ' @@ -653,9 +656,9 @@ Partial Class frmAdmin_Globix Me.IDB_OBJECT_STORE_IDComboBox.DataSource = Me.VWIDB_OBJECT_STOREBindingSource Me.IDB_OBJECT_STORE_IDComboBox.DisplayMember = "Objectstore" Me.IDB_OBJECT_STORE_IDComboBox.FormattingEnabled = True - Me.IDB_OBJECT_STORE_IDComboBox.Location = New System.Drawing.Point(166, 166) + Me.IDB_OBJECT_STORE_IDComboBox.Location = New System.Drawing.Point(156, 166) Me.IDB_OBJECT_STORE_IDComboBox.Name = "IDB_OBJECT_STORE_IDComboBox" - Me.IDB_OBJECT_STORE_IDComboBox.Size = New System.Drawing.Size(379, 21) + Me.IDB_OBJECT_STORE_IDComboBox.Size = New System.Drawing.Size(389, 21) Me.IDB_OBJECT_STORE_IDComboBox.TabIndex = 57 Me.IDB_OBJECT_STORE_IDComboBox.ValueMember = "GUID" ' @@ -667,10 +670,10 @@ Partial Class frmAdmin_Globix 'SEQUENCENumericUpDown ' Me.SEQUENCENumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_INDEX_MANBindingSource, "SEQUENCE", True)) - Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(395, 15) + Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(385, 15) Me.SEQUENCENumericUpDown.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) Me.SEQUENCENumericUpDown.Name = "SEQUENCENumericUpDown" - Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(34, 22) + Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(44, 21) Me.SEQUENCENumericUpDown.TabIndex = 56 Me.SEQUENCENumericUpDown.Value = New Decimal(New Integer() {1, 0, 0, 0}) ' @@ -692,81 +695,81 @@ Partial Class frmAdmin_Globix 'GEAENDERTWANNTextBox ' Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GEAENDERTWANN", True)) - Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(706, 257) + Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(696, 257) Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox" Me.GEAENDERTWANNTextBox.ReadOnly = True - Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(381, 20) + Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(391, 20) Me.GEAENDERTWANNTextBox.TabIndex = 39 ' 'TextEditErstelltWer ' Me.TextEditErstelltWer.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWER", True)) - Me.TextEditErstelltWer.Location = New System.Drawing.Point(166, 227) + Me.TextEditErstelltWer.Location = New System.Drawing.Point(156, 227) Me.TextEditErstelltWer.MenuManager = Me.RibbonControl1 Me.TextEditErstelltWer.Name = "TextEditErstelltWer" - Me.TextEditErstelltWer.Size = New System.Drawing.Size(379, 20) + Me.TextEditErstelltWer.Size = New System.Drawing.Size(389, 20) Me.TextEditErstelltWer.StyleController = Me.LayoutControlProfile Me.TextEditErstelltWer.TabIndex = 44 ' 'TextEditGeandertWer ' Me.TextEditGeandertWer.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GEANDERTWER", True)) - Me.TextEditGeandertWer.Location = New System.Drawing.Point(706, 227) + Me.TextEditGeandertWer.Location = New System.Drawing.Point(696, 227) Me.TextEditGeandertWer.MenuManager = Me.RibbonControl1 Me.TextEditGeandertWer.Name = "TextEditGeandertWer" - Me.TextEditGeandertWer.Size = New System.Drawing.Size(381, 20) + Me.TextEditGeandertWer.Size = New System.Drawing.Size(391, 20) Me.TextEditGeandertWer.StyleController = Me.LayoutControlProfile Me.TextEditGeandertWer.TabIndex = 45 ' 'TextEditNamenkonvention ' Me.TextEditNamenkonvention.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "NAMENKONVENTION", True)) - Me.TextEditNamenkonvention.Location = New System.Drawing.Point(166, 136) + Me.TextEditNamenkonvention.Location = New System.Drawing.Point(156, 136) Me.TextEditNamenkonvention.MenuManager = Me.RibbonControl1 Me.TextEditNamenkonvention.Name = "TextEditNamenkonvention" - Me.TextEditNamenkonvention.Size = New System.Drawing.Size(662, 20) + Me.TextEditNamenkonvention.Size = New System.Drawing.Size(672, 20) Me.TextEditNamenkonvention.StyleController = Me.LayoutControlProfile Me.TextEditNamenkonvention.TabIndex = 46 ' 'TextEditBeschreibung ' Me.TextEditBeschreibung.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "BESCHREIBUNG", True)) - Me.TextEditBeschreibung.Location = New System.Drawing.Point(166, 197) + Me.TextEditBeschreibung.Location = New System.Drawing.Point(156, 197) Me.TextEditBeschreibung.MenuManager = Me.RibbonControl1 Me.TextEditBeschreibung.Name = "TextEditBeschreibung" - Me.TextEditBeschreibung.Size = New System.Drawing.Size(921, 20) + Me.TextEditBeschreibung.Size = New System.Drawing.Size(931, 20) Me.TextEditBeschreibung.StyleController = Me.LayoutControlProfile Me.TextEditBeschreibung.TabIndex = 48 ' 'TextEditBezeichnung ' Me.TextEditBezeichnung.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "BEZEICHNUNG", True)) - Me.TextEditBezeichnung.Location = New System.Drawing.Point(706, 45) + Me.TextEditBezeichnung.Location = New System.Drawing.Point(696, 45) Me.TextEditBezeichnung.MenuManager = Me.RibbonControl1 Me.TextEditBezeichnung.Name = "TextEditBezeichnung" - Me.TextEditBezeichnung.Size = New System.Drawing.Size(381, 20) + Me.TextEditBezeichnung.Size = New System.Drawing.Size(391, 20) Me.TextEditBezeichnung.StyleController = Me.LayoutControlProfile Me.TextEditBezeichnung.TabIndex = 51 ' 'TextEditDoctypeID ' Me.TextEditDoctypeID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GUID", True)) - Me.TextEditDoctypeID.Location = New System.Drawing.Point(166, 15) + Me.TextEditDoctypeID.Location = New System.Drawing.Point(156, 15) Me.TextEditDoctypeID.MenuManager = Me.RibbonControl1 Me.TextEditDoctypeID.Name = "TextEditDoctypeID" - Me.TextEditDoctypeID.Size = New System.Drawing.Size(68, 20) + Me.TextEditDoctypeID.Size = New System.Drawing.Size(78, 20) Me.TextEditDoctypeID.StyleController = Me.LayoutControlProfile Me.TextEditDoctypeID.TabIndex = 52 ' 'ComboBoxEditDupl_handling ' Me.ComboBoxEditDupl_handling.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "DUPLICATE_HANDLING", True)) - Me.ComboBoxEditDupl_handling.Location = New System.Drawing.Point(166, 106) + Me.ComboBoxEditDupl_handling.Location = New System.Drawing.Point(156, 106) Me.ComboBoxEditDupl_handling.MenuManager = Me.RibbonControl1 Me.ComboBoxEditDupl_handling.Name = "ComboBoxEditDupl_handling" Me.ComboBoxEditDupl_handling.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.ComboBoxEditDupl_handling.Properties.Items.AddRange(New Object() {"New version", "Default", "Question"}) - Me.ComboBoxEditDupl_handling.Size = New System.Drawing.Size(921, 20) + Me.ComboBoxEditDupl_handling.Size = New System.Drawing.Size(931, 20) Me.ComboBoxEditDupl_handling.StyleController = Me.LayoutControlProfile Me.ComboBoxEditDupl_handling.TabIndex = 54 ' @@ -798,7 +801,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem10.Size = New System.Drawing.Size(542, 31) Me.LayoutControlItem10.Text = "Bezeichnung" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(129, 13) ' 'LayoutControlItem3 ' @@ -811,7 +814,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem3.Size = New System.Drawing.Size(540, 30) Me.LayoutControlItem3.Text = "Erstellt wer" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(129, 13) ' 'LayoutControlItem30 ' @@ -821,7 +824,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem30.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem30.Size = New System.Drawing.Size(823, 30) Me.LayoutControlItem30.Text = "Namenkonvention" - Me.LayoutControlItem30.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem30.TextSize = New System.Drawing.Size(129, 13) ' 'LayoutControlItem20 ' @@ -832,7 +835,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem20.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem20.Size = New System.Drawing.Size(195, 30) Me.LayoutControlItem20.Text = "Reihenfolge" - Me.LayoutControlItem20.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem20.TextSize = New System.Drawing.Size(129, 13) ' 'LayoutControlItem4 ' @@ -844,7 +847,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem4.Size = New System.Drawing.Size(229, 30) Me.LayoutControlItem4.Text = "ID" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(129, 13) ' 'EmptySpaceItem1 ' @@ -873,7 +876,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem25.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem25.Size = New System.Drawing.Size(540, 31) Me.LayoutControlItem25.Text = "File-Store:" - Me.LayoutControlItem25.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem25.TextSize = New System.Drawing.Size(129, 13) ' 'EmptySpaceItem3 ' @@ -891,7 +894,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem26.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem26.Size = New System.Drawing.Size(1082, 30) Me.LayoutControlItem26.Text = "Verhalten Datei vorhanden" - Me.LayoutControlItem26.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem26.TextSize = New System.Drawing.Size(129, 13) ' 'LayoutControlItem1 ' @@ -913,7 +916,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem32.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem32.Size = New System.Drawing.Size(540, 30) Me.LayoutControlItem32.Text = "Erstellt wann" - Me.LayoutControlItem32.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem32.TextSize = New System.Drawing.Size(129, 13) ' 'LayoutControlItem5 ' @@ -926,7 +929,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem5.Size = New System.Drawing.Size(542, 30) Me.LayoutControlItem5.Text = "Geändert wer" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(129, 13) ' 'LayoutControlItem36 ' @@ -939,7 +942,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem36.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem36.Size = New System.Drawing.Size(542, 30) Me.LayoutControlItem36.Text = "Geändert wann:" - Me.LayoutControlItem36.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem36.TextSize = New System.Drawing.Size(129, 13) ' 'LayoutControlItem28 ' @@ -949,7 +952,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem28.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem28.Size = New System.Drawing.Size(1082, 30) Me.LayoutControlItem28.Text = "Beschreibung" - Me.LayoutControlItem28.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem28.TextSize = New System.Drawing.Size(129, 13) ' 'EmptySpaceItem12 ' @@ -967,7 +970,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem61.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem61.Size = New System.Drawing.Size(540, 31) Me.LayoutControlItem61.Text = "Dokumentart" - Me.LayoutControlItem61.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem61.TextSize = New System.Drawing.Size(129, 13) ' 'LayoutControlItem12 ' @@ -976,7 +979,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem12.Name = "LayoutControlItem12" Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem12.Size = New System.Drawing.Size(1082, 30) - Me.LayoutControlItem12.TextSize = New System.Drawing.Size(139, 13) + Me.LayoutControlItem12.TextSize = New System.Drawing.Size(129, 13) ' 'XtraTabControl2 ' @@ -1003,7 +1006,6 @@ Partial Class frmAdmin_Globix ' 'LayoutControlManIndexe ' - Me.LayoutControlManIndexe.Controls.Add(Me.OPTIONALCheckBox) Me.LayoutControlManIndexe.Controls.Add(Me.TextEdit4) Me.LayoutControlManIndexe.Controls.Add(Me.CONNECTION_IDTextBox) Me.LayoutControlManIndexe.Controls.Add(Me.SQL_RESULTTextBox) @@ -1011,7 +1013,6 @@ Partial Class frmAdmin_Globix Me.LayoutControlManIndexe.Controls.Add(Me.VKT_ADD_ITEMCheckBox) Me.LayoutControlManIndexe.Controls.Add(Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox) Me.LayoutControlManIndexe.Controls.Add(Me.MULTISELECTCheckBox) - Me.LayoutControlManIndexe.Controls.Add(Me.ACTIVECheckBox) Me.LayoutControlManIndexe.Controls.Add(Me.btneditSQLmanIndex) Me.LayoutControlManIndexe.Controls.Add(Me.TextEditAddedWho_ManIndex) Me.LayoutControlManIndexe.Controls.Add(Me.TextEdit2) @@ -1021,31 +1022,23 @@ Partial Class frmAdmin_Globix Me.LayoutControlManIndexe.Controls.Add(Me.TextEdit11) Me.LayoutControlManIndexe.Controls.Add(Me.SpinEdit1) Me.LayoutControlManIndexe.Controls.Add(Me.ComboBoxEdit4) + Me.LayoutControlManIndexe.Controls.Add(Me.ACTIVECheckBox2) + Me.LayoutControlManIndexe.Controls.Add(Me.OPTIONALCheckBox2) Me.LayoutControlManIndexe.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControlManIndexe.Location = New System.Drawing.Point(191, 0) + Me.LayoutControlManIndexe.Location = New System.Drawing.Point(187, 0) Me.LayoutControlManIndexe.Name = "LayoutControlManIndexe" Me.LayoutControlManIndexe.Root = Me.LayoutControlGroupDoctype - Me.LayoutControlManIndexe.Size = New System.Drawing.Size(920, 267) + Me.LayoutControlManIndexe.Size = New System.Drawing.Size(924, 267) Me.LayoutControlManIndexe.TabIndex = 1 Me.LayoutControlManIndexe.Text = "LayoutControl1" ' - 'OPTIONALCheckBox - ' - Me.OPTIONALCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "OPTIONAL", True)) - Me.OPTIONALCheckBox.Location = New System.Drawing.Point(442, 12) - Me.OPTIONALCheckBox.Name = "OPTIONALCheckBox" - Me.OPTIONALCheckBox.Size = New System.Drawing.Size(100, 20) - Me.OPTIONALCheckBox.TabIndex = 32 - Me.OPTIONALCheckBox.Text = "Optional" - Me.OPTIONALCheckBox.UseVisualStyleBackColor = True - ' 'TextEdit4 ' Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit4.Location = New System.Drawing.Point(496, 235) + Me.TextEdit4.Location = New System.Drawing.Point(498, 235) Me.TextEdit4.MenuManager = Me.RibbonControl1 Me.TextEdit4.Name = "TextEdit4" - Me.TextEdit4.Size = New System.Drawing.Size(392, 20) + Me.TextEdit4.Size = New System.Drawing.Size(394, 20) Me.TextEdit4.StyleController = Me.LayoutControlManIndexe Me.TextEdit4.TabIndex = 31 ' @@ -1062,7 +1055,7 @@ Partial Class frmAdmin_Globix Me.SQL_RESULTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "SQL_RESULT", True)) Me.SQL_RESULTTextBox.Location = New System.Drawing.Point(206, 168) Me.SQL_RESULTTextBox.Name = "SQL_RESULTTextBox" - Me.SQL_RESULTTextBox.Size = New System.Drawing.Size(685, 20) + Me.SQL_RESULTTextBox.Size = New System.Drawing.Size(689, 20) Me.SQL_RESULTTextBox.TabIndex = 29 ' 'WD_INDEXComboBox @@ -1071,9 +1064,9 @@ Partial Class frmAdmin_Globix Me.WD_INDEXComboBox.DataSource = Me.VWIDB_BE_ATTRIBUTEBindingSource Me.WD_INDEXComboBox.DisplayMember = "ATTR_TITLE" Me.WD_INDEXComboBox.FormattingEnabled = True - Me.WD_INDEXComboBox.Location = New System.Drawing.Point(528, 42) + Me.WD_INDEXComboBox.Location = New System.Drawing.Point(530, 42) Me.WD_INDEXComboBox.Name = "WD_INDEXComboBox" - Me.WD_INDEXComboBox.Size = New System.Drawing.Size(363, 21) + Me.WD_INDEXComboBox.Size = New System.Drawing.Size(365, 21) Me.WD_INDEXComboBox.TabIndex = 28 Me.WD_INDEXComboBox.ValueMember = "ATTR_TITLE" ' @@ -1085,9 +1078,9 @@ Partial Class frmAdmin_Globix 'VKT_ADD_ITEMCheckBox ' Me.VKT_ADD_ITEMCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "VKT_ADD_ITEM", True)) - Me.VKT_ADD_ITEMCheckBox.Location = New System.Drawing.Point(632, 102) + Me.VKT_ADD_ITEMCheckBox.Location = New System.Drawing.Point(635, 102) Me.VKT_ADD_ITEMCheckBox.Name = "VKT_ADD_ITEMCheckBox" - Me.VKT_ADD_ITEMCheckBox.Size = New System.Drawing.Size(259, 20) + Me.VKT_ADD_ITEMCheckBox.Size = New System.Drawing.Size(260, 20) Me.VKT_ADD_ITEMCheckBox.TabIndex = 14 Me.VKT_ADD_ITEMCheckBox.Text = "Neueingabe erlauben" Me.VKT_ADD_ITEMCheckBox.UseVisualStyleBackColor = True @@ -1095,9 +1088,9 @@ Partial Class frmAdmin_Globix 'VKT_PREVENT_MULTIPLE_VALUESCheckBox ' Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "VKT_PREVENT_MULTIPLE_VALUES", True)) - Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Location = New System.Drawing.Point(444, 102) + Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Location = New System.Drawing.Point(446, 102) Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Name = "VKT_PREVENT_MULTIPLE_VALUESCheckBox" - Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Size = New System.Drawing.Size(184, 20) + Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Size = New System.Drawing.Size(185, 20) Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.TabIndex = 13 Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Text = "Doppelte Einträge verhindern" Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.UseVisualStyleBackColor = True @@ -1105,23 +1098,13 @@ Partial Class frmAdmin_Globix 'MULTISELECTCheckBox ' Me.MULTISELECTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "MULTISELECT", True)) - Me.MULTISELECTCheckBox.Location = New System.Drawing.Point(231, 102) + Me.MULTISELECTCheckBox.Location = New System.Drawing.Point(232, 102) Me.MULTISELECTCheckBox.Name = "MULTISELECTCheckBox" - Me.MULTISELECTCheckBox.Size = New System.Drawing.Size(209, 20) + Me.MULTISELECTCheckBox.Size = New System.Drawing.Size(210, 20) Me.MULTISELECTCheckBox.TabIndex = 12 Me.MULTISELECTCheckBox.Text = "Mehrfachauswahl" Me.MULTISELECTCheckBox.UseVisualStyleBackColor = True ' - 'ACTIVECheckBox - ' - Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "ACTIVE", True)) - Me.ACTIVECheckBox.Location = New System.Drawing.Point(302, 12) - Me.ACTIVECheckBox.Name = "ACTIVECheckBox" - Me.ACTIVECheckBox.Size = New System.Drawing.Size(136, 20) - Me.ACTIVECheckBox.TabIndex = 5 - Me.ACTIVECheckBox.Text = "Aktiv" - Me.ACTIVECheckBox.UseVisualStyleBackColor = True - ' 'btneditSQLmanIndex ' Me.btneditSQLmanIndex.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.editdatasource @@ -1129,7 +1112,7 @@ Partial Class frmAdmin_Globix Me.btneditSQLmanIndex.Location = New System.Drawing.Point(12, 132) Me.btneditSQLmanIndex.Name = "btneditSQLmanIndex" Me.btneditSQLmanIndex.Padding = New System.Windows.Forms.Padding(5) - Me.btneditSQLmanIndex.Size = New System.Drawing.Size(879, 32) + Me.btneditSQLmanIndex.Size = New System.Drawing.Size(883, 32) Me.btneditSQLmanIndex.StyleController = Me.LayoutControlManIndexe Me.btneditSQLmanIndex.TabIndex = 16 Me.btneditSQLmanIndex.Text = "SQL Auswahlliste bearbeiten" @@ -1141,7 +1124,7 @@ Partial Class frmAdmin_Globix Me.TextEditAddedWho_ManIndex.Location = New System.Drawing.Point(100, 205) Me.TextEditAddedWho_ManIndex.MenuManager = Me.RibbonControl1 Me.TextEditAddedWho_ManIndex.Name = "TextEditAddedWho_ManIndex" - Me.TextEditAddedWho_ManIndex.Size = New System.Drawing.Size(301, 20) + Me.TextEditAddedWho_ManIndex.Size = New System.Drawing.Size(303, 20) Me.TextEditAddedWho_ManIndex.StyleController = Me.LayoutControlManIndexe Me.TextEditAddedWho_ManIndex.TabIndex = 18 ' @@ -1151,17 +1134,17 @@ Partial Class frmAdmin_Globix Me.TextEdit2.Location = New System.Drawing.Point(100, 235) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(301, 20) + Me.TextEdit2.Size = New System.Drawing.Size(303, 20) Me.TextEdit2.StyleController = Me.LayoutControlManIndexe Me.TextEdit2.TabIndex = 19 ' 'TextEditChangedWho_ManIndex ' Me.TextEditChangedWho_ManIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CHANGED_WHO", True)) - Me.TextEditChangedWho_ManIndex.Location = New System.Drawing.Point(496, 205) + Me.TextEditChangedWho_ManIndex.Location = New System.Drawing.Point(498, 205) Me.TextEditChangedWho_ManIndex.MenuManager = Me.RibbonControl1 Me.TextEditChangedWho_ManIndex.Name = "TextEditChangedWho_ManIndex" - Me.TextEditChangedWho_ManIndex.Size = New System.Drawing.Size(392, 20) + Me.TextEditChangedWho_ManIndex.Size = New System.Drawing.Size(394, 20) Me.TextEditChangedWho_ManIndex.StyleController = Me.LayoutControlManIndexe Me.TextEditChangedWho_ManIndex.TabIndex = 20 ' @@ -1171,7 +1154,7 @@ Partial Class frmAdmin_Globix Me.GUIDTextBoxMANINDEX.Location = New System.Drawing.Point(100, 15) Me.GUIDTextBoxMANINDEX.MenuManager = Me.RibbonControl1 Me.GUIDTextBoxMANINDEX.Name = "GUIDTextBoxMANINDEX" - Me.GUIDTextBoxMANINDEX.Size = New System.Drawing.Size(50, 20) + Me.GUIDTextBoxMANINDEX.Size = New System.Drawing.Size(51, 20) Me.GUIDTextBoxMANINDEX.StyleController = Me.LayoutControlManIndexe Me.GUIDTextBoxMANINDEX.TabIndex = 21 ' @@ -1181,7 +1164,7 @@ Partial Class frmAdmin_Globix Me.TextEdit10.Location = New System.Drawing.Point(100, 45) Me.TextEdit10.MenuManager = Me.RibbonControl1 Me.TextEdit10.Name = "TextEdit10" - Me.TextEdit10.Size = New System.Drawing.Size(336, 20) + Me.TextEdit10.Size = New System.Drawing.Size(338, 20) Me.TextEdit10.StyleController = Me.LayoutControlManIndexe Me.TextEdit10.TabIndex = 22 ' @@ -1191,7 +1174,7 @@ Partial Class frmAdmin_Globix Me.TextEdit11.Location = New System.Drawing.Point(100, 75) Me.TextEdit11.MenuManager = Me.RibbonControl1 Me.TextEdit11.Name = "TextEdit11" - Me.TextEdit11.Size = New System.Drawing.Size(788, 20) + Me.TextEdit11.Size = New System.Drawing.Size(792, 20) Me.TextEdit11.StyleController = Me.LayoutControlManIndexe Me.TextEdit11.TabIndex = 23 ' @@ -1199,11 +1182,11 @@ Partial Class frmAdmin_Globix ' Me.SpinEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_INDEX_MANBindingSource, "SEQUENCE", True)) Me.SpinEdit1.EditValue = New Decimal(New Integer() {0, 0, 0, 0}) - Me.SpinEdit1.Location = New System.Drawing.Point(245, 15) + Me.SpinEdit1.Location = New System.Drawing.Point(246, 15) Me.SpinEdit1.MenuManager = Me.RibbonControl1 Me.SpinEdit1.Name = "SpinEdit1" Me.SpinEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.SpinEdit1.Size = New System.Drawing.Size(50, 20) + Me.SpinEdit1.Size = New System.Drawing.Size(51, 20) Me.SpinEdit1.StyleController = Me.LayoutControlManIndexe Me.SpinEdit1.TabIndex = 25 ' @@ -1215,25 +1198,47 @@ Partial Class frmAdmin_Globix Me.ComboBoxEdit4.Name = "ComboBoxEdit4" Me.ComboBoxEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.ComboBoxEdit4.Properties.Items.AddRange(New Object() {"VARCHAR", "INTEGER", "DATE", "BOOLEAN"}) - Me.ComboBoxEdit4.Size = New System.Drawing.Size(124, 20) + Me.ComboBoxEdit4.Size = New System.Drawing.Size(125, 20) Me.ComboBoxEdit4.StyleController = Me.LayoutControlManIndexe Me.ComboBoxEdit4.TabIndex = 27 ' + 'ACTIVECheckBox2 + ' + Me.ACTIVECheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_INDEX_MANBindingSource, "ACTIVE", True)) + Me.ACTIVECheckBox2.Location = New System.Drawing.Point(445, 12) + Me.ACTIVECheckBox2.MenuManager = Me.RibbonControl1 + Me.ACTIVECheckBox2.Name = "ACTIVECheckBox2" + Me.ACTIVECheckBox2.Properties.Caption = "Aktiv" + Me.ACTIVECheckBox2.Size = New System.Drawing.Size(207, 20) + Me.ACTIVECheckBox2.StyleController = Me.LayoutControlManIndexe + Me.ACTIVECheckBox2.TabIndex = 33 + ' + 'OPTIONALCheckBox2 + ' + Me.OPTIONALCheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_INDEX_MANBindingSource, "OPTIONAL", True)) + Me.OPTIONALCheckBox2.Location = New System.Drawing.Point(656, 12) + Me.OPTIONALCheckBox2.MenuManager = Me.RibbonControl1 + Me.OPTIONALCheckBox2.Name = "OPTIONALCheckBox2" + Me.OPTIONALCheckBox2.Properties.Caption = "Optional" + Me.OPTIONALCheckBox2.Size = New System.Drawing.Size(239, 20) + Me.OPTIONALCheckBox2.StyleController = Me.LayoutControlManIndexe + Me.OPTIONALCheckBox2.TabIndex = 34 + ' 'LayoutControlGroupDoctype ' Me.LayoutControlGroupDoctype.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutControlGroupDoctype.GroupBordersVisible = False - Me.LayoutControlGroupDoctype.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem17, Me.LayoutControlItem19, Me.LayoutControlItem21, Me.LayoutControlItem6, Me.LayoutControlItem24, Me.LayoutControlItem2, Me.LayoutControlItem8, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlItem9, Me.LayoutControlItem27, Me.LayoutControlItem29, Me.EmptySpaceItem2, Me.LayoutControlItem16, Me.LayoutControlItem7, Me.LayoutControlItem31, Me.LayoutControlItem18, Me.EmptySpaceItem6, Me.LayoutControlItem46, Me.LayoutControlItem62}) + Me.LayoutControlGroupDoctype.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem17, Me.LayoutControlItem19, Me.LayoutControlItem21, Me.LayoutControlItem6, Me.LayoutControlItem24, Me.LayoutControlItem2, Me.LayoutControlItem8, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlItem9, Me.LayoutControlItem27, Me.LayoutControlItem29, Me.LayoutControlItem16, Me.LayoutControlItem31, Me.LayoutControlItem18, Me.EmptySpaceItem6, Me.LayoutControlItem46, Me.LayoutControlItem63, Me.LayoutControlItem64, Me.EmptySpaceItem2}) Me.LayoutControlGroupDoctype.Name = "LayoutControlGroupDoctype" - Me.LayoutControlGroupDoctype.Size = New System.Drawing.Size(903, 270) + Me.LayoutControlGroupDoctype.Size = New System.Drawing.Size(907, 270) Me.LayoutControlGroupDoctype.TextVisible = False ' 'LayoutControlItem17 ' Me.LayoutControlItem17.Control = Me.MULTISELECTCheckBox - Me.LayoutControlItem17.Location = New System.Drawing.Point(219, 90) + Me.LayoutControlItem17.Location = New System.Drawing.Point(220, 90) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(213, 30) + Me.LayoutControlItem17.Size = New System.Drawing.Size(214, 30) Me.LayoutControlItem17.Text = "MULTISELECT:" Me.LayoutControlItem17.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem17.TextVisible = False @@ -1241,9 +1246,9 @@ Partial Class frmAdmin_Globix 'LayoutControlItem19 ' Me.LayoutControlItem19.Control = Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox - Me.LayoutControlItem19.Location = New System.Drawing.Point(432, 90) + Me.LayoutControlItem19.Location = New System.Drawing.Point(434, 90) Me.LayoutControlItem19.Name = "LayoutControlItem19" - Me.LayoutControlItem19.Size = New System.Drawing.Size(188, 30) + Me.LayoutControlItem19.Size = New System.Drawing.Size(189, 30) Me.LayoutControlItem19.Text = "VKT PREVENT MULTIPLE VALUES:" Me.LayoutControlItem19.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem19.TextVisible = False @@ -1251,9 +1256,9 @@ Partial Class frmAdmin_Globix 'LayoutControlItem21 ' Me.LayoutControlItem21.Control = Me.VKT_ADD_ITEMCheckBox - Me.LayoutControlItem21.Location = New System.Drawing.Point(620, 90) + Me.LayoutControlItem21.Location = New System.Drawing.Point(623, 90) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(263, 30) + Me.LayoutControlItem21.Size = New System.Drawing.Size(264, 30) Me.LayoutControlItem21.Text = "VKT ADD ITEM:" Me.LayoutControlItem21.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem21.TextVisible = False @@ -1263,7 +1268,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem6.Control = Me.btneditSQLmanIndex Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 120) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Size = New System.Drawing.Size(883, 36) + Me.LayoutControlItem6.Size = New System.Drawing.Size(887, 36) Me.LayoutControlItem6.Text = "SQL Abfrage bearbeiten" Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem6.TextVisible = False @@ -1273,10 +1278,11 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem24.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LayoutControlItem24.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem24.Control = Me.TextEditAddedWho_ManIndex + Me.LayoutControlItem24.Enabled = False Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 190) Me.LayoutControlItem24.Name = "LayoutControlItem24" Me.LayoutControlItem24.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem24.Size = New System.Drawing.Size(396, 30) + Me.LayoutControlItem24.Size = New System.Drawing.Size(398, 30) Me.LayoutControlItem24.Text = "ErstelltWer" Me.LayoutControlItem24.TextSize = New System.Drawing.Size(73, 13) ' @@ -1288,7 +1294,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem2.Size = New System.Drawing.Size(145, 30) + Me.LayoutControlItem2.Size = New System.Drawing.Size(146, 30) Me.LayoutControlItem2.Text = "ID" Me.LayoutControlItem2.TextSize = New System.Drawing.Size(73, 13) ' @@ -1298,7 +1304,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 30) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem8.Size = New System.Drawing.Size(431, 30) + Me.LayoutControlItem8.Size = New System.Drawing.Size(433, 30) Me.LayoutControlItem8.Text = "Bezeichnung" Me.LayoutControlItem8.TextSize = New System.Drawing.Size(73, 13) ' @@ -1308,7 +1314,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 60) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem11.Size = New System.Drawing.Size(883, 30) + Me.LayoutControlItem11.Size = New System.Drawing.Size(887, 30) Me.LayoutControlItem11.Text = "Hinweis" Me.LayoutControlItem11.TextSize = New System.Drawing.Size(73, 13) ' @@ -1318,17 +1324,17 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 90) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem13.Size = New System.Drawing.Size(219, 30) + Me.LayoutControlItem13.Size = New System.Drawing.Size(220, 30) Me.LayoutControlItem13.Text = "Datentyp" Me.LayoutControlItem13.TextSize = New System.Drawing.Size(73, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.SpinEdit1 - Me.LayoutControlItem9.Location = New System.Drawing.Point(145, 0) + Me.LayoutControlItem9.Location = New System.Drawing.Point(146, 0) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem9.Size = New System.Drawing.Size(145, 30) + Me.LayoutControlItem9.Size = New System.Drawing.Size(146, 30) Me.LayoutControlItem9.Text = "Reihenfolge" Me.LayoutControlItem9.TextSize = New System.Drawing.Size(73, 13) ' @@ -1341,7 +1347,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem27.Location = New System.Drawing.Point(0, 220) Me.LayoutControlItem27.Name = "LayoutControlItem27" Me.LayoutControlItem27.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem27.Size = New System.Drawing.Size(396, 30) + Me.LayoutControlItem27.Size = New System.Drawing.Size(398, 30) Me.LayoutControlItem27.Text = "Erstellt wann" Me.LayoutControlItem27.TextSize = New System.Drawing.Size(73, 13) ' @@ -1351,40 +1357,22 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem29.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem29.Control = Me.TextEditChangedWho_ManIndex Me.LayoutControlItem29.Enabled = False - Me.LayoutControlItem29.Location = New System.Drawing.Point(396, 190) + Me.LayoutControlItem29.Location = New System.Drawing.Point(398, 190) Me.LayoutControlItem29.Name = "LayoutControlItem29" Me.LayoutControlItem29.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem29.Size = New System.Drawing.Size(487, 30) + Me.LayoutControlItem29.Size = New System.Drawing.Size(489, 30) Me.LayoutControlItem29.Text = "Geändert wer" Me.LayoutControlItem29.TextSize = New System.Drawing.Size(73, 13) ' - 'EmptySpaceItem2 - ' - Me.EmptySpaceItem2.AllowHotTrack = False - Me.EmptySpaceItem2.Location = New System.Drawing.Point(534, 0) - Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(349, 30) - Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) - ' 'LayoutControlItem16 ' Me.LayoutControlItem16.Control = Me.WD_INDEXComboBox - Me.LayoutControlItem16.Location = New System.Drawing.Point(431, 30) + Me.LayoutControlItem16.Location = New System.Drawing.Point(433, 30) Me.LayoutControlItem16.Name = "LayoutControlItem16" - Me.LayoutControlItem16.Size = New System.Drawing.Size(452, 30) + Me.LayoutControlItem16.Size = New System.Drawing.Size(454, 30) Me.LayoutControlItem16.Text = "Attribut" Me.LayoutControlItem16.TextSize = New System.Drawing.Size(73, 13) ' - 'LayoutControlItem7 - ' - Me.LayoutControlItem7.Control = Me.ACTIVECheckBox - Me.LayoutControlItem7.Location = New System.Drawing.Point(290, 0) - Me.LayoutControlItem7.Name = "LayoutControlItem7" - Me.LayoutControlItem7.Size = New System.Drawing.Size(140, 30) - Me.LayoutControlItem7.Text = "ACTIVE:" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem7.TextVisible = False - ' 'LayoutControlItem31 ' Me.LayoutControlItem31.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -1403,7 +1391,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem18.Control = Me.SQL_RESULTTextBox Me.LayoutControlItem18.Location = New System.Drawing.Point(109, 156) Me.LayoutControlItem18.Name = "LayoutControlItem18" - Me.LayoutControlItem18.Size = New System.Drawing.Size(774, 24) + Me.LayoutControlItem18.Size = New System.Drawing.Size(778, 24) Me.LayoutControlItem18.Text = "SQL:" Me.LayoutControlItem18.TextSize = New System.Drawing.Size(73, 13) ' @@ -1412,7 +1400,7 @@ Partial Class frmAdmin_Globix Me.EmptySpaceItem6.AllowHotTrack = False Me.EmptySpaceItem6.Location = New System.Drawing.Point(0, 180) Me.EmptySpaceItem6.Name = "EmptySpaceItem6" - Me.EmptySpaceItem6.Size = New System.Drawing.Size(883, 10) + Me.EmptySpaceItem6.Size = New System.Drawing.Size(887, 10) Me.EmptySpaceItem6.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem46 @@ -1421,34 +1409,30 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem46.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem46.Control = Me.TextEdit4 Me.LayoutControlItem46.Enabled = False - Me.LayoutControlItem46.Location = New System.Drawing.Point(396, 220) + Me.LayoutControlItem46.Location = New System.Drawing.Point(398, 220) Me.LayoutControlItem46.Name = "LayoutControlItem46" Me.LayoutControlItem46.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem46.Size = New System.Drawing.Size(487, 30) + Me.LayoutControlItem46.Size = New System.Drawing.Size(489, 30) Me.LayoutControlItem46.Text = "Geändert wann" Me.LayoutControlItem46.TextSize = New System.Drawing.Size(73, 13) ' - 'LayoutControlItem62 + 'LayoutControlItem63 ' - Me.LayoutControlItem62.Control = Me.OPTIONALCheckBox - Me.LayoutControlItem62.Location = New System.Drawing.Point(430, 0) - Me.LayoutControlItem62.Name = "LayoutControlItem62" - Me.LayoutControlItem62.Size = New System.Drawing.Size(104, 30) - Me.LayoutControlItem62.Text = "OPTIONAL:" - Me.LayoutControlItem62.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem62.TextVisible = False + Me.LayoutControlItem63.Control = Me.ACTIVECheckBox2 + Me.LayoutControlItem63.Location = New System.Drawing.Point(433, 0) + Me.LayoutControlItem63.Name = "LayoutControlItem63" + Me.LayoutControlItem63.Size = New System.Drawing.Size(211, 30) + Me.LayoutControlItem63.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem63.TextVisible = False ' - 'ListBoxAutoIndexe + 'LayoutControlItem64 ' - Me.ListBoxAutoIndexe.DataSource = Me.TBDD_INDEX_MANBindingSource - Me.ListBoxAutoIndexe.DisplayMember = "NAME" - Me.ListBoxAutoIndexe.Dock = System.Windows.Forms.DockStyle.Left - Me.ListBoxAutoIndexe.FormattingEnabled = True - Me.ListBoxAutoIndexe.Location = New System.Drawing.Point(0, 0) - Me.ListBoxAutoIndexe.Name = "ListBoxAutoIndexe" - Me.ListBoxAutoIndexe.Size = New System.Drawing.Size(191, 267) - Me.ListBoxAutoIndexe.TabIndex = 0 - Me.ListBoxAutoIndexe.ValueMember = "GUID" + Me.LayoutControlItem64.Control = Me.OPTIONALCheckBox2 + Me.LayoutControlItem64.Location = New System.Drawing.Point(644, 0) + Me.LayoutControlItem64.Name = "LayoutControlItem64" + Me.LayoutControlItem64.Size = New System.Drawing.Size(243, 30) + Me.LayoutControlItem64.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem64.TextVisible = False ' 'XtraTabPageRework ' @@ -1531,9 +1515,9 @@ Partial Class frmAdmin_Globix Me.CONNECTION_IDTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "CONNECTION_ID", True)) Me.CONNECTION_IDTextBox1.Enabled = False Me.CONNECTION_IDTextBox1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CONNECTION_IDTextBox1.Location = New System.Drawing.Point(352, 142) + Me.CONNECTION_IDTextBox1.Location = New System.Drawing.Point(350, 142) Me.CONNECTION_IDTextBox1.Name = "CONNECTION_IDTextBox1" - Me.CONNECTION_IDTextBox1.Size = New System.Drawing.Size(24, 20) + Me.CONNECTION_IDTextBox1.Size = New System.Drawing.Size(26, 20) Me.CONNECTION_IDTextBox1.TabIndex = 23 ' 'SQL_RESULTTextBox1 @@ -1559,9 +1543,9 @@ Partial Class frmAdmin_Globix 'VALUETextBox ' Me.VALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "VALUE", True)) - Me.VALUETextBox.Location = New System.Drawing.Point(369, 76) + Me.VALUETextBox.Location = New System.Drawing.Point(361, 76) Me.VALUETextBox.Name = "VALUETextBox" - Me.VALUETextBox.Size = New System.Drawing.Size(177, 20) + Me.VALUETextBox.Size = New System.Drawing.Size(185, 20) Me.VALUETextBox.TabIndex = 9 ' 'INDEXNAMEComboBox @@ -1570,9 +1554,9 @@ Partial Class frmAdmin_Globix Me.INDEXNAMEComboBox.DataSource = Me.VWIDB_BE_ATTRIBUTEBindingSource Me.INDEXNAMEComboBox.DisplayMember = "ATTR_TITLE" Me.INDEXNAMEComboBox.FormattingEnabled = True - Me.INDEXNAMEComboBox.Location = New System.Drawing.Point(369, 45) + Me.INDEXNAMEComboBox.Location = New System.Drawing.Point(361, 45) Me.INDEXNAMEComboBox.Name = "INDEXNAMEComboBox" - Me.INDEXNAMEComboBox.Size = New System.Drawing.Size(376, 21) + Me.INDEXNAMEComboBox.Size = New System.Drawing.Size(384, 21) Me.INDEXNAMEComboBox.TabIndex = 8 ' 'ACTIVECheckBox1 @@ -1588,19 +1572,19 @@ Partial Class frmAdmin_Globix 'SEQUENCENumericUpDown1 ' Me.SEQUENCENumericUpDown1.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_INDEX_AUTOMBindingSource, "SEQUENCE", True)) - Me.SEQUENCENumericUpDown1.Location = New System.Drawing.Point(469, 15) + Me.SEQUENCENumericUpDown1.Location = New System.Drawing.Point(463, 15) Me.SEQUENCENumericUpDown1.Name = "SEQUENCENumericUpDown1" - Me.SEQUENCENumericUpDown1.Size = New System.Drawing.Size(46, 22) + Me.SEQUENCENumericUpDown1.Size = New System.Drawing.Size(52, 21) Me.SEQUENCENumericUpDown1.TabIndex = 6 ' 'GUIDTextBoxAutoAttribute ' Me.GUIDTextBoxAutoAttribute.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "GUID", True)) Me.GUIDTextBoxAutoAttribute.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GUIDTextBoxAutoAttribute.Location = New System.Drawing.Point(369, 15) + Me.GUIDTextBoxAutoAttribute.Location = New System.Drawing.Point(361, 15) Me.GUIDTextBoxAutoAttribute.Name = "GUIDTextBoxAutoAttribute" Me.GUIDTextBoxAutoAttribute.ReadOnly = True - Me.GUIDTextBoxAutoAttribute.Size = New System.Drawing.Size(22, 20) + Me.GUIDTextBoxAutoAttribute.Size = New System.Drawing.Size(30, 20) Me.GUIDTextBoxAutoAttribute.TabIndex = 5 ' 'SimpleButton1 @@ -1617,12 +1601,12 @@ Partial Class frmAdmin_Globix ' 'ComboBoxEditAAttrFileParam ' - Me.ComboBoxEditAAttrFileParam.Location = New System.Drawing.Point(844, 76) + Me.ComboBoxEditAAttrFileParam.Location = New System.Drawing.Point(836, 76) Me.ComboBoxEditAAttrFileParam.MenuManager = Me.RibbonControl1 Me.ComboBoxEditAAttrFileParam.Name = "ComboBoxEditAAttrFileParam" Me.ComboBoxEditAAttrFileParam.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.ComboBoxEditAAttrFileParam.Properties.Items.AddRange(New Object() {"FILENAME_EXT", "FILENAME", "EXTENSION", "DATE_CREATED", "DATE_MODIFIED"}) - Me.ComboBoxEditAAttrFileParam.Size = New System.Drawing.Size(252, 20) + Me.ComboBoxEditAAttrFileParam.Size = New System.Drawing.Size(260, 20) Me.ComboBoxEditAAttrFileParam.StyleController = Me.LayoutControlAutoIndexe Me.ComboBoxEditAAttrFileParam.TabIndex = 11 ' @@ -1641,12 +1625,12 @@ Partial Class frmAdmin_Globix ' Me.ADDED_WHOTextBoxAutoAttribut.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "ADDED_WHO", True)) Me.ADDED_WHOTextBoxAutoAttribut.Enabled = False - Me.ADDED_WHOTextBoxAutoAttribut.Location = New System.Drawing.Point(369, 202) + Me.ADDED_WHOTextBoxAutoAttribut.Location = New System.Drawing.Point(361, 202) Me.ADDED_WHOTextBoxAutoAttribut.MenuManager = Me.RibbonControl1 Me.ADDED_WHOTextBoxAutoAttribut.Name = "ADDED_WHOTextBoxAutoAttribut" Me.ADDED_WHOTextBoxAutoAttribut.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ADDED_WHOTextBoxAutoAttribut.Properties.Appearance.Options.UseFont = True - Me.ADDED_WHOTextBoxAutoAttribut.Size = New System.Drawing.Size(271, 20) + Me.ADDED_WHOTextBoxAutoAttribut.Size = New System.Drawing.Size(279, 20) Me.ADDED_WHOTextBoxAutoAttribut.StyleController = Me.LayoutControlAutoIndexe Me.ADDED_WHOTextBoxAutoAttribut.TabIndex = 19 ' @@ -1654,12 +1638,12 @@ Partial Class frmAdmin_Globix ' Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "ADDED_WHEN", True)) Me.TextEdit3.Enabled = False - Me.TextEdit3.Location = New System.Drawing.Point(369, 232) + Me.TextEdit3.Location = New System.Drawing.Point(361, 232) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" Me.TextEdit3.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit3.Properties.Appearance.Options.UseFont = True - Me.TextEdit3.Size = New System.Drawing.Size(271, 20) + Me.TextEdit3.Size = New System.Drawing.Size(279, 20) Me.TextEdit3.StyleController = Me.LayoutControlAutoIndexe Me.TextEdit3.TabIndex = 20 ' @@ -1667,24 +1651,24 @@ Partial Class frmAdmin_Globix ' Me.CHANGED_WHOTextEditAutoAttribut.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "CHANGED_WHO", True)) Me.CHANGED_WHOTextEditAutoAttribut.EditValue = "" - Me.CHANGED_WHOTextEditAutoAttribut.Location = New System.Drawing.Point(825, 202) + Me.CHANGED_WHOTextEditAutoAttribut.Location = New System.Drawing.Point(817, 202) Me.CHANGED_WHOTextEditAutoAttribut.MenuManager = Me.RibbonControl1 Me.CHANGED_WHOTextEditAutoAttribut.Name = "CHANGED_WHOTextEditAutoAttribut" Me.CHANGED_WHOTextEditAutoAttribut.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CHANGED_WHOTextEditAutoAttribut.Properties.Appearance.Options.UseFont = True - Me.CHANGED_WHOTextEditAutoAttribut.Size = New System.Drawing.Size(271, 20) + Me.CHANGED_WHOTextEditAutoAttribut.Size = New System.Drawing.Size(279, 20) Me.CHANGED_WHOTextEditAutoAttribut.StyleController = Me.LayoutControlAutoIndexe Me.CHANGED_WHOTextEditAutoAttribut.TabIndex = 21 ' 'TextEdit5 ' Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit5.Location = New System.Drawing.Point(825, 232) + Me.TextEdit5.Location = New System.Drawing.Point(817, 232) Me.TextEdit5.MenuManager = Me.RibbonControl1 Me.TextEdit5.Name = "TextEdit5" Me.TextEdit5.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit5.Properties.Appearance.Options.UseFont = True - Me.TextEdit5.Size = New System.Drawing.Size(271, 20) + Me.TextEdit5.Size = New System.Drawing.Size(279, 20) Me.TextEdit5.StyleController = Me.LayoutControlAutoIndexe Me.TextEdit5.TabIndex = 22 ' @@ -1705,7 +1689,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem15.Size = New System.Drawing.Size(207, 30) Me.LayoutControlItem15.Text = "ID" - Me.LayoutControlItem15.TextSize = New System.Drawing.Size(163, 13) + Me.LayoutControlItem15.TextSize = New System.Drawing.Size(155, 13) ' 'LayoutControlItem23 ' @@ -1716,7 +1700,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem23.Size = New System.Drawing.Size(124, 30) Me.LayoutControlItem23.Text = "Reihenfolge" Me.LayoutControlItem23.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize - Me.LayoutControlItem23.TextSize = New System.Drawing.Size(63, 13) + Me.LayoutControlItem23.TextSize = New System.Drawing.Size(57, 13) Me.LayoutControlItem23.TextToControlDistance = 5 ' 'LayoutControlItem33 @@ -1737,7 +1721,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem34.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem34.Size = New System.Drawing.Size(561, 31) Me.LayoutControlItem34.Text = "Attribut" - Me.LayoutControlItem34.TextSize = New System.Drawing.Size(163, 13) + Me.LayoutControlItem34.TextSize = New System.Drawing.Size(155, 13) ' 'LayoutControlItem35 ' @@ -1749,7 +1733,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem35.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem35.Size = New System.Drawing.Size(362, 40) Me.LayoutControlItem35.Text = "Fester oder Automatischer Wert" - Me.LayoutControlItem35.TextSize = New System.Drawing.Size(163, 13) + Me.LayoutControlItem35.TextSize = New System.Drawing.Size(155, 13) ' 'LayoutControlItem14 ' @@ -1781,7 +1765,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem37.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem37.Size = New System.Drawing.Size(437, 40) Me.LayoutControlItem37.Text = "FILE-Parameter" - Me.LayoutControlItem37.TextSize = New System.Drawing.Size(163, 13) + Me.LayoutControlItem37.TextSize = New System.Drawing.Size(155, 13) ' 'LayoutControlItem39 ' @@ -1820,7 +1804,7 @@ Partial Class frmAdmin_Globix Me.ADDED_WHOAutoAttribut.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.ADDED_WHOAutoAttribut.Size = New System.Drawing.Size(456, 30) Me.ADDED_WHOAutoAttribut.Text = "Erstellt wer" - Me.ADDED_WHOAutoAttribut.TextSize = New System.Drawing.Size(163, 13) + Me.ADDED_WHOAutoAttribut.TextSize = New System.Drawing.Size(155, 13) ' 'LayoutControlItem41 ' @@ -1830,7 +1814,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem41.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem41.Size = New System.Drawing.Size(456, 30) Me.LayoutControlItem41.Text = "Erstellt wann" - Me.LayoutControlItem41.TextSize = New System.Drawing.Size(163, 13) + Me.LayoutControlItem41.TextSize = New System.Drawing.Size(155, 13) ' 'CHANGED_WHOItemAutoAttribut ' @@ -1840,7 +1824,7 @@ Partial Class frmAdmin_Globix Me.CHANGED_WHOItemAutoAttribut.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.CHANGED_WHOItemAutoAttribut.Size = New System.Drawing.Size(456, 30) Me.CHANGED_WHOItemAutoAttribut.Text = "Geändert wer" - Me.CHANGED_WHOItemAutoAttribut.TextSize = New System.Drawing.Size(163, 13) + Me.CHANGED_WHOItemAutoAttribut.TextSize = New System.Drawing.Size(155, 13) ' 'LayoutControlItem43 ' @@ -1850,7 +1834,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem43.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem43.Size = New System.Drawing.Size(456, 30) Me.LayoutControlItem43.Text = "Geändert wann" - Me.LayoutControlItem43.TextSize = New System.Drawing.Size(163, 13) + Me.LayoutControlItem43.TextSize = New System.Drawing.Size(155, 13) ' 'LayoutControlItem45 ' @@ -1861,7 +1845,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem45.Size = New System.Drawing.Size(84, 30) Me.LayoutControlItem45.Text = "Conn ID:" Me.LayoutControlItem45.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize - Me.LayoutControlItem45.TextSize = New System.Drawing.Size(45, 13) + Me.LayoutControlItem45.TextSize = New System.Drawing.Size(43, 13) Me.LayoutControlItem45.TextToControlDistance = 5 ' 'LayoutControlItem44 @@ -2087,10 +2071,10 @@ Partial Class frmAdmin_Globix ' Me.ChangedWhenAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "CHANGED_WHEN", True)) Me.ChangedWhenAutoSelect.Enabled = False - Me.ChangedWhenAutoSelect.Location = New System.Drawing.Point(511, 117) + Me.ChangedWhenAutoSelect.Location = New System.Drawing.Point(505, 117) Me.ChangedWhenAutoSelect.MenuManager = Me.RibbonControl1 Me.ChangedWhenAutoSelect.Name = "ChangedWhenAutoSelect" - Me.ChangedWhenAutoSelect.Size = New System.Drawing.Size(266, 20) + Me.ChangedWhenAutoSelect.Size = New System.Drawing.Size(272, 20) Me.ChangedWhenAutoSelect.StyleController = Me.LayoutControl2 Me.ChangedWhenAutoSelect.TabIndex = 16 ' @@ -2103,10 +2087,10 @@ Partial Class frmAdmin_Globix ' Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "ADDED_WHEN", True)) Me.TextEdit8.Enabled = False - Me.TextEdit8.Location = New System.Drawing.Point(125, 117) + Me.TextEdit8.Location = New System.Drawing.Point(119, 117) Me.TextEdit8.MenuManager = Me.RibbonControl1 Me.TextEdit8.Name = "TextEdit8" - Me.TextEdit8.Size = New System.Drawing.Size(266, 20) + Me.TextEdit8.Size = New System.Drawing.Size(272, 20) Me.TextEdit8.StyleController = Me.LayoutControl2 Me.TextEdit8.TabIndex = 15 ' @@ -2114,10 +2098,10 @@ Partial Class frmAdmin_Globix ' Me.AddedWhoAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "ADDED_WHO", True)) Me.AddedWhoAutoSelect.Enabled = False - Me.AddedWhoAutoSelect.Location = New System.Drawing.Point(125, 87) + Me.AddedWhoAutoSelect.Location = New System.Drawing.Point(119, 87) Me.AddedWhoAutoSelect.MenuManager = Me.RibbonControl1 Me.AddedWhoAutoSelect.Name = "AddedWhoAutoSelect" - Me.AddedWhoAutoSelect.Size = New System.Drawing.Size(266, 20) + Me.AddedWhoAutoSelect.Size = New System.Drawing.Size(272, 20) Me.AddedWhoAutoSelect.StyleController = Me.LayoutControl2 Me.AddedWhoAutoSelect.TabIndex = 14 ' @@ -2125,18 +2109,18 @@ Partial Class frmAdmin_Globix ' Me.ChangedWhoAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "CHANGED_WHO", True)) Me.ChangedWhoAutoSelect.Enabled = False - Me.ChangedWhoAutoSelect.Location = New System.Drawing.Point(511, 87) + Me.ChangedWhoAutoSelect.Location = New System.Drawing.Point(505, 87) Me.ChangedWhoAutoSelect.MenuManager = Me.RibbonControl1 Me.ChangedWhoAutoSelect.Name = "ChangedWhoAutoSelect" - Me.ChangedWhoAutoSelect.Size = New System.Drawing.Size(266, 20) + Me.ChangedWhoAutoSelect.Size = New System.Drawing.Size(272, 20) Me.ChangedWhoAutoSelect.StyleController = Me.LayoutControl2 Me.ChangedWhoAutoSelect.TabIndex = 13 ' 'txtDateinameTest ' - Me.txtDateinameTest.Location = New System.Drawing.Point(122, 60) + Me.txtDateinameTest.Location = New System.Drawing.Point(116, 60) Me.txtDateinameTest.Name = "txtDateinameTest" - Me.txtDateinameTest.Size = New System.Drawing.Size(658, 20) + Me.txtDateinameTest.Size = New System.Drawing.Size(664, 20) Me.txtDateinameTest.TabIndex = 12 Me.txtDateinameTest.Text = "Example.pdf" ' @@ -2153,18 +2137,18 @@ Partial Class frmAdmin_Globix 'REGEXTextBox ' Me.REGEXTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "REGEX", True)) - Me.REGEXTextBox.Location = New System.Drawing.Point(122, 36) + Me.REGEXTextBox.Location = New System.Drawing.Point(116, 36) Me.REGEXTextBox.Name = "REGEXTextBox" - Me.REGEXTextBox.Size = New System.Drawing.Size(658, 20) + Me.REGEXTextBox.Size = New System.Drawing.Size(664, 20) Me.REGEXTextBox.TabIndex = 6 ' 'GUIDTextBoxAutoSelect ' Me.GUIDTextBoxAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "GUID", True)) - Me.GUIDTextBoxAutoSelect.Location = New System.Drawing.Point(122, 12) + Me.GUIDTextBoxAutoSelect.Location = New System.Drawing.Point(116, 12) Me.GUIDTextBoxAutoSelect.Name = "GUIDTextBoxAutoSelect" Me.GUIDTextBoxAutoSelect.ReadOnly = True - Me.GUIDTextBoxAutoSelect.Size = New System.Drawing.Size(42, 20) + Me.GUIDTextBoxAutoSelect.Size = New System.Drawing.Size(48, 20) Me.GUIDTextBoxAutoSelect.TabIndex = 5 ' 'LayoutControlGroup5 @@ -2183,7 +2167,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem55.Name = "LayoutControlItem55" Me.LayoutControlItem55.Size = New System.Drawing.Size(772, 24) Me.LayoutControlItem55.Text = "Regular Expression" - Me.LayoutControlItem55.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem55.TextSize = New System.Drawing.Size(92, 13) ' 'EmptySpaceItem9 ' @@ -2211,7 +2195,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem54.Name = "LayoutControlItem54" Me.LayoutControlItem54.Size = New System.Drawing.Size(156, 24) Me.LayoutControlItem54.Text = "ID" - Me.LayoutControlItem54.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem54.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem53 ' @@ -2240,7 +2224,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem57.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem57.Size = New System.Drawing.Size(386, 30) Me.LayoutControlItem57.Text = "Erstellt wer" - Me.LayoutControlItem57.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem57.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem59 ' @@ -2252,7 +2236,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem59.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem59.Size = New System.Drawing.Size(386, 145) Me.LayoutControlItem59.Text = "Geändert wann" - Me.LayoutControlItem59.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem59.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem58 ' @@ -2264,7 +2248,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem58.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem58.Size = New System.Drawing.Size(386, 145) Me.LayoutControlItem58.Text = "Erstellt wann" - Me.LayoutControlItem58.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem58.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem56 ' @@ -2276,7 +2260,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem56.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem56.Size = New System.Drawing.Size(386, 30) Me.LayoutControlItem56.Text = "Geändert wer" - Me.LayoutControlItem56.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem56.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem60 ' @@ -2285,7 +2269,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem60.Name = "LayoutControlItem60" Me.LayoutControlItem60.Size = New System.Drawing.Size(772, 24) Me.LayoutControlItem60.Text = "Dateiname für Test" - Me.LayoutControlItem60.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem60.TextSize = New System.Drawing.Size(92, 13) ' 'ListBox2 ' @@ -2703,6 +2687,25 @@ Partial Class frmAdmin_Globix ' Me.VWIDB_DOCTYPE_LANGUAGETableAdapter.ClearBeforeFill = True ' + 'ListBoxAutoIndexe + ' + Me.ListBoxAutoIndexe.DataSource = Me.TBDD_INDEX_MANBindingSource + Me.ListBoxAutoIndexe.DisplayMember = "NAME" + Me.ListBoxAutoIndexe.Dock = System.Windows.Forms.DockStyle.Left + Me.ListBoxAutoIndexe.Location = New System.Drawing.Point(0, 0) + Me.ListBoxAutoIndexe.Name = "ListBoxAutoIndexe" + Me.ListBoxAutoIndexe.Size = New System.Drawing.Size(187, 267) + Me.ListBoxAutoIndexe.TabIndex = 2 + Me.ListBoxAutoIndexe.ValueMember = "GUID" + ' + 'EmptySpaceItem2 + ' + Me.EmptySpaceItem2.AllowHotTrack = False + Me.EmptySpaceItem2.Location = New System.Drawing.Point(561, 0) + Me.EmptySpaceItem2.Name = "EmptySpaceItem2" + Me.EmptySpaceItem2.Size = New System.Drawing.Size(326, 30) + Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) + ' 'frmAdmin_Globix ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2773,6 +2776,8 @@ Partial Class frmAdmin_Globix CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ACTIVECheckBox2.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.OPTIONALCheckBox2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroupDoctype, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() @@ -2786,14 +2791,13 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem31, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem46, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem62, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem63, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem64, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageRework.ResumeLayout(False) CType(Me.LayoutControlRework, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() @@ -2887,6 +2891,8 @@ Partial Class frmAdmin_Globix CType(Me.viewAvailableGroups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem38, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ListBoxAutoIndexe, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -2932,15 +2938,12 @@ Partial Class frmAdmin_Globix Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlManIndexe As DevExpress.XtraLayout.LayoutControl Friend WithEvents LayoutControlGroupDoctype As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents ListBoxAutoIndexe As ListBox Friend WithEvents TBDD_INDEX_MANBindingSource As BindingSource Friend WithEvents TBDD_INDEX_MANTableAdapter As GlobixDatasetTableAdapters.TBDD_INDEX_MANTableAdapter Friend WithEvents VKT_ADD_ITEMCheckBox As CheckBox Friend WithEvents VKT_PREVENT_MULTIPLE_VALUESCheckBox As CheckBox Friend WithEvents MULTISELECTCheckBox As CheckBox - Friend WithEvents ACTIVECheckBox As CheckBox Friend WithEvents btneditSQLmanIndex As DevExpress.XtraEditors.SimpleButton - Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem17 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem19 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem21 As DevExpress.XtraLayout.LayoutControlItem @@ -2978,7 +2981,6 @@ Partial Class frmAdmin_Globix Friend WithEvents IDB_OBJECT_STORE_IDComboBox As ComboBox Friend WithEvents LayoutControlItem25 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem - Friend WithEvents EmptySpaceItem2 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents WD_INDEXComboBox As ComboBox Friend WithEvents LayoutControlItem16 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents VWIDB_BE_ATTRIBUTEBindingSource As BindingSource @@ -3104,8 +3106,6 @@ Partial Class frmAdmin_Globix Friend WithEvents EmptySpaceItem12 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents cmbAllAttributes As ComboBox Friend WithEvents LayoutControlItem49 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents OPTIONALCheckBox As CheckBox - Friend WithEvents LayoutControlItem62 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents IDB_DOCTYPE_IDComboBox As ComboBox Friend WithEvents LayoutControlItem61 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents VWIDB_DOCTYPE_LANGUAGEBindingSource As BindingSource @@ -3113,4 +3113,10 @@ Partial Class frmAdmin_Globix Friend WithEvents GridLookUpEdit1 As DevExpress.XtraEditors.GridLookUpEdit Friend WithEvents GridLookUpEdit1View As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents LayoutControlItem12 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ACTIVECheckBox2 As DevExpress.XtraEditors.CheckEdit + Friend WithEvents OPTIONALCheckBox2 As DevExpress.XtraEditors.CheckEdit + Friend WithEvents LayoutControlItem63 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem64 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ListBoxAutoIndexe As DevExpress.XtraEditors.ListBoxControl + Friend WithEvents EmptySpaceItem2 As DevExpress.XtraLayout.EmptySpaceItem End Class diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx index c3704ee2..36d31cff 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx @@ -159,6 +159,9 @@ 350, 17 + + 350, 17 + 17, 17 @@ -209,6 +212,9 @@ NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + 1161, 17 + 752, 56 @@ -276,26 +282,6 @@ MC41LTAuMSwwLjctMC4yYzAuMi0wLjEsMC40LTAuMiwwLjYtMC41YzAuMi0wLjIsMC41LTAuNywxLTEu NEwyMSwyNC4zaC0xLjFsMC4zLTEuNCAgYzAuNi0wLjEsMS4yLTAuMywxLjctMC42SDIyLjV6IiBjbGFz cz0iQmx1ZSIgLz4NCjwvc3ZnPgs= - - - - 17, 95 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFycm93MUxlZnQiPg0KICAgIDxwb2x5Z29uIHBvaW50 - cz0iMjgsMTQgMTQsMTQgMTQsMTMuMyAxNCw2IDQsMTYgMTQsMjYgMTQsMTguNyAxNCwxOCAyOCwxOCAg - IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -319,26 +305,6 @@ MTBoLTR2NGg0VjEweiBNMTQsMTZoLTR2MTJoNFYxNnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQog IDxwYXRoIGQ9Ik0yNSwxNmwtNCw0aDNjMCwyLjItMS44LDQtNCw0di0zbC00LDRsNCw0di0zYzMuMyww LDYtMi43LDYtNmgzTDI1LDE2eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD - MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls - bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w - LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs - YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw - IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH - cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -357,22 +323,6 @@ MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw== - - - - 511, 95 - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj - aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r - K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml - rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz - xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR - 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh - zQ3o4jAe74EDiAAAAABJRU5ErkJggg== @@ -426,6 +376,93 @@ bDEuOCwxLjNsMS40LTEuNGwtMS4zLTEuOCAgIGMwLjMtMC41LDAuNi0xLjIsMC44LTEuOEwzMCwyNXog TTIyLDI2Yy0xLjEsMC0yLTAuOS0yLTJzMC45LTIsMi0yczIsMC45LDIsMlMyMy4xLDI2LDIyLDI2eiIg Y2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN + YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz + MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 + QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs + MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x + VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx + LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x + LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM + MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + 246, 56 + + + 752, 56 + + + 17, 95 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFycm93MUxlZnQiPg0KICAgIDxwb2x5Z29uIHBvaW50 + cz0iMjgsMTQgMTQsMTQgMTQsMTMuMyAxNCw2IDQsMTYgMTQsMjYgMTQsMTguNyAxNCwxOCAyOCwxOCAg + IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + 17, 95 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD + MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls + bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w + LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs + YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw + IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH + cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + 511, 95 + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj + aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r + K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml + rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz + xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR + 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh + zQ3o4jAe74EDiAAAAABJRU5ErkJggg== @@ -477,28 +514,6 @@ NFYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8L2c+DQogICAgPHJlY3QgeD0iMTgiIHk9IjE4IiB3 aWR0aD0iNCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0K PC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN - YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz - MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 - QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs - MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x - VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx - LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x - LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM - MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb index 6d9d8173..86d4da54 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb @@ -1,5 +1,6 @@ Imports System.Text.RegularExpressions Imports DevExpress.XtraLayout +Imports DigitalData.Controls.SQLEditor Imports DigitalData.Modules.Logging Public Class frmAdmin_Globix @@ -9,6 +10,9 @@ Public Class frmAdmin_Globix Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey Public Property GlobixHelper As ClassGIDatatables + Private AttributesManual As List(Of String) + Private AttributesAutomatic As List(Of String) + Private Pages As ClassDetailPageManager Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) ' Dieser Aufruf ist für den Designer erforderlich. @@ -105,17 +109,47 @@ Public Class frmAdmin_Globix End Try End Sub Sub Load_TabData() - Load_INDEXMAN() - Load_Attribute_Auto() + Load_Attributes_Manual() + Load_Attributes_Auto() End Sub - Private Sub Load_INDEXMAN() + Private Sub Load_Attributes_Manual() Try - Me.TBDD_INDEX_MANTableAdapter.Fill(Me.GlobixDataset.TBDD_INDEX_MAN, PrimaryKey) + If Not IsNumeric(PrimaryKey) Then + Exit Sub + End If - Catch ex As System.Exception + TBDD_INDEX_MANTableAdapter.Fill(GlobixDataset.TBDD_INDEX_MAN, PrimaryKey) + + AttributesManual = GlobixDataset.TBDD_INDEX_MAN. + Cast(Of DataRow). + Select(Of String)(Function(row) row.Item("NAME")). + ToList() + + Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Load IndexeManuell: ") End Try End Sub + + Private Sub Load_Attributes_Auto() + Try + If Not IsNumeric(PrimaryKey) Then + Exit Sub + End If + + TBDD_INDEX_AUTOMTableAdapter.Fill(GlobixDataset.TBDD_INDEX_AUTOM, PrimaryKey) + + AttributesAutomatic = GlobixDataset.TBDD_INDEX_AUTOM. + Cast(Of DataRow). + Select(Of String)(Function(row) row.Item("NAME")). + ToList() + + Catch ex As Exception + MessageBox.Show(ex.Message) + End Try + + End Sub + + Private Sub CurrentPage_Changed(sender As Object, e As ClassDetailPageManager.DetailPageEventArgs) If Not IsNothing(e.Page) Then If e.Page.IsPrimary = True Then @@ -136,15 +170,10 @@ Public Class frmAdmin_Globix labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always End Sub - - Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Throw New NotImplementedException() End Function - Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) - - End Sub Private Sub BarButtonSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonSave.ItemClick ResetMessages() @@ -164,13 +193,13 @@ Public Class frmAdmin_Globix Case XtraTabPageManIndexe.Name Try Save_manIndexe(oPage) - Load_INDEXMAN() + Load_Attributes_Manual() Catch ex As Exception End Try Case XtraTabPageAutoIndexe.Name Save_AutoIndexe(oPage) - Load_Attribute_Auto() + Load_Attributes_Auto() Case XtraTabPageAutoSelect.Name Save_AutoSelect(oPage) Case XtraTabPageDynamicFolder.Name @@ -322,11 +351,23 @@ Public Class frmAdmin_Globix Private Sub btneditSQLmanIndex_Click(sender As Object, e As EventArgs) Handles btneditSQLmanIndex.Click If Save_manIndexe(Pages.Current) = True Then Dim oSQLbefore = SQL_RESULTTextBox.Text - Dim oForm As New frmSQLDesigner() With {.SQLCommand = SQL_RESULTTextBox.Text, .DesignType = "GI_ATTRIBUTE_MAN", .ConnectionID = CONNECTION_IDTextBox.Text} - Dim oResult = oForm.ShowDialog() - If oSQLbefore <> oForm.SQLCommand Then - CONNECTION_IDTextBox.Text = oForm.ConnectionID - SQL_RESULTTextBox.Text = oForm.SQLCommand + Dim oForm2 As New frmSQLEditor(My.LogConfig, My.DatabaseECM) With { + .SQLCommand = SQL_RESULTTextBox.Text, + .SQLConnection = CONNECTION_IDTextBox.Text, + .PlaceholdersManual = AttributesManual + } + oForm2.ShowDialog() + + 'Dim oForm As New frmSQLDesigner() With { + ' .SQLCommand = SQL_RESULTTextBox.Text, + ' .DesignType = "GI_ATTRIBUTE_MAN", + ' .ConnectionID = CONNECTION_IDTextBox.Text + '} + 'Dim oResult = oForm.ShowDialog() + + If oSQLbefore <> oForm2.SQLCommand Then + CONNECTION_IDTextBox.Text = oForm2.SQLConnection + SQL_RESULTTextBox.Text = oForm2.SQLCommand 'TBDD_INDEX_MANTableAdapter.Adapter.UpdateCommand.Parameters("@SQL_RESULT").Value = oForm.SQLCommand 'TBDD_INDEX_MANTableAdapter.Adapter.UpdateCommand.Parameters("@CONNECTION_ID").Value = oForm.ConnectionID TextEditChangedWho_ManIndex.Text = My.Application.User.UserName @@ -342,17 +383,7 @@ Public Class frmAdmin_Globix TextEditNamenkonvention.Text = oForm.Nameconvention End Sub - Private Sub Load_Attribute_Auto() - Try - If Not IsNumeric(TextEditDoctypeID.Text) Then - Exit Sub - End If - Me.TBDD_INDEX_AUTOMTableAdapter.Fill(Me.GlobixDataset.TBDD_INDEX_AUTOM, TextEditDoctypeID.Text) - Catch ex As System.Exception - System.Windows.Forms.MessageBox.Show(ex.Message) - End Try - End Sub Private Sub Load_AutoSelect() Try Me.TBGI_REGEX_DOCTYPETableAdapter.Fill(Me.GlobixDataset.TBGI_REGEX_DOCTYPE, TextEditDoctypeID.Text) @@ -368,9 +399,9 @@ Public Class frmAdmin_Globix Pages.Current = oPage Select Case oPage.TabPage.Name Case XtraTabPageAutoIndexe.Name - Load_Attribute_Auto() + Load_Attributes_Auto() Case XtraTabPageManIndexe.Name - Load_INDEXMAN() + Load_Attributes_Manual() Case XtraTabPageAutoSelect.Name Load_AutoSelect() Case XtraTabPageDynamicFolder.Name @@ -393,16 +424,23 @@ Public Class frmAdmin_Globix Private Sub SimpleButton2_Click_1(sender As Object, e As EventArgs) Handles SimpleButton2.Click If Save_AutoIndexe(Pages.Current) = True Then - Dim oSQLbefore = SQL_RESULTTextBox1.Text - Dim oForm As New frmSQLDesigner() With { - .SQLCommand = oSQLbefore, .DesignType = "GI_ATTRIBUTE_AUTO", - .ConnectionID = CONNECTION_IDTextBox1.Text, - .AutoAttributID = GUIDTextBoxAutoAttribute.Text - } - Dim oResult = oForm.ShowDialog() - If oSQLbefore <> oForm.SQLCommand Then - CONNECTION_IDTextBox1.Text = oForm.ConnectionID - SQL_RESULTTextBox1.Text = oForm.SQLCommand + Dim oSQLbefore = SQL_RESULTTextBox.Text + Dim oForm2 As New frmSQLEditor(My.LogConfig, My.DatabaseECM) With { + .SQLCommand = SQL_RESULTTextBox.Text, + .SQLConnection = CONNECTION_IDTextBox.Text, + .PlaceholdersAutomatic = AttributesAutomatic + } + oForm2.ShowDialog() + + 'Dim oForm As New frmSQLDesigner() With { + ' .SQLCommand = oSQLbefore, .DesignType = "GI_ATTRIBUTE_AUTO", + ' .ConnectionID = CONNECTION_IDTextBox1.Text, + ' .AutoAttributID = GUIDTextBoxAutoAttribute.Text + ' } + 'Dim oResult = oForm.ShowDialog() + If oSQLbefore <> oForm2.SQLCommand Then + CONNECTION_IDTextBox1.Text = oForm2.SQLConnection + SQL_RESULTTextBox1.Text = oForm2.SQLCommand 'TBDD_INDEX_MANTableAdapter.Adapter.UpdateCommand.Parameters("@SQL_RESULT").Value = oForm.SQLCommand 'TBDD_INDEX_MANTableAdapter.Adapter.UpdateCommand.Parameters("@CONNECTION_ID").Value = oForm.ConnectionID CHANGED_WHOTextEditAutoAttribut.Text = My.Application.User.UserName @@ -580,7 +618,7 @@ Public Class frmAdmin_Globix If result = MsgBoxResult.Yes Then TBDD_INDEX_MANTableAdapter.Delete(GUIDTextBoxMANINDEX.Text) - Load_INDEXMAN() + Load_Attributes_Manual() End If Case XtraTabPageAutoIndexe.Name @@ -591,7 +629,7 @@ Public Class frmAdmin_Globix End If If result = MsgBoxResult.Yes Then TBDD_INDEX_AUTOMTableAdapter.Delete(GUIDTextBoxAutoAttribute.Text) - Load_Attribute_Auto() + Load_Attributes_Auto() End If Case XtraTabPageAutoSelect.Name diff --git a/GUIs.ZooFlow/Administration/frmSQLDesigner.Designer.vb b/GUIs.ZooFlow/Administration/frmSQLDesigner.Designer.vb index ba7e3b71..767627c1 100644 --- a/GUIs.ZooFlow/Administration/frmSQLDesigner.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmSQLDesigner.Designer.vb @@ -280,7 +280,7 @@ Partial Class frmSQLDesigner Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemLookUpEdit1, Me.RepositoryItemLookUpEdit2, Me.RepositoryItemLookUpEdit3}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(997, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(1008, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -365,10 +365,10 @@ Partial Class frmSQLDesigner 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 588) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 627) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(997, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1008, 24) ' 'RibbonPage2 ' @@ -385,7 +385,7 @@ Partial Class frmSQLDesigner Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(693, 157) + Me.GridControl1.Size = New System.Drawing.Size(704, 196) Me.GridControl1.TabIndex = 124 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -399,7 +399,7 @@ Partial Class frmSQLDesigner Me.Appearance.Options.UseFont = True Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(997, 612) + Me.ClientSize = New System.Drawing.Size(1008, 651) Me.Controls.Add(Me.GridControl1) Me.Controls.Add(Me.lblAttributeAuto) Me.Controls.Add(Me.btnAddAttributeAuto)