diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index c2b25b76..cba27296 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -172,6 +172,7 @@ frmDocumentResultList.vb + Designer @@ -354,5 +355,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/DocumentResultList/Layout.vb b/GUIs.Common/DocumentResultList/Layout.vb index bad872d8..39564d5f 100644 --- a/GUIs.Common/DocumentResultList/Layout.vb +++ b/GUIs.Common/DocumentResultList/Layout.vb @@ -1,17 +1,19 @@ -Imports DevExpress.Utils +Imports System.Windows.Forms +Imports DevExpress.Utils Imports DevExpress.XtraBars.Docking Imports DevExpress.XtraGrid.Views.BandedGrid Imports DevExpress.XtraGrid.Views.Grid Imports DigitalData.Modules.Base Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Language Namespace DocumentResultList Public Class Layout Inherits BaseClass - Private Config As ConfigManager(Of Config) - Private GridViews As List(Of GridView) + Private ReadOnly Config As ConfigManager(Of Config) + Private ReadOnly GridViews As List(Of GridView) Public Sub New(pLogConfig As LogConfig, pConfig As ConfigManager(Of DocumentResultList.Config), pGridViews As List(Of GridView)) MyBase.New(pLogConfig) @@ -76,6 +78,23 @@ Namespace DocumentResultList Dim oDirectory As String = IO.Path.GetDirectoryName(Config.UserConfigPath) Return IO.Path.Combine(oDirectory, Filename) End Function + + Public Sub LoadWindowLocationAndSize(ByRef pForm As Form) + If Utils.IsVisibleOnAnyScreen(Config.Config.WindowLocation) Then + If Utils.LocationIsVisible(Config.Config.WindowLocation) Then + pForm.Location = Config.Config.WindowLocation + End If + If Utils.SizeIsVisible(Config.Config.WindowSize) Then + pForm.Size = Config.Config.WindowSize + End If + End If + End Sub + + Public Sub SaveWindowLocationAndSize(ByRef pForm As Form) + Config.Config.WindowLocation = pForm.Location + Config.Config.WindowSize = pForm.Size + Config.Save() + End Sub #End Region Public Sub SetGroupPanelVisible(pVisible As Boolean) diff --git a/GUIs.Common/My Project/Resources.Designer.vb b/GUIs.Common/My Project/Resources.Designer.vb index 803ad7dc..d9a2e0e5 100644 --- a/GUIs.Common/My Project/Resources.Designer.vb +++ b/GUIs.Common/My Project/Resources.Designer.vb @@ -150,6 +150,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property columnheaders() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("columnheaders", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -220,6 +230,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property filterquery() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("filterquery", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -230,6 +250,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property groupheader() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("groupheader", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -310,6 +340,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property save1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("save1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -350,6 +390,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property title() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("title", 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.Common/My Project/Resources.resx b/GUIs.Common/My Project/Resources.resx index 9a6559ef..74e4d2ef 100644 --- a/GUIs.Common/My Project/Resources.resx +++ b/GUIs.Common/My Project/Resources.resx @@ -121,6 +121,9 @@ ..\Resources\bo_transition.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\groupheader.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\security_unlock.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -142,6 +145,9 @@ ..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -154,21 +160,21 @@ ..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\title.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -193,15 +199,21 @@ ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\filterquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -211,13 +223,16 @@ ..\Resources\Copy_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb index d8e206db..b2b29418 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb @@ -28,15 +28,15 @@ Partial Class ctrlObjectPropertyDialog Me.XtraTabPageObject = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.GridObjectHistory = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.ViewObjectHistory = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.progressLifecycle = New DevExpress.XtraEditors.ProgressBarControl() Me.txtObjectId = New DevExpress.XtraEditors.TextEdit() Me.txtCreatedWhen = New DevExpress.XtraEditors.TextEdit() Me.txtCreatedWho = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() - Me.txtAccessedWhen = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit11 = New DevExpress.XtraEditors.TextEdit() Me.RootMetadata = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() @@ -47,8 +47,6 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() - Me.txtAccessedWho = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() Me.lbLifecycleStart = New DevExpress.XtraLayout.SimpleLabelItem() @@ -58,7 +56,7 @@ Partial Class ctrlObjectPropertyDialog Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.XtraTabPageAttributeHistory = New DevExpress.XtraTab.XtraTabPage() Me.GridValueHistory = New DevExpress.XtraGrid.GridControl() - Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.ViewValueHistory = New DevExpress.XtraGrid.Views.Grid.GridView() Me.XtraTabPageVersions = New DevExpress.XtraTab.XtraTabPage() Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) Me.d = New DevExpress.XtraBars.Bar() @@ -75,15 +73,13 @@ Partial Class ctrlObjectPropertyDialog CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() CType(Me.GridObjectHistory, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewObjectHistory, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.progressLifecycle.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtObjectId.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtCreatedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtCreatedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtAccessedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -94,8 +90,6 @@ Partial Class ctrlObjectPropertyDialog CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtAccessedWho, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).BeginInit() @@ -105,7 +99,7 @@ Partial Class ctrlObjectPropertyDialog CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageAttributeHistory.SuspendLayout() CType(Me.GridValueHistory, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewValueHistory, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.cmbEntityIdInner, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -144,8 +138,6 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControl1.Controls.Add(Me.txtCreatedWho) Me.LayoutControl1.Controls.Add(Me.txtChangedWho) Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) - Me.LayoutControl1.Controls.Add(Me.txtAccessedWhen) - Me.LayoutControl1.Controls.Add(Me.TextEdit11) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) Me.LayoutControl1.Name = "LayoutControl1" @@ -157,17 +149,36 @@ Partial Class ctrlObjectPropertyDialog ' 'GridObjectHistory ' - Me.GridObjectHistory.Location = New System.Drawing.Point(24, 267) - Me.GridObjectHistory.MainView = Me.GridView1 + Me.GridObjectHistory.Location = New System.Drawing.Point(22, 265) + Me.GridObjectHistory.MainView = Me.ViewObjectHistory Me.GridObjectHistory.Name = "GridObjectHistory" - Me.GridObjectHistory.Size = New System.Drawing.Size(455, 281) + Me.GridObjectHistory.Size = New System.Drawing.Size(459, 285) Me.GridObjectHistory.TabIndex = 9 - Me.GridObjectHistory.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + Me.GridObjectHistory.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewObjectHistory}) ' - 'GridView1 + 'ViewObjectHistory ' - Me.GridView1.GridControl = Me.GridObjectHistory - Me.GridView1.Name = "GridView1" + Me.ViewObjectHistory.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn1, Me.GridColumn2}) + Me.ViewObjectHistory.GridControl = Me.GridObjectHistory + Me.ViewObjectHistory.Name = "ViewObjectHistory" + Me.ViewObjectHistory.OptionsView.ShowGroupPanel = False + Me.ViewObjectHistory.OptionsView.ShowIndicator = False + ' + 'GridColumn1 + ' + Me.GridColumn1.Caption = "Ereignis" + Me.GridColumn1.FieldName = "STATE_LANG" + Me.GridColumn1.Name = "GridColumn1" + Me.GridColumn1.Visible = True + Me.GridColumn1.VisibleIndex = 0 + ' + 'GridColumn2 + ' + Me.GridColumn2.Caption = "Datum" + Me.GridColumn2.FieldName = "ADDED_WHEN" + Me.GridColumn2.Name = "GridColumn2" + Me.GridColumn2.Visible = True + Me.GridColumn2.VisibleIndex = 1 ' 'progressLifecycle ' @@ -179,81 +190,59 @@ Partial Class ctrlObjectPropertyDialog ' 'txtObjectId ' - Me.txtObjectId.Location = New System.Drawing.Point(109, 48) + Me.txtObjectId.Location = New System.Drawing.Point(95, 48) Me.txtObjectId.Name = "txtObjectId" Me.txtObjectId.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtObjectId.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtObjectId.Properties.ReadOnly = True - Me.txtObjectId.Size = New System.Drawing.Size(367, 20) + Me.txtObjectId.Size = New System.Drawing.Size(381, 20) Me.txtObjectId.StyleController = Me.LayoutControl1 Me.txtObjectId.TabIndex = 7 ' 'txtCreatedWhen ' - Me.txtCreatedWhen.Location = New System.Drawing.Point(109, 78) + Me.txtCreatedWhen.Location = New System.Drawing.Point(95, 78) Me.txtCreatedWhen.Name = "txtCreatedWhen" Me.txtCreatedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtCreatedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtCreatedWhen.Properties.ReadOnly = True - Me.txtCreatedWhen.Size = New System.Drawing.Size(137, 20) + Me.txtCreatedWhen.Size = New System.Drawing.Size(151, 20) Me.txtCreatedWhen.StyleController = Me.LayoutControl1 Me.txtCreatedWhen.TabIndex = 4 ' 'txtCreatedWho ' - Me.txtCreatedWho.Location = New System.Drawing.Point(338, 78) + Me.txtCreatedWho.Location = New System.Drawing.Point(324, 78) Me.txtCreatedWho.Name = "txtCreatedWho" Me.txtCreatedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtCreatedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtCreatedWho.Properties.ReadOnly = True - Me.txtCreatedWho.Size = New System.Drawing.Size(138, 20) + Me.txtCreatedWho.Size = New System.Drawing.Size(152, 20) Me.txtCreatedWho.StyleController = Me.LayoutControl1 Me.txtCreatedWho.TabIndex = 8 ' 'txtChangedWho ' - Me.txtChangedWho.Location = New System.Drawing.Point(338, 108) + Me.txtChangedWho.Location = New System.Drawing.Point(324, 108) Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtChangedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(138, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(152, 20) Me.txtChangedWho.StyleController = Me.LayoutControl1 Me.txtChangedWho.TabIndex = 9 ' 'txtChangedWhen ' - Me.txtChangedWhen.Location = New System.Drawing.Point(109, 108) + Me.txtChangedWhen.Location = New System.Drawing.Point(95, 108) Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtChangedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(137, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(151, 20) Me.txtChangedWhen.StyleController = Me.LayoutControl1 Me.txtChangedWhen.TabIndex = 5 ' - 'txtAccessedWhen - ' - Me.txtAccessedWhen.Location = New System.Drawing.Point(109, 138) - Me.txtAccessedWhen.Name = "txtAccessedWhen" - Me.txtAccessedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White - Me.txtAccessedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True - Me.txtAccessedWhen.Properties.ReadOnly = True - Me.txtAccessedWhen.Size = New System.Drawing.Size(137, 20) - Me.txtAccessedWhen.StyleController = Me.LayoutControl1 - Me.txtAccessedWhen.TabIndex = 6 - ' - 'TextEdit11 - ' - Me.TextEdit11.Location = New System.Drawing.Point(338, 138) - Me.TextEdit11.Name = "TextEdit11" - Me.TextEdit11.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White - Me.TextEdit11.Properties.AppearanceReadOnly.Options.UseBackColor = True - Me.TextEdit11.Properties.ReadOnly = True - Me.TextEdit11.Size = New System.Drawing.Size(138, 20) - Me.TextEdit11.StyleController = Me.LayoutControl1 - Me.TextEdit11.TabIndex = 10 - ' 'RootMetadata ' Me.RootMetadata.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -268,6 +257,7 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2}) Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 222) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) Me.LayoutControlGroup1.Size = New System.Drawing.Size(483, 330) Me.LayoutControlGroup1.Text = "Objekt Historie" ' @@ -276,13 +266,14 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlItem2.Control = Me.GridObjectHistory Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(459, 285) + Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(9, 9, 9, 9) + Me.LayoutControlItem2.Size = New System.Drawing.Size(477, 303) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' 'LayoutControlGroup2 ' - Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.EmptySpaceItem1, Me.LayoutControlItem1, Me.LayoutControlItem3, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.txtAccessedWho}) + Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.EmptySpaceItem1, Me.LayoutControlItem1, Me.LayoutControlItem3, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7}) Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup2.Name = "LayoutControlGroup2" Me.LayoutControlGroup2.Size = New System.Drawing.Size(483, 222) @@ -291,9 +282,9 @@ Partial Class ctrlObjectPropertyDialog 'EmptySpaceItem1 ' Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 120) + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 90) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(459, 57) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(459, 87) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem1 @@ -306,7 +297,7 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem1.Size = New System.Drawing.Size(459, 30) Me.LayoutControlItem1.Text = "Objekt Id" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(56, 13) ' 'LayoutControlItem3 ' @@ -318,7 +309,7 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem3.Size = New System.Drawing.Size(229, 30) Me.LayoutControlItem3.Text = "Erstellt" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(56, 13) ' 'LayoutControlItem5 ' @@ -330,7 +321,7 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem5.Size = New System.Drawing.Size(230, 30) Me.LayoutControlItem5.Text = "von" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(56, 13) ' 'LayoutControlItem6 ' @@ -342,7 +333,7 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem6.Size = New System.Drawing.Size(230, 30) Me.LayoutControlItem6.Text = "von" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(56, 13) ' 'LayoutControlItem7 ' @@ -354,31 +345,7 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem7.Size = New System.Drawing.Size(229, 30) Me.LayoutControlItem7.Text = "Geändert" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(70, 13) - ' - 'LayoutControlItem8 - ' - Me.LayoutControlItem8.Control = Me.txtAccessedWhen - Me.LayoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft - Me.LayoutControlItem8.CustomizationFormText = "Letzter Zugriff" - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 90) - Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem8.Size = New System.Drawing.Size(229, 30) - Me.LayoutControlItem8.Text = "Letzter Zugriff" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(70, 13) - ' - 'txtAccessedWho - ' - Me.txtAccessedWho.Control = Me.TextEdit11 - Me.txtAccessedWho.ControlAlignment = System.Drawing.ContentAlignment.TopLeft - Me.txtAccessedWho.CustomizationFormText = "von" - Me.txtAccessedWho.Location = New System.Drawing.Point(229, 90) - Me.txtAccessedWho.Name = "txtAccessedWho" - Me.txtAccessedWho.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.txtAccessedWho.Size = New System.Drawing.Size(230, 30) - Me.txtAccessedWho.Text = "von" - Me.txtAccessedWho.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(56, 13) ' 'LayoutControlGroup3 ' @@ -405,7 +372,7 @@ Partial Class ctrlObjectPropertyDialog Me.lbLifecycleStart.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.lbLifecycleStart.Size = New System.Drawing.Size(229, 33) Me.lbLifecycleStart.Text = "00.00.0000" - Me.lbLifecycleStart.TextSize = New System.Drawing.Size(70, 13) + Me.lbLifecycleStart.TextSize = New System.Drawing.Size(56, 13) ' 'lbLifecycleEnd ' @@ -417,7 +384,7 @@ Partial Class ctrlObjectPropertyDialog Me.lbLifecycleEnd.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.lbLifecycleEnd.Size = New System.Drawing.Size(230, 33) Me.lbLifecycleEnd.Text = "99.99.9999" - Me.lbLifecycleEnd.TextSize = New System.Drawing.Size(70, 13) + Me.lbLifecycleEnd.TextSize = New System.Drawing.Size(56, 13) ' 'XtraTabPageAttributes ' @@ -449,6 +416,7 @@ Partial Class ctrlObjectPropertyDialog ' Me.XtraTabPageAttributeHistory.Controls.Add(Me.GridValueHistory) Me.XtraTabPageAttributeHistory.Name = "XtraTabPageAttributeHistory" + Me.XtraTabPageAttributeHistory.PageEnabled = False Me.XtraTabPageAttributeHistory.Size = New System.Drawing.Size(503, 668) Me.XtraTabPageAttributeHistory.Text = "Attribut Historie" ' @@ -456,16 +424,18 @@ Partial Class ctrlObjectPropertyDialog ' Me.GridValueHistory.Dock = System.Windows.Forms.DockStyle.Fill Me.GridValueHistory.Location = New System.Drawing.Point(0, 0) - Me.GridValueHistory.MainView = Me.GridView2 + Me.GridValueHistory.MainView = Me.ViewValueHistory Me.GridValueHistory.Name = "GridValueHistory" Me.GridValueHistory.Size = New System.Drawing.Size(503, 668) Me.GridValueHistory.TabIndex = 0 - Me.GridValueHistory.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) + Me.GridValueHistory.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewValueHistory}) ' - 'GridView2 + 'ViewValueHistory ' - Me.GridView2.GridControl = Me.GridValueHistory - Me.GridView2.Name = "GridView2" + Me.ViewValueHistory.GridControl = Me.GridValueHistory + Me.ViewValueHistory.Name = "ViewValueHistory" + Me.ViewValueHistory.OptionsView.ShowGroupPanel = False + Me.ViewValueHistory.OptionsView.ShowIndicator = False ' 'XtraTabPageVersions ' @@ -564,15 +534,13 @@ Partial Class ctrlObjectPropertyDialog CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) CType(Me.GridObjectHistory, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewObjectHistory, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.progressLifecycle.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtObjectId.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtCreatedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtCreatedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtAccessedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() @@ -583,8 +551,6 @@ Partial Class ctrlObjectPropertyDialog CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtAccessedWho, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).EndInit() @@ -594,7 +560,7 @@ Partial Class ctrlObjectPropertyDialog CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageAttributeHistory.ResumeLayout(False) CType(Me.GridValueHistory, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewValueHistory, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.cmbEntityIdInner, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) @@ -616,7 +582,7 @@ Partial Class ctrlObjectPropertyDialog Friend WithEvents XtraTabPageAttributes As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPageAttributeHistory As DevExpress.XtraTab.XtraTabPage Friend WithEvents GridObjectHistory As DevExpress.XtraGrid.GridControl - Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents ViewObjectHistory As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents txtObjectId As DevExpress.XtraEditors.TextEdit @@ -624,17 +590,13 @@ Partial Class ctrlObjectPropertyDialog Friend WithEvents txtCreatedWho As DevExpress.XtraEditors.TextEdit Friend WithEvents txtChangedWho As DevExpress.XtraEditors.TextEdit Friend WithEvents txtChangedWhen As DevExpress.XtraEditors.TextEdit - Friend WithEvents txtAccessedWhen As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit11 As DevExpress.XtraEditors.TextEdit Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents txtAccessedWho As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents GridValueHistory As DevExpress.XtraGrid.GridControl - Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents ViewValueHistory As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents LayoutControl2 As DevExpress.XtraLayout.LayoutControl Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager @@ -646,4 +608,6 @@ Partial Class ctrlObjectPropertyDialog Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl Friend WithEvents XtraTabPageVersions As DevExpress.XtraTab.XtraTabPage + Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb index 4c388733..2d67d8af 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb @@ -6,6 +6,9 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Language Imports DigitalData.Modules.ZooFlow Imports DevExpress.XtraSplashScreen +Imports DevExpress.XtraEditors +Imports DigitalData.Modules.Base.IDB +Imports DevExpress.XtraLayout Public Class ctrlObjectPropertyDialog Implements IBaseForm @@ -14,15 +17,20 @@ Public Class ctrlObjectPropertyDialog Private Property Logger As Logger Implements IBaseForm.Logger Private Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler Private Property ControlManager As AttributeControls + Private Property GridBuilder As GridBuilder Private Property Client As Client Private Property Environment As Environment Private Property ObjectId As Long Private ReadOnly Changes As New Dictionary(Of String, Object) + Public ReadOnly Property HasChanges As Boolean + Get + Return Changes.Count > 0 + End Get + End Property - Private Loading As Boolean = False - + Private IsLoading As Boolean = False Private LastEntityId As Integer = 0 Private Sub ctrlObjectPropertyDialog_Load(sender As Object, e As EventArgs) Handles Me.Load @@ -34,10 +42,42 @@ Public Class ctrlObjectPropertyDialog Logger = pLogConfig.GetLogger() ErrorHandler = New BaseErrorHandler(pLogConfig, pHostForm) ControlManager = New AttributeControls(pLogConfig, pEnv, pClient) + + GridBuilder = New GridBuilder(ViewObjectHistory, ViewValueHistory) + GridBuilder. + WithDefaults(). + WithReadOnlyOptions(). + WithClipboardHandler() + + AddHandler ControlManager.EditValueChanged, AddressOf BaseEdit_EditValueChanged + Client = pClient Environment = pEnv End Sub + Public Async Function SaveChanges() As Task + Try + For Each oChange As KeyValuePair(Of String, Object) In Changes + Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString) + Await Client.SetAttributeValueAsync(ObjectId, oChange.Key, oChange.Value, New Options.SetAttributeValueOptions With { + .Language = Environment.User.Language, + .Username = Environment.User.UserName + }) + + Logger.Info("Updating Object State for Object [{0}]", ObjectId) + Await Client.SetObjectStateAsync(ObjectId, FileStore.OBJECT_STATE_METADATA_CHANGED, New Options.SetObjectStateOptions With { + .Language = Environment.User.Language, + .Username = Environment.User.UserName + }) + Next + + ErrorHandler.ShowInfoMessage($"{Changes.Count} Änderungen gespeichert!") + Changes.Clear() + Catch ex As Exception + ErrorHandler.ShowErrorMessage(ex, "SaveChanges") + End Try + End Function + Public Async Function LoadObject(pObjectId As Long) As Task(Of Boolean) ' Load Business Entities Dim oEntityIds = Await GetBusinessEntitiesForObjectId(pObjectId) @@ -52,7 +92,7 @@ Public Class ctrlObjectPropertyDialog End Function Public Async Function LoadObject(pObjectId As Long, pEntityId As Long) As Task(Of Boolean) - Loading = True + IsLoading = True Dim oLoadingHandle = SplashScreenManager.ShowOverlayForm(Me) Try @@ -85,13 +125,16 @@ Public Class ctrlObjectPropertyDialog ' Save the current entity id LastEntityId = pEntityId + ' Delete all existing changes from other objects + Changes.Clear() + Return True Catch ex As Exception Logger.Error(ex) Return False Finally SplashScreenManager.CloseOverlayForm(oLoadingHandle) - Loading = False + IsLoading = False End Try End Function @@ -123,8 +166,8 @@ Public Class ctrlObjectPropertyDialog txtObjectId.Text = oRow.Item("IDB_OBJ_ID") txtCreatedWhen.Text = oRow.Item("ADDED_WHEN") txtCreatedWho.Text = oRow.Item("ADDED_WHO") - txtChangedWhen.Text = Utils.NotNull(oRow.Item("CHANGED_WHEN"), String.Empty) - txtChangedWho.Text = Utils.NotNull(oRow.Item("CHANGED_WHO"), String.Empty) + txtChangedWhen.Text = Utils.NotNull(oRow.Item("CHANGED_WHEN_SUBSTRUCTURE"), String.Empty) + txtChangedWho.Text = Utils.NotNull(oRow.Item("CHANGED_WHO_SUBSTRUCTURE"), String.Empty) lbLifecycleStart.Text = DirectCast(oRow.Item("ADDED_WHEN"), Date).ToShortDateString lbLifecycleEnd.Text = Date.MaxValue.ToShortDateString @@ -199,8 +242,6 @@ Public Class ctrlObjectPropertyDialog MsgBox($"Es konnten keine Attribute für das Objekt '{pObjectId}' geladen werden!", MsgBoxStyle.Critical, Text) End If - - ControlManager.LoadControlsForAttributes(oAttributes, Root) Await ControlManager.LoadControlValuesForAttributes(pObjectId, Root) Catch ex As Exception @@ -211,8 +252,28 @@ Public Class ctrlObjectPropertyDialog Private Async Sub cmbEntityId_EditValueChanged(sender As Object, e As EventArgs) Handles cmbEntityId.EditValueChanged Dim oEntityId As Long - If Integer.TryParse(cmbEntityId.EditValue, oEntityId) AndAlso Loading = False Then + If Integer.TryParse(cmbEntityId.EditValue, oEntityId) AndAlso IsLoading = False Then Await LoadObject(ObjectId, oEntityId) End If End Sub + + Private Sub BaseEdit_EditValueChanged(sender As Object, e As EventArgs) + If IsLoading = True Then + Exit Sub + End If + + Dim oControlItem As LayoutControlItem = sender + Dim oControl As BaseEdit = oControlItem.Control + Dim oAttribute As Attribute = oControl.Tag + Dim oValue = oControl.EditValue + Dim oKey = oAttribute.Title + + If Changes.ContainsKey(oKey) Then + Changes.Item(oKey) = oValue + Else + Changes.Add(oAttribute.Title, oValue) + + End If + End Sub + End Class diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb index 85373fd0..1e724258 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb @@ -50,11 +50,9 @@ Partial Class frmObjectPropertyDialog Me.lbLifecycleStart = New DevExpress.XtraEditors.LabelControl() Me.txtCreatedWhen = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() - Me.txtAccessedWhen = New DevExpress.XtraEditors.TextEdit() Me.txtObjectId = New DevExpress.XtraEditors.TextEdit() Me.txtCreatedWho = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.LayoutObject = New DevExpress.XtraLayout.LayoutControlGroup() Me.SimpleSeparator1 = New DevExpress.XtraLayout.SimpleSeparator() Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() @@ -66,8 +64,6 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() - Me.txtAccessedWho = New DevExpress.XtraLayout.LayoutControlItem() Me.TabPageHistory = New DevExpress.XtraBars.TabFormPage() Me.TabFormContentContainer4 = New DevExpress.XtraBars.TabFormContentContainer() Me.GridValueHistory = New DevExpress.XtraGrid.GridControl() @@ -93,11 +89,9 @@ Partial Class frmObjectPropertyDialog CType(Me.progressLifecycle.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtCreatedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtAccessedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtObjectId.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtCreatedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutObject, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() @@ -109,8 +103,6 @@ Partial Class frmObjectPropertyDialog CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtAccessedWho, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabFormContentContainer4.SuspendLayout() CType(Me.GridValueHistory, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewValueHistory, System.ComponentModel.ISupportInitialize).BeginInit() @@ -222,11 +214,9 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlObject.Controls.Add(Me.GroupControl1) Me.LayoutControlObject.Controls.Add(Me.txtCreatedWhen) Me.LayoutControlObject.Controls.Add(Me.txtChangedWhen) - Me.LayoutControlObject.Controls.Add(Me.txtAccessedWhen) Me.LayoutControlObject.Controls.Add(Me.txtObjectId) Me.LayoutControlObject.Controls.Add(Me.txtCreatedWho) Me.LayoutControlObject.Controls.Add(Me.txtChangedWho) - Me.LayoutControlObject.Controls.Add(Me.TextEdit1) Me.LayoutControlObject.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControlObject.Location = New System.Drawing.Point(0, 0) Me.LayoutControlObject.Name = "LayoutControlObject" @@ -237,10 +227,10 @@ Partial Class frmObjectPropertyDialog ' 'GridObjectHistory ' - Me.GridObjectHistory.Location = New System.Drawing.Point(24, 211) + Me.GridObjectHistory.Location = New System.Drawing.Point(24, 181) Me.GridObjectHistory.MainView = Me.GridView1 Me.GridObjectHistory.Name = "GridObjectHistory" - Me.GridObjectHistory.Size = New System.Drawing.Size(524, 199) + Me.GridObjectHistory.Size = New System.Drawing.Size(524, 229) Me.GridObjectHistory.TabIndex = 11 Me.GridObjectHistory.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -260,7 +250,7 @@ Partial Class frmObjectPropertyDialog ' 'GridColumn7 ' - Me.GridColumn7.Caption = "Datum " + Me.GridColumn7.Caption = "Datum" Me.GridColumn7.FieldName = "ADDED_WHEN" Me.GridColumn7.Name = "GridColumn7" Me.GridColumn7.Visible = True @@ -310,81 +300,59 @@ Partial Class frmObjectPropertyDialog ' 'txtCreatedWhen ' - Me.txtCreatedWhen.Location = New System.Drawing.Point(109, 78) + Me.txtCreatedWhen.Location = New System.Drawing.Point(84, 78) Me.txtCreatedWhen.Name = "txtCreatedWhen" Me.txtCreatedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtCreatedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtCreatedWhen.Properties.ReadOnly = True - Me.txtCreatedWhen.Size = New System.Drawing.Size(172, 20) + Me.txtCreatedWhen.Size = New System.Drawing.Size(197, 20) Me.txtCreatedWhen.StyleController = Me.LayoutControlObject Me.txtCreatedWhen.TabIndex = 4 ' 'txtChangedWhen ' - Me.txtChangedWhen.Location = New System.Drawing.Point(109, 108) + Me.txtChangedWhen.Location = New System.Drawing.Point(84, 108) Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtChangedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(172, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(197, 20) Me.txtChangedWhen.StyleController = Me.LayoutControlObject Me.txtChangedWhen.TabIndex = 5 ' - 'txtAccessedWhen - ' - Me.txtAccessedWhen.Location = New System.Drawing.Point(109, 138) - Me.txtAccessedWhen.Name = "txtAccessedWhen" - Me.txtAccessedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White - Me.txtAccessedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True - Me.txtAccessedWhen.Properties.ReadOnly = True - Me.txtAccessedWhen.Size = New System.Drawing.Size(172, 20) - Me.txtAccessedWhen.StyleController = Me.LayoutControlObject - Me.txtAccessedWhen.TabIndex = 6 - ' 'txtObjectId ' - Me.txtObjectId.Location = New System.Drawing.Point(109, 48) + Me.txtObjectId.Location = New System.Drawing.Point(84, 48) Me.txtObjectId.Name = "txtObjectId" Me.txtObjectId.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtObjectId.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtObjectId.Properties.ReadOnly = True - Me.txtObjectId.Size = New System.Drawing.Size(436, 20) + Me.txtObjectId.Size = New System.Drawing.Size(461, 20) Me.txtObjectId.StyleController = Me.LayoutControlObject Me.txtObjectId.TabIndex = 7 ' 'txtCreatedWho ' - Me.txtCreatedWho.Location = New System.Drawing.Point(373, 78) + Me.txtCreatedWho.Location = New System.Drawing.Point(348, 78) Me.txtCreatedWho.Name = "txtCreatedWho" Me.txtCreatedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtCreatedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtCreatedWho.Properties.ReadOnly = True - Me.txtCreatedWho.Size = New System.Drawing.Size(172, 20) + Me.txtCreatedWho.Size = New System.Drawing.Size(197, 20) Me.txtCreatedWho.StyleController = Me.LayoutControlObject Me.txtCreatedWho.TabIndex = 8 ' 'txtChangedWho ' - Me.txtChangedWho.Location = New System.Drawing.Point(373, 108) + Me.txtChangedWho.Location = New System.Drawing.Point(348, 108) Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtChangedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(172, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(197, 20) Me.txtChangedWho.StyleController = Me.LayoutControlObject Me.txtChangedWho.TabIndex = 9 ' - 'TextEdit1 - ' - Me.TextEdit1.Location = New System.Drawing.Point(373, 138) - Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White - Me.TextEdit1.Properties.AppearanceReadOnly.Options.UseBackColor = True - Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(172, 20) - Me.TextEdit1.StyleController = Me.LayoutControlObject - Me.TextEdit1.TabIndex = 10 - ' 'LayoutObject ' Me.LayoutObject.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -397,7 +365,7 @@ Partial Class frmObjectPropertyDialog 'SimpleSeparator1 ' Me.SimpleSeparator1.AllowHotTrack = False - Me.SimpleSeparator1.Location = New System.Drawing.Point(0, 165) + Me.SimpleSeparator1.Location = New System.Drawing.Point(0, 135) Me.SimpleSeparator1.Name = "SimpleSeparator1" Me.SimpleSeparator1.Size = New System.Drawing.Size(552, 1) ' @@ -413,9 +381,9 @@ Partial Class frmObjectPropertyDialog 'LayoutControlGroup1 ' Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem8}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 166) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 136) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(552, 248) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(552, 278) Me.LayoutControlGroup1.Text = "Objekt Historie" ' 'LayoutControlItem8 @@ -423,16 +391,16 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem8.Control = Me.GridObjectHistory Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Size = New System.Drawing.Size(528, 203) + Me.LayoutControlItem8.Size = New System.Drawing.Size(528, 233) Me.LayoutControlItem8.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem8.TextVisible = False ' 'LayoutControlGroup2 ' - Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.LayoutControlItem1, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.txtAccessedWho}) + Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.LayoutControlItem1, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem2}) Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(552, 165) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(552, 135) Me.LayoutControlGroup2.Text = "Eigenschaften" ' 'LayoutControlItem4 @@ -443,7 +411,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem4.Size = New System.Drawing.Size(528, 30) Me.LayoutControlItem4.Text = "Objekt Id" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(45, 13) ' 'LayoutControlItem1 ' @@ -453,7 +421,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem1.Size = New System.Drawing.Size(264, 30) Me.LayoutControlItem1.Text = "Erstellt" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(45, 13) ' 'LayoutControlItem5 ' @@ -463,7 +431,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem5.Size = New System.Drawing.Size(264, 30) Me.LayoutControlItem5.Text = "von" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(45, 13) ' 'LayoutControlItem6 ' @@ -473,7 +441,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem6.Size = New System.Drawing.Size(264, 30) Me.LayoutControlItem6.Text = "von" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(45, 13) ' 'LayoutControlItem2 ' @@ -483,28 +451,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem2.Size = New System.Drawing.Size(264, 30) Me.LayoutControlItem2.Text = "Geändert" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(70, 13) - ' - 'LayoutControlItem3 - ' - Me.LayoutControlItem3.Control = Me.txtAccessedWhen - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 90) - Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem3.Size = New System.Drawing.Size(264, 30) - Me.LayoutControlItem3.Text = "Letzter Zugriff" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(70, 13) - ' - 'txtAccessedWho - ' - Me.txtAccessedWho.Control = Me.TextEdit1 - Me.txtAccessedWho.CustomizationFormText = "von" - Me.txtAccessedWho.Location = New System.Drawing.Point(264, 90) - Me.txtAccessedWho.Name = "txtAccessedWho" - Me.txtAccessedWho.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.txtAccessedWho.Size = New System.Drawing.Size(264, 30) - Me.txtAccessedWho.Text = "von" - Me.txtAccessedWho.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(45, 13) ' 'TabPageHistory ' @@ -615,11 +562,9 @@ Partial Class frmObjectPropertyDialog CType(Me.progressLifecycle.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtCreatedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtAccessedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtObjectId.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtCreatedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutObject, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() @@ -631,8 +576,6 @@ Partial Class frmObjectPropertyDialog CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtAccessedWho, System.ComponentModel.ISupportInitialize).EndInit() Me.TabFormContentContainer4.ResumeLayout(False) CType(Me.GridValueHistory, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewValueHistory, System.ComponentModel.ISupportInitialize).EndInit() @@ -665,12 +608,10 @@ Partial Class frmObjectPropertyDialog Friend WithEvents AttributeLayout As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents txtCreatedWhen As DevExpress.XtraEditors.TextEdit Friend WithEvents txtChangedWhen As DevExpress.XtraEditors.TextEdit - Friend WithEvents txtAccessedWhen As DevExpress.XtraEditors.TextEdit Friend WithEvents txtObjectId As DevExpress.XtraEditors.TextEdit Friend WithEvents SimpleSeparator1 As DevExpress.XtraLayout.SimpleSeparator Friend WithEvents txtCreatedWho As DevExpress.XtraEditors.TextEdit Friend WithEvents txtChangedWho As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit Friend WithEvents lbLifecycleStart As DevExpress.XtraEditors.LabelControl Friend WithEvents lbLifecycleEnd As DevExpress.XtraEditors.LabelControl Friend WithEvents progressLifecycle As DevExpress.XtraEditors.ProgressBarControl @@ -683,8 +624,6 @@ Partial Class frmObjectPropertyDialog Friend WithEvents LayoutControlItem2 As LayoutControlItem Friend WithEvents LayoutControlItem5 As LayoutControlItem Friend WithEvents LayoutControlItem6 As LayoutControlItem - Friend WithEvents LayoutControlItem3 As LayoutControlItem - Friend WithEvents txtAccessedWho As LayoutControlItem Friend WithEvents LayoutControlItem8 As LayoutControlItem Friend WithEvents btnSave As DevExpress.XtraBars.BarButtonItem Friend WithEvents LayoutControlGroup1 As LayoutControlGroup diff --git a/GUIs.Common/Resources/columnheaders.svg b/GUIs.Common/Resources/columnheaders.svg new file mode 100644 index 00000000..3539a81d --- /dev/null +++ b/GUIs.Common/Resources/columnheaders.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/filterquery.svg b/GUIs.Common/Resources/filterquery.svg new file mode 100644 index 00000000..1950b60d --- /dev/null +++ b/GUIs.Common/Resources/filterquery.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/groupheader.svg b/GUIs.Common/Resources/groupheader.svg new file mode 100644 index 00000000..0fea94fb --- /dev/null +++ b/GUIs.Common/Resources/groupheader.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/save1.svg b/GUIs.Common/Resources/save1.svg new file mode 100644 index 00000000..b09d6ee8 --- /dev/null +++ b/GUIs.Common/Resources/save1.svg @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/title.svg b/GUIs.Common/Resources/title.svg new file mode 100644 index 00000000..2687569e --- /dev/null +++ b/GUIs.Common/Resources/title.svg @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/frmDocumentResultList.Designer.vb b/GUIs.Common/frmDocumentResultList.Designer.vb index 00f8adc3..1e0eab61 100644 --- a/GUIs.Common/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/frmDocumentResultList.Designer.vb @@ -21,6 +21,7 @@ Partial Class frmDocumentResultList Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocumentResultList)) + Dim PushTransition1 As DevExpress.Utils.Animation.PushTransition = New DevExpress.Utils.Animation.PushTransition() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.GridView1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() @@ -57,23 +58,25 @@ Partial Class frmDocumentResultList Me.chkGridShowQuickfilter = New DevExpress.XtraBars.BarCheckItem() Me.chkGridShowGrouping = New DevExpress.XtraBars.BarCheckItem() Me.chkGridShowTitle = New DevExpress.XtraBars.BarCheckItem() + Me.MenuItemSaveProperties = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem() + Me.BarWorkspaceMenuItem1 = New DevExpress.XtraBars.BarWorkspaceMenuItem() + Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components) Me.RibbonPageCategoryFile = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() Me.RibbonPage4 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup7 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupFilesystem = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup8 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageExport = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup_Layout = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup9 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupExport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup_Layout = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.RepositoryItemTextEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -183,12 +186,13 @@ Partial Class frmDocumentResultList 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemPropertiesECM, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemPropertiesECM, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarWorkspaceMenuItem1}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") - Me.RibbonControl.MaxItemId = 43 + Me.RibbonControl.MaxItemId = 46 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryFile}) - Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPageExport, Me.RibbonPage2}) + Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1) + Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2}) Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl.ShowToolbarCustomizeItem = False @@ -404,20 +408,49 @@ Partial Class frmDocumentResultList ' resources.ApplyResources(Me.chkGridShowQuickfilter, "chkGridShowQuickfilter") Me.chkGridShowQuickfilter.Id = 40 + Me.chkGridShowQuickfilter.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.filterquery Me.chkGridShowQuickfilter.Name = "chkGridShowQuickfilter" ' 'chkGridShowGrouping ' resources.ApplyResources(Me.chkGridShowGrouping, "chkGridShowGrouping") Me.chkGridShowGrouping.Id = 41 + Me.chkGridShowGrouping.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.groupheader Me.chkGridShowGrouping.Name = "chkGridShowGrouping" ' 'chkGridShowTitle ' resources.ApplyResources(Me.chkGridShowTitle, "chkGridShowTitle") Me.chkGridShowTitle.Id = 42 + Me.chkGridShowTitle.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.title Me.chkGridShowTitle.Name = "chkGridShowTitle" ' + 'MenuItemSaveProperties + ' + resources.ApplyResources(Me.MenuItemSaveProperties, "MenuItemSaveProperties") + Me.MenuItemSaveProperties.Id = 43 + Me.MenuItemSaveProperties.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.save1 + Me.MenuItemSaveProperties.Name = "MenuItemSaveProperties" + ' + 'BarButtonItem11 + ' + resources.ApplyResources(Me.BarButtonItem11, "BarButtonItem11") + Me.BarButtonItem11.Id = 44 + Me.BarButtonItem11.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.columnheaders + Me.BarButtonItem11.Name = "BarButtonItem11" + ' + 'BarWorkspaceMenuItem1 + ' + resources.ApplyResources(Me.BarWorkspaceMenuItem1, "BarWorkspaceMenuItem1") + Me.BarWorkspaceMenuItem1.Id = 45 + Me.BarWorkspaceMenuItem1.Name = "BarWorkspaceMenuItem1" + Me.BarWorkspaceMenuItem1.WorkspaceManager = Me.WorkspaceManager1 + ' + 'WorkspaceManager1 + ' + Me.WorkspaceManager1.TargetControl = Me + Me.WorkspaceManager1.TransitionType = PushTransition1 + ' 'RibbonPageCategoryFile ' Me.RibbonPageCategoryFile.Appearance.BackColor = System.Drawing.Color.DarkGreen @@ -430,22 +463,18 @@ Partial Class frmDocumentResultList ' Me.RibbonPage4.Appearance.BackColor = System.Drawing.Color.Green Me.RibbonPage4.Appearance.Options.UseBackColor = True - Me.RibbonPage4.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup7, Me.RibbonPageGroupFilesystem}) + Me.RibbonPage4.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroupFilesystem}) Me.RibbonPage4.Name = "RibbonPage4" resources.ApplyResources(Me.RibbonPage4, "RibbonPage4") ' 'RibbonPageGroup3 ' Me.RibbonPageGroup3.ItemLinks.Add(Me.MenuItemFileOpen) + Me.RibbonPageGroup3.ItemLinks.Add(Me.MenuItemSaveProperties) + Me.RibbonPageGroup3.ItemLinks.Add(Me.MenuItemPropertiesECM) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") ' - 'RibbonPageGroup7 - ' - Me.RibbonPageGroup7.ItemLinks.Add(Me.MenuItemPropertiesECM, True) - Me.RibbonPageGroup7.Name = "RibbonPageGroup7" - resources.ApplyResources(Me.RibbonPageGroup7, "RibbonPageGroup7") - ' 'RibbonPageGroupFilesystem ' Me.RibbonPageGroupFilesystem.ItemLinks.Add(Me.MenuItemFolderOpen) @@ -476,7 +505,7 @@ Partial Class frmDocumentResultList ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroup5}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroup9, Me.RibbonPageGroupExport, Me.RibbonPageGroup5}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -487,6 +516,23 @@ Partial Class frmDocumentResultList Me.RibbonPageGroup_Navigation.Name = "RibbonPageGroup_Navigation" resources.ApplyResources(Me.RibbonPageGroup_Navigation, "RibbonPageGroup_Navigation") ' + 'RibbonPageGroup9 + ' + Me.RibbonPageGroup9.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowQuickfilter) + Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowGrouping) + Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowTitle) + Me.RibbonPageGroup9.ItemLinks.Add(Me.BarButtonItem11) + Me.RibbonPageGroup9.Name = "RibbonPageGroup9" + resources.ApplyResources(Me.RibbonPageGroup9, "RibbonPageGroup9") + ' + 'RibbonPageGroupExport + ' + Me.RibbonPageGroupExport.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroupExport.ItemLinks.Add(Me.BarButtonItemExportGrid1) + Me.RibbonPageGroupExport.Name = "RibbonPageGroupExport" + resources.ApplyResources(Me.RibbonPageGroupExport, "RibbonPageGroupExport") + ' 'RibbonPageGroup5 ' Me.RibbonPageGroup5.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far @@ -494,31 +540,12 @@ Partial Class frmDocumentResultList Me.RibbonPageGroup5.Name = "RibbonPageGroup5" resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") ' - 'RibbonPageExport - ' - Me.RibbonPageExport.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2}) - Me.RibbonPageExport.Name = "RibbonPageExport" - resources.ApplyResources(Me.RibbonPageExport, "RibbonPageExport") - ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItemExportGrid1) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") - ' 'RibbonPage2 ' - Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup9, Me.RibbonPageGroup_Layout}) + Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup_Layout}) Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' - 'RibbonPageGroup_Layout - ' - Me.RibbonPageGroup_Layout.ItemLinks.Add(Me.SwitchMainContainerHorizontal) - Me.RibbonPageGroup_Layout.ItemLinks.Add(Me.SwitchDetailContainerHorizontal) - Me.RibbonPageGroup_Layout.Name = "RibbonPageGroup_Layout" - resources.ApplyResources(Me.RibbonPageGroup_Layout, "RibbonPageGroup_Layout") - ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonResetLayout) @@ -526,13 +553,12 @@ Partial Class frmDocumentResultList Me.RibbonPageGroup1.Name = "RibbonPageGroup1" resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") ' - 'RibbonPageGroup9 + 'RibbonPageGroup_Layout ' - Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowQuickfilter) - Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowGrouping) - Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowTitle) - Me.RibbonPageGroup9.Name = "RibbonPageGroup9" - resources.ApplyResources(Me.RibbonPageGroup9, "RibbonPageGroup9") + Me.RibbonPageGroup_Layout.ItemLinks.Add(Me.SwitchMainContainerHorizontal) + Me.RibbonPageGroup_Layout.ItemLinks.Add(Me.SwitchDetailContainerHorizontal) + Me.RibbonPageGroup_Layout.Name = "RibbonPageGroup_Layout" + resources.ApplyResources(Me.RibbonPageGroup_Layout, "RibbonPageGroup_Layout") ' 'RepositoryItemTextEdit1 ' @@ -796,8 +822,7 @@ Partial Class frmDocumentResultList Friend WithEvents ButtonRefresh As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageExport As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupExport As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem @@ -808,7 +833,6 @@ Partial Class frmDocumentResultList Friend WithEvents RibbonPageGroupFilesystem As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageGroup7 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager Friend WithEvents DockPanelDocViewer As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer @@ -831,4 +855,8 @@ Partial Class frmDocumentResultList Friend WithEvents chkGridShowTitle As DevExpress.XtraBars.BarCheckItem Friend WithEvents RibbonPageGroup8 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroup9 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents MenuItemSaveProperties As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem11 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarWorkspaceMenuItem1 As DevExpress.XtraBars.BarWorkspaceMenuItem + Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager End Class diff --git a/GUIs.Common/frmDocumentResultList.resx b/GUIs.Common/frmDocumentResultList.resx index 63ffa7db..0471653c 100644 --- a/GUIs.Common/frmDocumentResultList.resx +++ b/GUIs.Common/frmDocumentResultList.resx @@ -468,291 +468,26 @@ Titel anzeigen - - 0, 0 - - - RibbonPageGroup3 - - - RibbonPageGroup7 - - - RibbonPageGroup4 - - - Aktionen 1 - - - RibbonPageGroup4 - - - RibbonPageGroup8 - - - Aktionen 2 - - - Datei - - - Navigation - - - RibbonPageGroup5 - - - Start - - - RibbonPageGroup2 - - - Export - - - RibbonPageGroup1 - - - Tabellen Einstellungen - - - Layout - - - Layout - - - - False - - - False - - - 1189, 158 - - - 0, 647 - - - 1189, 24 - - - RibbonStatusBar - - - DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 3 - - - RibbonControl - - - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 4 - - - 568, 460 - - - 0 - - - GridControl1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl1.Panel1 - - - 0 - - - Panel1 - - - SplitContainerControl1.Panel1 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl1 - - - 0 - - - Fill - - - 0, 0 - - - Fill - - - 0, 0 - - - Tahoma, 9pt, style=Bold - - - GridBand2 - - - GridBand2 - - - 0, 0 - - - 0 - - - GridControl2 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl2.Panel1 - - - 0 - - - Panel1 - - - SplitContainerControl2.Panel1 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl2 - - - 0 - - - Fill - - - 0, 0 - - - Tahoma, 9pt, style=Bold - - - GridBand3 - - - GridBand3 - - - 0, 0 - - - 0 - - - GridControl3 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl2.Panel2 - - - 0 - - - Panel2 - - - SplitContainerControl2.Panel2 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl2 - - - 1 - - - 0, 0 - - - 0 - - - SplitContainerControl2 - - - SplitContainerControl2 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl1.Panel2 - - - 0 - - - Panel2 - - - SplitContainerControl1.Panel2 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl1 - - - 1 - - - 578, 460 - - - 2 - - - SplitContainerControl1 - - - SplitContainerControl1 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DockPanel2_Container - - - 0 + + Speichern + + + Spaltenauswahl + + + BarWorkspaceMenuItem1 + + + 456, 22 + + + True + + + 6, 13 + + + 1189, 671 Fill @@ -763,6 +498,7 @@ 318, 459 + 0 @@ -778,24 +514,6 @@ 0 - - 12, 27 - - - RibbonPageGroup6 - - - 155, 22 - - - True - - - 6, 13 - - - 1189, 671 - 3, 26 @@ -890,7 +608,7 @@ 280, 489 - Mehr + Eigenschaften DockPanelMetadata @@ -946,6 +664,24 @@ 2 + + 0, 647 + + + 1189, 24 + + + RibbonStatusBar + + + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 3 + AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA @@ -1227,6 +963,30 @@ DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + MenuItemSaveProperties + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem11 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarWorkspaceMenuItem1 + + + DevExpress.XtraBars.BarWorkspaceMenuItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + WorkspaceManager1 + + + DevExpress.Utils.WorkspaceManager, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPageCategoryFile @@ -1245,12 +1005,6 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup7 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPageGroupFilesystem @@ -1287,46 +1041,40 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageGroup9 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroupExport + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPageGroup5 DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageExport - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup2 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPage2 DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup_Layout - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPageGroup1 DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup9 + + RibbonPageGroup_Layout - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1395,6 +1143,276 @@ DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 0, 0 + + + Dokument + + + Dateien und Ordner + + + Aktionen 1 + + + Workflow + + + Bearbeiten + + + Aktionen 2 + + + Datei + + + Navigation + + + Tabellen Einstellungen + + + Export + + + Aktualisieren + + + Start + + + RibbonPageGroup1 + + + Layout + + + Layout + + + False + + + False + + + 1189, 158 + + + RibbonControl + + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 4 + + + 568, 460 + + + 0 + + + GridControl1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1.Panel1 + + + 0 + + + Panel1 + + + SplitContainerControl1.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 0 + + + Fill + + + 0, 0 + + + Fill + + + 0, 0 + + + Tahoma, 9pt, style=Bold + + + GridBand2 + + + GridBand2 + + + 0, 0 + + + 0 + + + GridControl2 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl2.Panel1 + + + 0 + + + Panel1 + + + SplitContainerControl2.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl2 + + + 0 + + + Fill + + + 0, 0 + + + Tahoma, 9pt, style=Bold + + + GridBand3 + + + GridBand3 + + + 0, 0 + + + 0 + + + GridControl3 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl2.Panel2 + + + 0 + + + Panel2 + + + SplitContainerControl2.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl2 + + + 1 + + + 0, 0 + + + 0 + + + SplitContainerControl2 + + + SplitContainerControl2 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1.Panel2 + + + 0 + + + Panel2 + + + SplitContainerControl1.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 1 + + + 578, 460 + + + 2 + + + SplitContainerControl1 + + + SplitContainerControl1 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanel2_Container + + + 0 + + + 12, 27 + + + RibbonPageGroup6 + + + 155, 22 + 290, 22 diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb index df2d62a6..9c557087 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -25,61 +25,52 @@ Imports DigitalData.GUIs.Common.Base Public Class frmDocumentResultList Implements IResultForm, IBaseForm - ' These are NOT constants, only defaults - ' Can be changed when calling frmDocumentResultList - Private ReadOnly COLUMN_FILEPATH As String = "FULL_FILENAME" - Private ReadOnly COLUMN_FILENAME As String = "Filename" - Private ReadOnly COLUMN_DOCID As String = "DocID" - Private ReadOnly COLUMN_ICON As String = "ICON" - ' Constants - Private Const OPEN_FILE As String = "Datei öffnen" - Private Const OPEN_DIRECTORY As String = "Ordner öffnen" - Private Const COPY_FILE_PATH As String = "Dateipfad kopieren" - Private Const COPY_FOLDER_PATH As String = "Ordnerpfad kopieren" - Private Const OPEN_PROPERTIES As String = "Eigenschaften" - Private Const FILE_OPEN_TIMER_INTERVAL As Integer = 500 + Private Const SaveWindowLocationAndSize As Integer = 1 + ' Interface implementations Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger Public ReadOnly Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler + Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm ' Helper Classes - Private _IDBClient As Client + Private Client As Client + Private Documentloader As DocumentResultList.Loader + Private ControlManager As AttributeControls + Private ReadOnly Config As ConfigManager(Of DocumentResultList.Config) Private ReadOnly Environment As Environment Private ReadOnly Filesystem As Modules.Filesystem.File Private ReadOnly GridBuilder As GridBuilder Private ReadOnly FileEx As Modules.Windows.File - Private ReadOnly Helpers As DocumentResultList.Helpers Private ReadOnly Params As DocumentResultList.Params Private ReadOnly LayoutManager As DocumentResultList.Layout - Private WithEvents Watcher As DocumentResultList.Watcher - Private ControlManager As AttributeControls - - Private Documentloader As DocumentResultList.Loader ' Runtime variables Private Property ResultLists As List(Of DocumentResultList.DocumentResult) - Private _IsLoading As Boolean = True + Private IsLoading As Boolean = True Private _DragBoxFromMouseDown As Rectangle Private _ScreenOffset As Point Private _CurrentDocument As DocumentResultList.Document = Nothing - Private ReadOnly _FileOpenList As New Dictionary(Of Integer, String) - Private ReadOnly _Language As String + Private ReadOnly UserLanguage As String + + Private ReadOnly ColumnFilepath As String = "FULL_FILENAME" + Private ReadOnly ColumnFilename As String = "Filename" + Private ReadOnly ColumnDocumentId As String = "DocID" + Private ReadOnly ColumnIcon As String = "ICON" Private Property _ActiveGrid As GridControl = Nothing Private Property _ActiveGridBand As GridBand = Nothing Private Property GridList As List(Of GridControl) Private Property ViewList As List(Of BandedGridView) - Private Property OperationMode As OperationMode Implements IResultForm.OperationMode - Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm + Public Event NeedsRefresh As EventHandler(Of Integer) Implements IResultForm.NeedsRefresh Public Event ResultsRefreshed As EventHandler(Of List(Of DocumentResultList.DocumentResult)) @@ -94,10 +85,10 @@ Public Class frmDocumentResultList ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. Dim oConfigPath As String = Path.Combine(Application.UserAppDataPath, "ResultList", pParams.WindowGuid) - COLUMN_DOCID = pParams.ColumnNames.ObjectIdColumn - COLUMN_FILENAME = pParams.ColumnNames.FilenameColumn - COLUMN_FILEPATH = pParams.ColumnNames.FullPathColumn - COLUMN_ICON = pParams.ColumnNames.IconColumn + ColumnDocumentId = pParams.ColumnNames.ObjectIdColumn + ColumnFilename = pParams.ColumnNames.FilenameColumn + ColumnFilepath = pParams.ColumnNames.FullPathColumn + ColumnIcon = pParams.ColumnNames.IconColumn LogConfig = pLogConfig Logger = pLogConfig.GetLogger() @@ -115,7 +106,7 @@ Public Class frmDocumentResultList Watcher = New DocumentResultList.Watcher(pLogConfig) LayoutManager = New DocumentResultList.Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}) - _Language = Utils.NotNull(Me.Environment.User.Language, State.UserState.LANG_EN_US) + UserLanguage = Utils.NotNull(Me.Environment.User.Language, State.UserState.LANG_EN_US) End Sub Private Function GetOperationMode() As OperationMode @@ -144,19 +135,20 @@ Public Class frmDocumentResultList End If - Documentloader = New DocumentResultList.Loader(LogConfig, OperationMode, _IDBClient, Environment.User) + Documentloader = New DocumentResultList.Loader(LogConfig, OperationMode, Client, Environment.User) If Params.WindowTitle <> "" Then Text = $"{Text} - {Params.WindowTitle}" End If ' Initialize Viewer with GDPicture.NET License - If Environment.Settings.GdPictureKey = String.Empty Then - Throw New ApplicationException("GDPicture Licensekey is missing!") + If Environment.Settings.GdPictureKey <> String.Empty Then + DocumentViewer1.Init(LogConfig, Environment.Settings.GdPictureKey) End If - DocumentViewer1.Init(LogConfig, Environment.Settings.GdPictureKey) 'Load config + LayoutManager.LoadWindowLocationAndSize(Me) + LayoutManager.DockManager_RestoreLayout(DockManager1) SplitContainerControl1.SplitterPosition = Config.Config.SplitContainer1Distance SwitchMainContainerHorizontal.Checked = Config.Config.SplitContainer1Horizontal SplitContainerControl2.SplitterPosition = Config.Config.SplitContainer2Distance @@ -174,32 +166,16 @@ Public Class frmDocumentResultList End If If OperationMode <> OperationMode.NoAppServer Then - ' Location and size will be managed by the ZooFlow Search Window - If Utils.IsVisibleOnAnyScreen(Config.Config.WindowLocation) Then - If Utils.LocationIsVisible(Config.Config.WindowLocation) Then - Location = Config.Config.WindowLocation - End If - If Utils.SizeIsVisible(Config.Config.WindowSize) Then - Size = Config.Config.WindowSize - End If - End If - - CtrlObjectPropertyDialog.Initialize(LogConfig, Me, _IDBClient, Environment) + CtrlObjectPropertyDialog.Initialize(LogConfig, Me, Client, Environment) SwitchMainContainerHorizontal.Visibility = BarItemVisibility.Never SwitchDetailContainerHorizontal.Visibility = BarItemVisibility.Never End If - GridBuilder.WithReadOnlyOptions() - - AddHandler GridView1.FocusedRowChanged, AddressOf GridView_FocusedRowChanged - AddHandler GridView2.FocusedRowChanged, AddressOf GridView_FocusedRowChanged - AddHandler GridView3.FocusedRowChanged, AddressOf GridView_FocusedRowChanged - UpdateTotalResults() - UpdateGridData() + LoadGridDataAndLayout() - LayoutManager.DockManager_RestoreLayout(DockManager1) + GridBuilder.WithReadOnlyOptions() chkGridShowQuickfilter.Checked = LayoutManager.GetFilterRowVisible() chkGridShowGrouping.Checked = LayoutManager.GetGroupPanelVisible() @@ -209,7 +185,7 @@ Public Class frmDocumentResultList ErrorHandler.ShowErrorMessage(ex, "Error while loading results", "Form Load") Finally - _IsLoading = False + IsLoading = False End Try End Sub @@ -218,10 +194,7 @@ Public Class frmDocumentResultList Try LayoutManager.GridView_SaveLayout(_ActiveGrid.MainView) LayoutManager.DockManager_SaveLayout(DockManager1) - - Config.Config.WindowLocation = Location - Config.Config.WindowSize = Size - Config.Save() + LayoutManager.SaveWindowLocationAndSize(Me) DocumentViewer1.Done() Catch ex As Exception @@ -229,7 +202,7 @@ Public Class frmDocumentResultList End Try End Sub - Private Async Sub GridView_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) + Private Async Sub GridView_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) Handles GridView1.FocusedRowChanged, GridView2.FocusedRowChanged, GridView3.FocusedRowChanged Helpers.SetRowHandle(e) Try @@ -237,52 +210,48 @@ Public Class frmDocumentResultList If e.FocusedRowHandle >= 0 Then Dim oRow = sender.GetDataRow(Helpers.ActiveRowHandle) - Dim oObjectId = oRow.ItemEx(Of Long)(COLUMN_DOCID, 0) - Dim oFullPath = oRow.ItemEx(Of String)(COLUMN_FILEPATH, "") + Dim oObjectId = oRow.ItemEx(Of Long)(ColumnDocumentId, 0) + Dim oFullPath = oRow.ItemEx(ColumnFilepath, "") Dim oDocumentInfo As DocumentResultList.Document = Nothing - DocumentViewer1.CloseDocument() + ' Show Ribbon Category + RibbonPageCategoryFile.Visible = True + ' Load DocumentInfo oDocumentInfo = Documentloader.Load(oObjectId, oFullPath) - - ' Check DocumentInfo If IsNothing(oDocumentInfo) Then + DocumentViewer1.CloseDocument() ErrorHandler.ShowErrorMessage("File could not be loaded!") Exit Sub End If - Dim oFileName = $"{oObjectId}.{oDocumentInfo.Extension}" - - DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocumentInfo.Contents)) - - ' Save reference to current + ' Save reference to current document _CurrentDocument = oDocumentInfo + ' Load Document in Document Viewer + Dim oFileName = $"{oObjectId}.{oDocumentInfo.Extension}" + DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocumentInfo.Contents)) + ' Hide Export and filesystem options for view only right If oDocumentInfo.AccessRight = Rights.AccessRight.VIEW_ONLY Then DocumentViewer1.SetViewOnly(True) - RibbonPageExport.Visible = False + RibbonPageGroupExport.Visible = False RibbonPageGroupFilesystem.Visible = False Else DocumentViewer1.SetViewOnly(False) - RibbonPageExport.Visible = True + RibbonPageGroupExport.Visible = True RibbonPageGroupFilesystem.Visible = True End If If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then - Dim oEntityId = 1 - Dim oAttributes = Await ControlManager.GetAttributesForBusinessEntity(oEntityId) - - If oAttributes.Count = 0 Then - MsgBox($"Es konnten keine Attribute für das Objekt '{oObjectId}' geladen werden!", MsgBoxStyle.Critical, Text) - End If + 'Dim oEntityId = 1 + 'Dim oAttributes = Await ControlManager.GetAttributesForBusinessEntity(oEntityId) + 'If oAttributes.Count = 0 Then + ' MsgBox($"Es konnten keine Attribute für das Objekt '{oObjectId}' geladen werden!", MsgBoxStyle.Critical, Text) + 'End If Await CtrlObjectPropertyDialog.LoadObject(oObjectId) - - 'Await ControlManager.LoadControlsForAttributes(oObjectId, oAttributes, RootMetadata) End If - - RibbonPageCategoryFile.Visible = True Else RibbonPageCategoryFile.Visible = False End If @@ -296,7 +265,7 @@ Public Class frmDocumentResultList #Region "Watcher" Public Async Sub Watcher_FileOpened(sender As Object, e As DocumentResultList.Watcher.FileOpenedArgs) Handles Watcher.FileOpened - Await _IDBClient.SetObjectStateAsync(e.File.Document.Id, OBJECT_STATE_FILE_OPENED, New Options.SetObjectStateOptions With { + Await Client.SetObjectStateAsync(e.File.Document.Id, OBJECT_STATE_FILE_OPENED, New Options.SetObjectStateOptions With { .Language = Environment.User.Language, .Username = Environment.User.UserName }) @@ -308,7 +277,7 @@ Public Class frmDocumentResultList Dim oDoctype As GlobalStateDoctype = Nothing If e.File.Document.DocumentType IsNot Nothing Then - oDoctype = _IDBClient.ClientConfig.DocumentTypes. + oDoctype = Client.ClientConfig.DocumentTypes. Where(Function(doctype) doctype.Name = e.File.Document.DocumentType). FirstOrDefault() End If @@ -346,7 +315,7 @@ Public Class frmDocumentResultList Private Async Function Watcher_OverwriteFile(pFile As DocumentResultList.Watcher.OpenFile) As Task Await Watcher_UpdateFile(pFile, pCreateNewVersion:=False) - Await _IDBClient.SetObjectStateAsync(pFile.Document.Id, OBJECT_STATE_FILE_CHANGED, New Options.SetObjectStateOptions With { + Await Client.SetObjectStateAsync(pFile.Document.Id, OBJECT_STATE_FILE_CHANGED, New Options.SetObjectStateOptions With { .Language = Environment.User.Language, .Username = Environment.User.UserName }) @@ -354,7 +323,7 @@ Public Class frmDocumentResultList Private Async Function Watcher_VersionFile(pFile As DocumentResultList.Watcher.OpenFile) As Task Await Watcher_UpdateFile(pFile, pCreateNewVersion:=True) - Await _IDBClient.SetObjectStateAsync(pFile.Document.Id, OBJECT_STATE_FILE_VERSIONED, New Options.SetObjectStateOptions With { + Await Client.SetObjectStateAsync(pFile.Document.Id, OBJECT_STATE_FILE_VERSIONED, New Options.SetObjectStateOptions With { .Language = Environment.User.Language, .Username = Environment.User.UserName }) @@ -363,7 +332,7 @@ Public Class frmDocumentResultList Private Async Function Watcher_UpdateFile(pFile As DocumentResultList.Watcher.OpenFile, pCreateNewVersion As Boolean) As Task Dim oFileInfo As New FileInfo(pFile.FilePath) Dim oDisplayName As String = pFile.Document.DisplayFileName - Dim oObjectId = Await _IDBClient.UpdateFileAsync(pFile.Document.Id, pFile.FilePath, New Options.UpdateFileOptions With { + Dim oObjectId = Await Client.UpdateFileAsync(pFile.Document.Id, pFile.FilePath, New Options.UpdateFileOptions With { .CreateNewFileVersion = pCreateNewVersion, .Language = Environment.User.Language, .Username = Environment.User.UserName @@ -401,17 +370,15 @@ Public Class frmDocumentResultList End Function #End Region - - Private Function InitAppServer() As Boolean Dim oSplit As List(Of String) = Environment.Service.Address.Split(":").ToList() Dim oAddress As String = oSplit.Item(0) Dim oPort As Integer = oSplit.Item(1) - _IDBClient = New Client(LogConfig, oAddress, oPort) - ControlManager = New AttributeControls(LogConfig, Environment, _IDBClient) + Client = New Client(LogConfig, oAddress, oPort) + ControlManager = New AttributeControls(LogConfig, Environment, Client) - If Not _IDBClient.Connect() Then + If Not Client.Connect() Then Logger.Warn("Client could not connect to Service at [{0}]", Environment.Service.Address) Return False End If @@ -427,7 +394,7 @@ Public Class frmDocumentResultList Dim oDelegate As New RefreshResultsDelegate(AddressOf RefreshResults) Return GridControl1.Invoke(oDelegate, pResults) Else - _IsLoading = True + IsLoading = True Try ' Save the new results ResultLists = pResults @@ -437,7 +404,7 @@ Public Class frmDocumentResultList ' Update the grid UpdateTotalResults() - UpdateGridData() + LoadGridDataAndLayout() Return True Catch ex As Exception @@ -446,18 +413,18 @@ Public Class frmDocumentResultList MessageBox.Show("Error while refreshing results:" & vbNewLine & vbNewLine & ex.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error) Return False Finally - _IsLoading = False + IsLoading = False End Try End If End Function Private Sub LoadGridData(View As GridView, Result As DocumentResultList.DocumentResult) - If Result.Datatable.Columns.Contains(COLUMN_DOCID) = False Then - Throw New ApplicationException($"Datatable is missing DocId Column [{COLUMN_DOCID}] for search {Result.Title}!") + If Result.Datatable.Columns.Contains(ColumnDocumentId) = False Then + Throw New ApplicationException($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!") End If - If OperationMode = OperationMode.NoAppServer And Result.Datatable.Columns.Contains(COLUMN_FILEPATH) = False Then - Throw New ApplicationException($"Datatable is missing Filepath Column [{COLUMN_FILEPATH}] for search {Result.Title}!") + If OperationMode = OperationMode.NoAppServer And Result.Datatable.Columns.Contains(ColumnFilepath) = False Then + Throw New ApplicationException($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!") End If SetGridDataSource(View, Result.Datatable) @@ -478,7 +445,7 @@ Public Class frmDocumentResultList End Try End Sub - Private Sub UpdateGridData() + Private Sub LoadGridDataAndLayout() ' Load Grids For oIndex = 0 To ResultLists.Count - 1 Select Case oIndex @@ -486,24 +453,24 @@ Public Class frmDocumentResultList Dim oResult As DocumentResultList.DocumentResult = ResultLists.Item(0) LoadGridData(GridView1, oResult) - CreateDocumentGrid(GridView1, oResult) LayoutManager.GridView_RestoreLayout(GridView1) + CreateDocumentGrid(GridView1, oResult) UpdateGridHeader(ResultLists, oIndex, oResult.Datatable.Rows.Count) Case 1 Dim oResult As DocumentResultList.DocumentResult = ResultLists.Item(1) LoadGridData(GridView2, oResult) - CreateDocumentGrid(GridView2, oResult) LayoutManager.GridView_RestoreLayout(GridView2) + CreateDocumentGrid(GridView2, oResult) UpdateGridHeader(ResultLists, oIndex, oResult.Datatable.Rows.Count) Case 2 Dim oResult As DocumentResultList.DocumentResult = ResultLists.Item(2) LoadGridData(GridView3, oResult) - CreateDocumentGrid(GridView3, oResult) LayoutManager.GridView_RestoreLayout(GridView3) + CreateDocumentGrid(GridView3, oResult) UpdateGridHeader(ResultLists, oIndex, oResult.Datatable.Rows.Count) Case Else @@ -569,8 +536,8 @@ Public Class frmDocumentResultList Private Sub CreateDocumentGrid(GridView As BandedGridView, Result As DocumentResultList.DocumentResult) Try - If IsNothing(GridView.Columns(COLUMN_ICON)) Then - Dim oIconColumn = GridView.Columns.AddVisible(COLUMN_ICON, COLUMN_ICON) + If IsNothing(GridView.Columns(ColumnIcon)) Then + Dim oIconColumn = GridView.Columns.AddVisible(ColumnIcon, ColumnIcon) With oIconColumn .OptionsColumn.AllowSort = False .OptionsColumn.AllowSize = False @@ -586,55 +553,61 @@ Public Class frmDocumentResultList oFirstBand.Columns.MoveTo(0, oIconColumn) End If - Dim oCreated, oChanged As String - If _Language = State.UserState.LANG_DE_DE Then - oChanged = "Geändert" - oCreated = "Erstellt" - Else - oCreated = "Created" - oChanged = "Changed" - End If Dim oColumnsToHide As New List(Of String) From { - oCreated, oChanged, COLUMN_DOCID, COLUMN_FILEPATH, - "CREATED_WHEN", "CREATED_WHO", "ADDED_WHEN", "ADDED_WHO" + ColumnDocumentId, + ColumnFilepath, + ColumnFilename, + ColumnIcon, + "ADDED_WHEN", "ADDED_WHO", "CHANGED_WHEN", "CHANGED_WHO", + "Added when", "Added who", "Changed when", "Changed who" } For Each oFieldName As String In oColumnsToHide Try - Dim oColumn = GridView.Columns(oFieldName) + Dim oColumn = GridView.Columns. + Where(Function(column) column.FieldName.ToUpper.Equals(oFieldName.ToUpper)). + FirstOrDefault() If oColumn IsNot Nothing Then - oColumn.Visible = False + oColumn.VisibleIndex = -1 End If Catch ex As Exception End Try Next - Try - Dim oFilePathColumn As GridColumn = GridView.Columns(COLUMN_FILEPATH) - If Not IsNothing(oFilePathColumn) Then - ' Hide Fullpath column completely in AppServer-Mode - If OperationMode = OperationMode.WithAppServer Then - oFilePathColumn.OptionsColumn.ShowInCustomizationForm = False - End If - End If + 'Dim oCreated, oChanged As String + 'If UserLanguage = State.UserState.LANG_DE_DE Then + ' oChanged = "Geändert" + ' oCreated = "Erstellt" + 'Else + ' oCreated = "Created" + ' oChanged = "Changed" + 'End If + 'Try + ' Dim oFilePathColumn As GridColumn = GridView.Columns(ColumnFilepath) + ' If Not IsNothing(oFilePathColumn) Then + ' ' Hide Fullpath column completely in AppServer-Mode + ' If OperationMode = OperationMode.WithAppServer Then + ' oFilePathColumn.OptionsColumn.ShowInCustomizationForm = False + ' End If + ' End If - 'Dim oCreatedColumn = GridView.Columns(oCreated) - 'If Not IsNothing(oCreatedColumn) Then - ' oCreatedColumn.DisplayFormat.FormatType = FormatType.DateTime - ' oCreatedColumn.DisplayFormat.FormatString = Environment.User.DateFormat & " HH:MM:ss" - 'End If + ' 'Dim oCreatedColumn = GridView.Columns(oCreated) + ' 'If Not IsNothing(oCreatedColumn) Then + ' ' oCreatedColumn.DisplayFormat.FormatType = FormatType.DateTime + ' ' oCreatedColumn.DisplayFormat.FormatString = Environment.User.DateFormat & " HH:MM:ss" + ' 'End If - 'Dim oChangedColumn = GridView.Columns(oChanged) - 'If Not IsNothing(oChangedColumn) Then - ' oChangedColumn.DisplayFormat.FormatType = FormatType.DateTime - ' oChangedColumn.DisplayFormat.FormatString = Environment.User.DateFormat & " HH:MM:ss" - 'End If - Catch ex As Exception - Logger.Error(ex) - End Try + ' 'Dim oChangedColumn = GridView.Columns(oChanged) + ' 'If Not IsNothing(oChangedColumn) Then + ' ' oChangedColumn.DisplayFormat.FormatType = FormatType.DateTime + ' ' oChangedColumn.DisplayFormat.FormatString = Environment.User.DateFormat & " HH:MM:ss" + ' 'End If + 'Catch ex As Exception + ' Logger.Error(ex) + 'End Try - GridView.OptionsView.BestFitMaxRowCount = 10 + GridView.OptionsView.BestFitMaxRowCount = 5 GridView.BestFitColumns() Catch ex As ApplicationException MsgBox($"Error while loading grid data for search {Result.Title}: {vbNewLine}{vbNewLine}{ex.Message}", MsgBoxStyle.Critical, Text) @@ -698,7 +671,7 @@ Public Class frmDocumentResultList End If Else - If _Language = State.UserState.LANG_DE_DE Then + If UserLanguage = State.UserState.LANG_DE_DE Then MessageBox.Show("Bitte wählen Sie eine Tabelle aus, die Sie exportieren möchten", Text, MessageBoxButtons.OK, MessageBoxIcon.Information) Else MessageBox.Show("Please select a table that you want to export", Text, MessageBoxButtons.OK, MessageBoxIcon.Information) @@ -783,7 +756,7 @@ Public Class frmDocumentResultList If IO.File.Exists(oFile) Then IO.File.Delete(oFile) End If - UpdateGridData() + LoadGridDataAndLayout() Catch ex As Exception Logger.Error(ex) End Try @@ -803,31 +776,19 @@ Public Class frmDocumentResultList End If End Function - Private Function TestDirectoryExists(pDirectory As String, pTitle As String) As Boolean + Private Function TestDirectoryExists(pDirectory As String) As Boolean If _CurrentDocument Is Nothing Then Return False End If If Directory.Exists(pDirectory) = False Then - MessageBox.Show($"Ordner {pDirectory} existiert nicht oder wurde verschoben!", pTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) + MessageBox.Show($"Ordner {pDirectory} existiert nicht oder wurde verschoben!", Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) Return False Else Return True End If End Function - Private Function TestObjectIdExists(pObjectId As Long, pTitle As String) As Boolean - If pObjectId = 0 Then - MessageBox.Show($"Objekt {pObjectId} existiert nicht oder wurde verschoben!", pTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) - Return False - Else - Return True - End If - End Function - - - - #Region "File Actions" Private Sub MenuItem_OpenProperties_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemPropertiesECM.ItemClick If _CurrentDocument Is Nothing Then @@ -839,7 +800,7 @@ Public Class frmDocumentResultList FileEx.OpenFileProperties(_CurrentDocument.FullPath) Case Else - Dim oPropertyDialog As New frmObjectPropertyDialog(LogConfig, Environment, _IDBClient, _CurrentDocument.Id) + Dim oPropertyDialog As New frmObjectPropertyDialog(LogConfig, Environment, Client, _CurrentDocument.Id) oPropertyDialog.Show() End Select End Sub @@ -850,7 +811,12 @@ Public Class frmDocumentResultList End Sub Private Sub MenuItem_CopyFilepath_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFilepathCopy.ItemClick - Clipboard.SetText(_CurrentDocument.FullPath) + If _CurrentDocument IsNot Nothing Then + Dim oPath = Utils.NotNull(_CurrentDocument.FullPath, "") + If oPath <> String.Empty Then + Clipboard.SetText(oPath) + End If + End If End Sub Private Async Sub MenuItem_OpenFile_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFileOpen.ItemClick @@ -864,7 +830,7 @@ Public Class frmDocumentResultList Private Sub MenuItem_FolderOpen_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFolderOpen.ItemClick Dim oFolderPath = Path.GetDirectoryName(_CurrentDocument.FullPath) - If TestDirectoryExists(oFolderPath, OPEN_DIRECTORY) = False Then + If TestDirectoryExists(oFolderPath) = False Then Exit Sub End If @@ -918,13 +884,13 @@ Public Class frmDocumentResultList #End Region #Region "Layout" Private Sub SplitContainerControl1_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl1.SplitterPositionChanged - If _IsLoading = False Then + If IsLoading = False Then Config.Config.SplitContainer1Distance = SplitContainerControl1.SplitterPosition End If End Sub Private Sub SplitContainerControl2_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl2.SplitterPositionChanged - If _IsLoading = False Then + If IsLoading = False Then Config.Config.SplitContainer2Distance = SplitContainerControl2.SplitterPosition End If End Sub @@ -932,7 +898,7 @@ Public Class frmDocumentResultList Private Sub SwitchMainContainerHorizontal_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SwitchMainContainerHorizontal.CheckedChanged SplitContainerControl1.Horizontal = SwitchMainContainerHorizontal.Checked - If Config IsNot Nothing And _IsLoading = False Then + If Config IsNot Nothing And IsLoading = False Then Config.Config.SplitContainer1Horizontal = SwitchMainContainerHorizontal.Checked End If End Sub @@ -940,7 +906,7 @@ Public Class frmDocumentResultList Private Sub SwitchDetailContainerHorizontal2_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SwitchDetailContainerHorizontal.CheckedChanged SplitContainerControl2.Horizontal = SwitchDetailContainerHorizontal.Checked - If Config IsNot Nothing And _IsLoading = False Then + If Config IsNot Nothing And IsLoading = False Then Config.Config.SplitContainer2Horizontal = SwitchDetailContainerHorizontal.Checked End If End Sub @@ -962,20 +928,28 @@ Public Class frmDocumentResultList Private Sub chkGridShowGrouping_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles chkGridShowGrouping.CheckedChanged - If _IsLoading = False Then + If IsLoading = False Then LayoutManager.SetGroupPanelVisible(chkGridShowGrouping.Checked) End If End Sub Private Sub chkGridShowQuickfilter_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles chkGridShowQuickfilter.CheckedChanged - If _IsLoading = False Then + If IsLoading = False Then LayoutManager.SetFilterRowVisible(chkGridShowQuickfilter.Checked) End If End Sub Private Sub chkGridShowTitle_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles chkGridShowTitle.CheckedChanged - If _IsLoading = False Then + If IsLoading = False Then LayoutManager.SetBandTitleVisible(chkGridShowTitle.Checked) End If End Sub + + Private Async Sub MenuItemSaveProperties_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemSaveProperties.ItemClick + Await CtrlObjectPropertyDialog.SaveChanges() + End Sub + + Private Sub BarButtonItem11_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem11.ItemClick + GridView1.ShowCustomization() + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index 9b622656..735facaf 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -247,10 +247,13 @@ Public Class frmFlowSearch1 Dim oSearchTerm = txtSearchInput.Text Dim oParams = New DocumentResultList.Params() With { - .WindowGuid = "FlowSearch", - .WindowTitle = GetResultWindowString(oSearchTerm), - .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, - .ProfileGuid = 354522 + .WindowGuid = "FlowSearch", + .WindowTitle = GetResultWindowString(oSearchTerm), + .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, + .ProfileGuid = 354522, + .ColumnNames = New DocumentResultList.ColumnNames With { + .ObjectIdColumn = "DocID" + } } Dim oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~{SEARCH_PARAM3}" diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 598b4f06..e019d92a 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -182,6 +182,7 @@ Partial Class frmFlowForm ' Me.txtQuicksearch1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtQuicksearch1.EditValue = "" Me.txtQuicksearch1.Location = New System.Drawing.Point(21, 29) Me.txtQuicksearch1.Name = "txtQuicksearch1" Me.txtQuicksearch1.Properties.Appearance.BackColor = System.Drawing.Color.LightGray @@ -219,8 +220,6 @@ Partial Class frmFlowForm ' 'Bar3 ' - Me.Bar3.BarAppearance.Normal.BackColor = System.Drawing.Color.White - Me.Bar3.BarAppearance.Normal.Options.UseBackColor = True Me.Bar3.BarName = "Statusleiste" Me.Bar3.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Bottom Me.Bar3.DockCol = 0 @@ -228,7 +227,6 @@ Partial Class frmFlowForm Me.Bar3.DockStyle = DevExpress.XtraBars.BarDockStyle.Bottom Me.Bar3.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarSubItem1)}) Me.Bar3.OptionsBar.AllowQuickCustomization = False - Me.Bar3.OptionsBar.DrawBorder = False Me.Bar3.OptionsBar.DrawDragBorder = False Me.Bar3.OptionsBar.UseWholeRow = True Me.Bar3.Text = "Statusleiste" @@ -254,7 +252,7 @@ Partial Class frmFlowForm ' Me.btnGlobixConfig.Caption = "Grundeinstellungen Globix" Me.btnGlobixConfig.Id = 10 - Me.btnGlobixConfig.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemGlobixGE.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.btnGlobixConfig.ImageOptions.SvgImage = CType(resources.GetObject("btnGlobixConfig.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.btnGlobixConfig.Name = "btnGlobixConfig" ' 'btnServiceConfig diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index b780cf16..1e9efab3 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1997,7 +1997,7 @@ DQogIDwvZz4NCjwvc3ZnPgs= - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl