From 4108410b15a9c43e03d8f51ff270344c1ed8bac8 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 12 Feb 2021 11:28:25 +0100 Subject: [PATCH] ZooFlow: Finishing Attribute Form --- ...r.vb => frmAdmin_IDBAttribute.Designer.vb} | 2 +- ...ribute.resx => frmAdmin_IDBAttribute.resx} | 0 ..._Attribute.vb => frmAdmin_IDBAttribute.vb} | 8 +- .../Administration/frmAdmin_Start.Designer.vb | 123 +++++++++++------- .../Administration/frmAdmin_Start.resx | 5 +- GUIs.ZooFlow/Administration/frmAdmin_Start.vb | 38 +++++- GUIs.ZooFlow/My Project/Resources.Designer.vb | 40 ++++++ GUIs.ZooFlow/My Project/Resources.resx | 16 ++- GUIs.ZooFlow/Resources/actions_addcircled.svg | 15 +++ .../Resources/actions_deletecircled.svg | 15 +++ GUIs.ZooFlow/Resources/actions_edit.svg | 17 +++ GUIs.ZooFlow/Resources/bo_document.svg | 26 ++++ GUIs.ZooFlow/ZooFlow.vbproj | 22 +++- 13 files changed, 269 insertions(+), 58 deletions(-) rename GUIs.ZooFlow/Administration/{frmAdmin_Attribute.Designer.vb => frmAdmin_IDBAttribute.Designer.vb} (99%) rename GUIs.ZooFlow/Administration/{frmAdmin_Attribute.resx => frmAdmin_IDBAttribute.resx} (100%) rename GUIs.ZooFlow/Administration/{frmAdmin_Attribute.vb => frmAdmin_IDBAttribute.vb} (89%) create mode 100644 GUIs.ZooFlow/Resources/actions_addcircled.svg create mode 100644 GUIs.ZooFlow/Resources/actions_deletecircled.svg create mode 100644 GUIs.ZooFlow/Resources/actions_edit.svg create mode 100644 GUIs.ZooFlow/Resources/bo_document.svg diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Attribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb similarity index 99% rename from GUIs.ZooFlow/Administration/frmAdmin_Attribute.Designer.vb rename to GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb index 70b5f168..2d09f8da 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Attribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb @@ -1,5 +1,5 @@  -Partial Class frmAdmin_Attribute +Partial Class frmAdmin_IDBAttribute Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Attribute.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx similarity index 100% rename from GUIs.ZooFlow/Administration/frmAdmin_Attribute.resx rename to GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Attribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb similarity index 89% rename from GUIs.ZooFlow/Administration/frmAdmin_Attribute.vb rename to GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb index 0818721a..8f514cb5 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Attribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb @@ -1,12 +1,12 @@ Imports DigitalData.Modules.Logging -Public Class frmAdmin_Attribute +Public Class frmAdmin_IDBAttribute Implements interfaceAdmin_Form - Private Property PrimaryKey As Integer Implements interfaceAdmin_Form.PrimaryKey Private Property Logger As Logger Implements interfaceAdmin_Form.Logger Public Property HasChanges As Boolean = False Implements interfaceAdmin_Form.HasChanges Public Property IsInsert As Boolean = False Implements interfaceAdmin_Form.IsInsert + Public Property PrimaryKey As Integer Implements interfaceAdmin_Form.PrimaryKey Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) ' Dieser Aufruf ist für den Designer erforderlich. @@ -59,9 +59,9 @@ Public Class frmAdmin_Attribute HasChanges = True If IsInsert Then - txtAddedWho.Text = My.Application.User.UserName + txtAddedWho.EditValue = My.Application.User.UserName Else - txtChangedWho.Text = My.Application.User.UserName + txtChangedWho.EditValue = My.Application.User.UserName End If TBIDB_ATTRIBUTEBindingSource.EndEdit() diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index ba6439fa..79588c04 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -43,6 +43,9 @@ Partial Class frmAdmin_Start Me.BarButtonItemSaveAttribute = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItemAddAttribute = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItemRefreshAttribute = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage_ClipboardWatcher = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -123,8 +126,6 @@ Partial Class frmAdmin_Start Me.XtraTabPageIDB_Attributes.SuspendLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.XtraTabPage_GlobalIndexer.SuspendLayout() - Me.XtraTabPage_ClipboardWatcher.SuspendLayout() CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl.SuspendLayout() Me.SuspendLayout() @@ -134,7 +135,7 @@ Partial Class frmAdmin_Start CHANGED_WHENLabel.AutoSize = True CHANGED_WHENLabel.Location = New System.Drawing.Point(472, 188) CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" - CHANGED_WHENLabel.Size = New System.Drawing.Size(85, 13) + CHANGED_WHENLabel.Size = New System.Drawing.Size(90, 13) CHANGED_WHENLabel.TabIndex = 20 CHANGED_WHENLabel.Text = "Geändert wann:" ' @@ -143,7 +144,7 @@ Partial Class frmAdmin_Start CHANGED_WHOLabel.AutoSize = True CHANGED_WHOLabel.Location = New System.Drawing.Point(351, 188) CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" - CHANGED_WHOLabel.Size = New System.Drawing.Size(77, 13) + CHANGED_WHOLabel.Size = New System.Drawing.Size(80, 13) CHANGED_WHOLabel.TabIndex = 18 CHANGED_WHOLabel.Text = "Geändert wer:" ' @@ -152,7 +153,7 @@ Partial Class frmAdmin_Start ADDED_WHENLabel.AutoSize = True ADDED_WHENLabel.Location = New System.Drawing.Point(472, 146) ADDED_WHENLabel.Name = "ADDED_WHENLabel" - ADDED_WHENLabel.Size = New System.Drawing.Size(73, 13) + ADDED_WHENLabel.Size = New System.Drawing.Size(77, 13) ADDED_WHENLabel.TabIndex = 16 ADDED_WHENLabel.Text = "Erstellt wann:" ' @@ -161,7 +162,7 @@ Partial Class frmAdmin_Start ADDED_WHOLabel.AutoSize = True ADDED_WHOLabel.Location = New System.Drawing.Point(351, 146) ADDED_WHOLabel.Name = "ADDED_WHOLabel" - ADDED_WHOLabel.Size = New System.Drawing.Size(65, 13) + ADDED_WHOLabel.Size = New System.Drawing.Size(67, 13) ADDED_WHOLabel.TabIndex = 14 ADDED_WHOLabel.Text = "Erstellt wer:" ' @@ -170,7 +171,7 @@ Partial Class frmAdmin_Start COMMENTLabel.AutoSize = True COMMENTLabel.Location = New System.Drawing.Point(351, 106) COMMENTLabel.Name = "COMMENTLabel" - COMMENTLabel.Size = New System.Drawing.Size(65, 13) + COMMENTLabel.Size = New System.Drawing.Size(68, 13) COMMENTLabel.TabIndex = 12 COMMENTLabel.Text = "Kommentar:" ' @@ -179,7 +180,7 @@ Partial Class frmAdmin_Start VIEW_SEQUENCELabel.AutoSize = True VIEW_SEQUENCELabel.Location = New System.Drawing.Point(351, 82) VIEW_SEQUENCELabel.Name = "VIEW_SEQUENCELabel" - VIEW_SEQUENCELabel.Size = New System.Drawing.Size(93, 13) + VIEW_SEQUENCELabel.Size = New System.Drawing.Size(101, 13) VIEW_SEQUENCELabel.TabIndex = 8 VIEW_SEQUENCELabel.Text = "View Reihenfolge:" ' @@ -188,7 +189,7 @@ Partial Class frmAdmin_Start TITLELabel.AutoSize = True TITLELabel.Location = New System.Drawing.Point(351, 12) TITLELabel.Name = "TITLELabel" - TITLELabel.Size = New System.Drawing.Size(71, 13) + TITLELabel.Size = New System.Drawing.Size(76, 13) TITLELabel.TabIndex = 2 TITLELabel.Text = "Bezeichnung:" ' @@ -197,19 +198,19 @@ Partial Class frmAdmin_Start GUIDLabel.AutoSize = True GUIDLabel.Location = New System.Drawing.Point(297, 12) GUIDLabel.Name = "GUIDLabel" - GUIDLabel.Size = New System.Drawing.Size(36, 13) + GUIDLabel.Size = New System.Drawing.Size(37, 13) GUIDLabel.TabIndex = 0 GUIDLabel.Text = "GUID:" ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemSaveAttribute, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemSaveAttribute, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 11 + Me.RibbonControl1.MaxItemId = 14 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage_ClipboardWatcher, Me.RibbonPage_GlobalIndexer, Me.RibbonPage_IDB}) - Me.RibbonControl1.Size = New System.Drawing.Size(1328, 157) + Me.RibbonControl1.Size = New System.Drawing.Size(1328, 159) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -287,6 +288,27 @@ Partial Class frmAdmin_Start Me.BarButtonItemRefreshAttribute.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemRefreshAttribute.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItemRefreshAttribute.Name = "BarButtonItemRefreshAttribute" ' + 'BarButtonItem6 + ' + Me.BarButtonItem6.Caption = "Neues Attribut" + Me.BarButtonItem6.Id = 11 + Me.BarButtonItem6.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_addcircled + Me.BarButtonItem6.Name = "BarButtonItem6" + ' + 'BarButtonItem7 + ' + Me.BarButtonItem7.Caption = "Bearbeiten" + Me.BarButtonItem7.Id = 12 + Me.BarButtonItem7.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_edit + Me.BarButtonItem7.Name = "BarButtonItem7" + ' + 'BarButtonItem8 + ' + Me.BarButtonItem8.Caption = "Löschen" + Me.BarButtonItem8.Id = 13 + Me.BarButtonItem8.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_deletecircled + Me.BarButtonItem8.Name = "BarButtonItem8" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2}) @@ -295,8 +317,11 @@ Partial Class frmAdmin_Start ' 'RibbonPageGroup2 ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem6) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem7) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem8) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "Attribute" ' 'RibbonPage_ClipboardWatcher ' @@ -402,7 +427,7 @@ Partial Class frmAdmin_Start Me.TreeListMenu.OptionsView.ShowIndicator = False Me.TreeListMenu.OptionsView.ShowVertLines = False Me.TreeListMenu.SelectImageList = Me.SvgImageCollection1 - Me.TreeListMenu.Size = New System.Drawing.Size(193, 523) + Me.TreeListMenu.Size = New System.Drawing.Size(193, 521) Me.TreeListMenu.TabIndex = 8 ' 'TreeListColumn1 @@ -430,10 +455,10 @@ Partial Class frmAdmin_Start Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("ce81b5b5-eff5-4006-8018-548aa8413799") - Me.DockPanel1.Location = New System.Drawing.Point(0, 157) + Me.DockPanel1.Location = New System.Drawing.Point(0, 159) Me.DockPanel1.Name = "DockPanel1" Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.Size = New System.Drawing.Size(200, 572) + Me.DockPanel1.Size = New System.Drawing.Size(200, 570) Me.DockPanel1.Text = "Übersicht" ' 'DockPanel1_Container @@ -441,7 +466,7 @@ Partial Class frmAdmin_Start Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu) Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 523) + Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 521) Me.DockPanel1_Container.TabIndex = 0 ' 'TBIDB_ATTRIBUTEBindingSource @@ -457,7 +482,16 @@ Partial Class frmAdmin_Start 'TBIDB_ATTRIBUTETableAdapter ' Me.TBIDB_ATTRIBUTETableAdapter.ClearBeforeFill = True - ' ' + ' + 'TableAdapterManager + ' + Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.Connection = Nothing + Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing + Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing + Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + ' 'TBIDB_ATTRIBUTE_TYPEBindingSource ' Me.TBIDB_ATTRIBUTE_TYPEBindingSource.DataMember = "TBIDB_ATTRIBUTE_TYPE" @@ -471,7 +505,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPage_IDB.Controls.Add(Me.XtraTabControlIDB) Me.XtraTabPage_IDB.Name = "XtraTabPage_IDB" - Me.XtraTabPage_IDB.Size = New System.Drawing.Size(1126, 549) + Me.XtraTabPage_IDB.Size = New System.Drawing.Size(1126, 547) Me.XtraTabPage_IDB.Text = "IDB" ' 'XtraTabControlIDB @@ -480,7 +514,7 @@ Partial Class frmAdmin_Start Me.XtraTabControlIDB.Location = New System.Drawing.Point(0, 0) Me.XtraTabControlIDB.Name = "XtraTabControlIDB" Me.XtraTabControlIDB.SelectedTabPage = Me.XtraTabPageIDB_Attributes_New - Me.XtraTabControlIDB.Size = New System.Drawing.Size(1126, 549) + Me.XtraTabControlIDB.Size = New System.Drawing.Size(1126, 547) Me.XtraTabControlIDB.TabIndex = 0 Me.XtraTabControlIDB.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageIDB_Attributes_New, Me.XtraTabPageIDB_Attributes, Me.XtraTabPage2}) ' @@ -488,7 +522,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPageIDB_Attributes_New.Controls.Add(Me.GridAttributes) Me.XtraTabPageIDB_Attributes_New.Name = "XtraTabPageIDB_Attributes_New" - Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(1124, 526) + Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(1124, 524) Me.XtraTabPageIDB_Attributes_New.Text = "Attribute" ' 'GridAttributes @@ -498,7 +532,7 @@ Partial Class frmAdmin_Start Me.GridAttributes.MainView = Me.ViewAttributes Me.GridAttributes.MenuManager = Me.RibbonControl1 Me.GridAttributes.Name = "GridAttributes" - Me.GridAttributes.Size = New System.Drawing.Size(1124, 526) + Me.GridAttributes.Size = New System.Drawing.Size(1124, 524) Me.GridAttributes.TabIndex = 0 Me.GridAttributes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewAttributes}) ' @@ -532,7 +566,7 @@ Partial Class frmAdmin_Start Me.XtraTabPageIDB_Attributes.Controls.Add(CHANGED_WHENLabel) Me.XtraTabPageIDB_Attributes.Controls.Add(Me.CHANGED_WHENTextBox) Me.XtraTabPageIDB_Attributes.Name = "XtraTabPageIDB_Attributes" - Me.XtraTabPageIDB_Attributes.Size = New System.Drawing.Size(1124, 526) + Me.XtraTabPageIDB_Attributes.Size = New System.Drawing.Size(1124, 524) Me.XtraTabPageIDB_Attributes.Text = "Attributverwaltung" ' 'ComboBox1 @@ -551,7 +585,7 @@ Partial Class frmAdmin_Start Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(282, 526) + Me.GridControl1.Size = New System.Drawing.Size(282, 524) Me.GridControl1.TabIndex = 28 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -597,7 +631,7 @@ Partial Class frmAdmin_Start Me.GUIDTextBox.Location = New System.Drawing.Point(300, 28) Me.GUIDTextBox.Name = "GUIDTextBox" Me.GUIDTextBox.ReadOnly = True - Me.GUIDTextBox.Size = New System.Drawing.Size(33, 21) + Me.GUIDTextBox.Size = New System.Drawing.Size(33, 22) Me.GUIDTextBox.TabIndex = 1 ' 'TITLETextBox @@ -605,7 +639,7 @@ Partial Class frmAdmin_Start Me.TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "TITLE", True)) Me.TITLETextBox.Location = New System.Drawing.Point(354, 28) Me.TITLETextBox.Name = "TITLETextBox" - Me.TITLETextBox.Size = New System.Drawing.Size(290, 21) + Me.TITLETextBox.Size = New System.Drawing.Size(290, 22) Me.TITLETextBox.TabIndex = 3 ' 'TYP_IDTextBox @@ -613,7 +647,7 @@ Partial Class frmAdmin_Start Me.TYP_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "TYP_ID", True)) Me.TYP_IDTextBox.Location = New System.Drawing.Point(777, 28) Me.TYP_IDTextBox.Name = "TYP_IDTextBox" - Me.TYP_IDTextBox.Size = New System.Drawing.Size(104, 21) + Me.TYP_IDTextBox.Size = New System.Drawing.Size(104, 22) Me.TYP_IDTextBox.TabIndex = 5 ' 'MULTI_CONTEXTCheckBox @@ -631,7 +665,7 @@ Partial Class frmAdmin_Start Me.VIEW_SEQUENCETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True)) Me.VIEW_SEQUENCETextBox.Location = New System.Drawing.Point(450, 79) Me.VIEW_SEQUENCETextBox.Name = "VIEW_SEQUENCETextBox" - Me.VIEW_SEQUENCETextBox.Size = New System.Drawing.Size(33, 21) + Me.VIEW_SEQUENCETextBox.Size = New System.Drawing.Size(33, 22) Me.VIEW_SEQUENCETextBox.TabIndex = 9 ' 'VIEW_VISIBLECheckBox @@ -649,7 +683,7 @@ Partial Class frmAdmin_Start Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "COMMENT", True)) Me.COMMENTTextBox.Location = New System.Drawing.Point(354, 122) Me.COMMENTTextBox.Name = "COMMENTTextBox" - Me.COMMENTTextBox.Size = New System.Drawing.Size(417, 21) + Me.COMMENTTextBox.Size = New System.Drawing.Size(417, 22) Me.COMMENTTextBox.TabIndex = 13 ' 'ADDED_WHOTextBox @@ -658,7 +692,7 @@ Partial Class frmAdmin_Start Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(354, 164) Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" Me.ADDED_WHOTextBox.ReadOnly = True - Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(104, 21) + Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(104, 22) Me.ADDED_WHOTextBox.TabIndex = 15 ' 'ADDED_WHENTextBox @@ -667,7 +701,7 @@ Partial Class frmAdmin_Start Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(475, 164) Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" Me.ADDED_WHENTextBox.ReadOnly = True - Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(131, 21) + Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(131, 22) Me.ADDED_WHENTextBox.TabIndex = 17 ' 'CHANGED_WHOTextBox @@ -676,7 +710,7 @@ Partial Class frmAdmin_Start Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(354, 204) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.ReadOnly = True - Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(104, 21) + Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(104, 22) Me.CHANGED_WHOTextBox.TabIndex = 19 ' 'CHANGED_WHENTextBox @@ -685,41 +719,41 @@ Partial Class frmAdmin_Start Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(475, 204) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.ReadOnly = True - Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(131, 21) + Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(131, 22) Me.CHANGED_WHENTextBox.TabIndex = 21 ' 'XtraTabPage2 ' Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1124, 526) + Me.XtraTabPage2.Size = New System.Drawing.Size(1124, 524) Me.XtraTabPage2.Text = "XtraTabPage2" ' 'XtraTabPage_GlobalIndexer ' Me.XtraTabPage_GlobalIndexer.Name = "XtraTabPage_GlobalIndexer" Me.XtraTabPage_GlobalIndexer.PageVisible = False - Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 549) + Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 547) Me.XtraTabPage_GlobalIndexer.Text = "Global Indexer" ' 'XtraTabPage_ClipboardWatcher ' Me.XtraTabPage_ClipboardWatcher.Name = "XtraTabPage_ClipboardWatcher" Me.XtraTabPage_ClipboardWatcher.PageVisible = False - Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(1126, 549) + Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(1126, 547) Me.XtraTabPage_ClipboardWatcher.Text = "Clipboard Watcher" ' 'XtraTabControl ' Me.XtraTabControl.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl.Location = New System.Drawing.Point(200, 157) + Me.XtraTabControl.Location = New System.Drawing.Point(200, 159) Me.XtraTabControl.Name = "XtraTabControl" Me.XtraTabControl.SelectedTabPage = Me.XtraTabPage_IDB Me.XtraTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] - Me.XtraTabControl.Size = New System.Drawing.Size(1128, 572) + Me.XtraTabControl.Size = New System.Drawing.Size(1128, 570) Me.XtraTabControl.TabIndex = 4 Me.XtraTabControl.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage_ClipboardWatcher, Me.XtraTabPage_GlobalIndexer, Me.XtraTabPage_IDB}) ' - 'frmAdministrationZooFlow + 'frmAdmin_Start ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -728,8 +762,8 @@ Partial Class frmAdmin_Start Me.Controls.Add(Me.DockPanel1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) - Me.IconOptions.SvgImage = CType(resources.GetObject("frmAdministrationZooFlow.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.Name = "frmAdministrationZooFlow" + Me.IconOptions.SvgImage = CType(resources.GetObject("frmAdmin_Start.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.Name = "frmAdmin_Start" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Administration" @@ -752,8 +786,6 @@ Partial Class frmAdmin_Start Me.XtraTabPageIDB_Attributes.PerformLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - Me.XtraTabPage_GlobalIndexer.ResumeLayout(False) - Me.XtraTabPage_ClipboardWatcher.ResumeLayout(False) CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl.ResumeLayout(False) Me.ResumeLayout(False) @@ -829,4 +861,7 @@ Partial Class frmAdmin_Start Friend WithEvents CHANGED_WHOTextBox As TextBox Friend WithEvents CHANGED_WHENTextBox As TextBox Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx index b6ce6a6f..3dad7a9c 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx @@ -338,7 +338,7 @@ 487, 21 - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -361,6 +361,9 @@ LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + 487, 21 + 875, 21 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 55da26b0..76ca4241 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -122,15 +122,51 @@ Public Class frmAdmin_Start Dim oGridView = DirectCast(GridControl.DefaultView, GridView) + With oGridView.Appearance.EvenRow + .BackColor = Color.Gainsboro + .Options.UseBackColor = True + End With + + With oGridView.Appearance.FocusedCell + .BackColor = Color.Gold + .Options.UseBackColor = True + End With + + With oGridView.Appearance.FocusedRow + .BackColor = Color.Gold + .Options.UseBackColor = True + End With + With oGridView.OptionsBehavior .Editable = False .ReadOnly = True End With + With oGridView.OptionsClipboard + .CopyColumnHeaders = DefaultBoolean.False + End With + + With oGridView.OptionsFind + .AlwaysVisible = True + End With + With oGridView.OptionsView .ShowAutoFilterRow = True + .EnableAppearanceEvenRow = True + .ShowIndicator = False End With + AddHandler oGridView.KeyDown, Sub(sender As Object, e As KeyEventArgs) + Dim oView As GridView = DirectCast(sender, GridView) + If e.Control AndAlso e.KeyCode = Keys.C And e.Modifiers = Keys.Control Then + Dim oCellValue = oView.GetRowCellValue(oView.FocusedRowHandle, oView.FocusedColumn) + If oCellValue IsNot Nothing AndAlso oCellValue.ToString() <> String.Empty Then + Clipboard.SetText(oCellValue.ToString) + End If + e.Handled = True + End If + End Sub + oGridView.BestFitColumns() Catch ex As Exception @@ -146,7 +182,7 @@ Public Class frmAdmin_Start Try Dim oRow As DataRow = ViewAttributes.GetFocusedDataRow Dim oPrimaryKey As Integer = oRow.Item(PrimaryKey) - Dim oForm As New frmAdmin_Attribute(oPrimaryKey) + Dim oForm As New frmAdmin_IDBAttribute(oPrimaryKey) GridView1.ShowLoadingPanel() oForm.ShowDialog() diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 0b39ceba..462a7792 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -200,6 +200,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_addcircled() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_addcircled", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -210,6 +220,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_deletecircled() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_deletecircled", 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 actions_edit() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_edit", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -230,6 +260,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_document() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_document", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index b5eed34a..ccd05a49 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -178,6 +178,12 @@ ..\Resources\4_GLOBIX_INAKTIV_ZOO.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_deletecircled.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 @@ -190,6 +196,9 @@ ..\Resources\action_add_16xLG.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\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -205,6 +214,9 @@ ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled.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 @@ -214,7 +226,7 @@ ..\Resources\2_ZOO_FLOW_Abo.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_edit.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_addcircled.svg b/GUIs.ZooFlow/Resources/actions_addcircled.svg new file mode 100644 index 00000000..0c97b24a --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_addcircled.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_deletecircled.svg b/GUIs.ZooFlow/Resources/actions_deletecircled.svg new file mode 100644 index 00000000..d8c9bb3f --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_deletecircled.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_edit.svg b/GUIs.ZooFlow/Resources/actions_edit.svg new file mode 100644 index 00000000..89aa31c7 --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_edit.svg @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/bo_document.svg b/GUIs.ZooFlow/Resources/bo_document.svg new file mode 100644 index 00000000..b3b7afa3 --- /dev/null +++ b/GUIs.ZooFlow/Resources/bo_document.svg @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 83c57266..ec747ac1 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -114,10 +114,10 @@ - - frmAdmin_Attribute.vb + + frmAdmin_IDBAttribute.vb - + Form @@ -256,8 +256,8 @@ - - frmAdmin_Attribute.vb + + frmAdmin_IDBAttribute.vb frmGlobixBasicConfig.vb @@ -489,6 +489,18 @@ + + + + + + + + + + + +