diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb index b4bf5d1b..3b42cd8e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb @@ -24,19 +24,20 @@ Partial Class frmAdmin_SourceSQL Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.TBZF_ADMIN_SOURCE_SQLBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit() Me.MemoEdit1 = New DevExpress.XtraEditors.MemoEdit() Me.txtAddedWho = New DevExpress.XtraEditors.TextEdit() - Me.TBZF_ADMIN_SOURCE_SQLBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() Me.TextEdit7 = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() Me.TextEdit9 = New DevExpress.XtraEditors.TextEdit() @@ -58,14 +59,14 @@ Partial Class frmAdmin_SourceSQL CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBZF_ADMIN_SOURCE_SQLBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBZF_ADMIN_SOURCE_SQLBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -87,15 +88,15 @@ Partial Class frmAdmin_SourceSQL ' Me.RibbonControl.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.labelStatus}) Me.RibbonControl.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 4 + Me.RibbonControl.MaxItemId = 5 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl.ShowToolbarCustomizeItem = False - Me.RibbonControl.Size = New System.Drawing.Size(768, 63) + Me.RibbonControl.Size = New System.Drawing.Size(768, 66) Me.RibbonControl.StatusBar = Me.RibbonStatusBar Me.RibbonControl.Toolbar.ShowCustomizeItem = False ' @@ -120,6 +121,14 @@ Partial Class frmAdmin_SourceSQL Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.delete Me.BarButtonItem3.Name = "BarButtonItem3" ' + 'labelStatus + ' + Me.labelStatus.Caption = "labelStatus" + Me.labelStatus.Id = 4 + Me.labelStatus.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.about4 + Me.labelStatus.Name = "labelStatus" + Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -136,10 +145,11 @@ Partial Class frmAdmin_SourceSQL ' 'RibbonStatusBar ' - Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 583) + Me.RibbonStatusBar.ItemLinks.Add(Me.labelStatus) + Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 585) Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl - Me.RibbonStatusBar.Size = New System.Drawing.Size(768, 24) + Me.RibbonStatusBar.Size = New System.Drawing.Size(768, 22) ' 'LayoutControl1 ' @@ -154,85 +164,24 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControl1.Controls.Add(Me.txtChangedWho) Me.LayoutControl1.Controls.Add(Me.TextEdit9) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 63) + Me.LayoutControl1.Location = New System.Drawing.Point(0, 66) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(768, 520) + Me.LayoutControl1.Size = New System.Drawing.Size(768, 519) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "GUID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(99, 20) + Me.TextEdit1.Location = New System.Drawing.Point(105, 20) Me.TextEdit1.MenuManager = Me.RibbonControl Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(649, 20) + Me.TextEdit1.Size = New System.Drawing.Size(643, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' - 'TextEdit2 - ' - Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ENTITY_TITLE", True)) - Me.TextEdit2.Location = New System.Drawing.Point(99, 60) - Me.TextEdit2.MenuManager = Me.RibbonControl - Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(649, 20) - Me.TextEdit2.StyleController = Me.LayoutControl1 - Me.TextEdit2.TabIndex = 5 - ' - 'TextEdit3 - ' - Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "PK_COLUMN", True)) - Me.TextEdit3.Location = New System.Drawing.Point(99, 100) - Me.TextEdit3.MenuManager = Me.RibbonControl - Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(649, 20) - Me.TextEdit3.StyleController = Me.LayoutControl1 - Me.TextEdit3.TabIndex = 6 - ' - 'TextEdit4 - ' - Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "FK_COLUMN", True)) - Me.TextEdit4.Location = New System.Drawing.Point(99, 140) - Me.TextEdit4.MenuManager = Me.RibbonControl - Me.TextEdit4.Name = "TextEdit4" - Me.TextEdit4.Size = New System.Drawing.Size(649, 20) - Me.TextEdit4.StyleController = Me.LayoutControl1 - Me.TextEdit4.TabIndex = 7 - ' - 'TextEdit5 - ' - Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SCOPE", True)) - Me.TextEdit5.Location = New System.Drawing.Point(99, 180) - Me.TextEdit5.MenuManager = Me.RibbonControl - Me.TextEdit5.Name = "TextEdit5" - Me.TextEdit5.Size = New System.Drawing.Size(649, 20) - Me.TextEdit5.StyleController = Me.LayoutControl1 - Me.TextEdit5.TabIndex = 8 - ' - 'MemoEdit1 - ' - Me.MemoEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SQL_COMMAND", True)) - Me.MemoEdit1.Location = New System.Drawing.Point(99, 220) - Me.MemoEdit1.MenuManager = Me.RibbonControl - Me.MemoEdit1.Name = "MemoEdit1" - Me.MemoEdit1.Size = New System.Drawing.Size(649, 128) - Me.MemoEdit1.StyleController = Me.LayoutControl1 - Me.MemoEdit1.TabIndex = 9 - ' - 'txtAddedWho - ' - Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(99, 368) - Me.txtAddedWho.MenuManager = Me.RibbonControl - Me.txtAddedWho.Name = "txtAddedWho" - Me.txtAddedWho.Properties.ReadOnly = True - Me.txtAddedWho.Size = New System.Drawing.Size(275, 20) - Me.txtAddedWho.StyleController = Me.LayoutControl1 - Me.txtAddedWho.TabIndex = 10 - ' 'TBZF_ADMIN_SOURCE_SQLBindingSource ' Me.TBZF_ADMIN_SOURCE_SQLBindingSource.DataMember = "TBZF_ADMIN_SOURCE_SQL" @@ -243,36 +192,97 @@ Partial Class frmAdmin_SourceSQL Me.DSIDB_Stammdaten.DataSetName = "DSIDB_Stammdaten" Me.DSIDB_Stammdaten.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' + 'TextEdit2 + ' + Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ENTITY_TITLE", True)) + Me.TextEdit2.Location = New System.Drawing.Point(105, 60) + Me.TextEdit2.MenuManager = Me.RibbonControl + Me.TextEdit2.Name = "TextEdit2" + Me.TextEdit2.Size = New System.Drawing.Size(643, 20) + Me.TextEdit2.StyleController = Me.LayoutControl1 + Me.TextEdit2.TabIndex = 5 + ' + 'TextEdit3 + ' + Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "PK_COLUMN", True)) + Me.TextEdit3.Location = New System.Drawing.Point(105, 100) + Me.TextEdit3.MenuManager = Me.RibbonControl + Me.TextEdit3.Name = "TextEdit3" + Me.TextEdit3.Size = New System.Drawing.Size(643, 20) + Me.TextEdit3.StyleController = Me.LayoutControl1 + Me.TextEdit3.TabIndex = 6 + ' + 'TextEdit4 + ' + Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "FK_COLUMN", True)) + Me.TextEdit4.Location = New System.Drawing.Point(105, 140) + Me.TextEdit4.MenuManager = Me.RibbonControl + Me.TextEdit4.Name = "TextEdit4" + Me.TextEdit4.Size = New System.Drawing.Size(643, 20) + Me.TextEdit4.StyleController = Me.LayoutControl1 + Me.TextEdit4.TabIndex = 7 + ' + 'TextEdit5 + ' + Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SCOPE", True)) + Me.TextEdit5.Location = New System.Drawing.Point(105, 180) + Me.TextEdit5.MenuManager = Me.RibbonControl + Me.TextEdit5.Name = "TextEdit5" + Me.TextEdit5.Size = New System.Drawing.Size(643, 20) + Me.TextEdit5.StyleController = Me.LayoutControl1 + Me.TextEdit5.TabIndex = 8 + ' + 'MemoEdit1 + ' + Me.MemoEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SQL_COMMAND", True)) + Me.MemoEdit1.Location = New System.Drawing.Point(105, 220) + Me.MemoEdit1.MenuManager = Me.RibbonControl + Me.MemoEdit1.Name = "MemoEdit1" + Me.MemoEdit1.Size = New System.Drawing.Size(643, 127) + Me.MemoEdit1.StyleController = Me.LayoutControl1 + Me.MemoEdit1.TabIndex = 9 + ' + 'txtAddedWho + ' + Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHO", True)) + Me.txtAddedWho.Location = New System.Drawing.Point(105, 367) + Me.txtAddedWho.MenuManager = Me.RibbonControl + Me.txtAddedWho.Name = "txtAddedWho" + Me.txtAddedWho.Properties.ReadOnly = True + Me.txtAddedWho.Size = New System.Drawing.Size(269, 20) + Me.txtAddedWho.StyleController = Me.LayoutControl1 + Me.txtAddedWho.TabIndex = 10 + ' 'TextEdit7 ' Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHEN", True)) - Me.TextEdit7.Location = New System.Drawing.Point(473, 368) + Me.TextEdit7.Location = New System.Drawing.Point(479, 367) Me.TextEdit7.MenuManager = Me.RibbonControl Me.TextEdit7.Name = "TextEdit7" Me.TextEdit7.Properties.ReadOnly = True - Me.TextEdit7.Size = New System.Drawing.Size(275, 20) + Me.TextEdit7.Size = New System.Drawing.Size(269, 20) Me.TextEdit7.StyleController = Me.LayoutControl1 Me.TextEdit7.TabIndex = 11 ' 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "CHANGED_WHO", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(99, 408) + Me.txtChangedWho.Location = New System.Drawing.Point(105, 407) Me.txtChangedWho.MenuManager = Me.RibbonControl Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(275, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(269, 20) Me.txtChangedWho.StyleController = Me.LayoutControl1 Me.txtChangedWho.TabIndex = 12 ' 'TextEdit9 ' Me.TextEdit9.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit9.Location = New System.Drawing.Point(473, 408) + Me.TextEdit9.Location = New System.Drawing.Point(479, 407) Me.TextEdit9.MenuManager = Me.RibbonControl Me.TextEdit9.Name = "TextEdit9" Me.TextEdit9.Properties.ReadOnly = True - Me.TextEdit9.Size = New System.Drawing.Size(275, 20) + Me.TextEdit9.Size = New System.Drawing.Size(269, 20) Me.TextEdit9.StyleController = Me.LayoutControl1 Me.TextEdit9.TabIndex = 13 ' @@ -282,7 +292,7 @@ Partial Class frmAdmin_SourceSQL Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.EmptySpaceItem1, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem10}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(768, 520) + Me.Root.Size = New System.Drawing.Size(768, 519) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -293,7 +303,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem1.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem1.Text = "GUID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(76, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(82, 13) ' 'LayoutControlItem2 ' @@ -303,7 +313,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem2.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem2.Text = "Entity Title" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(76, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(82, 13) ' 'LayoutControlItem3 ' @@ -313,7 +323,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem3.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem3.Text = "Primary Key" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(76, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(82, 13) ' 'LayoutControlItem4 ' @@ -323,7 +333,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem4.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem4.Text = "Foreign Key" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(76, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(82, 13) ' 'LayoutControlItem5 ' @@ -333,7 +343,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem5.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem5.Text = "Scope" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(76, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(82, 13) ' 'LayoutControlItem6 ' @@ -341,14 +351,14 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 200) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem6.Size = New System.Drawing.Size(748, 148) + Me.LayoutControlItem6.Size = New System.Drawing.Size(748, 147) Me.LayoutControlItem6.Text = "SQL Command" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(76, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(82, 13) ' 'EmptySpaceItem1 ' Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 428) + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 427) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" Me.EmptySpaceItem1.Size = New System.Drawing.Size(748, 72) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) @@ -356,42 +366,42 @@ Partial Class frmAdmin_SourceSQL 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.txtAddedWho - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 348) + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 347) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem7.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem7.Text = "Erstellt Wer" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(76, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(82, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.txtChangedWho - Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 388) + Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 387) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem9.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem9.Text = "Geändert Wer" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(76, 13) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(82, 13) ' 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.TextEdit7 - Me.LayoutControlItem8.Location = New System.Drawing.Point(374, 348) + Me.LayoutControlItem8.Location = New System.Drawing.Point(374, 347) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem8.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem8.Text = "Erstellt Wann" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(76, 13) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(82, 13) ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.TextEdit9 - Me.LayoutControlItem10.Location = New System.Drawing.Point(374, 388) + Me.LayoutControlItem10.Location = New System.Drawing.Point(374, 387) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem10.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem10.Text = "Geändert Wann" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(76, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(82, 13) ' 'TBZF_ADMIN_SOURCE_SQLTableAdapter ' @@ -423,14 +433,14 @@ Partial Class frmAdmin_SourceSQL CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBZF_ADMIN_SOURCE_SQLBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBZF_ADMIN_SOURCE_SQLBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -485,4 +495,5 @@ Partial Class frmAdmin_SourceSQL Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx index fbbe0e94..452569f0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx @@ -123,6 +123,9 @@ 17, 17 + + 17, 17 + 457, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb index cfdf0ab8..24f5a165 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb @@ -19,7 +19,7 @@ Try TBZF_ADMIN_SOURCE_SQLBindingSource.EndEdit() - If DSIDB_Stammdaten.TBIDB_BUSINESS_ENTITY.GetChanges() IsNot Nothing Then + If DSIDB_Stammdaten.TBZF_ADMIN_SOURCE_SQL.GetChanges() IsNot Nothing Then HasChanges = True If IsInsert Then @@ -46,4 +46,29 @@ ShowError(ex) End Try End Sub + + Private Sub ResetMessages() + labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End Sub + + Private Sub ShowStatus(Message As String) + labelStatus.Caption = Message + labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + ResetMessages() + + If SaveData() And HasChanges Then + ShowStatus("Attribute gespeichert!") + End If + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + ResetMessages() + + If SaveData() Then + Close() + End If + End Sub End Class \ No newline at end of file