diff --git a/GUIs.ZooFlow/Administration/ClassDetailPage.vb b/GUIs.ZooFlow/Administration/ClassDetailPage.vb index 55e472bf..e19ad4ce 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailPage.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailPage.vb @@ -1,4 +1,5 @@ -Imports DevExpress.XtraEditors +Imports System.ComponentModel +Imports DevExpress.XtraEditors Imports DevExpress.XtraLayout Imports DevExpress.XtraTab @@ -25,10 +26,14 @@ Public Class ClassDetailPages Public Sub New(LayoutControls As List(Of LayoutControl)) For Each oLayoutControl In LayoutControls + AddHandler oLayoutControl.Click, AddressOf Handle_Focus + AddHandler oLayoutControl.GotFocus, AddressOf Handle_Focus + For Each oContainer As LayoutControlItem In oLayoutControl.Root.Items Dim oControl As BaseEdit = oContainer.Control AddHandler oControl.GotFocus, AddressOf Handle_Focus AddHandler oControl.EditValueChanged, AddressOf Handle_EditValueChanged + AddHandler oControl.Validating, AddressOf Handle_Validating Next Next End Sub @@ -43,26 +48,59 @@ Public Class ClassDetailPages Next End Sub - Private Sub Handle_Focus(sender As BaseEdit, e As EventArgs) + Private Sub Handle_Validating(sender As Object, e As CancelEventArgs) Dim oControl As BaseEdit = sender + Dim oBinding As Binding = oControl.DataBindings.Item("EditValue") + + If TypeOf oBinding.DataSource Is BindingSource Then + Dim oSource As BindingSource = oBinding.DataSource + Dim oTableName As String = oSource.DataMember + Dim oDataSet As DataSet = oSource.DataSource + Dim oTable = oDataSet.Tables(oTableName) + Dim oColumnName As String = oBinding.BindingMemberInfo.BindingField + Dim oColumn As DataColumn = oTable.Columns.Item(oColumnName) + + Dim oNullable As Boolean = oColumn.AllowDBNull + + If oNullable = False And NotNull(oControl.EditValue, String.Empty) = String.Empty Then + Throw New NoNullAllowedException() + End If + End If + + Console.WriteLine() + End Sub + + Private Sub Handle_Focus(sender As Control, e As EventArgs) + Dim oControl As Control = sender + Dim oLayoutControl As LayoutControl = Nothing ' Get the Layout Control containing the Edit Contol If TypeOf oControl.Parent Is LayoutControl Then - Dim oLayoutControl As LayoutControl = oControl.Parent + oLayoutControl = oControl.Parent + ElseIf TypeOf oControl Is LayoutControl Then + oLayoutControl = oControl + End If - ' Get the TabPage containing the Layout Control - If TypeOf oLayoutControl.Parent Is XtraTabPage Then - Dim oTabPage As XtraTabPage = oLayoutControl.Parent + If oLayoutControl Is Nothing Then + Exit Sub + End If - If Items.ContainsKey(oTabPage.Name) Then - CurrentPage = Items.Item(oTabPage.Name) + ' Get the TabPage containing the Layout Control + Do_Handle_Focus(oLayoutControl, oControl) + End Sub - Dim oData As New DetailPageEventArgs With {.Page = Items.Item(oTabPage.Name)} - RaiseEvent AnyControl_Focus(oControl, oData) - Else - CurrentPage = Nothing - RaiseEvent AnyControl_Focus(oControl, Nothing) - End If + Private Sub Do_Handle_Focus(LayoutControl As LayoutControl, Control As Control) + If TypeOf LayoutControl.Parent Is XtraTabPage Then + Dim oTabPage As XtraTabPage = LayoutControl.Parent + + If Items.ContainsKey(oTabPage.Name) Then + CurrentPage = Items.Item(oTabPage.Name) + + Dim oData As New DetailPageEventArgs With {.Page = Items.Item(oTabPage.Name)} + RaiseEvent AnyControl_Focus(Control, oData) + Else + CurrentPage = Nothing + RaiseEvent AnyControl_Focus(Control, Nothing) End If End If End Sub diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Base.vb b/GUIs.ZooFlow/Administration/frmAdmin_Base.vb index 0499672f..73c8bcd1 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Base.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Base.vb @@ -19,7 +19,7 @@ Partial Public MustInherit Class BaseForm End Sub Public Sub ShowError(Exception As Exception) - Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True) + Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, 2) Logger.Error(Exception) ShowError($"Error in {oCallingClass}:{vbNewLine}{Exception.Message}") End Sub diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb index c599da96..2ba738e9 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb @@ -187,7 +187,7 @@ Partial Class frmAdmin_CWProfile Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1328, 131) + Me.RibbonControl1.Size = New System.Drawing.Size(1328, 132) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -224,6 +224,7 @@ Partial Class frmAdmin_CWProfile 'BarButtonNew ' Me.BarButtonNew.Caption = "Neu" + Me.BarButtonNew.Enabled = False Me.BarButtonNew.Id = 6 Me.BarButtonNew.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_add1 Me.BarButtonNew.Name = "BarButtonNew" @@ -246,10 +247,10 @@ Partial Class frmAdmin_CWProfile ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 676) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 674) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 24) ' 'RibbonPage2 ' @@ -301,74 +302,74 @@ Partial Class frmAdmin_CWProfile 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "GUID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(116, 15) + Me.TextEdit1.Location = New System.Drawing.Point(110, 15) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Size = New System.Drawing.Size(540, 20) + Me.TextEdit1.Size = New System.Drawing.Size(546, 20) Me.TextEdit1.StyleController = Me.LayoutControlProfile Me.TextEdit1.TabIndex = 4 ' 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True)) - Me.TextEdit2.Location = New System.Drawing.Point(116, 45) + Me.TextEdit2.Location = New System.Drawing.Point(110, 45) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(1195, 20) + Me.TextEdit2.Size = New System.Drawing.Size(1201, 20) Me.TextEdit2.StyleController = Me.LayoutControlProfile Me.TextEdit2.TabIndex = 5 ' 'TextEdit3 ' Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "COMMENT", True)) - Me.TextEdit3.Location = New System.Drawing.Point(116, 75) + Me.TextEdit3.Location = New System.Drawing.Point(110, 75) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(1195, 20) + Me.TextEdit3.Size = New System.Drawing.Size(1201, 20) Me.TextEdit3.StyleController = Me.LayoutControlProfile Me.TextEdit3.TabIndex = 6 ' 'txtAddedWho ' Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(116, 137) + Me.txtAddedWho.Location = New System.Drawing.Point(110, 139) Me.txtAddedWho.MenuManager = Me.RibbonControl1 Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Properties.ReadOnly = True - Me.txtAddedWho.Size = New System.Drawing.Size(540, 20) + Me.txtAddedWho.Size = New System.Drawing.Size(546, 20) Me.txtAddedWho.StyleController = Me.LayoutControlProfile Me.txtAddedWho.TabIndex = 7 ' 'txtAddedWhen ' Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True)) - Me.txtAddedWhen.Location = New System.Drawing.Point(767, 137) + Me.txtAddedWhen.Location = New System.Drawing.Point(761, 139) Me.txtAddedWhen.MenuManager = Me.RibbonControl1 Me.txtAddedWhen.Name = "txtAddedWhen" Me.txtAddedWhen.Properties.ReadOnly = True - Me.txtAddedWhen.Size = New System.Drawing.Size(544, 20) + Me.txtAddedWhen.Size = New System.Drawing.Size(550, 20) Me.txtAddedWhen.StyleController = Me.LayoutControlProfile Me.txtAddedWhen.TabIndex = 8 ' 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(116, 167) + Me.txtChangedWho.Location = New System.Drawing.Point(110, 169) Me.txtChangedWho.MenuManager = Me.RibbonControl1 Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(540, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(546, 20) Me.txtChangedWho.StyleController = Me.LayoutControlProfile Me.txtChangedWho.TabIndex = 9 ' 'txtChangedWhen ' Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen.Location = New System.Drawing.Point(767, 167) + Me.txtChangedWhen.Location = New System.Drawing.Point(761, 169) Me.txtChangedWhen.MenuManager = Me.RibbonControl1 Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(544, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(550, 20) Me.txtChangedWhen.StyleController = Me.LayoutControlProfile Me.txtChangedWhen.TabIndex = 10 ' @@ -379,19 +380,20 @@ Partial Class frmAdmin_CWProfile Me.CheckEdit1.MenuManager = Me.RibbonControl1 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Aktiv" - Me.CheckEdit1.Size = New System.Drawing.Size(645, 18) + Me.CheckEdit1.Size = New System.Drawing.Size(645, 20) Me.CheckEdit1.StyleController = Me.LayoutControlProfile Me.CheckEdit1.TabIndex = 11 ' 'TextEdit4 ' Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "REGEX_EXPRESSION", True)) - Me.TextEdit4.Location = New System.Drawing.Point(116, 105) + Me.TextEdit4.Location = New System.Drawing.Point(110, 105) Me.TextEdit4.MenuManager = Me.RibbonControl1 Me.TextEdit4.Name = "TextEdit4" + EditorButtonImageOptions1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.definednameuseinformula3 EditorButtonImageOptions1.SvgImageSize = New System.Drawing.Size(16, 16) - Me.TextEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Regex bearbeiten", -1, True, True, False, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", "BUTTON_REGEX_PROFILE", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) - Me.TextEdit4.Size = New System.Drawing.Size(1195, 22) + Me.TextEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Regex bearbeiten", 50, True, True, False, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", "BUTTON_REGEX_PROFILE", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + Me.TextEdit4.Size = New System.Drawing.Size(1201, 24) Me.TextEdit4.StyleController = Me.LayoutControlProfile Me.TextEdit4.TabIndex = 12 ' @@ -412,7 +414,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem2.Size = New System.Drawing.Size(1306, 30) Me.LayoutControlItem2.Text = "Profil" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem3 ' @@ -422,47 +424,47 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem3.Size = New System.Drawing.Size(1306, 30) Me.LayoutControlItem3.Text = "Kommentar" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem4 ' Me.LayoutControlItem4.Control = Me.txtAddedWho - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 122) + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 124) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem4.Size = New System.Drawing.Size(651, 30) Me.LayoutControlItem4.Text = "Erstellt Wer" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.txtChangedWho - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 152) + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 154) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem6.Size = New System.Drawing.Size(651, 80) + Me.LayoutControlItem6.Size = New System.Drawing.Size(651, 78) Me.LayoutControlItem6.Text = "Geändert Wer" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.txtAddedWhen - Me.LayoutControlItem5.Location = New System.Drawing.Point(651, 122) + Me.LayoutControlItem5.Location = New System.Drawing.Point(651, 124) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem5.Size = New System.Drawing.Size(655, 30) Me.LayoutControlItem5.Text = "Erstellt Wann" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.txtChangedWhen - Me.LayoutControlItem7.Location = New System.Drawing.Point(651, 152) + Me.LayoutControlItem7.Location = New System.Drawing.Point(651, 154) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem7.Size = New System.Drawing.Size(655, 80) + Me.LayoutControlItem7.Size = New System.Drawing.Size(655, 78) Me.LayoutControlItem7.Text = "Geändert Wann" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem9 ' @@ -470,9 +472,9 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 90) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem9.Size = New System.Drawing.Size(1306, 32) + Me.LayoutControlItem9.Size = New System.Drawing.Size(1306, 34) Me.LayoutControlItem9.Text = "Regular Expression" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem8 ' @@ -492,15 +494,15 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem1.Size = New System.Drawing.Size(651, 30) Me.LayoutControlItem1.Text = "GUID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(92, 13) ' 'XtraTabControl1 ' Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl1.Location = New System.Drawing.Point(0, 131) + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 132) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.PageProfile - Me.XtraTabControl1.Size = New System.Drawing.Size(1328, 545) + Me.XtraTabControl1.Size = New System.Drawing.Size(1328, 542) Me.XtraTabControl1.TabIndex = 5 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.PageProfile}) ' @@ -511,7 +513,7 @@ Partial Class frmAdmin_CWProfile Me.PageProfile.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.pagesetup1 Me.PageProfile.ImageOptions.SvgImageSize = New System.Drawing.Size(24, 24) Me.PageProfile.Name = "PageProfile" - Me.PageProfile.Size = New System.Drawing.Size(1326, 511) + Me.PageProfile.Size = New System.Drawing.Size(1326, 506) Me.PageProfile.Tag = "TAB_PAGE_PROFILE" Me.PageProfile.Text = "Profil-Verwaltung" ' @@ -521,7 +523,7 @@ Partial Class frmAdmin_CWProfile Me.XtraTabControl2.Location = New System.Drawing.Point(0, 252) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.PageDocumentSearch - Me.XtraTabControl2.Size = New System.Drawing.Size(1326, 259) + Me.XtraTabControl2.Size = New System.Drawing.Size(1326, 254) Me.XtraTabControl2.TabIndex = 3 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.PageDocumentSearch, Me.PageDataSearch, Me.PageApplicationAssignment}) ' @@ -532,7 +534,7 @@ Partial Class frmAdmin_CWProfile Me.PageDocumentSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.singlepageview Me.PageDocumentSearch.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.PageDocumentSearch.Name = "PageDocumentSearch" - Me.PageDocumentSearch.Size = New System.Drawing.Size(1324, 233) + Me.PageDocumentSearch.Size = New System.Drawing.Size(1324, 226) Me.PageDocumentSearch.Tag = "TAB_PAGE_DOCSEARCH" Me.PageDocumentSearch.Text = "Dokument-Suche" ' @@ -553,17 +555,17 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlDocSearch.Name = "LayoutControlDocSearch" Me.LayoutControlDocSearch.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1270, 407, 650, 400) Me.LayoutControlDocSearch.Root = Me.LayoutControlGroup1 - Me.LayoutControlDocSearch.Size = New System.Drawing.Size(1099, 233) + Me.LayoutControlDocSearch.Size = New System.Drawing.Size(1099, 226) Me.LayoutControlDocSearch.TabIndex = 1 Me.LayoutControlDocSearch.Text = "LayoutControl2" ' 'TextEdit5 ' Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "GUID", True)) - Me.TextEdit5.Location = New System.Drawing.Point(150, 15) + Me.TextEdit5.Location = New System.Drawing.Point(140, 15) Me.TextEdit5.MenuManager = Me.RibbonControl1 Me.TextEdit5.Name = "TextEdit5" - Me.TextEdit5.Size = New System.Drawing.Size(124, 20) + Me.TextEdit5.Size = New System.Drawing.Size(134, 20) Me.TextEdit5.StyleController = Me.LayoutControlDocSearch Me.TextEdit5.TabIndex = 4 ' @@ -575,98 +577,102 @@ Partial Class frmAdmin_CWProfile 'TextEdit6 ' Me.TextEdit6.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_TITLE", True)) - Me.TextEdit6.Location = New System.Drawing.Point(150, 45) + Me.TextEdit6.Location = New System.Drawing.Point(140, 45) Me.TextEdit6.MenuManager = Me.RibbonControl1 Me.TextEdit6.Name = "TextEdit6" - Me.TextEdit6.Size = New System.Drawing.Size(934, 20) + Me.TextEdit6.Size = New System.Drawing.Size(944, 20) Me.TextEdit6.StyleController = Me.LayoutControlDocSearch Me.TextEdit6.TabIndex = 5 ' 'CheckEdit2 ' Me.CheckEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ACTIVE", True)) - Me.CheckEdit2.Location = New System.Drawing.Point(689, 15) + Me.CheckEdit2.Location = New System.Drawing.Point(688, 15) Me.CheckEdit2.MenuManager = Me.RibbonControl1 Me.CheckEdit2.Name = "CheckEdit2" Me.CheckEdit2.Properties.Caption = "Aktiv" - Me.CheckEdit2.Size = New System.Drawing.Size(395, 18) + Me.CheckEdit2.Size = New System.Drawing.Size(396, 20) Me.CheckEdit2.StyleController = Me.LayoutControlDocSearch Me.CheckEdit2.TabIndex = 6 ' 'ComboBoxEdit1 ' Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_INDEX", True)) - Me.ComboBoxEdit1.Location = New System.Drawing.Point(419, 15) + Me.ComboBoxEdit1.Location = New System.Drawing.Point(409, 15) Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 Me.ComboBoxEdit1.Name = "ComboBoxEdit1" Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit1.Size = New System.Drawing.Size(260, 20) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(269, 20) Me.ComboBoxEdit1.StyleController = Me.LayoutControlDocSearch Me.ComboBoxEdit1.TabIndex = 7 ' 'TextEdit7 ' Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "SQL_COMMAND", True)) - Me.TextEdit7.Location = New System.Drawing.Point(150, 75) + Me.TextEdit7.Location = New System.Drawing.Point(140, 75) Me.TextEdit7.MenuManager = Me.RibbonControl1 Me.TextEdit7.Name = "TextEdit7" + EditorButtonImageOptions2.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.editdatasource + EditorButtonImageOptions2.SvgImageSize = New System.Drawing.Size(16, 16) SerializableAppearanceObject5.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) SerializableAppearanceObject5.Options.UseBackColor = True - Me.TextEdit7.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "SQL bearbeiten", -1, True, True, False, EditorButtonImageOptions2, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject5, SerializableAppearanceObject6, SerializableAppearanceObject7, SerializableAppearanceObject8, "", "BUTTON_SEARCH_SQL", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) - Me.TextEdit7.Size = New System.Drawing.Size(934, 22) + Me.TextEdit7.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", 50, True, True, False, EditorButtonImageOptions2, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject5, SerializableAppearanceObject6, SerializableAppearanceObject7, SerializableAppearanceObject8, "", "BUTTON_SEARCH_SQL", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + Me.TextEdit7.Size = New System.Drawing.Size(944, 24) Me.TextEdit7.StyleController = Me.LayoutControlDocSearch Me.TextEdit7.TabIndex = 8 ' 'TextEdit8 ' Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.TextEdit8.Location = New System.Drawing.Point(150, 107) + Me.TextEdit8.Location = New System.Drawing.Point(140, 109) Me.TextEdit8.MenuManager = Me.RibbonControl1 Me.TextEdit8.Name = "TextEdit8" + EditorButtonImageOptions3.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.editdatasource1 + EditorButtonImageOptions3.SvgImageSize = New System.Drawing.Size(16, 16) SerializableAppearanceObject9.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) SerializableAppearanceObject9.Options.UseBackColor = True - Me.TextEdit8.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "SQL bearbeiten", -1, True, True, False, EditorButtonImageOptions3, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject9, SerializableAppearanceObject10, SerializableAppearanceObject11, SerializableAppearanceObject12, "", "BUTTON_COUNT_SQL", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) - Me.TextEdit8.Size = New System.Drawing.Size(934, 22) + Me.TextEdit8.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "SQL bearbeiten", 50, True, True, False, EditorButtonImageOptions3, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject9, SerializableAppearanceObject10, SerializableAppearanceObject11, SerializableAppearanceObject12, "", "BUTTON_COUNT_SQL", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + Me.TextEdit8.Size = New System.Drawing.Size(944, 24) Me.TextEdit8.StyleController = Me.LayoutControlDocSearch Me.TextEdit8.TabIndex = 9 ' 'txtAddedWho1 ' Me.txtAddedWho1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho1.Location = New System.Drawing.Point(150, 139) + Me.txtAddedWho1.Location = New System.Drawing.Point(140, 143) Me.txtAddedWho1.Name = "txtAddedWho1" Me.txtAddedWho1.Properties.ReadOnly = True - Me.txtAddedWho1.Size = New System.Drawing.Size(393, 20) + Me.txtAddedWho1.Size = New System.Drawing.Size(403, 20) Me.txtAddedWho1.StyleController = Me.LayoutControlDocSearch Me.txtAddedWho1.TabIndex = 7 ' 'txtChangedWho1 ' Me.txtChangedWho1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHO", True)) - Me.txtChangedWho1.Location = New System.Drawing.Point(150, 169) + Me.txtChangedWho1.Location = New System.Drawing.Point(140, 173) Me.txtChangedWho1.Name = "txtChangedWho1" Me.txtChangedWho1.Properties.ReadOnly = True - Me.txtChangedWho1.Size = New System.Drawing.Size(393, 20) + Me.txtChangedWho1.Size = New System.Drawing.Size(403, 20) Me.txtChangedWho1.StyleController = Me.LayoutControlDocSearch Me.txtChangedWho1.TabIndex = 9 ' 'txtAddedWhen1 ' Me.txtAddedWhen1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHEN", True)) - Me.txtAddedWhen1.Location = New System.Drawing.Point(688, 139) + Me.txtAddedWhen1.Location = New System.Drawing.Point(678, 143) Me.txtAddedWhen1.Name = "txtAddedWhen1" Me.txtAddedWhen1.Properties.ReadOnly = True - Me.txtAddedWhen1.Size = New System.Drawing.Size(396, 20) + Me.txtAddedWhen1.Size = New System.Drawing.Size(406, 20) Me.txtAddedWhen1.StyleController = Me.LayoutControlDocSearch Me.txtAddedWhen1.TabIndex = 8 ' 'txtChangedWhen1 ' Me.txtChangedWhen1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen1.Location = New System.Drawing.Point(688, 169) + Me.txtChangedWhen1.Location = New System.Drawing.Point(678, 173) Me.txtChangedWhen1.Name = "txtChangedWhen1" Me.txtChangedWhen1.Properties.ReadOnly = True - Me.txtChangedWhen1.Size = New System.Drawing.Size(396, 20) + Me.txtChangedWhen1.Size = New System.Drawing.Size(406, 20) Me.txtChangedWhen1.StyleController = Me.LayoutControlDocSearch Me.txtChangedWhen1.TabIndex = 10 ' @@ -676,7 +682,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlGroup1.GroupBordersVisible = False Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlItem12, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem16, Me.LayoutControlItem17, Me.LayoutControlItem18, Me.LayoutControlItem19}) Me.LayoutControlGroup1.Name = "Root" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(1099, 233) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(1099, 226) Me.LayoutControlGroup1.TextVisible = False ' 'LayoutControlItem10 @@ -687,7 +693,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem10.Size = New System.Drawing.Size(269, 30) Me.LayoutControlItem10.Text = "GUID" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(132, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem11 ' @@ -697,7 +703,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem11.Size = New System.Drawing.Size(1079, 30) Me.LayoutControlItem11.Text = "Name" - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(132, 13) + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem13 ' @@ -705,17 +711,17 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem13.Location = New System.Drawing.Point(269, 0) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem13.Size = New System.Drawing.Size(405, 30) + Me.LayoutControlItem13.Size = New System.Drawing.Size(404, 30) Me.LayoutControlItem13.Text = "Reihenfolge" - Me.LayoutControlItem13.TextSize = New System.Drawing.Size(132, 13) + Me.LayoutControlItem13.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem12 ' Me.LayoutControlItem12.Control = Me.CheckEdit2 - Me.LayoutControlItem12.Location = New System.Drawing.Point(674, 0) + Me.LayoutControlItem12.Location = New System.Drawing.Point(673, 0) Me.LayoutControlItem12.Name = "LayoutControlItem12" Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem12.Size = New System.Drawing.Size(405, 30) + Me.LayoutControlItem12.Size = New System.Drawing.Size(406, 30) Me.LayoutControlItem12.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem12.TextVisible = False ' @@ -725,67 +731,67 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 60) Me.LayoutControlItem14.Name = "LayoutControlItem14" Me.LayoutControlItem14.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem14.Size = New System.Drawing.Size(1079, 32) + Me.LayoutControlItem14.Size = New System.Drawing.Size(1079, 34) Me.LayoutControlItem14.Text = "SQL für Suche" - Me.LayoutControlItem14.TextSize = New System.Drawing.Size(132, 13) + Me.LayoutControlItem14.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem15 ' Me.LayoutControlItem15.Control = Me.TextEdit8 - Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 92) + Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 94) Me.LayoutControlItem15.Name = "LayoutControlItem15" Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem15.Size = New System.Drawing.Size(1079, 32) + Me.LayoutControlItem15.Size = New System.Drawing.Size(1079, 34) Me.LayoutControlItem15.Text = "SQL für Ergebnis-Zählung" - Me.LayoutControlItem15.TextSize = New System.Drawing.Size(132, 13) + Me.LayoutControlItem15.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem16 ' Me.LayoutControlItem16.Control = Me.txtAddedWho1 Me.LayoutControlItem16.ControlAlignment = System.Drawing.ContentAlignment.TopLeft Me.LayoutControlItem16.CustomizationFormText = "Erstellt Wer" - Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 124) + Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 128) Me.LayoutControlItem16.Name = "LayoutControlItem16" Me.LayoutControlItem16.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem16.Size = New System.Drawing.Size(538, 30) Me.LayoutControlItem16.Text = "Erstellt Wer" - Me.LayoutControlItem16.TextSize = New System.Drawing.Size(132, 13) + Me.LayoutControlItem16.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem17 ' Me.LayoutControlItem17.Control = Me.txtChangedWho1 Me.LayoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft Me.LayoutControlItem17.CustomizationFormText = "Geändert Wer" - Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 154) + Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 158) Me.LayoutControlItem17.Name = "LayoutControlItem17" Me.LayoutControlItem17.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem17.Size = New System.Drawing.Size(538, 59) + Me.LayoutControlItem17.Size = New System.Drawing.Size(538, 48) Me.LayoutControlItem17.Text = "Geändert Wer" - Me.LayoutControlItem17.TextSize = New System.Drawing.Size(132, 13) + Me.LayoutControlItem17.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem18 ' Me.LayoutControlItem18.Control = Me.txtAddedWhen1 Me.LayoutControlItem18.ControlAlignment = System.Drawing.ContentAlignment.TopLeft Me.LayoutControlItem18.CustomizationFormText = "Erstellt Wann" - Me.LayoutControlItem18.Location = New System.Drawing.Point(538, 124) + Me.LayoutControlItem18.Location = New System.Drawing.Point(538, 128) Me.LayoutControlItem18.Name = "LayoutControlItem18" Me.LayoutControlItem18.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem18.Size = New System.Drawing.Size(541, 30) Me.LayoutControlItem18.Text = "Erstellt Wann" - Me.LayoutControlItem18.TextSize = New System.Drawing.Size(132, 13) + Me.LayoutControlItem18.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem19 ' Me.LayoutControlItem19.Control = Me.txtChangedWhen1 Me.LayoutControlItem19.ControlAlignment = System.Drawing.ContentAlignment.TopLeft Me.LayoutControlItem19.CustomizationFormText = "Geändert Wann" - Me.LayoutControlItem19.Location = New System.Drawing.Point(538, 154) + Me.LayoutControlItem19.Location = New System.Drawing.Point(538, 158) Me.LayoutControlItem19.Name = "LayoutControlItem19" Me.LayoutControlItem19.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem19.Size = New System.Drawing.Size(541, 59) + Me.LayoutControlItem19.Size = New System.Drawing.Size(541, 48) Me.LayoutControlItem19.Text = "Geändert Wann" - Me.LayoutControlItem19.TextSize = New System.Drawing.Size(132, 13) + Me.LayoutControlItem19.TextSize = New System.Drawing.Size(122, 13) ' 'GridControl2 ' @@ -795,7 +801,7 @@ Partial Class frmAdmin_CWProfile Me.GridControl2.MainView = Me.GridViewDocSearch Me.GridControl2.MenuManager = Me.RibbonControl1 Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(225, 233) + Me.GridControl2.Size = New System.Drawing.Size(225, 226) Me.GridControl2.TabIndex = 2 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch}) ' @@ -819,7 +825,7 @@ Partial Class frmAdmin_CWProfile Me.PageDataSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_database Me.PageDataSearch.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.PageDataSearch.Name = "PageDataSearch" - Me.PageDataSearch.Size = New System.Drawing.Size(1324, 233) + Me.PageDataSearch.Size = New System.Drawing.Size(1324, 226) Me.PageDataSearch.Text = "Daten-Suchen" ' 'LayoutControlDataSearch @@ -828,7 +834,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlDataSearch.Location = New System.Drawing.Point(225, 0) Me.LayoutControlDataSearch.Name = "LayoutControlDataSearch" Me.LayoutControlDataSearch.Root = Me.LayoutControlGroup2 - Me.LayoutControlDataSearch.Size = New System.Drawing.Size(1099, 233) + Me.LayoutControlDataSearch.Size = New System.Drawing.Size(1099, 226) Me.LayoutControlDataSearch.TabIndex = 1 Me.LayoutControlDataSearch.Text = "LayoutControl1" ' @@ -837,7 +843,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutControlGroup2.GroupBordersVisible = False Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(1099, 233) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(1099, 226) Me.LayoutControlGroup2.TextVisible = False ' 'GridControl1 @@ -848,7 +854,7 @@ Partial Class frmAdmin_CWProfile Me.GridControl1.MainView = Me.GridViewDataSearch Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(225, 233) + Me.GridControl1.Size = New System.Drawing.Size(225, 226) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDataSearch}) ' @@ -875,7 +881,7 @@ Partial Class frmAdmin_CWProfile Me.PageApplicationAssignment.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.windows Me.PageApplicationAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.PageApplicationAssignment.Name = "PageApplicationAssignment" - Me.PageApplicationAssignment.Size = New System.Drawing.Size(1324, 233) + Me.PageApplicationAssignment.Size = New System.Drawing.Size(1324, 226) Me.PageApplicationAssignment.Text = "Anwendungs-Zuordnung" ' 'TBCW_PROF_DOC_SEARCHTableAdapter diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb index a26b9a25..1cb87d3d 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb @@ -115,6 +115,8 @@ Public Class frmAdmin_CWProfile labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always End Sub + + Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData If Pages.CurrentPage Is Nothing Then Return False @@ -167,6 +169,19 @@ Public Class frmAdmin_CWProfile Throw New NotImplementedException() End Function + Public Function AddData() As Boolean + If Pages.CurrentPage Is Nothing Then + Return False + End If + + Dim oPage = Pages.CurrentPage + + oPage.DataTable.Columns.Item("PROFILE_ID").DefaultValue = PrimaryKey + Dim oNewRecord As DataRowView = oPage.BindingSource.AddNew() + + Return True + End Function + Private Sub TextEdit4_ButtonClick(sender As Object, e As DevExpress.XtraEditors.Controls.ButtonPressedEventArgs) Handles TextEdit4.ButtonClick Dim oTextEdit As TextEdit = sender @@ -205,4 +220,8 @@ Public Class frmAdmin_CWProfile End If End If End Sub + + Private Sub BarButtonNew_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonNew.ItemClick + AddData() + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/DBCW_Stammdaten.xss b/GUIs.ZooFlow/DBCW_Stammdaten.xss index aa57a081..bc0a1bec 100644 --- a/GUIs.ZooFlow/DBCW_Stammdaten.xss +++ b/GUIs.ZooFlow/DBCW_Stammdaten.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index f4e8a4a7..becd271f 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -630,6 +630,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property definednameuseinformula3() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("definednameuseinformula3", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -750,6 +760,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property editdatasource() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("editdatasource", 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 editdatasource1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("editdatasource1", 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 ee5b013b..d0a84b98 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -136,14 +136,14 @@ ..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -154,9 +154,6 @@ ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\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 @@ -166,18 +163,24 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save4.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_addcircled4.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\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -187,8 +190,8 @@ ..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,6 +205,9 @@ ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -211,54 +217,51 @@ ..\Resources\markcomplete1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editdatasource.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 ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext.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 + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_addcircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -280,14 +283,20 @@ ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\insertsheet.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -304,29 +313,32 @@ ..\Resources\about3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\del3.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 + + ..\Resources\actions_deletecircled2.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\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo.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 ..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -346,23 +358,23 @@ ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\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\actions_check2.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 ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -370,8 +382,8 @@ ..\Resources\crossdatasourcefiltering.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\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -382,8 +394,8 @@ ..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -400,16 +412,13 @@ ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\StatusAnnotations_Stop_16xLG_color.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\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula3.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/definednameuseinformula3.svg b/GUIs.ZooFlow/Resources/definednameuseinformula3.svg new file mode 100644 index 00000000..0d27a20b --- /dev/null +++ b/GUIs.ZooFlow/Resources/definednameuseinformula3.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/editdatasource.svg b/GUIs.ZooFlow/Resources/editdatasource.svg new file mode 100644 index 00000000..6e46621c --- /dev/null +++ b/GUIs.ZooFlow/Resources/editdatasource.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/editdatasource1.svg b/GUIs.ZooFlow/Resources/editdatasource1.svg new file mode 100644 index 00000000..6e46621c --- /dev/null +++ b/GUIs.ZooFlow/Resources/editdatasource1.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 02b53cc3..f639044d 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -793,6 +793,15 @@ + + + + + + + + +