From 1be949b1b6cd3ee112d4a6aaa5a7f3bdeba09834 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 24 May 2022 08:48:33 +0200 Subject: [PATCH] ms --- GUIs.Common/frmDialog.Designer.vb | 47 +++--- GUIs.Common/frmDialog.vb | 27 ++- .../IDB/frmAdmin_IDBAttribute.Designer.vb | 156 +++++++++++------- .../IDB/frmAdmin_IDBAttribute.resx | 27 ++- .../IDB/frmAdmin_IDBAttribute.vb | 28 +++- .../Search/frmFlowSearch2.Designer.vb | 30 ++-- 6 files changed, 187 insertions(+), 128 deletions(-) diff --git a/GUIs.Common/frmDialog.Designer.vb b/GUIs.Common/frmDialog.Designer.vb index 8c6eddee..735d6ba7 100644 --- a/GUIs.Common/frmDialog.Designer.vb +++ b/GUIs.Common/frmDialog.Designer.vb @@ -24,18 +24,19 @@ Partial Class frmDialog Private Sub InitializeComponent() Me.OK_Button = New System.Windows.Forms.Button() Me.Cancel_Button = New System.Windows.Forms.Button() - Me.Panel1 = New System.Windows.Forms.Panel() Me.lblMeldung = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() - Me.Panel1.SuspendLayout() + Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() Me.Panel2.SuspendLayout() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.PanelControl1.SuspendLayout() Me.SuspendLayout() ' 'OK_Button ' Me.OK_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) 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(3, 10) + Me.OK_Button.Location = New System.Drawing.Point(3, 125) Me.OK_Button.Name = "OK_Button" Me.OK_Button.Size = New System.Drawing.Size(86, 32) Me.OK_Button.TabIndex = 0 @@ -46,28 +47,17 @@ Partial Class frmDialog Me.Cancel_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel 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(358, 10) + Me.Cancel_Button.Location = New System.Drawing.Point(363, 125) Me.Cancel_Button.Name = "Cancel_Button" Me.Cancel_Button.Size = New System.Drawing.Size(91, 32) Me.Cancel_Button.TabIndex = 1 Me.Cancel_Button.Text = "Abbrechen" ' - 'Panel1 - ' - Me.Panel1.BackColor = System.Drawing.Color.OrangeRed - Me.Panel1.Controls.Add(Me.lblMeldung) - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Panel1.Location = New System.Drawing.Point(0, 0) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(452, 180) - Me.Panel1.TabIndex = 2 - ' 'lblMeldung ' Me.lblMeldung.AutoSize = True Me.lblMeldung.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMeldung.Location = New System.Drawing.Point(3, 9) + Me.lblMeldung.Location = New System.Drawing.Point(5, 9) Me.lblMeldung.Name = "lblMeldung" Me.lblMeldung.Size = New System.Drawing.Size(56, 21) Me.lblMeldung.TabIndex = 0 @@ -75,23 +65,33 @@ Partial Class frmDialog ' 'Panel2 ' + Me.Panel2.Controls.Add(Me.PanelControl1) Me.Panel2.Controls.Add(Me.OK_Button) Me.Panel2.Controls.Add(Me.Cancel_Button) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel2.Location = New System.Drawing.Point(0, 180) + Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(452, 45) + Me.Panel2.Size = New System.Drawing.Size(457, 160) Me.Panel2.TabIndex = 3 ' + 'PanelControl1 + ' + Me.PanelControl1.Appearance.Options.UseBackColor = True + Me.PanelControl1.Controls.Add(Me.lblMeldung) + Me.PanelControl1.Dock = System.Windows.Forms.DockStyle.Top + Me.PanelControl1.Location = New System.Drawing.Point(0, 0) + Me.PanelControl1.Name = "PanelControl1" + Me.PanelControl1.Size = New System.Drawing.Size(457, 120) + Me.PanelControl1.TabIndex = 2 + ' 'frmDialog ' Me.AcceptButton = Me.OK_Button Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(452, 225) + Me.ClientSize = New System.Drawing.Size(457, 160) Me.Controls.Add(Me.Panel2) - Me.Controls.Add(Me.Panel1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.MaximizeBox = False Me.MinimizeBox = False @@ -99,15 +99,16 @@ Partial Class frmDialog Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Dialog1" - Me.Panel1.ResumeLayout(False) - Me.Panel1.PerformLayout() Me.Panel2.ResumeLayout(False) + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.PanelControl1.ResumeLayout(False) + Me.PanelControl1.PerformLayout() Me.ResumeLayout(False) End Sub Friend WithEvents OK_Button As System.Windows.Forms.Button Friend WithEvents Cancel_Button As System.Windows.Forms.Button - Friend WithEvents Panel1 As Windows.Forms.Panel Friend WithEvents Panel2 As Windows.Forms.Panel Friend WithEvents lblMeldung As Windows.Forms.Label + Friend WithEvents PanelControl1 As DevExpress.XtraEditors.PanelControl End Class diff --git a/GUIs.Common/frmDialog.vb b/GUIs.Common/frmDialog.vb index 775c7293..e6db317b 100644 --- a/GUIs.Common/frmDialog.vb +++ b/GUIs.Common/frmDialog.vb @@ -1,23 +1,21 @@ Imports System.Drawing Imports System.Windows.Forms + Public Class frmDialog + Private Is_Error As Boolean + Private MyTitle As String + Private MyMessage As String Public Sub New(pMessageText As String, pTitle As String, IsError As Boolean) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Is_Error = IsError + MyTitle = pTitle + MyMessage = pMessageText - Me.lblMeldung.Text = pMessageText - Me.Text = pTitle - If IsError Then - Panel1.BackColor = Color.Red - Cancel_Button.Visible = False - Else - Panel1.BackColor = Color.OrangeRed - Cancel_Button.Visible = True - End If End Sub Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click @@ -36,4 +34,15 @@ Public Class frmDialog Cancel_Button.Visible = True End Sub + Private Sub frmDialog_Load(sender As Object, e As EventArgs) Handles Me.Load + Me.lblMeldung.Text = MyMessage + Me.Text = MyTitle + If Is_Error = True Then + PanelControl1.BackColor = Color.Red + Cancel_Button.Visible = False + Else + PanelControl1.BackColor = Color.OrangeRed + Cancel_Button.Visible = True + End If + End Sub End Class diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.Designer.vb index bcd7c590..8df51284 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.Designer.vb @@ -31,6 +31,7 @@ Partial Class frmAdmin_IDBAttribute Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -65,7 +66,9 @@ Partial Class frmAdmin_IDBAttribute Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() Me.VWIDB_BE_ATTRIBUTETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.VWIDB_BE_ATTRIBUTETableAdapter() Me.TBWH_ATTRIBUTE_TYPETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBWH_ATTRIBUTE_TYPETableAdapter() - Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() + Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() @@ -95,10 +98,14 @@ Partial Class frmAdmin_IDBAttribute CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.XtraTabPage1.SuspendLayout() Me.SuspendLayout() ' 'RibbonControl1 ' + Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.BarButtonItem3, Me.BarButtonItem4}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) @@ -114,7 +121,7 @@ Partial Class frmAdmin_IDBAttribute ' 'BarButtonItem1 ' - Me.BarButtonItem1.Caption = "Speichern und Schließen" + Me.BarButtonItem1.Caption = "Abbrechen" Me.BarButtonItem1.Id = 1 Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem1.Name = "BarButtonItem1" @@ -141,6 +148,13 @@ Partial Class frmAdmin_IDBAttribute Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.del1 Me.BarButtonItem3.Name = "BarButtonItem3" ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "Löschen" + Me.BarButtonItem4.Id = 7 + Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem4.Name = "BarButtonItem4" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -158,10 +172,10 @@ Partial Class frmAdmin_IDBAttribute 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 539) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 537) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(894, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(894, 24) ' 'RibbonPage2 ' @@ -182,21 +196,21 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit1) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 132) + Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(894, 407) + Me.LayoutControl1.Size = New System.Drawing.Size(892, 380) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ATTR_ID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(177, 20) + Me.TextEdit1.Location = New System.Drawing.Point(163, 20) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(697, 20) + Me.TextEdit1.Size = New System.Drawing.Size(709, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' @@ -213,10 +227,10 @@ Partial Class frmAdmin_IDBAttribute 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ATTR_TITLE", True)) - Me.TextEdit2.Location = New System.Drawing.Point(177, 60) + Me.TextEdit2.Location = New System.Drawing.Point(163, 60) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(697, 20) + Me.TextEdit2.Size = New System.Drawing.Size(709, 20) Me.TextEdit2.StyleController = Me.LayoutControl1 Me.TextEdit2.TabIndex = 5 ' @@ -224,11 +238,11 @@ Partial Class frmAdmin_IDBAttribute ' Me.SpinEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True)) Me.SpinEdit1.EditValue = New Decimal(New Integer() {0, 0, 0, 0}) - Me.SpinEdit1.Location = New System.Drawing.Point(613, 180) + Me.SpinEdit1.Location = New System.Drawing.Point(598, 180) 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(261, 20) + Me.SpinEdit1.Size = New System.Drawing.Size(274, 20) Me.SpinEdit1.StyleController = Me.LayoutControl1 Me.SpinEdit1.TabIndex = 6 ' @@ -239,7 +253,7 @@ Partial Class frmAdmin_IDBAttribute Me.CheckEditMulticontext.MenuManager = Me.RibbonControl1 Me.CheckEditMulticontext.Name = "CheckEditMulticontext" Me.CheckEditMulticontext.Properties.Caption = "Attribut mehrzeilig" - Me.CheckEditMulticontext.Size = New System.Drawing.Size(854, 18) + Me.CheckEditMulticontext.Size = New System.Drawing.Size(852, 20) Me.CheckEditMulticontext.StyleController = Me.LayoutControl1 Me.CheckEditMulticontext.TabIndex = 7 ' @@ -250,67 +264,67 @@ Partial Class frmAdmin_IDBAttribute Me.CheckEdit2.MenuManager = Me.RibbonControl1 Me.CheckEdit2.Name = "CheckEdit2" Me.CheckEdit2.Properties.Caption = "Standard in Ergebnisliste" - Me.CheckEdit2.Size = New System.Drawing.Size(416, 18) + Me.CheckEdit2.Size = New System.Drawing.Size(415, 20) Me.CheckEdit2.StyleController = Me.LayoutControl1 Me.CheckEdit2.TabIndex = 8 ' 'TextEdit3 ' - Me.TextEdit3.Location = New System.Drawing.Point(177, 140) + Me.TextEdit3.Location = New System.Drawing.Point(163, 140) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(697, 20) + Me.TextEdit3.Size = New System.Drawing.Size(709, 20) Me.TextEdit3.StyleController = Me.LayoutControl1 Me.TextEdit3.TabIndex = 9 ' 'txtAddedWho ' Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(177, 258) + Me.txtAddedWho.Location = New System.Drawing.Point(163, 260) Me.txtAddedWho.MenuManager = Me.RibbonControl1 Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Properties.ReadOnly = True - Me.txtAddedWho.Size = New System.Drawing.Size(259, 20) + Me.txtAddedWho.Size = New System.Drawing.Size(272, 20) Me.txtAddedWho.StyleController = Me.LayoutControl1 Me.txtAddedWho.TabIndex = 10 ' 'txtAddedWhen ' Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ADDED_WHEN", True)) - Me.txtAddedWhen.Location = New System.Drawing.Point(613, 258) + Me.txtAddedWhen.Location = New System.Drawing.Point(598, 260) Me.txtAddedWhen.MenuManager = Me.RibbonControl1 Me.txtAddedWhen.Name = "txtAddedWhen" Me.txtAddedWhen.Properties.ReadOnly = True - Me.txtAddedWhen.Size = New System.Drawing.Size(261, 20) + Me.txtAddedWhen.Size = New System.Drawing.Size(274, 20) Me.txtAddedWhen.StyleController = Me.LayoutControl1 Me.txtAddedWhen.TabIndex = 11 ' 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "CHANGED_WHO", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(177, 298) + Me.txtChangedWho.Location = New System.Drawing.Point(163, 300) Me.txtChangedWho.MenuManager = Me.RibbonControl1 Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(259, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(272, 20) Me.txtChangedWho.StyleController = Me.LayoutControl1 Me.txtChangedWho.TabIndex = 12 ' 'txtChangedWhen ' Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen.Location = New System.Drawing.Point(613, 298) + Me.txtChangedWhen.Location = New System.Drawing.Point(598, 300) Me.txtChangedWhen.MenuManager = Me.RibbonControl1 Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(261, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(274, 20) Me.txtChangedWhen.StyleController = Me.LayoutControl1 Me.txtChangedWhen.TabIndex = 13 ' 'ComboBoxEdit1 ' Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "TYPE_ID", True)) - Me.ComboBoxEdit1.Location = New System.Drawing.Point(177, 100) + Me.ComboBoxEdit1.Location = New System.Drawing.Point(163, 100) Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 Me.ComboBoxEdit1.Name = "ComboBoxEdit1" Me.ComboBoxEdit1.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFit @@ -320,7 +334,7 @@ Partial Class frmAdmin_IDBAttribute Me.ComboBoxEdit1.Properties.NullText = "" Me.ComboBoxEdit1.Properties.PopupSizeable = False Me.ComboBoxEdit1.Properties.ValueMember = "GUID" - Me.ComboBoxEdit1.Size = New System.Drawing.Size(697, 20) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(709, 20) Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 Me.ComboBoxEdit1.TabIndex = 14 ' @@ -335,7 +349,7 @@ Partial Class frmAdmin_IDBAttribute Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem3, Me.LayoutControlItem11, Me.LayoutControlItem9, Me.LayoutControlItem5, Me.LayoutControlItem8, Me.LayoutControlItem10}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(894, 407) + Me.Root.Size = New System.Drawing.Size(892, 380) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -348,9 +362,9 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem1.Size = New System.Drawing.Size(874, 40) + Me.LayoutControlItem1.Size = New System.Drawing.Size(872, 40) Me.LayoutControlItem1.Text = "ID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem2 ' @@ -358,9 +372,9 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 40) Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem2.Size = New System.Drawing.Size(874, 40) + Me.LayoutControlItem2.Size = New System.Drawing.Size(872, 40) Me.LayoutControlItem2.Text = "Bezeichnung" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem4 ' @@ -368,7 +382,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 200) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem4.Size = New System.Drawing.Size(874, 38) + Me.LayoutControlItem4.Size = New System.Drawing.Size(872, 40) Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem4.TextVisible = False ' @@ -378,9 +392,9 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 120) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem6.Size = New System.Drawing.Size(874, 40) + Me.LayoutControlItem6.Size = New System.Drawing.Size(872, 40) Me.LayoutControlItem6.Text = "Kommentar" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem7 ' @@ -388,23 +402,23 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem7.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem7.Control = Me.txtAddedWho Me.LayoutControlItem7.Enabled = False - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 238) + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 240) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem7.Size = New System.Drawing.Size(436, 40) + Me.LayoutControlItem7.Size = New System.Drawing.Size(435, 40) Me.LayoutControlItem7.Text = "Erstellt Wer" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem3 ' Me.LayoutControlItem3.Control = Me.SpinEdit1 Me.LayoutControlItem3.CustomizationFormText = "Anzeige Reihenfolge" - Me.LayoutControlItem3.Location = New System.Drawing.Point(436, 160) + Me.LayoutControlItem3.Location = New System.Drawing.Point(435, 160) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(438, 40) + Me.LayoutControlItem3.Size = New System.Drawing.Size(437, 40) Me.LayoutControlItem3.Text = "Reihenfolge in Ergebnisliste" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem11 ' @@ -412,9 +426,9 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 80) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem11.Size = New System.Drawing.Size(874, 40) + Me.LayoutControlItem11.Size = New System.Drawing.Size(872, 40) Me.LayoutControlItem11.Text = "Attribut-Typ" - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem9 ' @@ -422,12 +436,12 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem9.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem9.Control = Me.txtChangedWho Me.LayoutControlItem9.Enabled = False - Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 278) + Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 280) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem9.Size = New System.Drawing.Size(436, 109) + Me.LayoutControlItem9.Size = New System.Drawing.Size(435, 80) Me.LayoutControlItem9.Text = "Geändert Wer" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem5 ' @@ -435,7 +449,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 160) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem5.Size = New System.Drawing.Size(436, 40) + Me.LayoutControlItem5.Size = New System.Drawing.Size(435, 40) Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem5.TextVisible = False ' @@ -445,12 +459,12 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem8.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem8.Control = Me.txtAddedWhen Me.LayoutControlItem8.Enabled = False - Me.LayoutControlItem8.Location = New System.Drawing.Point(436, 238) + Me.LayoutControlItem8.Location = New System.Drawing.Point(435, 240) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem8.Size = New System.Drawing.Size(438, 40) + Me.LayoutControlItem8.Size = New System.Drawing.Size(437, 40) Me.LayoutControlItem8.Text = "Erstellt Wann" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem10 ' @@ -458,12 +472,12 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem10.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem10.Control = Me.txtChangedWhen Me.LayoutControlItem10.Enabled = False - Me.LayoutControlItem10.Location = New System.Drawing.Point(436, 278) + Me.LayoutControlItem10.Location = New System.Drawing.Point(435, 280) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(438, 109) + Me.LayoutControlItem10.Size = New System.Drawing.Size(437, 80) Me.LayoutControlItem10.Text = "Geändert Wann" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(131, 13) ' 'TableAdapterManager ' @@ -472,8 +486,12 @@ Partial Class frmAdmin_IDBAttribute Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBIDB_CATALOG_USERTableAdapter = Nothing Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing + Me.TableAdapterManager.TBIDB_COMMON_SQLTableAdapter = Nothing Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing + Me.TableAdapterManager.TBIDB_DOCTYPETableAdapter = Nothing + Me.TableAdapterManager.TBIDB_LANGUAGETableAdapter = Nothing Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete @@ -487,19 +505,35 @@ Partial Class frmAdmin_IDBAttribute ' Me.TBWH_ATTRIBUTE_TYPETableAdapter.ClearBeforeFill = True ' - 'BarButtonItem4 + 'XtraTabControl1 ' - Me.BarButtonItem4.Caption = "Löschen" - Me.BarButtonItem4.Id = 7 - Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem4.Name = "BarButtonItem4" + Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 132) + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 + Me.XtraTabControl1.Size = New System.Drawing.Size(894, 405) + Me.XtraTabControl1.TabIndex = 5 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) + ' + 'XtraTabPage1 + ' + Me.XtraTabPage1.Controls.Add(Me.LayoutControl1) + Me.XtraTabPage1.Name = "XtraTabPage1" + Me.XtraTabPage1.Size = New System.Drawing.Size(892, 380) + Me.XtraTabPage1.Text = "Detail" + ' + 'XtraTabPage2 + ' + Me.XtraTabPage2.Name = "XtraTabPage2" + Me.XtraTabPage2.Size = New System.Drawing.Size(150, 300) + Me.XtraTabPage2.Text = "Übersetzungen" ' 'frmAdmin_IDBAttribute ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(894, 561) - Me.Controls.Add(Me.LayoutControl1) + Me.Controls.Add(Me.XtraTabControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.bo_appearance @@ -536,6 +570,9 @@ Partial Class frmAdmin_IDBAttribute CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.XtraTabPage1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -581,4 +618,7 @@ Partial Class frmAdmin_IDBAttribute Friend WithEvents TBWH_ATTRIBUTE_TYPEBindingSource As BindingSource Friend WithEvents TBWH_ATTRIBUTE_TYPETableAdapter As DSIDB_StammdatenTableAdapters.TBWH_ATTRIBUTE_TYPETableAdapter Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage End Class diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx index 512b7159..bb2306b3 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx @@ -122,26 +122,16 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGkEAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPoBAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw - MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu - bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU2F2ZUFuZENsb3NlIj4NCiAgICA8 - cGF0aCBkPSJNNiwxNlY2SDNDMi40LDYsMiw2LjQsMiw3djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYs - MCwxLTAuNCwxLTFWMTZINnogTTYsMjZ2LTZoMTZ2Nkg2eiBNMTYsNkg4djhoOFY2eiAgICBNMTIsMTJo - LTJWOGgyVjEyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yOSwySDE5Yy0wLjUsMC0x - LDAuNS0xLDF2MTBjMCwwLjUsMC41LDEsMSwxaDEwYzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41 - LDIsMjksMnogTTI3LjcsMTAuNCAgIGMwLjQsMC40LDAuNCwxLDAsMS4zYy0wLjQsMC40LTEsMC40LTEu - MywwTDI0LDkuM2wtMi40LDIuNGMtMC40LDAuNC0xLDAuNC0xLjMsMGMtMC40LTAuNC0wLjQtMSwwLTEu - M0wyMi43LDhsLTIuNC0yLjQgICBjLTAuNC0wLjQtMC40LTEsMC0xLjNjMC40LTAuNCwxLTAuNCwxLjMs - MEwyNCw2LjdsMi40LTIuNGMwLjQtMC40LDEtMC40LDEuMywwYzAuNCwwLjQsMC40LDEsMCwxLjNMMjUu - Myw4TDI3LjcsMTAuNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJIZWFkZXJBbmRGb290ZXIiIHN0eWxlPSJlbmFibGUtYmFja2dy + b3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDoj + RDExQzFDO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDRINUM0LjUsNCw0LDQuNSw0LDV2MjJjMCww + LjUsMC41LDEsMSwxaDIyYzAuNSwwLDEtMC41LDEtMVY1QzI4LDQuNSwyNy41LDQsMjcsNHogTTIyLDIw + bC0yLDJsLTQtNGwtNCw0ICBsLTItMmw0LTRsLTQtNGwyLTJsNCw0bDQtNGwyLDJsLTQsNEwyMiwyMHoi + IGNsYXNzPSJSZWQiIC8+DQo8L3N2Zz4L @@ -176,6 +166,9 @@ 848, 17 + + 17, 17 + 177, 17 diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.vb index 88ecabe0..4d197bcb 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.vb @@ -4,6 +4,9 @@ Public Property HasChanges As Boolean = False Implements IAdminForm.HasChanges Public Property IsInsert As Boolean = False Implements IAdminForm.IsInsert Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey + Private Const ConstDetail = "Detail" + Private Const ConstTranslate = "Translate" + Private Property oMode As String = "Detail" Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) ' Dieser Aufruf ist für den Designer erforderlich. @@ -35,7 +38,16 @@ End Sub Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick ResetMessages() + Dim oGetMax As Boolean = False + If IsInsert Then + oGetMax = True + End If If SaveData() And HasChanges Then + If IsInsert Then + Dim oSQL = "Select MAX(GUID) FROM TBIDB_ATTRIBUTE" + PrimaryKey = My.DatabaseIDB.GetScalarValue(oSQL) + End If + FillAttribute() End If @@ -52,11 +64,7 @@ End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - ResetMessages() - - If SaveData() Then - Close() - End If + Close() End Sub Public Function SaveData() As Boolean @@ -77,7 +85,7 @@ ' TODO: Update Database If Not IsInsert Then Dim oUpdate As String = $"UPDATE TBIDB_ATTRIBUTE " & - $"SET TITLE = '{TextEdit2.Text}', TYP_ID = {ComboBoxEdit1.EditValue}, VIEW_SEQUENCE = {SpinEdit1.Value}, VIEW_VISIBLE = '{CheckEdit2.Checked}'" & + $"Set TITLE = '{TextEdit2.Text}', TYP_ID = {ComboBoxEdit1.EditValue}, VIEW_SEQUENCE = {SpinEdit1.Value}, VIEW_VISIBLE = '{CheckEdit2.Checked}'" & $",MULTI_CONTEXT = '{CheckEditMulticontext.Checked}', COMMENT = '{TextEdit3.Text}', CHANGED_WHO = '{My.Application.User.UserName}' " & $"WHERE (GUID = {TextEdit1.Text})" @@ -136,4 +144,12 @@ End If End If End Sub + + Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged + If XtraTabControl1.SelectedTabPageIndex = 1 Then + oMode = ConstTranslate + Else + oMode = ConstDetail + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb index 0e8495cf..0fcf8b15 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb @@ -353,24 +353,24 @@ Partial Class frmFlowSearch2 'DateEditFrom ' Me.DateEditFrom.EditValue = Nothing - Me.DateEditFrom.Location = New System.Drawing.Point(101, 236) + Me.DateEditFrom.Location = New System.Drawing.Point(95, 236) Me.DateEditFrom.MenuManager = Me.RibbonControl1 Me.DateEditFrom.Name = "DateEditFrom" Me.DateEditFrom.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.DateEditFrom.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.DateEditFrom.Size = New System.Drawing.Size(778, 20) + Me.DateEditFrom.Size = New System.Drawing.Size(784, 20) Me.DateEditFrom.StyleController = Me.LayoutControl1 Me.DateEditFrom.TabIndex = 5 ' 'DateEditTo ' Me.DateEditTo.EditValue = Nothing - Me.DateEditTo.Location = New System.Drawing.Point(101, 289) + Me.DateEditTo.Location = New System.Drawing.Point(95, 288) Me.DateEditTo.MenuManager = Me.RibbonControl1 Me.DateEditTo.Name = "DateEditTo" Me.DateEditTo.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.DateEditTo.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.DateEditTo.Size = New System.Drawing.Size(778, 20) + Me.DateEditTo.Size = New System.Drawing.Size(784, 20) Me.DateEditTo.StyleController = Me.LayoutControl1 Me.DateEditTo.TabIndex = 7 ' @@ -381,17 +381,17 @@ Partial Class frmFlowSearch2 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.OffText = "Datum bis deaktiviert" Me.CheckEdit1.Properties.OnText = "Datum bis aktiviert" - Me.CheckEdit1.Size = New System.Drawing.Size(878, 19) + Me.CheckEdit1.Size = New System.Drawing.Size(878, 18) Me.CheckEdit1.StyleController = Me.LayoutControl1 Me.CheckEdit1.TabIndex = 8 ' 'ComboBoxDateAttributes ' - Me.ComboBoxDateAttributes.Location = New System.Drawing.Point(101, 319) + Me.ComboBoxDateAttributes.Location = New System.Drawing.Point(95, 318) Me.ComboBoxDateAttributes.MenuManager = Me.RibbonControl1 Me.ComboBoxDateAttributes.Name = "ComboBoxDateAttributes" Me.ComboBoxDateAttributes.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxDateAttributes.Size = New System.Drawing.Size(778, 20) + Me.ComboBoxDateAttributes.Size = New System.Drawing.Size(784, 20) Me.ComboBoxDateAttributes.StyleController = Me.LayoutControl1 Me.ComboBoxDateAttributes.TabIndex = 9 ' @@ -428,25 +428,25 @@ Partial Class frmFlowSearch2 Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem2.Size = New System.Drawing.Size(882, 30) Me.LayoutControlItem2.Text = "Datum Von" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlItem4 ' Me.LayoutControlItem4.Control = Me.DateEditTo Me.LayoutControlItem4.Enabled = False - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 53) + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 52) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem4.Size = New System.Drawing.Size(882, 30) Me.LayoutControlItem4.Text = "Datum Bis" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(76, 13) ' 'EmptySpaceItem1 ' Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 113) + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 112) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(882, 67) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(882, 68) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem6 @@ -454,19 +454,19 @@ Partial Class frmFlowSearch2 Me.LayoutControlItem6.Control = Me.CheckEdit1 Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 30) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Size = New System.Drawing.Size(882, 23) + Me.LayoutControlItem6.Size = New System.Drawing.Size(882, 22) Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem6.TextVisible = False ' 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.ComboBoxDateAttributes - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 83) + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 82) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem8.Size = New System.Drawing.Size(882, 30) Me.LayoutControlItem8.Text = "Datums Attribut" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlGroup3 '