diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index b5f72f52..055cc611 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -172,10 +172,10 @@ - - MsgBoxEx.vb + + NNMsgBoxEx.vb - + Form @@ -232,8 +232,8 @@ frmWorkflow_Adhoc_start.vb - - MsgBoxEx.vb + + NNMsgBoxEx.vb diff --git a/GUIs.Common/MsgBoxEx.Designer.vb b/GUIs.Common/NNMsgBoxEx.Designer.vb similarity index 99% rename from GUIs.Common/MsgBoxEx.Designer.vb rename to GUIs.Common/NNMsgBoxEx.Designer.vb index 25c89387..1cef32a5 100644 --- a/GUIs.Common/MsgBoxEx.Designer.vb +++ b/GUIs.Common/NNMsgBoxEx.Designer.vb @@ -1,5 +1,5 @@  -Partial Class MsgBoxEx +Partial Class NNMsgBoxEx Inherits DevExpress.XtraEditors.XtraForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.Common/MsgBoxEx.resx b/GUIs.Common/NNMsgBoxEx.resx similarity index 100% rename from GUIs.Common/MsgBoxEx.resx rename to GUIs.Common/NNMsgBoxEx.resx diff --git a/GUIs.Common/MsgBoxEx.vb b/GUIs.Common/NNMsgBoxEx.vb similarity index 99% rename from GUIs.Common/MsgBoxEx.vb rename to GUIs.Common/NNMsgBoxEx.vb index 84e81a0b..2d43db46 100644 --- a/GUIs.Common/MsgBoxEx.vb +++ b/GUIs.Common/NNMsgBoxEx.vb @@ -1,7 +1,7 @@ Imports System.Drawing Imports System.Windows.Forms -Public Class MsgBoxEx +Public Class NNMsgBoxEx Public Sub New(message As String, title As String) Me.New(message, title, MessageBoxIcon.None) End Sub diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb index fd15f654..f7f23536 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -441,15 +441,15 @@ Public Class frmDocumentResultList Dim oDisplayName = pFile.Document.DisplayFileName Dim oMessage = $"Die Datei '{oDisplayName}' wurde außerhalb des Systems verändert. Wollen Sie diese Änderung als neue Version in das System übernehmen oder überschreiben?" - Dim oMessageBox As New MsgBoxEx(oMessage, "Datei verändert", MessageBoxIcon.Question) + Dim oMessageBox As New NNMsgBoxEx(oMessage, "Datei verändert", MessageBoxIcon.Question) oMessageBox.SetButtons("Überschreiben", "Neue Version", "Abbrechen") oMessageBox.ShowDialog() Select Case oMessageBox.Result - Case MsgBoxEx.DialogBoxResult.Button1 + Case NNMsgBoxEx.DialogBoxResult.Button1 Await Watcher_OverwriteFile(pFile) - Case MsgBoxEx.DialogBoxResult.Button2 + Case NNMsgBoxEx.DialogBoxResult.Button2 Await Watcher_VersionFile(pFile) Case Else diff --git a/GUIs.Test.TestGUI/frmMsgBox.vb b/GUIs.Test.TestGUI/frmMsgBox.vb index 9794d77f..b7ce4aa3 100644 --- a/GUIs.Test.TestGUI/frmMsgBox.vb +++ b/GUIs.Test.TestGUI/frmMsgBox.vb @@ -14,7 +14,7 @@ Public Class frmMsgBox End Sub Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click - Dim oMsgbox = New MsgBoxEx("Hallo Welt!", "Ein Titel") + Dim oMsgbox = New NNMsgBoxEx("Hallo Welt!", "Ein Titel") oMsgbox.ShowDialog() End Sub diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb index 25ed3b82..a2584296 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb @@ -122,7 +122,6 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem46 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem63 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem64 = New DevExpress.XtraLayout.LayoutControlItem() - Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() Me.ListBoxAutoIndexe = New DevExpress.XtraEditors.ListBoxControl() Me.XtraTabPageRework = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlRework = New DevExpress.XtraLayout.LayoutControl() @@ -164,7 +163,6 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem43 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem45 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem44 = New DevExpress.XtraLayout.LayoutControlItem() - Me.EmptySpaceItem5 = New DevExpress.XtraLayout.EmptySpaceItem() Me.XtraTabPageDynamicFolder = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.cmbAllAttributes = New System.Windows.Forms.ComboBox() @@ -323,7 +321,6 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem46, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem63, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem64, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ListBoxAutoIndexe, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageRework.SuspendLayout() CType(Me.LayoutControlRework, System.ComponentModel.ISupportInitialize).BeginInit() @@ -356,7 +353,6 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem43, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem45, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem44, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem5, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageDynamicFolder.SuspendLayout() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() @@ -992,17 +988,17 @@ Partial Class frmAdmin_Globix '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(498, 240) + Me.TextEdit4.Location = New System.Drawing.Point(519, 232) Me.TextEdit4.MenuManager = Me.RibbonControl1 Me.TextEdit4.Name = "TextEdit4" - Me.TextEdit4.Size = New System.Drawing.Size(394, 20) + Me.TextEdit4.Size = New System.Drawing.Size(390, 20) Me.TextEdit4.StyleController = Me.LayoutControlManIndexe Me.TextEdit4.TabIndex = 31 ' 'CONNECTION_IDTextBox ' Me.CONNECTION_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CONNECTION_ID", True)) - Me.CONNECTION_IDTextBox.Location = New System.Drawing.Point(97, 173) + Me.CONNECTION_IDTextBox.Location = New System.Drawing.Point(337, 136) Me.CONNECTION_IDTextBox.Name = "CONNECTION_IDTextBox" Me.CONNECTION_IDTextBox.Size = New System.Drawing.Size(20, 20) Me.CONNECTION_IDTextBox.TabIndex = 30 @@ -1010,9 +1006,9 @@ Partial Class frmAdmin_Globix 'SQL_RESULTTextBox ' 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, 173) + Me.SQL_RESULTTextBox.Location = New System.Drawing.Point(465, 136) Me.SQL_RESULTTextBox.Name = "SQL_RESULTTextBox" - Me.SQL_RESULTTextBox.Size = New System.Drawing.Size(689, 20) + Me.SQL_RESULTTextBox.Size = New System.Drawing.Size(444, 20) Me.SQL_RESULTTextBox.TabIndex = 29 ' 'WD_INDEXComboBox @@ -1021,9 +1017,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(530, 52) + Me.WD_INDEXComboBox.Location = New System.Drawing.Point(554, 45) Me.WD_INDEXComboBox.Name = "WD_INDEXComboBox" - Me.WD_INDEXComboBox.Size = New System.Drawing.Size(365, 21) + Me.WD_INDEXComboBox.Size = New System.Drawing.Size(355, 21) Me.WD_INDEXComboBox.TabIndex = 28 Me.WD_INDEXComboBox.ValueMember = "ATTR_TITLE" ' @@ -1035,9 +1031,10 @@ 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(635, 107) + Me.VKT_ADD_ITEMCheckBox.Location = New System.Drawing.Point(647, 103) Me.VKT_ADD_ITEMCheckBox.Name = "VKT_ADD_ITEMCheckBox" - Me.VKT_ADD_ITEMCheckBox.Size = New System.Drawing.Size(260, 20) + Me.VKT_ADD_ITEMCheckBox.Padding = New System.Windows.Forms.Padding(2) + Me.VKT_ADD_ITEMCheckBox.Size = New System.Drawing.Size(265, 20) Me.VKT_ADD_ITEMCheckBox.TabIndex = 14 Me.VKT_ADD_ITEMCheckBox.Text = "Neueingabe erlauben" Me.VKT_ADD_ITEMCheckBox.UseVisualStyleBackColor = True @@ -1045,9 +1042,10 @@ 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(446, 107) + Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Location = New System.Drawing.Point(454, 103) Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Name = "VKT_PREVENT_MULTIPLE_VALUESCheckBox" - Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Size = New System.Drawing.Size(185, 20) + Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Padding = New System.Windows.Forms.Padding(2) + Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Size = New System.Drawing.Size(189, 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 @@ -1055,83 +1053,86 @@ 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(232, 107) + Me.MULTISELECTCheckBox.Location = New System.Drawing.Point(236, 103) Me.MULTISELECTCheckBox.Name = "MULTISELECTCheckBox" - Me.MULTISELECTCheckBox.Size = New System.Drawing.Size(210, 20) + Me.MULTISELECTCheckBox.Padding = New System.Windows.Forms.Padding(2) + Me.MULTISELECTCheckBox.Size = New System.Drawing.Size(214, 20) Me.MULTISELECTCheckBox.TabIndex = 12 Me.MULTISELECTCheckBox.Text = "Mehrfachauswahl" Me.MULTISELECTCheckBox.UseVisualStyleBackColor = True ' 'btneditSQLmanIndex ' + Me.btneditSQLmanIndex.Appearance.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btneditSQLmanIndex.Appearance.Options.UseFont = True Me.btneditSQLmanIndex.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.editdatasource Me.btneditSQLmanIndex.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) - Me.btneditSQLmanIndex.Location = New System.Drawing.Point(12, 137) + Me.btneditSQLmanIndex.Location = New System.Drawing.Point(12, 133) Me.btneditSQLmanIndex.Name = "btneditSQLmanIndex" Me.btneditSQLmanIndex.Padding = New System.Windows.Forms.Padding(5) - Me.btneditSQLmanIndex.Size = New System.Drawing.Size(883, 32) + Me.btneditSQLmanIndex.Size = New System.Drawing.Size(220, 32) Me.btneditSQLmanIndex.StyleController = Me.LayoutControlManIndexe Me.btneditSQLmanIndex.TabIndex = 16 - Me.btneditSQLmanIndex.Text = "SQL Auswahlliste bearbeiten" + Me.btneditSQLmanIndex.Text = "SQL Designer" ' 'TextEditAddedWho_ManIndex ' Me.TextEditAddedWho_ManIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "ADDED_WHO", True)) Me.TextEditAddedWho_ManIndex.Enabled = False - Me.TextEditAddedWho_ManIndex.Location = New System.Drawing.Point(100, 210) + Me.TextEditAddedWho_ManIndex.Location = New System.Drawing.Point(113, 202) Me.TextEditAddedWho_ManIndex.MenuManager = Me.RibbonControl1 Me.TextEditAddedWho_ManIndex.Name = "TextEditAddedWho_ManIndex" - Me.TextEditAddedWho_ManIndex.Size = New System.Drawing.Size(303, 20) + Me.TextEditAddedWho_ManIndex.Size = New System.Drawing.Size(298, 20) Me.TextEditAddedWho_ManIndex.StyleController = Me.LayoutControlManIndexe Me.TextEditAddedWho_ManIndex.TabIndex = 18 ' 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "ADDED_WHEN", True)) - Me.TextEdit2.Location = New System.Drawing.Point(100, 240) + Me.TextEdit2.Location = New System.Drawing.Point(113, 232) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(303, 20) + Me.TextEdit2.Size = New System.Drawing.Size(298, 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(498, 210) + Me.TextEditChangedWho_ManIndex.Location = New System.Drawing.Point(519, 202) Me.TextEditChangedWho_ManIndex.MenuManager = Me.RibbonControl1 Me.TextEditChangedWho_ManIndex.Name = "TextEditChangedWho_ManIndex" - Me.TextEditChangedWho_ManIndex.Size = New System.Drawing.Size(394, 20) + Me.TextEditChangedWho_ManIndex.Size = New System.Drawing.Size(390, 20) Me.TextEditChangedWho_ManIndex.StyleController = Me.LayoutControlManIndexe Me.TextEditChangedWho_ManIndex.TabIndex = 20 ' 'GUIDTextBoxMANINDEX ' Me.GUIDTextBoxMANINDEX.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "GUID", True)) - Me.GUIDTextBoxMANINDEX.Location = New System.Drawing.Point(100, 15) + Me.GUIDTextBoxMANINDEX.Location = New System.Drawing.Point(113, 15) Me.GUIDTextBoxMANINDEX.MenuManager = Me.RibbonControl1 Me.GUIDTextBoxMANINDEX.Name = "GUIDTextBoxMANINDEX" - Me.GUIDTextBoxMANINDEX.Size = New System.Drawing.Size(51, 20) + Me.GUIDTextBoxMANINDEX.Size = New System.Drawing.Size(53, 20) Me.GUIDTextBoxMANINDEX.StyleController = Me.LayoutControlManIndexe Me.GUIDTextBoxMANINDEX.TabIndex = 21 ' 'TextEdit10 ' Me.TextEdit10.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "NAME", True)) - Me.TextEdit10.Location = New System.Drawing.Point(100, 45) + Me.TextEdit10.Location = New System.Drawing.Point(113, 45) Me.TextEdit10.MenuManager = Me.RibbonControl1 Me.TextEdit10.Name = "TextEdit10" - Me.TextEdit10.Size = New System.Drawing.Size(338, 20) + Me.TextEdit10.Size = New System.Drawing.Size(333, 20) Me.TextEdit10.StyleController = Me.LayoutControlManIndexe Me.TextEdit10.TabIndex = 22 ' 'TextEdit11 ' Me.TextEdit11.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "COMMENT", True)) - Me.TextEdit11.Location = New System.Drawing.Point(100, 80) + Me.TextEdit11.Location = New System.Drawing.Point(113, 76) Me.TextEdit11.MenuManager = Me.RibbonControl1 Me.TextEdit11.Name = "TextEdit11" - Me.TextEdit11.Size = New System.Drawing.Size(792, 20) + Me.TextEdit11.Size = New System.Drawing.Size(796, 20) Me.TextEdit11.StyleController = Me.LayoutControlManIndexe Me.TextEdit11.TabIndex = 23 ' @@ -1139,45 +1140,45 @@ 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(246, 15) + Me.SpinEdit1.Location = New System.Drawing.Point(274, 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(51, 20) + Me.SpinEdit1.Size = New System.Drawing.Size(53, 20) Me.SpinEdit1.StyleController = Me.LayoutControlManIndexe Me.SpinEdit1.TabIndex = 25 ' 'ComboBoxEdit4 ' Me.ComboBoxEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_INDEX_MANBindingSource, "DATATYPE", True)) - Me.ComboBoxEdit4.Location = New System.Drawing.Point(100, 110) + Me.ComboBoxEdit4.Location = New System.Drawing.Point(113, 106) Me.ComboBoxEdit4.MenuManager = Me.RibbonControl1 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(125, 20) + Me.ComboBoxEdit4.Size = New System.Drawing.Size(116, 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(307, 15) + Me.ACTIVECheckBox2.Location = New System.Drawing.Point(337, 15) Me.ACTIVECheckBox2.MenuManager = Me.RibbonControl1 Me.ACTIVECheckBox2.Name = "ACTIVECheckBox2" Me.ACTIVECheckBox2.Properties.Caption = "Aktiv" - Me.ACTIVECheckBox2.Size = New System.Drawing.Size(341, 20) + Me.ACTIVECheckBox2.Size = New System.Drawing.Size(333, 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(658, 15) + Me.OPTIONALCheckBox2.Location = New System.Drawing.Point(680, 15) Me.OPTIONALCheckBox2.MenuManager = Me.RibbonControl1 Me.OPTIONALCheckBox2.Name = "OPTIONALCheckBox2" Me.OPTIONALCheckBox2.Properties.Caption = "Optional" - Me.OPTIONALCheckBox2.Size = New System.Drawing.Size(234, 20) + Me.OPTIONALCheckBox2.Size = New System.Drawing.Size(229, 20) Me.OPTIONALCheckBox2.StyleController = Me.LayoutControlManIndexe Me.OPTIONALCheckBox2.TabIndex = 34 ' @@ -1185,17 +1186,17 @@ Partial Class frmAdmin_Globix ' 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.LayoutControlItem16, Me.LayoutControlItem31, Me.LayoutControlItem18, Me.EmptySpaceItem6, Me.LayoutControlItem46, Me.LayoutControlItem63, Me.LayoutControlItem64, Me.EmptySpaceItem2}) + Me.LayoutControlGroupDoctype.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem17, Me.LayoutControlItem19, Me.LayoutControlItem21, 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.LayoutControlItem6}) Me.LayoutControlGroupDoctype.Name = "LayoutControlGroupDoctype" - Me.LayoutControlGroupDoctype.Size = New System.Drawing.Size(907, 275) + Me.LayoutControlGroupDoctype.Size = New System.Drawing.Size(924, 267) Me.LayoutControlGroupDoctype.TextVisible = False ' 'LayoutControlItem17 ' Me.LayoutControlItem17.Control = Me.MULTISELECTCheckBox - Me.LayoutControlItem17.Location = New System.Drawing.Point(220, 95) + Me.LayoutControlItem17.Location = New System.Drawing.Point(224, 91) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(214, 30) + Me.LayoutControlItem17.Size = New System.Drawing.Size(218, 30) Me.LayoutControlItem17.Text = "MULTISELECT:" Me.LayoutControlItem17.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem17.TextVisible = False @@ -1203,9 +1204,9 @@ Partial Class frmAdmin_Globix 'LayoutControlItem19 ' Me.LayoutControlItem19.Control = Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox - Me.LayoutControlItem19.Location = New System.Drawing.Point(434, 95) + Me.LayoutControlItem19.Location = New System.Drawing.Point(442, 91) Me.LayoutControlItem19.Name = "LayoutControlItem19" - Me.LayoutControlItem19.Size = New System.Drawing.Size(189, 30) + Me.LayoutControlItem19.Size = New System.Drawing.Size(193, 30) Me.LayoutControlItem19.Text = "VKT PREVENT MULTIPLE VALUES:" Me.LayoutControlItem19.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem19.TextVisible = False @@ -1213,9 +1214,9 @@ Partial Class frmAdmin_Globix 'LayoutControlItem21 ' Me.LayoutControlItem21.Control = Me.VKT_ADD_ITEMCheckBox - Me.LayoutControlItem21.Location = New System.Drawing.Point(623, 95) + Me.LayoutControlItem21.Location = New System.Drawing.Point(635, 91) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(264, 30) + Me.LayoutControlItem21.Size = New System.Drawing.Size(269, 30) Me.LayoutControlItem21.Text = "VKT ADD ITEM:" Me.LayoutControlItem21.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem21.TextVisible = False @@ -1223,9 +1224,9 @@ Partial Class frmAdmin_Globix 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.btneditSQLmanIndex - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 125) + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 121) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Size = New System.Drawing.Size(887, 36) + Me.LayoutControlItem6.Size = New System.Drawing.Size(224, 36) Me.LayoutControlItem6.Text = "SQL Abfrage bearbeiten" Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem6.TextVisible = False @@ -1236,12 +1237,12 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem24.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem24.Control = Me.TextEditAddedWho_ManIndex Me.LayoutControlItem24.Enabled = False - Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 195) + Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 187) Me.LayoutControlItem24.Name = "LayoutControlItem24" Me.LayoutControlItem24.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem24.Size = New System.Drawing.Size(398, 30) + Me.LayoutControlItem24.Size = New System.Drawing.Size(406, 30) Me.LayoutControlItem24.Text = "ErstelltWer" - Me.LayoutControlItem24.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem24.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem2 ' @@ -1251,9 +1252,9 @@ 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(146, 30) + Me.LayoutControlItem2.Size = New System.Drawing.Size(161, 30) Me.LayoutControlItem2.Text = "ID" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem8 ' @@ -1261,39 +1262,39 @@ 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(433, 35) - Me.LayoutControlItem8.Text = "Bezeichnung" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem8.Size = New System.Drawing.Size(441, 31) + Me.LayoutControlItem8.Text = "Titel" + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.TextEdit11 - Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 65) + Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 61) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem11.Size = New System.Drawing.Size(887, 30) - Me.LayoutControlItem11.Text = "Hinweis" - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem11.Size = New System.Drawing.Size(904, 30) + Me.LayoutControlItem11.Text = "Hinweis Eingabe" + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem13 ' Me.LayoutControlItem13.Control = Me.ComboBoxEdit4 - Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 95) + Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 91) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem13.Size = New System.Drawing.Size(220, 30) + Me.LayoutControlItem13.Size = New System.Drawing.Size(224, 30) Me.LayoutControlItem13.Text = "Datentyp" - Me.LayoutControlItem13.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem13.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.SpinEdit1 - Me.LayoutControlItem9.Location = New System.Drawing.Point(146, 0) + Me.LayoutControlItem9.Location = New System.Drawing.Point(161, 0) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem9.Size = New System.Drawing.Size(146, 30) + Me.LayoutControlItem9.Size = New System.Drawing.Size(161, 30) Me.LayoutControlItem9.Text = "Reihenfolge" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem27 ' @@ -1301,12 +1302,12 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem27.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem27.Control = Me.TextEdit2 Me.LayoutControlItem27.Enabled = False - Me.LayoutControlItem27.Location = New System.Drawing.Point(0, 225) + Me.LayoutControlItem27.Location = New System.Drawing.Point(0, 217) Me.LayoutControlItem27.Name = "LayoutControlItem27" Me.LayoutControlItem27.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem27.Size = New System.Drawing.Size(398, 30) + Me.LayoutControlItem27.Size = New System.Drawing.Size(406, 30) Me.LayoutControlItem27.Text = "Erstellt wann" - Me.LayoutControlItem27.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem27.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem29 ' @@ -1314,50 +1315,53 @@ 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(398, 195) + Me.LayoutControlItem29.Location = New System.Drawing.Point(406, 187) Me.LayoutControlItem29.Name = "LayoutControlItem29" Me.LayoutControlItem29.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem29.Size = New System.Drawing.Size(489, 30) + Me.LayoutControlItem29.Size = New System.Drawing.Size(498, 30) Me.LayoutControlItem29.Text = "Geändert wer" - Me.LayoutControlItem29.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem29.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem16 ' Me.LayoutControlItem16.Control = Me.WD_INDEXComboBox - Me.LayoutControlItem16.Location = New System.Drawing.Point(433, 40) + Me.LayoutControlItem16.Location = New System.Drawing.Point(441, 30) Me.LayoutControlItem16.Name = "LayoutControlItem16" - Me.LayoutControlItem16.Size = New System.Drawing.Size(454, 25) + Me.LayoutControlItem16.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem16.Size = New System.Drawing.Size(463, 31) Me.LayoutControlItem16.Text = "Attribut" - Me.LayoutControlItem16.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem16.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem31 ' Me.LayoutControlItem31.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LayoutControlItem31.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem31.Control = Me.CONNECTION_IDTextBox - Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 161) + Me.LayoutControlItem31.Location = New System.Drawing.Point(224, 121) Me.LayoutControlItem31.Name = "LayoutControlItem31" - Me.LayoutControlItem31.Size = New System.Drawing.Size(109, 24) + Me.LayoutControlItem31.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem31.Size = New System.Drawing.Size(128, 36) Me.LayoutControlItem31.Text = "ConnId:" - Me.LayoutControlItem31.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem31.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem18 ' Me.LayoutControlItem18.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LayoutControlItem18.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem18.Control = Me.SQL_RESULTTextBox - Me.LayoutControlItem18.Location = New System.Drawing.Point(109, 161) + Me.LayoutControlItem18.Location = New System.Drawing.Point(352, 121) Me.LayoutControlItem18.Name = "LayoutControlItem18" - Me.LayoutControlItem18.Size = New System.Drawing.Size(778, 24) + Me.LayoutControlItem18.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem18.Size = New System.Drawing.Size(552, 36) Me.LayoutControlItem18.Text = "SQL:" - Me.LayoutControlItem18.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem18.TextSize = New System.Drawing.Size(86, 13) ' 'EmptySpaceItem6 ' Me.EmptySpaceItem6.AllowHotTrack = False - Me.EmptySpaceItem6.Location = New System.Drawing.Point(0, 185) + Me.EmptySpaceItem6.Location = New System.Drawing.Point(0, 157) Me.EmptySpaceItem6.Name = "EmptySpaceItem6" - Me.EmptySpaceItem6.Size = New System.Drawing.Size(887, 10) + Me.EmptySpaceItem6.Size = New System.Drawing.Size(904, 30) Me.EmptySpaceItem6.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem46 @@ -1366,41 +1370,33 @@ 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(398, 225) + Me.LayoutControlItem46.Location = New System.Drawing.Point(406, 217) Me.LayoutControlItem46.Name = "LayoutControlItem46" Me.LayoutControlItem46.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem46.Size = New System.Drawing.Size(489, 30) + Me.LayoutControlItem46.Size = New System.Drawing.Size(498, 30) Me.LayoutControlItem46.Text = "Geändert wann" - Me.LayoutControlItem46.TextSize = New System.Drawing.Size(73, 13) + Me.LayoutControlItem46.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem63 ' Me.LayoutControlItem63.Control = Me.ACTIVECheckBox2 - Me.LayoutControlItem63.Location = New System.Drawing.Point(292, 0) + Me.LayoutControlItem63.Location = New System.Drawing.Point(322, 0) Me.LayoutControlItem63.Name = "LayoutControlItem63" Me.LayoutControlItem63.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem63.Size = New System.Drawing.Size(351, 30) + Me.LayoutControlItem63.Size = New System.Drawing.Size(343, 30) Me.LayoutControlItem63.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem63.TextVisible = False ' 'LayoutControlItem64 ' Me.LayoutControlItem64.Control = Me.OPTIONALCheckBox2 - Me.LayoutControlItem64.Location = New System.Drawing.Point(643, 0) + Me.LayoutControlItem64.Location = New System.Drawing.Point(665, 0) Me.LayoutControlItem64.Name = "LayoutControlItem64" Me.LayoutControlItem64.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem64.Size = New System.Drawing.Size(244, 30) + Me.LayoutControlItem64.Size = New System.Drawing.Size(239, 30) Me.LayoutControlItem64.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem64.TextVisible = False ' - 'EmptySpaceItem2 - ' - Me.EmptySpaceItem2.AllowHotTrack = False - Me.EmptySpaceItem2.Location = New System.Drawing.Point(433, 30) - Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(454, 10) - Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) - ' 'ListBoxAutoIndexe ' Me.ListBoxAutoIndexe.DataSource = Me.TBDD_INDEX_MANBindingSource @@ -1493,20 +1489,22 @@ 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(241, 206) Me.CONNECTION_IDTextBox1.Name = "CONNECTION_IDTextBox1" - Me.CONNECTION_IDTextBox1.Size = New System.Drawing.Size(24, 20) + Me.CONNECTION_IDTextBox1.Size = New System.Drawing.Size(399, 20) Me.CONNECTION_IDTextBox1.TabIndex = 23 + Me.CONNECTION_IDTextBox1.Visible = False ' 'SQL_RESULTTextBox1 ' Me.SQL_RESULTTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "SQL_RESULT", True)) Me.SQL_RESULTTextBox1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.SQL_RESULTTextBox1.Location = New System.Drawing.Point(410, 142) + Me.SQL_RESULTTextBox1.Location = New System.Drawing.Point(673, 206) Me.SQL_RESULTTextBox1.Name = "SQL_RESULTTextBox1" Me.SQL_RESULTTextBox1.ReadOnly = True - Me.SQL_RESULTTextBox1.Size = New System.Drawing.Size(686, 20) + Me.SQL_RESULTTextBox1.Size = New System.Drawing.Size(423, 20) Me.SQL_RESULTTextBox1.TabIndex = 14 + Me.SQL_RESULTTextBox1.Visible = False ' 'SQL_ACTIVECheckBox ' @@ -1540,9 +1538,10 @@ Partial Class frmAdmin_Globix 'ACTIVECheckBox1 ' Me.ACTIVECheckBox1.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_AUTOMBindingSource, "ACTIVE", True)) - Me.ACTIVECheckBox1.Location = New System.Drawing.Point(522, 12) + Me.ACTIVECheckBox1.Location = New System.Drawing.Point(540, 12) Me.ACTIVECheckBox1.Name = "ACTIVECheckBox1" - Me.ACTIVECheckBox1.Size = New System.Drawing.Size(577, 20) + Me.ACTIVECheckBox1.Padding = New System.Windows.Forms.Padding(2) + Me.ACTIVECheckBox1.Size = New System.Drawing.Size(559, 20) Me.ACTIVECheckBox1.TabIndex = 7 Me.ACTIVECheckBox1.Text = "Aktiv" Me.ACTIVECheckBox1.UseVisualStyleBackColor = True @@ -1550,9 +1549,9 @@ 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(489, 15) Me.SEQUENCENumericUpDown1.Name = "SEQUENCENumericUpDown1" - Me.SEQUENCENumericUpDown1.Size = New System.Drawing.Size(46, 22) + Me.SEQUENCENumericUpDown1.Size = New System.Drawing.Size(44, 22) Me.SEQUENCENumericUpDown1.TabIndex = 6 ' 'GUIDTextBoxAutoAttribute @@ -1562,7 +1561,7 @@ Partial Class frmAdmin_Globix Me.GUIDTextBoxAutoAttribute.Location = New System.Drawing.Point(369, 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(42, 20) Me.GUIDTextBoxAutoAttribute.TabIndex = 5 ' 'SimpleButton1 @@ -1572,24 +1571,26 @@ Partial Class frmAdmin_Globix Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.SimpleButton1.Location = New System.Drawing.Point(553, 73) Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(109, 36) + Me.SimpleButton1.Size = New System.Drawing.Size(111, 36) Me.SimpleButton1.StyleController = Me.LayoutControlAutoIndexe Me.SimpleButton1.TabIndex = 10 Me.SimpleButton1.Text = "Übernehmen" ' 'ComboBoxEditAAttrFileParam ' - Me.ComboBoxEditAAttrFileParam.Location = New System.Drawing.Point(844, 76) + Me.ComboBoxEditAAttrFileParam.Location = New System.Drawing.Point(846, 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(250, 20) Me.ComboBoxEditAAttrFileParam.StyleController = Me.LayoutControlAutoIndexe Me.ComboBoxEditAAttrFileParam.TabIndex = 11 ' 'SimpleButton2 ' + Me.SimpleButton2.Appearance.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.SimpleButton2.Appearance.Options.UseFont = True Me.SimpleButton2.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.editdatasource Me.SimpleButton2.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.SimpleButton2.Location = New System.Drawing.Point(299, 113) @@ -1597,13 +1598,13 @@ Partial Class frmAdmin_Globix Me.SimpleButton2.Size = New System.Drawing.Size(800, 22) Me.SimpleButton2.StyleController = Me.LayoutControlAutoIndexe Me.SimpleButton2.TabIndex = 13 - Me.SimpleButton2.Text = "SQL Konfiguration" + Me.SimpleButton2.Text = "SQL Designer" ' 'ADDED_WHOTextBoxAutoAttribut ' 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(369, 146) 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)) @@ -1616,7 +1617,7 @@ 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(369, 176) 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)) @@ -1629,7 +1630,7 @@ 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(825, 146) 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)) @@ -1641,7 +1642,7 @@ Partial Class frmAdmin_Globix '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(825, 176) 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)) @@ -1654,28 +1655,30 @@ Partial Class frmAdmin_Globix ' Me.LayoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutControlGroup2.GroupBordersVisible = False - Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem15, Me.LayoutControlItem23, Me.LayoutControlItem33, Me.LayoutControlItem34, Me.LayoutControlItem35, Me.LayoutControlItem14, Me.LayoutControlItem40, Me.LayoutControlItem37, Me.LayoutControlItem39, Me.LayoutControlItem42, Me.EmptySpaceItem4, Me.ADDED_WHOAutoAttribut, Me.LayoutControlItem41, Me.CHANGED_WHOItemAutoAttribut, Me.LayoutControlItem43, Me.LayoutControlItem45, Me.LayoutControlItem44, Me.EmptySpaceItem5}) + Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem15, Me.LayoutControlItem23, Me.LayoutControlItem33, Me.LayoutControlItem34, Me.LayoutControlItem35, Me.LayoutControlItem14, Me.LayoutControlItem40, Me.LayoutControlItem37, Me.EmptySpaceItem4, Me.ADDED_WHOAutoAttribut, Me.LayoutControlItem41, Me.CHANGED_WHOItemAutoAttribut, Me.LayoutControlItem43, Me.LayoutControlItem44, Me.LayoutControlItem39, Me.LayoutControlItem45, Me.LayoutControlItem42}) Me.LayoutControlGroup2.Name = "LayoutControlGroup2" Me.LayoutControlGroup2.Size = New System.Drawing.Size(1111, 267) Me.LayoutControlGroup2.TextVisible = False ' 'LayoutControlItem15 ' + Me.LayoutControlItem15.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LayoutControlItem15.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem15.Control = Me.GUIDTextBoxAutoAttribute Me.LayoutControlItem15.Location = New System.Drawing.Point(179, 0) Me.LayoutControlItem15.Name = "LayoutControlItem15" Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem15.Size = New System.Drawing.Size(207, 30) + Me.LayoutControlItem15.Size = New System.Drawing.Size(227, 30) Me.LayoutControlItem15.Text = "ID" Me.LayoutControlItem15.TextSize = New System.Drawing.Size(163, 13) ' 'LayoutControlItem23 ' Me.LayoutControlItem23.Control = Me.SEQUENCENumericUpDown1 - Me.LayoutControlItem23.Location = New System.Drawing.Point(386, 0) + Me.LayoutControlItem23.Location = New System.Drawing.Point(406, 0) Me.LayoutControlItem23.Name = "LayoutControlItem23" Me.LayoutControlItem23.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem23.Size = New System.Drawing.Size(124, 30) + Me.LayoutControlItem23.Size = New System.Drawing.Size(122, 30) Me.LayoutControlItem23.Text = "Reihenfolge" Me.LayoutControlItem23.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize Me.LayoutControlItem23.TextSize = New System.Drawing.Size(63, 13) @@ -1684,9 +1687,9 @@ Partial Class frmAdmin_Globix 'LayoutControlItem33 ' Me.LayoutControlItem33.Control = Me.ACTIVECheckBox1 - Me.LayoutControlItem33.Location = New System.Drawing.Point(510, 0) + Me.LayoutControlItem33.Location = New System.Drawing.Point(528, 0) Me.LayoutControlItem33.Name = "LayoutControlItem33" - Me.LayoutControlItem33.Size = New System.Drawing.Size(581, 30) + Me.LayoutControlItem33.Size = New System.Drawing.Size(563, 30) Me.LayoutControlItem33.Text = "Aktiv" Me.LayoutControlItem33.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem33.TextVisible = False @@ -1718,7 +1721,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem14.Control = Me.SimpleButton1 Me.LayoutControlItem14.Location = New System.Drawing.Point(541, 61) Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(113, 40) + Me.LayoutControlItem14.Size = New System.Drawing.Size(115, 40) Me.LayoutControlItem14.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem14.TextVisible = False ' @@ -1728,7 +1731,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem40.Location = New System.Drawing.Point(179, 101) Me.LayoutControlItem40.Name = "LayoutControlItem40" Me.LayoutControlItem40.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem40.Size = New System.Drawing.Size(108, 56) + Me.LayoutControlItem40.Size = New System.Drawing.Size(108, 30) Me.LayoutControlItem40.Text = "SQL ACTIVE:" Me.LayoutControlItem40.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem40.TextVisible = False @@ -1738,10 +1741,10 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem37.AppearanceItemCaption.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer)) Me.LayoutControlItem37.AppearanceItemCaption.Options.UseForeColor = True Me.LayoutControlItem37.Control = Me.ComboBoxEditAAttrFileParam - Me.LayoutControlItem37.Location = New System.Drawing.Point(654, 61) + Me.LayoutControlItem37.Location = New System.Drawing.Point(656, 61) Me.LayoutControlItem37.Name = "LayoutControlItem37" Me.LayoutControlItem37.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem37.Size = New System.Drawing.Size(437, 40) + Me.LayoutControlItem37.Size = New System.Drawing.Size(435, 40) Me.LayoutControlItem37.Text = "FILE-Parameter" Me.LayoutControlItem37.TextSize = New System.Drawing.Size(163, 13) ' @@ -1750,20 +1753,22 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem39.Control = Me.SimpleButton2 Me.LayoutControlItem39.Location = New System.Drawing.Point(287, 101) Me.LayoutControlItem39.Name = "LayoutControlItem39" - Me.LayoutControlItem39.Size = New System.Drawing.Size(804, 26) + Me.LayoutControlItem39.Size = New System.Drawing.Size(804, 30) Me.LayoutControlItem39.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem39.TextVisible = False ' 'LayoutControlItem42 ' + Me.LayoutControlItem42.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LayoutControlItem42.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem42.Control = Me.SQL_RESULTTextBox1 - Me.LayoutControlItem42.Location = New System.Drawing.Point(371, 127) + Me.LayoutControlItem42.Location = New System.Drawing.Point(635, 191) Me.LayoutControlItem42.Name = "LayoutControlItem42" Me.LayoutControlItem42.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem42.Size = New System.Drawing.Size(720, 30) + Me.LayoutControlItem42.Size = New System.Drawing.Size(456, 56) Me.LayoutControlItem42.Text = "SQL" Me.LayoutControlItem42.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize - Me.LayoutControlItem42.TextSize = New System.Drawing.Size(19, 13) + Me.LayoutControlItem42.TextSize = New System.Drawing.Size(18, 13) Me.LayoutControlItem42.TextToControlDistance = 5 ' 'EmptySpaceItem4 @@ -1776,8 +1781,11 @@ Partial Class frmAdmin_Globix ' 'ADDED_WHOAutoAttribut ' + Me.ADDED_WHOAutoAttribut.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ADDED_WHOAutoAttribut.AppearanceItemCaption.Options.UseFont = True Me.ADDED_WHOAutoAttribut.Control = Me.ADDED_WHOTextBoxAutoAttribut - Me.ADDED_WHOAutoAttribut.Location = New System.Drawing.Point(179, 187) + Me.ADDED_WHOAutoAttribut.Enabled = False + Me.ADDED_WHOAutoAttribut.Location = New System.Drawing.Point(179, 131) Me.ADDED_WHOAutoAttribut.Name = "ADDED_WHOAutoAttribut" Me.ADDED_WHOAutoAttribut.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.ADDED_WHOAutoAttribut.Size = New System.Drawing.Size(456, 30) @@ -1786,8 +1794,11 @@ Partial Class frmAdmin_Globix ' 'LayoutControlItem41 ' + Me.LayoutControlItem41.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LayoutControlItem41.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem41.Control = Me.TextEdit3 - Me.LayoutControlItem41.Location = New System.Drawing.Point(179, 217) + Me.LayoutControlItem41.Enabled = False + Me.LayoutControlItem41.Location = New System.Drawing.Point(179, 161) Me.LayoutControlItem41.Name = "LayoutControlItem41" Me.LayoutControlItem41.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem41.Size = New System.Drawing.Size(456, 30) @@ -1796,8 +1807,11 @@ Partial Class frmAdmin_Globix ' 'CHANGED_WHOItemAutoAttribut ' + Me.CHANGED_WHOItemAutoAttribut.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CHANGED_WHOItemAutoAttribut.AppearanceItemCaption.Options.UseFont = True Me.CHANGED_WHOItemAutoAttribut.Control = Me.CHANGED_WHOTextEditAutoAttribut - Me.CHANGED_WHOItemAutoAttribut.Location = New System.Drawing.Point(635, 187) + Me.CHANGED_WHOItemAutoAttribut.Enabled = False + Me.CHANGED_WHOItemAutoAttribut.Location = New System.Drawing.Point(635, 131) Me.CHANGED_WHOItemAutoAttribut.Name = "CHANGED_WHOItemAutoAttribut" Me.CHANGED_WHOItemAutoAttribut.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.CHANGED_WHOItemAutoAttribut.Size = New System.Drawing.Size(456, 30) @@ -1806,8 +1820,11 @@ Partial Class frmAdmin_Globix ' 'LayoutControlItem43 ' + Me.LayoutControlItem43.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LayoutControlItem43.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem43.Control = Me.TextEdit5 - Me.LayoutControlItem43.Location = New System.Drawing.Point(635, 217) + Me.LayoutControlItem43.Enabled = False + Me.LayoutControlItem43.Location = New System.Drawing.Point(635, 161) Me.LayoutControlItem43.Name = "LayoutControlItem43" Me.LayoutControlItem43.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem43.Size = New System.Drawing.Size(456, 30) @@ -1816,14 +1833,16 @@ Partial Class frmAdmin_Globix ' 'LayoutControlItem45 ' + Me.LayoutControlItem45.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LayoutControlItem45.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem45.Control = Me.CONNECTION_IDTextBox1 - Me.LayoutControlItem45.Location = New System.Drawing.Point(287, 127) + Me.LayoutControlItem45.Location = New System.Drawing.Point(179, 191) Me.LayoutControlItem45.Name = "LayoutControlItem45" Me.LayoutControlItem45.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem45.Size = New System.Drawing.Size(84, 30) + Me.LayoutControlItem45.Size = New System.Drawing.Size(456, 56) 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(42, 13) Me.LayoutControlItem45.TextToControlDistance = 5 ' 'LayoutControlItem44 @@ -1837,14 +1856,6 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem44.TextToControlDistance = 0 Me.LayoutControlItem44.TextVisible = False ' - 'EmptySpaceItem5 - ' - Me.EmptySpaceItem5.AllowHotTrack = False - Me.EmptySpaceItem5.Location = New System.Drawing.Point(179, 157) - Me.EmptySpaceItem5.Name = "EmptySpaceItem5" - Me.EmptySpaceItem5.Size = New System.Drawing.Size(912, 30) - Me.EmptySpaceItem5.TextSize = New System.Drawing.Size(0, 0) - ' 'XtraTabPageDynamicFolder ' Me.XtraTabPageDynamicFolder.Controls.Add(Me.LayoutControl1) @@ -2760,7 +2771,6 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem46, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem63, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem64, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ListBoxAutoIndexe, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageRework.ResumeLayout(False) CType(Me.LayoutControlRework, System.ComponentModel.ISupportInitialize).EndInit() @@ -2793,7 +2803,6 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem43, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem45, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem44, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem5, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageDynamicFolder.ResumeLayout(False) CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) @@ -3021,7 +3030,6 @@ Partial Class frmAdmin_Globix Friend WithEvents TextEdit4 As DevExpress.XtraEditors.TextEdit Friend WithEvents EmptySpaceItem6 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents LayoutControlItem46 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents EmptySpaceItem5 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl Friend WithEvents SimpleButton3 As DevExpress.XtraEditors.SimpleButton Friend WithEvents txtcrFoldermanuell As DevExpress.XtraEditors.TextEdit @@ -3072,7 +3080,6 @@ Partial Class frmAdmin_Globix 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 Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents TextEditGeaendertWann As DevExpress.XtraEditors.TextEdit diff --git a/GUIs.ZooFlow/App.config b/GUIs.ZooFlow/App.config index 865a709b..c0eceef9 100644 --- a/GUIs.ZooFlow/App.config +++ b/GUIs.ZooFlow/App.config @@ -7,12 +7,8 @@ - - + + @@ -28,7 +24,7 @@ - Custom/Digital Data + diff --git a/GUIs.ZooFlow/ClassConstants.vb b/GUIs.ZooFlow/ClassConstants.vb index d3546262..b2b38313 100644 --- a/GUIs.ZooFlow/ClassConstants.vb +++ b/GUIs.ZooFlow/ClassConstants.vb @@ -38,6 +38,9 @@ Public Const SQLCMD_FLOW_SEARCH_TILE = "FLOW_SEARCH_PER_TILE" Public Const SQLCMD_FLOW_SEARCH_BASE = "FLOW_SEARCH_SQL_BASE" + Public Const SQLCMD_AHW_LAYOUT_SELECT = "AHWF_CMD_LAYOUT_SELECT" + Public Const SQLCMD_AHW_USR_SELECT = "AHWF_CMD_USR_SELECT" + Public Const SQLCMD_RECENT_FILES_USER = "RECENT_FILES_USER" Public Const RESULTLIST_COL_ADDED_WHEN_DE = "Erstellt wann" Public Const RESULTLIST_COL_CHANGED_WHEN_DE = "Geändert wann" diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 6a5ad970..950fe289 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -266,10 +266,21 @@ Public Class ClassInit My.Tables.DTIDB_COMMON_SQL = My.Database.GetDatatable("TBIDB_COMMON_SQL", oSql, EDMI.API.Constants.DatabaseType.IDB) For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows + Dim oBaseSQL = oRow.Item("SQL_COMMAND").ToString + oBaseSQL = oBaseSQL.Replace("@USER_ID", My.Application.User.UserId) + oBaseSQL = oBaseSQL.Replace("@USERID", My.Application.User.UserId) + oBaseSQL = oBaseSQL.Replace("@USRID", My.Application.User.UserId) + oBaseSQL = oBaseSQL.Replace("@USRNAME", My.Application.User.UserName) + oBaseSQL = oBaseSQL.Replace("@UserName", My.Application.User.UserName) + oBaseSQL = oBaseSQL.Replace("@LANG_CODE", My.Application.User.Language) If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then - DocResultBaseSearch = oRow.Item("SQL_COMMAND") - DocResultBaseSearch = DocResultBaseSearch.Replace("@USER_ID", My.Application.User.UserId) - DocResultBaseSearch = DocResultBaseSearch.Replace("@LANG_CODE", My.Application.User.Language) + SQL_DocResultBase = oBaseSQL + ElseIf oRow.Item("TITLE") = SQLCMD_AHW_LAYOUT_SELECT Then + SQL_AHW_LAYOUT_SELECT = oBaseSQL + ElseIf oRow.Item("TITLE") = SQLCMD_AHW_USR_SELECT Then + SQL_AHW_USR_SELECT = oBaseSQL + ElseIf oRow.Item("TITLE") = SQLCMD_RECENT_FILES_USER Then + SQL_RECENT_FILES_USER = oBaseSQL End If Next @@ -299,7 +310,7 @@ Public Class ClassInit My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatable("VWIDB_BE_ATTRIBUTE", oSql, EDMI.API.Constants.DatabaseType.IDB, $"LANG_CODE = '{MyApplication.User.Language}'") - If DocResultBaseSearch = "" Then + If SQL_DocResultBase = "" Then Logger.Warn($"ATTENTION: NO DocResultBaseSearch - Check if entry {SQLCMD_FLOW_SEARCH_BASE} exists in TBIDB_COMMON_SQL") End If diff --git a/GUIs.ZooFlow/Dialog1.Designer.vb b/GUIs.ZooFlow/Dialog1.Designer.vb index f9b62e33..39b5c477 100644 --- a/GUIs.ZooFlow/Dialog1.Designer.vb +++ b/GUIs.ZooFlow/Dialog1.Designer.vb @@ -22,34 +22,19 @@ Partial Class Dialog1 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() Me.OK_Button = New System.Windows.Forms.Button() Me.Cancel_Button = New System.Windows.Forms.Button() Me.lblMeldung = New DevExpress.XtraEditors.LabelControl() - Me.TableLayoutPanel1.SuspendLayout() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Panel1.SuspendLayout() Me.SuspendLayout() ' - 'TableLayoutPanel1 - ' - Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TableLayoutPanel1.ColumnCount = 2 - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0) - Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0) - Me.TableLayoutPanel1.Location = New System.Drawing.Point(207, 81) - Me.TableLayoutPanel1.Name = "TableLayoutPanel1" - Me.TableLayoutPanel1.RowCount = 1 - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.Size = New System.Drawing.Size(216, 41) - Me.TableLayoutPanel1.TabIndex = 0 - ' 'OK_Button ' Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None Me.OK_Button.DialogResult = System.Windows.Forms.DialogResult.Yes Me.OK_Button.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.OK_Button.Location = New System.Drawing.Point(10, 4) + Me.OK_Button.Location = New System.Drawing.Point(235, 94) Me.OK_Button.Name = "OK_Button" Me.OK_Button.Size = New System.Drawing.Size(87, 32) Me.OK_Button.TabIndex = 0 @@ -60,7 +45,7 @@ Partial Class Dialog1 Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.No Me.Cancel_Button.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Cancel_Button.Location = New System.Drawing.Point(114, 4) + Me.Cancel_Button.Location = New System.Drawing.Point(328, 94) Me.Cancel_Button.Name = "Cancel_Button" Me.Cancel_Button.Size = New System.Drawing.Size(95, 32) Me.Cancel_Button.TabIndex = 1 @@ -69,13 +54,25 @@ Partial Class Dialog1 'lblMeldung ' Me.lblMeldung.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblMeldung.Appearance.ForeColor = System.Drawing.Color.Black Me.lblMeldung.Appearance.Options.UseFont = True - Me.lblMeldung.Location = New System.Drawing.Point(12, 1) + Me.lblMeldung.Appearance.Options.UseForeColor = True + Me.lblMeldung.Location = New System.Drawing.Point(12, 12) Me.lblMeldung.Name = "lblMeldung" Me.lblMeldung.Size = New System.Drawing.Size(98, 21) Me.lblMeldung.TabIndex = 1 Me.lblMeldung.Text = "LabelControl1" ' + 'Panel1 + ' + Me.Panel1.BackColor = System.Drawing.Color.SteelBlue + Me.Panel1.Controls.Add(Me.lblMeldung) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(435, 88) + Me.Panel1.TabIndex = 2 + ' 'Dialog1 ' Me.AcceptButton = Me.OK_Button @@ -83,22 +80,24 @@ Partial Class Dialog1 Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.CancelButton = Me.Cancel_Button Me.ClientSize = New System.Drawing.Size(435, 134) - Me.Controls.Add(Me.lblMeldung) - Me.Controls.Add(Me.TableLayoutPanel1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.Controls.Add(Me.Cancel_Button) + Me.Controls.Add(Me.OK_Button) + Me.Controls.Add(Me.Panel1) + Me.FormBorderEffect = DevExpress.XtraEditors.FormBorderEffect.None + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "Dialog1" Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Dialog1" - Me.TableLayoutPanel1.ResumeLayout(False) + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() Me.ResumeLayout(False) - Me.PerformLayout() End Sub - Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel Friend WithEvents OK_Button As System.Windows.Forms.Button Friend WithEvents Cancel_Button As System.Windows.Forms.Button Friend WithEvents lblMeldung As DevExpress.XtraEditors.LabelControl + Friend WithEvents Panel1 As Panel End Class diff --git a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb index 322519a0..0067375e 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb @@ -19,7 +19,7 @@ Public Class frmFileflow_Duplicate Environment = My.Application.GetEnvironment() Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch") With { - .BaseSearchSQL = DocResultBaseSearch + .BaseSearchSQL = SQL_DocResultBase } End Sub diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 54e223a0..dd59e2c6 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -232,7 +232,7 @@ Public Class frmFlowForm Modules = New ClassModules(My.LogConfig, My.SystemConfig) FileEx = New Filesystem.File(My.LogConfig) Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch") With { - .BaseSearchSQL = DocResultBaseSearch + .BaseSearchSQL = SQL_DocResultBase } ' === Initialize Theming === @@ -358,12 +358,12 @@ Public Class frmFlowForm Private Async Function Load_Recent_Files() As Task Try - Dim oSql = $"SELECT TOP 10 * FROM VWIDB_DOCRESULT_DE WHERE [Changed who] = '{My.Application.User.UserName}' ORDER BY [Changed when] DESC" - Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(oSql) + + Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(SQL_RECENT_FILES_USER) GridControlRecentFiles.DataSource = AccessedFilesTable - colPrimary.FieldName = "DisplayFileName" - colSecondary.FieldName = "Changed when" + colPrimary.FieldName = AccessedFilesTable.Columns(1).ColumnName ' "DisplayFileName" + colSecondary.FieldName = AccessedFilesTable.Columns(2).ColumnName '"Changed when" Catch ex As Exception ShowErrorMessage(ex) End Try @@ -1271,7 +1271,7 @@ Public Class frmFlowForm Dim oDataSource As DataTable = GridControlRecentFiles.DataSource Dim oResult = oDataSource.AsEnumerable(). - Where(Function(row) row.Item("DocId") = oObjectId). + Where(Function(row) row.Item(0) = oObjectId). CopyToDataTable() Search.Run(oResult, "Suche") diff --git a/GUIs.ZooFlow/modCurrent.vb b/GUIs.ZooFlow/modCurrent.vb index 8a121489..487d8b0e 100644 --- a/GUIs.ZooFlow/modCurrent.vb +++ b/GUIs.ZooFlow/modCurrent.vb @@ -13,5 +13,8 @@ Module modCurrent Public Property AHWF_CMD_USR_SELECT As String Public Property AHWF_CMD_LAYOUT_SELECT As String - Public Property DocResultBaseSearch As String + Public Property SQL_DocResultBase As String + Public Property SQL_AHW_LAYOUT_SELECT As String + Public Property SQL_AHW_USR_SELECT As String + Public Property SQL_RECENT_FILES_USER As String End Module