diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb index e6ee211c..b2b02471 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb @@ -8,4 +8,8 @@ Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData Throw New NotImplementedException() End Function + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Throw New NotImplementedException() + End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb index 498ec7b8..8a0c16c3 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb @@ -60,6 +60,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -93,9 +94,9 @@ Partial Class frmAdmin_CWProfile ' Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified 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.labelError}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.labelError, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 5 + Me.RibbonControl1.MaxItemId = 6 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -145,6 +146,7 @@ Partial Class frmAdmin_CWProfile ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' @@ -237,7 +239,7 @@ Partial Class frmAdmin_CWProfile 'txtAddedWho ' Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(145, 246) + Me.txtAddedWho.Location = New System.Drawing.Point(145, 222) Me.txtAddedWho.MenuManager = Me.RibbonControl1 Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Size = New System.Drawing.Size(244, 20) @@ -247,7 +249,7 @@ Partial Class frmAdmin_CWProfile 'txtAddedWhen ' Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True)) - Me.txtAddedWhen.Location = New System.Drawing.Point(534, 246) + Me.txtAddedWhen.Location = New System.Drawing.Point(534, 222) Me.txtAddedWhen.MenuManager = Me.RibbonControl1 Me.txtAddedWhen.Name = "txtAddedWhen" Me.txtAddedWhen.Size = New System.Drawing.Size(246, 20) @@ -257,7 +259,7 @@ Partial Class frmAdmin_CWProfile 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(145, 286) + Me.txtChangedWho.Location = New System.Drawing.Point(145, 262) Me.txtChangedWho.MenuManager = Me.RibbonControl1 Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Size = New System.Drawing.Size(244, 20) @@ -267,7 +269,7 @@ Partial Class frmAdmin_CWProfile 'txtChangedWhen ' Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen.Location = New System.Drawing.Point(534, 286) + Me.txtChangedWhen.Location = New System.Drawing.Point(534, 262) Me.txtChangedWhen.MenuManager = Me.RibbonControl1 Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Size = New System.Drawing.Size(246, 20) @@ -300,15 +302,16 @@ Partial Class frmAdmin_CWProfile Me.TextEdit5.Location = New System.Drawing.Point(145, 180) Me.TextEdit5.MenuManager = Me.RibbonControl1 Me.TextEdit5.Name = "TextEdit5" - Me.TextEdit5.Size = New System.Drawing.Size(635, 20) + Me.TextEdit5.Size = New System.Drawing.Size(434, 20) Me.TextEdit5.StyleController = Me.LayoutControl1 Me.TextEdit5.TabIndex = 13 ' 'SimpleButton1 ' - Me.SimpleButton1.Location = New System.Drawing.Point(12, 212) + Me.SimpleButton1.Location = New System.Drawing.Point(599, 180) + Me.SimpleButton1.Margin = New System.Windows.Forms.Padding(10) Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(776, 22) + Me.SimpleButton1.Size = New System.Drawing.Size(181, 22) Me.SimpleButton1.StyleController = Me.LayoutControl1 Me.SimpleButton1.TabIndex = 14 Me.SimpleButton1.Text = "Regular Expression prüfen" @@ -317,7 +320,7 @@ Partial Class frmAdmin_CWProfile ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7, Me.LayoutControlItem10, Me.LayoutControlItem9, Me.LayoutControlItem11, Me.LayoutControlItem8, Me.LayoutControlItem1}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7, Me.LayoutControlItem10, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem1, Me.LayoutControlItem11}) Me.Root.Name = "Root" Me.Root.Size = New System.Drawing.Size(800, 362) Me.Root.TextVisible = False @@ -345,7 +348,7 @@ Partial Class frmAdmin_CWProfile 'LayoutControlItem4 ' Me.LayoutControlItem4.Control = Me.txtAddedWho - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 226) + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 202) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem4.Size = New System.Drawing.Size(389, 40) @@ -355,17 +358,17 @@ Partial Class frmAdmin_CWProfile 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.txtChangedWho - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 266) + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 242) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem6.Size = New System.Drawing.Size(389, 76) + Me.LayoutControlItem6.Size = New System.Drawing.Size(389, 100) Me.LayoutControlItem6.Text = "Geändert Wer" Me.LayoutControlItem6.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.txtAddedWhen - Me.LayoutControlItem5.Location = New System.Drawing.Point(389, 226) + Me.LayoutControlItem5.Location = New System.Drawing.Point(389, 202) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem5.Size = New System.Drawing.Size(391, 40) @@ -375,10 +378,10 @@ Partial Class frmAdmin_CWProfile 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.txtChangedWhen - Me.LayoutControlItem7.Location = New System.Drawing.Point(389, 266) + Me.LayoutControlItem7.Location = New System.Drawing.Point(389, 242) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem7.Size = New System.Drawing.Size(391, 76) + Me.LayoutControlItem7.Size = New System.Drawing.Size(391, 100) Me.LayoutControlItem7.Text = "Geändert Wann" Me.LayoutControlItem7.TextSize = New System.Drawing.Size(122, 13) ' @@ -388,7 +391,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 160) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem10.Size = New System.Drawing.Size(579, 42) Me.LayoutControlItem10.Text = "Regular Expression Test" Me.LayoutControlItem10.TextSize = New System.Drawing.Size(122, 13) ' @@ -405,9 +408,10 @@ Partial Class frmAdmin_CWProfile 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.SimpleButton1 - Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 200) + Me.LayoutControlItem11.Location = New System.Drawing.Point(579, 160) Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Size = New System.Drawing.Size(780, 26) + Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem11.Size = New System.Drawing.Size(201, 42) Me.LayoutControlItem11.Text = "Regular Expression prüfen" Me.LayoutControlItem11.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem11.TextVisible = False @@ -432,6 +436,12 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem1.Text = "GUID" Me.LayoutControlItem1.TextSize = New System.Drawing.Size(122, 13) ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Löschen" + Me.BarButtonItem3.Id = 5 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'frmAdmin_CWProfile ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -513,4 +523,5 @@ Partial Class frmAdmin_CWProfile Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb index 81393c08..e02fd74a 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb @@ -73,4 +73,8 @@ Public Class frmAdmin_CWProfile ShowStatus("Attribute gespeichert!") End If End Sub + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Throw New NotImplementedException() + End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb index 0d351c91..a88839d0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb @@ -78,4 +78,8 @@ Public Class frmAdmin_Globix Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles SimpleButton2.Click End Sub + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Throw New NotImplementedException() + End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb index 78fc24cf..5c9a9896 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb @@ -27,6 +27,7 @@ Partial Class frmAdmin_IDBAttribute Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem3 = 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() @@ -96,9 +97,9 @@ Partial Class frmAdmin_IDBAttribute ' Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified 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.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 6 + Me.RibbonControl1.MaxItemId = 7 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -129,6 +130,13 @@ Partial Class frmAdmin_IDBAttribute Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Löschen" + Me.BarButtonItem3.Id = 6 + Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.del1 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -139,6 +147,7 @@ Partial Class frmAdmin_IDBAttribute ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Daten" ' @@ -443,6 +452,7 @@ Partial Class frmAdmin_IDBAttribute Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'VWIDB_BE_ATTRIBUTETableAdapter @@ -538,4 +548,5 @@ Partial Class frmAdmin_IDBAttribute Friend WithEvents TBIDB_ATTRIBUTE_TYPEBindingSource As BindingSource Friend WithEvents TBIDB_ATTRIBUTE_TYPETableAdapter As DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTE_TYPETableAdapter Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.LookUpEdit + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb index d7a5f62e..d990110b 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb @@ -86,4 +86,22 @@ Public Class frmAdmin_IDBAttribute COMMENT = @COMMENT WHERE (GUID = @GUID)" End Sub + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Try + TBIDB_ATTRIBUTE_TYPETableAdapter.Delete(PrimaryKey) + Return True + Catch ex As Exception + ShowError(ex) + Return False + End Try + End Function + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + If MsgBox($"Wollen Sie das Attribut [{PrimaryKey}] wirklich löschen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then + If DeleteData() Then + Close() + End If + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb index 1324d6a2..d810a618 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb @@ -27,6 +27,7 @@ Partial Class frmAdmin_IDBEntity Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem3 = 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() @@ -85,9 +86,9 @@ Partial Class frmAdmin_IDBEntity ' Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified 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.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -119,6 +120,13 @@ Partial Class frmAdmin_IDBEntity Me.labelStatus.Name = "labelStatus" Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Löschen" + Me.BarButtonItem3.Id = 4 + Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.del + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -129,6 +137,7 @@ Partial Class frmAdmin_IDBEntity ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' @@ -375,6 +384,7 @@ Partial Class frmAdmin_IDBEntity Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Me.TBIDB_BUSINESS_ENTITYTableAdapter + Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'frmAdmin_IDBEntity @@ -464,4 +474,5 @@ Partial Class frmAdmin_IDBEntity Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx index 401cbdab..bb650dbd 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx @@ -123,9 +123,6 @@ 17, 17 - - 17, 17 - 443, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb index c8d7747b..54a57ea0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb @@ -72,4 +72,22 @@ Public Class frmAdmin_IDBEntity Return False End Try End Function + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Try + TBIDB_BUSINESS_ENTITYTableAdapter.Delete(PrimaryKey) + Return True + Catch ex As Exception + ShowError(ex) + Return False + End Try + End Function + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + If MsgBox($"Wollen Sie die Entität [{PrimaryKey}] wirklich löschen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then + If DeleteData() Then + Close() + End If + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb b/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb index e37da229..354f8c30 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb @@ -6,4 +6,5 @@ Public Interface frmAdmin_Interface Property IsInsert As Boolean Function SaveData() As Boolean + Function DeleteData() As Boolean End Interface diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb index 3b42cd8e..d713b9ad 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb @@ -104,7 +104,7 @@ Partial Class frmAdmin_SourceSQL ' Me.BarButtonItem1.Caption = "Speichern und Schließen" Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_check4 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.markcomplete1 Me.BarButtonItem1.Name = "BarButtonItem1" ' 'BarButtonItem2 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx index 452569f0..fbbe0e94 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx @@ -123,9 +123,6 @@ 17, 17 - - 17, 17 - 457, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb index 24f5a165..48c452af 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb @@ -39,6 +39,16 @@ End Try End Function + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Try + TBZF_ADMIN_SOURCE_SQLTableAdapter.Delete(PrimaryKey) + Return True + Catch ex As Exception + ShowError(ex) + Return False + End Try + End Function + Private Sub frmAdmin_SourceSQL_Load(sender As Object, e As EventArgs) Handles Me.Load Try TBZF_ADMIN_SOURCE_SQLTableAdapter.Fill(DSIDB_Stammdaten.TBZF_ADMIN_SOURCE_SQL, PrimaryKey) @@ -71,4 +81,12 @@ Close() End If End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + If MsgBox($"Wollen Sie den SourceSQL [{PrimaryKey}] wirklich löschen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then + If DeleteData() Then + Close() + End If + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index cff44f8e..3d057911 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -141,7 +141,7 @@ Partial Class frmAdmin_Start Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1077, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(1077, 159) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -397,10 +397,10 @@ Partial Class frmAdmin_Start ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 652) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 654) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 22) ' 'RibbonPage2 ' @@ -433,7 +433,7 @@ Partial Class frmAdmin_Start Me.TreeListMenu.OptionsView.ShowIndicator = False Me.TreeListMenu.OptionsView.ShowVertLines = False Me.TreeListMenu.SelectImageList = Me.MainTreeImages - Me.TreeListMenu.Size = New System.Drawing.Size(193, 465) + Me.TreeListMenu.Size = New System.Drawing.Size(193, 446) Me.TreeListMenu.TabIndex = 8 ' 'TreeListColumn1 @@ -464,18 +464,18 @@ Partial Class frmAdmin_Start Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("ce81b5b5-eff5-4006-8018-548aa8413799") - Me.DockPanel1.Location = New System.Drawing.Point(0, 158) + Me.DockPanel1.Location = New System.Drawing.Point(0, 159) Me.DockPanel1.Name = "DockPanel1" Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.Size = New System.Drawing.Size(200, 494) + Me.DockPanel1.Size = New System.Drawing.Size(200, 495) Me.DockPanel1.Text = "Übersicht" ' 'DockPanel1_Container ' Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu) - Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 26) + Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 465) + Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 446) Me.DockPanel1_Container.TabIndex = 0 ' 'TBIDB_ATTRIBUTEBindingSource @@ -495,6 +495,7 @@ Partial Class frmAdmin_Start Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBIDB_ATTRIBUTE_TYPEBindingSource @@ -524,7 +525,7 @@ Partial Class frmAdmin_Start ' Me.Panel1.Controls.Add(Me.labelTitle) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Location = New System.Drawing.Point(200, 158) + Me.Panel1.Location = New System.Drawing.Point(200, 159) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(877, 46) Me.Panel1.TabIndex = 8 @@ -727,11 +728,11 @@ Partial Class frmAdmin_Start 'GridControl1 ' Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl1.Location = New System.Drawing.Point(200, 204) + Me.GridControl1.Location = New System.Drawing.Point(200, 205) Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(877, 448) + Me.GridControl1.Size = New System.Drawing.Size(877, 449) Me.GridControl1.TabIndex = 12 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 44fd4d18..a905feb5 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -1,5 +1,4 @@ -Imports System.ComponentModel -Imports DevExpress.Utils +Imports DevExpress.Utils Imports DevExpress.XtraBars.Ribbon Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraEditors.Repository @@ -8,7 +7,6 @@ Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid.ViewInfo Imports DevExpress.XtraTab -Imports DevExpress.XtraTreeList Imports DigitalData.Modules.Logging Public Class frmAdmin_Start @@ -32,31 +30,50 @@ Public Class frmAdmin_Start Private Const PAGE_META_SOURCE_SQL = "META_SOURCE_SQL" Private PrimaryKey As String = Nothing - Private AdminItems As New List(Of AdminItem) + + Private AdminItems As New Dictionary(Of String, AdminItem) + Private AdminNodes As New Dictionary(Of String, AdminNode) From { + {PAGE_IDB_ATTRIBUTES, + New AdminNode With { + .Title = "IDB Attribute", + .[Module] = MODULE_IDB, + .Entity = PAGE_IDB_ATTRIBUTES + }}, + {PAGE_IDB_BUSINESS_ENTITIES, + New AdminNode With { + .Title = "IDB Entitäten", + .[Module] = MODULE_IDB, + .Entity = PAGE_IDB_BUSINESS_ENTITIES + }}, + {PAGE_META_SOURCE_SQL, + New AdminNode With { + .Title = "Source SQL", + .[Module] = MODULE_META, + .Entity = PAGE_META_SOURCE_SQL + }}, + {PAGE_GLOBIX_PROFILES, + New AdminNode With { + .Title = "Global Indexer Profile", + .[Module] = MODULE_GLOBIX, + .Entity = PAGE_GLOBIX_PROFILES + }}, + {PAGE_CW_PROFILES, + New AdminNode With { + .Title = "Clipboard Watcher Profile", + .[Module] = MODULE_CW, + .Entity = PAGE_CW_PROFILES + }} + } Private CurrentModule As String Private CurrentPage As String Private CurrentItem As AdminItem - Private Function IsIDBAttributes(Item As AdminItem) As Boolean - Return Item.Entity = PAGE_IDB_ATTRIBUTES - End Function - - Private Function IsIDBEntities(Item As AdminItem) As Boolean - Return Item.Entity = PAGE_IDB_BUSINESS_ENTITIES - End Function - - Private Function IsCWPRofiles(Item As AdminItem) As Boolean - Return Item.Entity = PAGE_CW_PROFILES - End Function - - Private Function IsGLOBIXProfiles(Item As AdminItem) As Boolean - Return Item.Entity = PAGE_GLOBIX_PROFILES - End Function - - Private Function IsSourceSQL(Item As AdminItem) As Boolean - Return Item.Entity = PAGE_META_SOURCE_SQL - End Function + Private Class AdminNode + Public Property Title As String + Public Property [Module] As String + Public Property Entity As String + End Class Private Class AdminItem Public Property Guid As Integer @@ -73,8 +90,6 @@ Public Class frmAdmin_Start Load_SQLData() TreeListMenu.ExpandAll() - - AddHandler GridControl1.DoubleClick, AddressOf GridControl_DoubleClick End Sub Private Function Load_SQLData() As Boolean @@ -100,7 +115,7 @@ Public Class frmAdmin_Start Logger.Error(ex) End Try - AdminItems.Add(oItem) + AdminItems.Add(oItem.Entity, oItem) Next Return True Catch ex As Exception @@ -109,37 +124,7 @@ Public Class frmAdmin_Start End Try End Function - Sub Display_Tab(pPageToDisplay As XtraTabPage) - Try - If pPageToDisplay.TabControl Is Nothing Then - Exit Sub - End If - - For Each oDocument As XtraTabPage In pPageToDisplay.TabControl.TabPages - If oDocument.Name = pPageToDisplay.Name Then - oDocument.PageVisible = True - Else - oDocument.PageVisible = False - End If - Next - Catch ex As Exception - ShowError(ex) - End Try - End Sub - - Sub Display_RibbonPage(PageToDisplay As RibbonPage) - Try - For Each oPage As RibbonPage In RibbonControl1.Pages - If oPage.Name = PageToDisplay.Name Then - RibbonControl1.SelectedPage = PageToDisplay - End If - Next - Catch ex As Exception - ShowError(ex) - End Try - End Sub - - Private Sub TreeList1_FocusedNodeChanged(sender As Object, e As DevExpress.XtraTreeList.FocusedNodeChangedEventArgs) Handles TreeListMenu.FocusedNodeChanged + Private Sub TreeListMenu_FocusedNodeChanged(sender As Object, e As DevExpress.XtraTreeList.FocusedNodeChangedEventArgs) Handles TreeListMenu.FocusedNodeChanged Try If e.Node Is Nothing OrElse e.Node.Tag Is Nothing Then labelTitle.Text = "Start" @@ -148,47 +133,25 @@ Public Class frmAdmin_Start CurrentPage = e.Node.Tag.ToString - Select Case e.Node.Tag.ToString - Case PAGE_IDB_START - CurrentModule = MODULE_IDB - labelTitle.Text = "IDB Übersicht" - Case PAGE_IDB_ATTRIBUTES - CurrentModule = MODULE_IDB - labelTitle.Text = "IDB Attribute" + If AdminNodes.ContainsKey(CurrentPage) Then + Dim oNode = AdminNodes.Item(CurrentPage) + CurrentModule = oNode.Module + labelTitle.Text = oNode.Title + Else + MsgBox($"Page [{CurrentPage}] not found in AdminNodes! Exiting." & vbNewLine & + "Check your definitions in the TreeList NodeEditor and in SourceSQL", MsgBoxStyle.Critical, Text) + Exit Sub + End If - CurrentItem = AdminItems.Where(AddressOf IsIDBAttributes).FirstOrDefault() - Load_Tree(CurrentItem) - - Case PAGE_IDB_BUSINESS_ENTITIES - CurrentModule = MODULE_IDB - labelTitle.Text = "IDB Entitäten" - - CurrentItem = AdminItems.Where(AddressOf IsIDBEntities).FirstOrDefault() - Load_Tree(CurrentItem) - - Case PAGE_GLOBIX_PROFILES - CurrentModule = MODULE_GLOBIX - labelTitle.Text = "Global Indexer Profile" - - CurrentItem = AdminItems.Where(AddressOf IsGLOBIXProfiles).FirstOrDefault() - Load_Tree(CurrentItem) - - Case PAGE_CW_PROFILES - CurrentModule = MODULE_CW - labelTitle.Text = "Clipboard Watcher Profile" - - CurrentItem = AdminItems.Where(AddressOf IsCWPRofiles).FirstOrDefault() - Load_Tree(CurrentItem) - - Case PAGE_META_SOURCE_SQL - CurrentModule = MODULE_META - labelTitle.Text = "Source SQL" - - CurrentItem = AdminItems.Where(AddressOf IsSourceSQL).FirstOrDefault() - Load_Tree(CurrentItem) - - End Select + If AdminItems.ContainsKey(CurrentPage) Then + CurrentItem = AdminItems.Item(CurrentPage) + Load_GridData(CurrentItem) + Else + MsgBox($"Page [{CurrentPage}] not found in AdminItems! Exiting." & vbNewLine & + "Check your definitions in the TreeList NodeEditor and in SourceSQL", MsgBoxStyle.Critical, Text) + Exit Sub + End If Catch ex As Exception ShowError(ex) End Try @@ -218,7 +181,7 @@ Public Class frmAdmin_Start End With End Sub - Private Sub Load_Tree(Source As AdminItem) + Private Sub Load_GridData(Source As AdminItem) If Source Is Nothing OrElse Source.SQLResult Is Nothing Then Exit Sub End If @@ -281,13 +244,12 @@ Public Class frmAdmin_Start GridView1.BestFitColumns() End Sub - Private Sub GridControl_DoubleClick(sender As Object, e As EventArgs) Handles GridControl1.DoubleClick - Dim oGrid As GridControl = TryCast(sender, GridControl) - Dim oView As GridView = oGrid.MainView - Dim hitInfo As GridHitInfo = oView.CalcHitInfo(TryCast(e, DXMouseEventArgs).Location) - If hitInfo.InRow Then - Try - Dim oRowView As DataRowView = oView.GetFocusedRow + + Private Sub GridView1_RowClick(sender As Object, e As RowClickEventArgs) Handles GridView1.RowClick + Try + If e.Clicks = 2 And e.Button = MouseButtons.Left Then + Dim oView As GridView = TryCast(sender, GridView) + Dim oRowView As DataRowView = oView.GetRow(e.RowHandle) Dim oItem As AdminItem = CurrentItem Dim oGuid = oRowView.Row.Item(oItem.PrimaryKey) @@ -308,12 +270,15 @@ Public Class frmAdmin_Start Case PAGE_META_SOURCE_SQL Load_SourceSQL(oGuid) + + Case Else + MsgBox($"The Form for the Tag [{CurrentPage}] has no Form assigned. Maybe you have a typo in your definitions (Database, NodeEditor)?", MsgBoxStyle.Exclamation, Text) End Select End If - Catch ex As Exception - ShowError(ex) - End Try - End If + End If + Catch ex As Exception + ShowError(ex) + End Try End Sub Private Sub Load_SourceSQL(PrimaryKey As Integer) @@ -323,8 +288,7 @@ Public Class frmAdmin_Start If oForm.HasChanges Then Load_SQLData() - Dim oItem As AdminItem = AdminItems.Where(AddressOf IsSourceSQL).FirstOrDefault - Load_Tree(oItem) + Load_GridData(AdminItems.Item(CurrentPage)) End If Catch ex As Exception ShowError(ex) @@ -338,8 +302,7 @@ Public Class frmAdmin_Start If oForm.HasChanges Then Load_SQLData() - Dim oItem As AdminItem = AdminItems.Where(AddressOf IsIDBAttributes).FirstOrDefault - Load_Tree(oItem) + Load_GridData(AdminItems.Item(CurrentPage)) End If Catch ex As Exception ShowError(ex) @@ -353,8 +316,7 @@ Public Class frmAdmin_Start If oForm.HasChanges Then Load_SQLData() - Dim oItem As AdminItem = AdminItems.Where(AddressOf IsIDBAttributes).FirstOrDefault - Load_Tree(oItem) + Load_GridData(AdminItems.Item(CurrentPage)) End If Catch ex As Exception ShowError(ex) @@ -368,9 +330,7 @@ Public Class frmAdmin_Start If oForm.HasChanges Then Load_SQLData() - - Dim oItem As AdminItem = AdminItems.Where(AddressOf IsCWPRofiles).FirstOrDefault - Load_Tree(oItem) + Load_GridData(AdminItems.Item(CurrentPage)) End If Catch ex As Exception ShowError(ex) @@ -383,9 +343,7 @@ Public Class frmAdmin_Start If oForm.HasChanges Then Load_SQLData() - - Dim oItem As AdminItem = AdminItems.Where(AddressOf IsCWPRofiles).FirstOrDefault - Load_Tree(oItem) + Load_GridData(AdminItems.Item(CurrentPage)) End If Catch ex As Exception ShowError(ex) diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index 777f6688..00012dc3 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -5319,35 +5319,9 @@ Namespace DSIDB_StammdatenTableAdapters Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBZF_ADMIN_SOURCE_SQL] WHERE (([GUID] = @Original_GUID) AND ([PARENT"& _ - "_ID] = @Original_PARENT_ID) AND ([ENTITY_TITLE] = @Original_ENTITY_TITLE) AND (["& _ - "SCOPE] = @Original_SCOPE) AND ([PK_COLUMN] = @Original_PK_COLUMN) AND ((@IsNull_"& _ - "COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@Is"& _ - "Null_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WH"& _ - "O)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @O"& _ - "riginal_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR"& _ - " ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CH"& _ - "ANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull"& _ - "_FK_COLUMN = 1 AND [FK_COLUMN] IS NULL) OR ([FK_COLUMN] = @Original_FK_COLUMN)))"& _ - "" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBZF_ADMIN_SOURCE_SQL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PARENT_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ENTITY_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_TITLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SCOPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SCOPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PK_COLUMN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PK_COLUMN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FK_COLUMN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FK_COLUMN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FK_COLUMN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FK_COLUMN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBZF_ADMIN_SOURCE_SQL] ([PARENT_ID], [ENTITY_TITLE], [SCOPE], [PK_CO"& _ @@ -5497,66 +5471,8 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Delete, true)> _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_PARENT_ID As Integer, ByVal Original_ENTITY_TITLE As String, ByVal Original_SCOPE As String, ByVal Original_PK_COLUMN As String, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_FK_COLUMN As String) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) - Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_PARENT_ID,Integer) - If (Original_ENTITY_TITLE Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_ENTITY_TITLE") - Else - Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_ENTITY_TITLE,String) - End If - If (Original_SCOPE Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_SCOPE") - Else - Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_SCOPE,String) - End If - If (Original_PK_COLUMN Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_PK_COLUMN") - Else - Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_PK_COLUMN,String) - End If - If (Original_COMMENT Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(5).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(6).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(5).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_COMMENT,String) - End If - If (Original_ADDED_WHO Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(8).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_ADDED_WHO,String) - End If - If (Original_ADDED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_ADDED_WHEN.Value,Date) - Else - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(10).Value = Global.System.DBNull.Value - End If - If (Original_CHANGED_WHO Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(11).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(12).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(11).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_CHANGED_WHO,String) - End If - If (Original_CHANGED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(13).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(14).Value = CType(Original_CHANGED_WHEN.Value,Date) - Else - Me.Adapter.DeleteCommand.Parameters(13).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(14).Value = Global.System.DBNull.Value - End If - If (Original_FK_COLUMN Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(15).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(16).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(15).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(16).Value = CType(Original_FK_COLUMN,String) - End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index 202d9258..c8cf5be7 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -286,26 +286,11 @@ FROM VWIDB_BE_ATTRIBUTE WHERE ATTR_ID = @ATTRIBUTE_ID AND LANG_ID = @ - - DELETE FROM [TBZF_ADMIN_SOURCE_SQL] WHERE (([GUID] = @Original_GUID) AND ([PARENT_ID] = @Original_PARENT_ID) AND ([ENTITY_TITLE] = @Original_ENTITY_TITLE) AND ([SCOPE] = @Original_SCOPE) AND ([PK_COLUMN] = @Original_PK_COLUMN) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_FK_COLUMN = 1 AND [FK_COLUMN] IS NULL) OR ([FK_COLUMN] = @Original_FK_COLUMN))) + + DELETE FROM TBZF_ADMIN_SOURCE_SQL +WHERE (GUID = @Original_GUID) - - - - - - - - - - - - - - - - - + @@ -400,7 +385,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -439,7 +424,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -496,7 +481,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -553,7 +538,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -594,7 +579,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -685,7 +670,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + \ No newline at end of file diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb index e9792a5a..666e1ece 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb @@ -820,7 +820,6 @@ Partial Class frmGlobixAdministration ' 'Button1 ' - Me.Button1.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.Datasource_16x16 Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button1.Location = New System.Drawing.Point(12, 85) Me.Button1.Name = "Button1" diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb index 5cc8ea6c..7c8bc544 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb @@ -204,4 +204,8 @@ Public Class frmGlobixAdministration RibbonPageGroup1.Text = "Auto Values" End Select End Sub + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Throw New NotImplementedException() + End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 116d1d46..e5373682 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -330,16 +330,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. - ''' - Friend ReadOnly Property actions_check4() As DevExpress.Utils.Svg.SvgImage - Get - Dim obj As Object = ResourceManager.GetObject("actions_check4", resourceCulture) - Return CType(obj,DevExpress.Utils.Svg.SvgImage) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -520,16 +510,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - ''' - Friend ReadOnly Property Datasource_16x16() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Datasource_16x16", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -560,6 +540,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property del() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("del", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property del1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("del1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -670,6 +670,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property markcomplete1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("markcomplete1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index a992d63b..b642b357 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -151,11 +151,8 @@ ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -187,9 +184,6 @@ ..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -199,12 +193,18 @@ ..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\markcomplete1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -244,8 +244,8 @@ ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -274,9 +274,6 @@ ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -307,6 +304,9 @@ ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -316,8 +316,8 @@ ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -328,8 +328,8 @@ ..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -343,10 +343,13 @@ ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/del.svg b/GUIs.ZooFlow/Resources/del.svg new file mode 100644 index 00000000..3ac92fc9 --- /dev/null +++ b/GUIs.ZooFlow/Resources/del.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/del1.svg b/GUIs.ZooFlow/Resources/del1.svg new file mode 100644 index 00000000..3ac92fc9 --- /dev/null +++ b/GUIs.ZooFlow/Resources/del1.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/markcomplete1.svg b/GUIs.ZooFlow/Resources/markcomplete1.svg new file mode 100644 index 00000000..6a4b15a1 --- /dev/null +++ b/GUIs.ZooFlow/Resources/markcomplete1.svg @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 3102d875..964ccb76 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -711,6 +711,15 @@ + + + + + + + + +