diff --git a/GUIs.ZooFlow/Administration/ClassDetailPage.vb b/GUIs.ZooFlow/Administration/ClassDetailPage.vb new file mode 100644 index 00000000..55e472bf --- /dev/null +++ b/GUIs.ZooFlow/Administration/ClassDetailPage.vb @@ -0,0 +1,92 @@ +Imports DevExpress.XtraEditors +Imports DevExpress.XtraLayout +Imports DevExpress.XtraTab + +Public Class ClassDetailPages + Public Items As New Dictionary(Of String, DetailPage) + Public CurrentPage As DetailPage + + Public Event AnyControl_Focus As EventHandler(Of DetailPageEventArgs) + Public Event AnyControl_Changed As EventHandler(Of DetailPageEventArgs) + + Public Class DetailPageEventArgs + Public Property Page As DetailPage + End Class + + Public Class DetailPage + Public IsPrimary As Boolean = False + Public TabPage As XtraTabPage + Public Name As String + Public BindingSource As BindingSource + Public DataTable As DataTable + Public AddedWhoEdit As TextEdit + Public ChangedWhoEdit As TextEdit + End Class + + Public Sub New(LayoutControls As List(Of LayoutControl)) + For Each oLayoutControl In LayoutControls + 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 + Next + Next + End Sub + + Public Sub Add(Page As DetailPage) + Items.Add(Page.TabPage.Name, Page) + End Sub + + Public Sub AddRange(ParamArray Pages As DetailPage()) + For Each oPage In Pages + Add(oPage) + Next + End Sub + + Private Sub Handle_Focus(sender As BaseEdit, e As EventArgs) + Dim oControl As BaseEdit = sender + + ' Get the Layout Control containing the Edit Contol + If TypeOf oControl.Parent Is LayoutControl Then + Dim oLayoutControl As LayoutControl = oControl.Parent + + ' Get the TabPage containing the Layout Control + If TypeOf oLayoutControl.Parent Is XtraTabPage Then + Dim oTabPage As XtraTabPage = oLayoutControl.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(oControl, oData) + Else + CurrentPage = Nothing + RaiseEvent AnyControl_Focus(oControl, Nothing) + End If + End If + End If + End Sub + + Private Sub Handle_EditValueChanged(sender As BaseEdit, e As EventArgs) + Dim oControl As BaseEdit = sender + + ' Get the Layout Control containing the Edit Contol + If TypeOf oControl.Parent Is LayoutControl Then + Dim oLayoutControl As LayoutControl = oControl.Parent + + ' Get the TabPage containing the Layout Control + If TypeOf oLayoutControl.Parent Is XtraTabPage Then + Dim oTabPage As XtraTabPage = oLayoutControl.Parent + + If Items.ContainsKey(oTabPage.Name) Then + Dim oData As New DetailPageEventArgs With {.Page = Items.Item(oTabPage.Name)} + RaiseEvent AnyControl_Changed(oControl, oData) + Else + RaiseEvent AnyControl_Changed(oControl, Nothing) + End If + End If + End If + End Sub +End Class + + diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb index 09e9a42a..c599da96 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb @@ -39,11 +39,11 @@ Partial Class frmAdmin_CWProfile Dim SerializableAppearanceObject11 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Dim SerializableAppearanceObject12 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonSave = New DevExpress.XtraBars.BarButtonItem() Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() Me.labelError = New DevExpress.XtraBars.BarStaticItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonNew = 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() @@ -52,7 +52,7 @@ Partial Class frmAdmin_CWProfile Me.TBCW_PROFILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBCW_PROFILESTableAdapter = New DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TBCW_PROFILESTableAdapter() Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TableAdapterManager() - Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.LayoutControlProfile = New DevExpress.XtraLayout.LayoutControl() Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() @@ -76,7 +76,7 @@ Partial Class frmAdmin_CWProfile Me.PageProfile = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl() Me.PageDocumentSearch = New DevExpress.XtraTab.XtraTabPage() - Me.LayoutControl2 = New DevExpress.XtraLayout.LayoutControl() + Me.LayoutControlDocSearch = New DevExpress.XtraLayout.LayoutControl() Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit() Me.TBCW_PROF_DOC_SEARCHBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TextEdit6 = New DevExpress.XtraEditors.TextEdit() @@ -103,6 +103,8 @@ Partial Class frmAdmin_CWProfile Me.GridViewDocSearch = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colTAB_TITLE1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.PageDataSearch = New DevExpress.XtraTab.XtraTabPage() + Me.LayoutControlDataSearch = New DevExpress.XtraLayout.LayoutControl() + Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.TBCW_PROF_DATA_SEARCHBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridViewDataSearch = New DevExpress.XtraGrid.Views.Grid.GridView() @@ -113,8 +115,8 @@ Partial Class frmAdmin_CWProfile CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.LayoutControl1.SuspendLayout() + CType(Me.LayoutControlProfile, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControlProfile.SuspendLayout() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -140,8 +142,8 @@ Partial Class frmAdmin_CWProfile CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl2.SuspendLayout() Me.PageDocumentSearch.SuspendLayout() - CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).BeginInit() - Me.LayoutControl2.SuspendLayout() + CType(Me.LayoutControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControlDocSearch.SuspendLayout() CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROF_DOC_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -167,6 +169,8 @@ Partial Class frmAdmin_CWProfile CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.PageDataSearch.SuspendLayout() + CType(Me.LayoutControlDataSearch, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROF_DATA_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewDataSearch, System.ComponentModel.ISupportInitialize).BeginInit() @@ -174,33 +178,25 @@ Partial Class frmAdmin_CWProfile ' 'RibbonControl1 ' - 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.BarButtonItem3}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonSave, Me.labelStatus, Me.labelError, Me.BarButtonItem3, Me.BarButtonNew}) 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] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1328, 66) + Me.RibbonControl1.Size = New System.Drawing.Size(1328, 131) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' - 'BarButtonItem1 + 'BarButtonSave ' - Me.BarButtonItem1.Caption = "Speichern und Schließen" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_check2 - Me.BarButtonItem1.Name = "BarButtonItem1" - ' - 'BarButtonItem2 - ' - Me.BarButtonItem2.Caption = "Speichern" - Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.save2 - Me.BarButtonItem2.Name = "BarButtonItem2" + Me.BarButtonSave.Caption = "Speichern" + Me.BarButtonSave.Id = 2 + Me.BarButtonSave.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.save2 + Me.BarButtonSave.Name = "BarButtonSave" ' 'labelStatus ' @@ -225,6 +221,13 @@ Partial Class frmAdmin_CWProfile Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_deletecircled6 Me.BarButtonItem3.Name = "BarButtonItem3" ' + 'BarButtonNew + ' + Me.BarButtonNew.Caption = "Neu" + Me.BarButtonNew.Id = 6 + Me.BarButtonNew.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_add1 + Me.BarButtonNew.Name = "BarButtonNew" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -233,11 +236,11 @@ Partial Class frmAdmin_CWProfile ' 'RibbonPageGroup1 ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonNew) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonSave) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Daten" ' 'RibbonStatusBar1 ' @@ -275,25 +278,25 @@ Partial Class frmAdmin_CWProfile Me.TableAdapterManager.TBCW_PROFILESTableAdapter = Me.TBCW_PROFILESTableAdapter Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' - 'LayoutControl1 + 'LayoutControlProfile ' - Me.LayoutControl1.Controls.Add(Me.TextEdit1) - Me.LayoutControl1.Controls.Add(Me.TextEdit2) - Me.LayoutControl1.Controls.Add(Me.TextEdit3) - Me.LayoutControl1.Controls.Add(Me.txtAddedWho) - Me.LayoutControl1.Controls.Add(Me.txtAddedWhen) - Me.LayoutControl1.Controls.Add(Me.txtChangedWho) - Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) - Me.LayoutControl1.Controls.Add(Me.CheckEdit1) - Me.LayoutControl1.Controls.Add(Me.TextEdit4) - Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Top - Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) - Me.LayoutControl1.Name = "LayoutControl1" - Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(848, 159, 650, 400) - Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(1326, 252) - Me.LayoutControl1.TabIndex = 2 - Me.LayoutControl1.Text = "LayoutControl1" + Me.LayoutControlProfile.Controls.Add(Me.TextEdit1) + Me.LayoutControlProfile.Controls.Add(Me.TextEdit2) + Me.LayoutControlProfile.Controls.Add(Me.TextEdit3) + Me.LayoutControlProfile.Controls.Add(Me.txtAddedWho) + Me.LayoutControlProfile.Controls.Add(Me.txtAddedWhen) + Me.LayoutControlProfile.Controls.Add(Me.txtChangedWho) + Me.LayoutControlProfile.Controls.Add(Me.txtChangedWhen) + Me.LayoutControlProfile.Controls.Add(Me.CheckEdit1) + Me.LayoutControlProfile.Controls.Add(Me.TextEdit4) + Me.LayoutControlProfile.Dock = System.Windows.Forms.DockStyle.Top + Me.LayoutControlProfile.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlProfile.Name = "LayoutControlProfile" + Me.LayoutControlProfile.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(848, 159, 650, 400) + Me.LayoutControlProfile.Root = Me.Root + Me.LayoutControlProfile.Size = New System.Drawing.Size(1326, 252) + Me.LayoutControlProfile.TabIndex = 2 + Me.LayoutControlProfile.Text = "LayoutControl1" ' 'TextEdit1 ' @@ -302,7 +305,7 @@ Partial Class frmAdmin_CWProfile Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Size = New System.Drawing.Size(540, 20) - Me.TextEdit1.StyleController = Me.LayoutControl1 + Me.TextEdit1.StyleController = Me.LayoutControlProfile Me.TextEdit1.TabIndex = 4 ' 'TextEdit2 @@ -312,7 +315,7 @@ Partial Class frmAdmin_CWProfile Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" Me.TextEdit2.Size = New System.Drawing.Size(1195, 20) - Me.TextEdit2.StyleController = Me.LayoutControl1 + Me.TextEdit2.StyleController = Me.LayoutControlProfile Me.TextEdit2.TabIndex = 5 ' 'TextEdit3 @@ -322,7 +325,7 @@ Partial Class frmAdmin_CWProfile Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" Me.TextEdit3.Size = New System.Drawing.Size(1195, 20) - Me.TextEdit3.StyleController = Me.LayoutControl1 + Me.TextEdit3.StyleController = Me.LayoutControlProfile Me.TextEdit3.TabIndex = 6 ' 'txtAddedWho @@ -333,7 +336,7 @@ Partial Class frmAdmin_CWProfile Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Properties.ReadOnly = True Me.txtAddedWho.Size = New System.Drawing.Size(540, 20) - Me.txtAddedWho.StyleController = Me.LayoutControl1 + Me.txtAddedWho.StyleController = Me.LayoutControlProfile Me.txtAddedWho.TabIndex = 7 ' 'txtAddedWhen @@ -344,7 +347,7 @@ Partial Class frmAdmin_CWProfile Me.txtAddedWhen.Name = "txtAddedWhen" Me.txtAddedWhen.Properties.ReadOnly = True Me.txtAddedWhen.Size = New System.Drawing.Size(544, 20) - Me.txtAddedWhen.StyleController = Me.LayoutControl1 + Me.txtAddedWhen.StyleController = Me.LayoutControlProfile Me.txtAddedWhen.TabIndex = 8 ' 'txtChangedWho @@ -355,7 +358,7 @@ Partial Class frmAdmin_CWProfile Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.ReadOnly = True Me.txtChangedWho.Size = New System.Drawing.Size(540, 20) - Me.txtChangedWho.StyleController = Me.LayoutControl1 + Me.txtChangedWho.StyleController = Me.LayoutControlProfile Me.txtChangedWho.TabIndex = 9 ' 'txtChangedWhen @@ -366,7 +369,7 @@ Partial Class frmAdmin_CWProfile Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.ReadOnly = True Me.txtChangedWhen.Size = New System.Drawing.Size(544, 20) - Me.txtChangedWhen.StyleController = Me.LayoutControl1 + Me.txtChangedWhen.StyleController = Me.LayoutControlProfile Me.txtChangedWhen.TabIndex = 10 ' 'CheckEdit1 @@ -377,7 +380,7 @@ Partial Class frmAdmin_CWProfile Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Aktiv" Me.CheckEdit1.Size = New System.Drawing.Size(645, 18) - Me.CheckEdit1.StyleController = Me.LayoutControl1 + Me.CheckEdit1.StyleController = Me.LayoutControlProfile Me.CheckEdit1.TabIndex = 11 ' 'TextEdit4 @@ -389,7 +392,7 @@ Partial Class frmAdmin_CWProfile 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.StyleController = Me.LayoutControl1 + Me.TextEdit4.StyleController = Me.LayoutControlProfile Me.TextEdit4.TabIndex = 12 ' 'Root @@ -494,21 +497,21 @@ Partial Class frmAdmin_CWProfile 'XtraTabControl1 ' Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl1.Location = New System.Drawing.Point(0, 66) + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 131) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.PageProfile - Me.XtraTabControl1.Size = New System.Drawing.Size(1328, 610) + Me.XtraTabControl1.Size = New System.Drawing.Size(1328, 545) Me.XtraTabControl1.TabIndex = 5 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.PageProfile}) ' 'PageProfile ' Me.PageProfile.Controls.Add(Me.XtraTabControl2) - Me.PageProfile.Controls.Add(Me.LayoutControl1) + Me.PageProfile.Controls.Add(Me.LayoutControlProfile) 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, 576) + Me.PageProfile.Size = New System.Drawing.Size(1326, 511) Me.PageProfile.Tag = "TAB_PAGE_PROFILE" Me.PageProfile.Text = "Profil-Verwaltung" ' @@ -518,41 +521,41 @@ 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, 324) + Me.XtraTabControl2.Size = New System.Drawing.Size(1326, 259) Me.XtraTabControl2.TabIndex = 3 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.PageDocumentSearch, Me.PageDataSearch, Me.PageApplicationAssignment}) ' 'PageDocumentSearch ' - Me.PageDocumentSearch.Controls.Add(Me.LayoutControl2) + Me.PageDocumentSearch.Controls.Add(Me.LayoutControlDocSearch) Me.PageDocumentSearch.Controls.Add(Me.GridControl2) 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, 298) + Me.PageDocumentSearch.Size = New System.Drawing.Size(1324, 233) Me.PageDocumentSearch.Tag = "TAB_PAGE_DOCSEARCH" Me.PageDocumentSearch.Text = "Dokument-Suche" ' - 'LayoutControl2 + 'LayoutControlDocSearch ' - Me.LayoutControl2.Controls.Add(Me.TextEdit5) - Me.LayoutControl2.Controls.Add(Me.TextEdit6) - Me.LayoutControl2.Controls.Add(Me.CheckEdit2) - Me.LayoutControl2.Controls.Add(Me.ComboBoxEdit1) - Me.LayoutControl2.Controls.Add(Me.TextEdit7) - Me.LayoutControl2.Controls.Add(Me.TextEdit8) - Me.LayoutControl2.Controls.Add(Me.txtAddedWho1) - Me.LayoutControl2.Controls.Add(Me.txtChangedWho1) - Me.LayoutControl2.Controls.Add(Me.txtAddedWhen1) - Me.LayoutControl2.Controls.Add(Me.txtChangedWhen1) - Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl2.Location = New System.Drawing.Point(225, 0) - Me.LayoutControl2.Name = "LayoutControl2" - Me.LayoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1270, 407, 650, 400) - Me.LayoutControl2.Root = Me.LayoutControlGroup1 - Me.LayoutControl2.Size = New System.Drawing.Size(1099, 298) - Me.LayoutControl2.TabIndex = 1 - Me.LayoutControl2.Text = "LayoutControl2" + Me.LayoutControlDocSearch.Controls.Add(Me.TextEdit5) + Me.LayoutControlDocSearch.Controls.Add(Me.TextEdit6) + Me.LayoutControlDocSearch.Controls.Add(Me.CheckEdit2) + Me.LayoutControlDocSearch.Controls.Add(Me.ComboBoxEdit1) + Me.LayoutControlDocSearch.Controls.Add(Me.TextEdit7) + Me.LayoutControlDocSearch.Controls.Add(Me.TextEdit8) + Me.LayoutControlDocSearch.Controls.Add(Me.txtAddedWho1) + Me.LayoutControlDocSearch.Controls.Add(Me.txtChangedWho1) + Me.LayoutControlDocSearch.Controls.Add(Me.txtAddedWhen1) + Me.LayoutControlDocSearch.Controls.Add(Me.txtChangedWhen1) + Me.LayoutControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControlDocSearch.Location = New System.Drawing.Point(225, 0) + 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.TabIndex = 1 + Me.LayoutControlDocSearch.Text = "LayoutControl2" ' 'TextEdit5 ' @@ -561,7 +564,7 @@ Partial Class frmAdmin_CWProfile Me.TextEdit5.MenuManager = Me.RibbonControl1 Me.TextEdit5.Name = "TextEdit5" Me.TextEdit5.Size = New System.Drawing.Size(124, 20) - Me.TextEdit5.StyleController = Me.LayoutControl2 + Me.TextEdit5.StyleController = Me.LayoutControlDocSearch Me.TextEdit5.TabIndex = 4 ' 'TBCW_PROF_DOC_SEARCHBindingSource @@ -576,7 +579,7 @@ Partial Class frmAdmin_CWProfile Me.TextEdit6.MenuManager = Me.RibbonControl1 Me.TextEdit6.Name = "TextEdit6" Me.TextEdit6.Size = New System.Drawing.Size(934, 20) - Me.TextEdit6.StyleController = Me.LayoutControl2 + Me.TextEdit6.StyleController = Me.LayoutControlDocSearch Me.TextEdit6.TabIndex = 5 ' 'CheckEdit2 @@ -585,9 +588,9 @@ Partial Class frmAdmin_CWProfile Me.CheckEdit2.Location = New System.Drawing.Point(689, 15) Me.CheckEdit2.MenuManager = Me.RibbonControl1 Me.CheckEdit2.Name = "CheckEdit2" - Me.CheckEdit2.Properties.Caption = "CheckEdit2" + Me.CheckEdit2.Properties.Caption = "Aktiv" Me.CheckEdit2.Size = New System.Drawing.Size(395, 18) - Me.CheckEdit2.StyleController = Me.LayoutControl2 + Me.CheckEdit2.StyleController = Me.LayoutControlDocSearch Me.CheckEdit2.TabIndex = 6 ' 'ComboBoxEdit1 @@ -598,7 +601,7 @@ Partial Class frmAdmin_CWProfile 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.StyleController = Me.LayoutControl2 + Me.ComboBoxEdit1.StyleController = Me.LayoutControlDocSearch Me.ComboBoxEdit1.TabIndex = 7 ' 'TextEdit7 @@ -607,10 +610,11 @@ Partial Class frmAdmin_CWProfile Me.TextEdit7.Location = New System.Drawing.Point(150, 75) Me.TextEdit7.MenuManager = Me.RibbonControl1 Me.TextEdit7.Name = "TextEdit7" + 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.Properties.ReadOnly = True Me.TextEdit7.Size = New System.Drawing.Size(934, 22) - Me.TextEdit7.StyleController = Me.LayoutControl2 + Me.TextEdit7.StyleController = Me.LayoutControlDocSearch Me.TextEdit7.TabIndex = 8 ' 'TextEdit8 @@ -619,9 +623,11 @@ Partial Class frmAdmin_CWProfile Me.TextEdit8.Location = New System.Drawing.Point(150, 107) Me.TextEdit8.MenuManager = Me.RibbonControl1 Me.TextEdit8.Name = "TextEdit8" + 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.StyleController = Me.LayoutControl2 + Me.TextEdit8.StyleController = Me.LayoutControlDocSearch Me.TextEdit8.TabIndex = 9 ' 'txtAddedWho1 @@ -631,7 +637,7 @@ Partial Class frmAdmin_CWProfile Me.txtAddedWho1.Name = "txtAddedWho1" Me.txtAddedWho1.Properties.ReadOnly = True Me.txtAddedWho1.Size = New System.Drawing.Size(393, 20) - Me.txtAddedWho1.StyleController = Me.LayoutControl2 + Me.txtAddedWho1.StyleController = Me.LayoutControlDocSearch Me.txtAddedWho1.TabIndex = 7 ' 'txtChangedWho1 @@ -641,7 +647,7 @@ Partial Class frmAdmin_CWProfile Me.txtChangedWho1.Name = "txtChangedWho1" Me.txtChangedWho1.Properties.ReadOnly = True Me.txtChangedWho1.Size = New System.Drawing.Size(393, 20) - Me.txtChangedWho1.StyleController = Me.LayoutControl2 + Me.txtChangedWho1.StyleController = Me.LayoutControlDocSearch Me.txtChangedWho1.TabIndex = 9 ' 'txtAddedWhen1 @@ -651,7 +657,7 @@ Partial Class frmAdmin_CWProfile Me.txtAddedWhen1.Name = "txtAddedWhen1" Me.txtAddedWhen1.Properties.ReadOnly = True Me.txtAddedWhen1.Size = New System.Drawing.Size(396, 20) - Me.txtAddedWhen1.StyleController = Me.LayoutControl2 + Me.txtAddedWhen1.StyleController = Me.LayoutControlDocSearch Me.txtAddedWhen1.TabIndex = 8 ' 'txtChangedWhen1 @@ -661,7 +667,7 @@ Partial Class frmAdmin_CWProfile Me.txtChangedWhen1.Name = "txtChangedWhen1" Me.txtChangedWhen1.Properties.ReadOnly = True Me.txtChangedWhen1.Size = New System.Drawing.Size(396, 20) - Me.txtChangedWhen1.StyleController = Me.LayoutControl2 + Me.txtChangedWhen1.StyleController = Me.LayoutControlDocSearch Me.txtChangedWhen1.TabIndex = 10 ' 'LayoutControlGroup1 @@ -670,7 +676,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, 298) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(1099, 233) Me.LayoutControlGroup1.TextVisible = False ' 'LayoutControlItem10 @@ -680,6 +686,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem10.Name = "LayoutControlItem10" 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) ' 'LayoutControlItem11 @@ -689,6 +696,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem11.Name = "LayoutControlItem11" 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) ' 'LayoutControlItem13 @@ -698,6 +706,7 @@ Partial Class frmAdmin_CWProfile 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.Text = "Reihenfolge" Me.LayoutControlItem13.TextSize = New System.Drawing.Size(132, 13) ' 'LayoutControlItem12 @@ -750,7 +759,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 154) Me.LayoutControlItem17.Name = "LayoutControlItem17" Me.LayoutControlItem17.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem17.Size = New System.Drawing.Size(538, 124) + Me.LayoutControlItem17.Size = New System.Drawing.Size(538, 59) Me.LayoutControlItem17.Text = "Geändert Wer" Me.LayoutControlItem17.TextSize = New System.Drawing.Size(132, 13) ' @@ -774,7 +783,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem19.Location = New System.Drawing.Point(538, 154) Me.LayoutControlItem19.Name = "LayoutControlItem19" Me.LayoutControlItem19.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem19.Size = New System.Drawing.Size(541, 124) + Me.LayoutControlItem19.Size = New System.Drawing.Size(541, 59) Me.LayoutControlItem19.Text = "Geändert Wann" Me.LayoutControlItem19.TextSize = New System.Drawing.Size(132, 13) ' @@ -786,7 +795,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, 298) + Me.GridControl2.Size = New System.Drawing.Size(225, 233) Me.GridControl2.TabIndex = 2 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch}) ' @@ -805,13 +814,32 @@ Partial Class frmAdmin_CWProfile ' 'PageDataSearch ' + Me.PageDataSearch.Controls.Add(Me.LayoutControlDataSearch) Me.PageDataSearch.Controls.Add(Me.GridControl1) 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, 298) + Me.PageDataSearch.Size = New System.Drawing.Size(1324, 233) Me.PageDataSearch.Text = "Daten-Suchen" ' + 'LayoutControlDataSearch + ' + Me.LayoutControlDataSearch.Dock = System.Windows.Forms.DockStyle.Fill + 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.TabIndex = 1 + Me.LayoutControlDataSearch.Text = "LayoutControl1" + ' + 'LayoutControlGroup2 + ' + 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.TextVisible = False + ' 'GridControl1 ' Me.GridControl1.DataSource = Me.TBCW_PROF_DATA_SEARCHBindingSource @@ -820,7 +848,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, 298) + Me.GridControl1.Size = New System.Drawing.Size(225, 233) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDataSearch}) ' @@ -847,7 +875,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, 298) + Me.PageApplicationAssignment.Size = New System.Drawing.Size(1324, 233) Me.PageApplicationAssignment.Text = "Anwendungs-Zuordnung" ' 'TBCW_PROF_DOC_SEARCHTableAdapter @@ -873,8 +901,8 @@ Partial Class frmAdmin_CWProfile CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.LayoutControl1.ResumeLayout(False) + CType(Me.LayoutControlProfile, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControlProfile.ResumeLayout(False) CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -900,8 +928,8 @@ Partial Class frmAdmin_CWProfile CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl2.ResumeLayout(False) Me.PageDocumentSearch.ResumeLayout(False) - CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).EndInit() - Me.LayoutControl2.ResumeLayout(False) + CType(Me.LayoutControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControlDocSearch.ResumeLayout(False) CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROF_DOC_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -927,6 +955,8 @@ Partial Class frmAdmin_CWProfile CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewDocSearch, System.ComponentModel.ISupportInitialize).EndInit() Me.PageDataSearch.ResumeLayout(False) + CType(Me.LayoutControlDataSearch, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROF_DATA_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewDataSearch, System.ComponentModel.ISupportInitialize).EndInit() @@ -944,9 +974,8 @@ Partial Class frmAdmin_CWProfile Friend WithEvents TBCW_PROFILESBindingSource As BindingSource Friend WithEvents TBCW_PROFILESTableAdapter As DBCW_StammdatenTableAdapters.TBCW_PROFILESTableAdapter Friend WithEvents TableAdapterManager As DBCW_StammdatenTableAdapters.TableAdapterManager - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents BarButtonSave As DevExpress.XtraBars.BarButtonItem + Friend WithEvents LayoutControlProfile As DevExpress.XtraLayout.LayoutControl Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem @@ -975,7 +1004,7 @@ Partial Class frmAdmin_CWProfile Friend WithEvents PageDataSearch As DevExpress.XtraTab.XtraTabPage Friend WithEvents PageApplicationAssignment As DevExpress.XtraTab.XtraTabPage Friend WithEvents TextEdit4 As DevExpress.XtraEditors.ButtonEdit - Friend WithEvents LayoutControl2 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents LayoutControlDocSearch As DevExpress.XtraLayout.LayoutControl Friend WithEvents TextEdit5 As DevExpress.XtraEditors.TextEdit Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem @@ -1007,4 +1036,7 @@ Partial Class frmAdmin_CWProfile Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl Friend WithEvents GridViewDocSearch As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents colTAB_TITLE1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents LayoutControlDataSearch As DevExpress.XtraLayout.LayoutControl + Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents BarButtonNew As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb index 664a9d89..a26b9a25 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb @@ -1,4 +1,5 @@ -Imports DevExpress.XtraEditors +Imports System.ComponentModel +Imports DevExpress.XtraEditors Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraLayout Imports DevExpress.XtraTab @@ -22,7 +23,7 @@ Public Class frmAdmin_CWProfile Private Const TAB_PAGE_DOCSEARCH = "TAB_PAGE_DOCSEARCH" Private Const TAB_PAGE_DATASEARCH = "TAB_PAGE_DATASEARCH" - Private Current_Page As String + Private Pages As ClassDetailPages Public Sub New(PrimaryKey As Integer) ' Dieser Aufruf ist für den Designer erforderlich. @@ -34,30 +35,6 @@ Public Class frmAdmin_CWProfile Me.IsInsert = IsInsert End Sub - Private Sub Any_EditValueChanged(sender As BaseEdit, e As EventArgs) - Dim oControl As BaseEdit = sender - - If TypeOf oControl.Parent Is LayoutControl Then - Dim oLayoutControl As LayoutControl = oControl.Parent - - If TypeOf oLayoutControl.Parent Is XtraTabPage Then - Dim oTabControl As XtraTabPage = oLayoutControl.Parent - Dim oTag As String = oTabControl.Tag - - Select Case oTag - Case TAB_PAGE_DOCSEARCH - Current_Page = TAB_PAGE_DOCSEARCH - - Case TAB_PAGE_PROFILE - Current_Page = TAB_PAGE_DOCSEARCH - - Case Else - Current_Page = Nothing - End Select - End If - End If - End Sub - Private Sub frmAdmin_CWProfile_Load(sender As Object, e As EventArgs) Handles Me.Load Try TBCW_PROFILESTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString @@ -69,21 +46,66 @@ Public Class frmAdmin_CWProfile TBCW_PROF_DATA_SEARCHTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString TBCW_PROF_DATA_SEARCHTableAdapter.Fill(DBCW_Stammdaten.TBCW_PROF_DATA_SEARCH, PrimaryKey) + ' Configure the GridViews with some default options Dim oViews As New List(Of GridView) From {GridViewDataSearch, GridViewDocSearch} Dim oGridBuilder As New GridBuilder(oViews) oGridBuilder. WithDefaults(). WithReadOnlyOptions() - For Each oContainer As LayoutControlItem In Root.Items - Dim oControl As BaseEdit = oContainer.Control - AddHandler oControl.GotFocus, AddressOf Any_EditValueChanged - Next + ' Add Focus Handler to all controls in all LayoutControls + Dim oLayoutControls = New List(Of LayoutControl) From {LayoutControlProfile, LayoutControlDocSearch, LayoutControlDataSearch} + + Pages = New ClassDetailPages(oLayoutControls) + Pages.AddRange({ + New ClassDetailPages.DetailPage With { + .IsPrimary = True, + .Name = "Profil", + .TabPage = PageProfile, + .BindingSource = TBCW_PROFILESBindingSource, + .DataTable = DBCW_Stammdaten.TBCW_PROFILES, + .AddedWhoEdit = txtAddedWho, + .ChangedWhoEdit = txtChangedWho + }, + New ClassDetailPages.DetailPage With { + .Name = "Dokument-Suche", + .TabPage = PageDocumentSearch, + .BindingSource = TBCW_PROF_DOC_SEARCHBindingSource, + .DataTable = DBCW_Stammdaten.TBCW_PROF_DOC_SEARCH, + .AddedWhoEdit = txtAddedWho1, + .ChangedWhoEdit = txtChangedWho1 + }, + New ClassDetailPages.DetailPage With { + .Name = "Daten-Suche", + .TabPage = PageDataSearch, + .BindingSource = TBCW_PROF_DATA_SEARCHBindingSource, + .DataTable = DBCW_Stammdaten.TBCW_PROF_DATA_SEARCH + } + }) + + AddHandler Pages.AnyControl_Focus, AddressOf AnyControl_Focus + AddHandler Pages.AnyControl_Changed, AddressOf AnyControl_Changed Catch ex As Exception ShowError(ex) End Try End Sub + Private Sub AnyControl_Focus(sender As Object, e As ClassDetailPages.DetailPageEventArgs) + If Not IsNothing(e.Page) Then + If e.Page.IsPrimary = True Then + BarButtonNew.Enabled = False + Else + BarButtonNew.Enabled = True + End If + + RibbonPageGroup1.Text = e.Page.Name + End If + End Sub + + Private Sub AnyControl_Changed(sender As Object, e As ClassDetailPages.DetailPageEventArgs) + + End Sub + Private Sub ResetMessages() labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End Sub @@ -94,42 +116,50 @@ Public Class frmAdmin_CWProfile End Sub Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData - Try - TBCW_PROFILESBindingSource.EndEdit() + If Pages.CurrentPage Is Nothing Then + Return False + End If - If DBCW_Stammdaten.TBCW_PROFILES.GetChanges() IsNot Nothing Then + Dim oPage = Pages.CurrentPage + + Try + oPage.BindingSource.EndEdit() + + If oPage.DataTable.GetChanges() IsNot Nothing Then HasChanges = True If IsInsert Then - txtAddedWho.EditValue = My.Application.User.UserName + oPage.AddedWhoEdit.EditValue = My.Application.User.UserName Else - txtChangedWho.EditValue = My.Application.User.UserName + oPage.ChangedWhoEdit.EditValue = My.Application.User.UserName End If - TBCW_PROFILESBindingSource.EndEdit() - TBCW_PROFILESTableAdapter.Update(DBCW_Stammdaten.TBCW_PROFILES) + oPage.BindingSource.EndEdit() + Return True + Else + HasChanges = False End If - Return True + Return False Catch ex As Exception ShowError(ex) Return False End Try End Function - Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - ResetMessages() - - If SaveData() Then - Close() - End If - End Sub - - Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Private Sub BarButtonSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonSave.ItemClick ResetMessages() If SaveData() And HasChanges Then - ShowStatus("Attribute gespeichert!") + Select Case Pages.CurrentPage.TabPage.Name + Case PageProfile.Name + TBCW_PROFILESTableAdapter.Update(Pages.CurrentPage.DataTable) + + Case PageDocumentSearch.Name + TBCW_PROF_DOC_SEARCHTableAdapter.Update(Pages.CurrentPage.DataTable) + End Select + + ShowStatus($"{Pages.CurrentPage.Name} gespeichert!") End If End Sub diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 3b1c6ad8..ace7b361 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -512,7 +512,7 @@ Partial Class frmAdmin_Start Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(200, 159) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(877, 46) + Me.Panel1.Size = New System.Drawing.Size(877, 9) Me.Panel1.TabIndex = 8 Me.Panel1.TabStop = True ' @@ -523,7 +523,7 @@ Partial Class frmAdmin_Start Me.labelTitle.Location = New System.Drawing.Point(0, 0) Me.labelTitle.Name = "labelTitle" Me.labelTitle.Padding = New System.Windows.Forms.Padding(5, 0, 0, 0) - Me.labelTitle.Size = New System.Drawing.Size(877, 46) + Me.labelTitle.Size = New System.Drawing.Size(877, 9) Me.labelTitle.TabIndex = 0 Me.labelTitle.Text = "labelTitle" Me.labelTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -713,11 +713,11 @@ Partial Class frmAdmin_Start 'GridControl1 ' Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl1.Location = New System.Drawing.Point(200, 205) + Me.GridControl1.Location = New System.Drawing.Point(200, 168) Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(877, 449) + Me.GridControl1.Size = New System.Drawing.Size(877, 486) Me.GridControl1.TabIndex = 12 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -725,6 +725,7 @@ Partial Class frmAdmin_Start ' Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False ' 'RibbonPageGroupAttributes ' diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 2f2497d1..f4e8a4a7 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -250,6 +250,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_add1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_add1", 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 6fb0e4af..ee5b013b 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -136,12 +136,15 @@ ..\Resources\doublenext2.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\doublenext1.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\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -151,6 +154,9 @@ ..\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 @@ -160,21 +166,18 @@ ..\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\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 @@ -199,9 +202,6 @@ ..\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 @@ -217,42 +217,48 @@ ..\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 @@ -274,17 +280,14 @@ ..\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\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_addcircled2.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 @@ -301,29 +304,29 @@ ..\Resources\about3.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\pagesetup.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\del3.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\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\del4.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\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bo_document.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\save4.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 @@ -349,17 +352,17 @@ ..\Resources\actions_deletecircled1.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_check1.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\CW_klein.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 + + ..\Resources\actions_check2.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 @@ -367,8 +370,8 @@ ..\Resources\crossdatasourcefiltering.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\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 @@ -379,8 +382,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\actions_deletecircled2.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 @@ -400,13 +403,13 @@ ..\Resources\StatusAnnotations_Stop_16xLG_color.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\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\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_add1.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/actions_add1.svg b/GUIs.ZooFlow/Resources/actions_add1.svg new file mode 100644 index 00000000..0f7c9b63 --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_add1.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 0bba7a14..02b53cc3 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -113,6 +113,7 @@ + Form @@ -789,6 +790,9 @@ + + +