Common: Save workspaces per language, fix resetting workspaces, set language on load

This commit is contained in:
Jonathan Jenne 2023-05-16 16:42:59 +02:00
parent b53e18d424
commit e77cfdb98b
6 changed files with 938 additions and 1300 deletions

View File

@ -20,6 +20,7 @@ Namespace DocumentResultList
Public Const DEFAULT_WORKSPACE As String = "Default" Public Const DEFAULT_WORKSPACE As String = "Default"
Private _CurrentWorkspace As String = Nothing Private _CurrentWorkspace As String = Nothing
Private _UserLanguage As String = Nothing
Public Event WorkspaceLoaded As EventHandler(Of String) Public Event WorkspaceLoaded As EventHandler(Of String)
@ -37,8 +38,9 @@ Namespace DocumentResultList
End Get End Get
End Property End Property
Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of TConfig), pWorkspaceManager As WorkspaceManager) Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of TConfig), pWorkspaceManager As WorkspaceManager, pUserLanguage As String)
MyBase.New(pLogConfig) MyBase.New(pLogConfig)
_UserLanguage = pUserLanguage
Manager = pWorkspaceManager Manager = pWorkspaceManager
Config = pConfigManager Config = pConfigManager
FileEx = New File(pLogConfig) FileEx = New File(pLogConfig)
@ -61,7 +63,7 @@ Namespace DocumentResultList
Private Function GetWorkspacePath(pWorkspaceName As String) As String Private Function GetWorkspacePath(pWorkspaceName As String) As String
Dim oDirectory = GetWorkspaceDirectoryPath() Dim oDirectory = GetWorkspaceDirectoryPath()
Dim oFilename As String = Utils.ConvertTextToSlug(pWorkspaceName) & ".xml" Dim oFilename As String = Utils.ConvertTextToSlug(pWorkspaceName) & "_" & _UserLanguage & ".xml"
Return IO.Path.Combine(oDirectory, oFilename) Return IO.Path.Combine(oDirectory, oFilename)
End Function End Function

View File

@ -303,6 +303,7 @@ Partial Class frmDocumentResultList
Me.labelResultCount.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.insertpagecount Me.labelResultCount.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.insertpagecount
Me.labelResultCount.Name = "labelResultCount" Me.labelResultCount.Name = "labelResultCount"
Me.labelResultCount.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.labelResultCount.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
Me.labelResultCount.Tag = "{0} Résultats"
' '
'BarButtonBack 'BarButtonBack
' '

View File

@ -117,9 +117,6 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="GridView1.GroupPanelText" xml:space="preserve">
<value>Drag a column heading into this area to group by it</value>
</data>
<data name="SwitchMainContainerHorizontal.Caption" xml:space="preserve"> <data name="SwitchMainContainerHorizontal.Caption" xml:space="preserve">
<value>Main Grid Horizontal</value> <value>Main Grid Horizontal</value>
</data> </data>
@ -195,6 +192,9 @@
bHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L bHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value> </value>
</data> </data>
<data name="labelResultCount.Caption" xml:space="preserve">
<value>{0} Results</value>
</data>
<data name="BarButtonBack.Caption" xml:space="preserve"> <data name="BarButtonBack.Caption" xml:space="preserve">
<value>Back</value> <value>Back</value>
</data> </data>

View File

@ -117,93 +117,16 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="GridControl1.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="GridControl1.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
<value>Default</value>
</data>
<data name="GridControl1.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left</value>
</data>
<data name="GridControl1.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="GridControl1.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Tile</value>
</data>
<data name="GridControl1.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>Inherit</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="GridControl1.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>0, 0</value>
</data>
<assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
<value>Center</value>
</data>
<data name="GridControl1.EmbeddedNavigator.ToolTip" xml:space="preserve">
<value />
</data>
<assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
<value>None</value>
</data>
<data name="GridControl1.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
<value />
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="RibbonControl.ExpandCollapseItem.SearchTags" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="SwitchMainContainerHorizontal.Caption" xml:space="preserve"> <data name="SwitchMainContainerHorizontal.Caption" xml:space="preserve">
<value>Grille principale Horizontale</value> <value>Grille principale Horizontale</value>
</data> </data>
<data name="SwitchMainContainerHorizontal.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="SwitchMainContainerHorizontal.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="SwitchMainContainerHorizontal.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="SwitchDetailContainerHorizontal.Caption" xml:space="preserve"> <data name="SwitchDetailContainerHorizontal.Caption" xml:space="preserve">
<value>Grille de détail horizontale</value> <value>Grille de détail horizontale</value>
</data> </data>
<data name="SwitchDetailContainerHorizontal.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="SwitchDetailContainerHorizontal.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="SwitchDetailContainerHorizontal.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="BarButtonItemExportGrid1.Caption" xml:space="preserve"> <data name="BarButtonItemExportGrid1.Caption" xml:space="preserve">
<value>Exporter en xlsx</value> <value>Exporter en xlsx</value>
</data> </data>
<data name="BarButtonItemExportGrid1.ImageOptions.ImageIndex" type="System.Int32, mscorlib"> <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<value>-1</value>
</data>
<data name="BarButtonItemExportGrid1.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItemExportGrid1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarButtonItemExportGrid1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -272,27 +195,13 @@
<data name="BarStaticItem1.Caption" xml:space="preserve"> <data name="BarStaticItem1.Caption" xml:space="preserve">
<value>{0} Résultats</value> <value>{0} Résultats</value>
</data> </data>
<data name="BarStaticItem1.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarStaticItem1.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarStaticItem1.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="labelResultCount.Caption" xml:space="preserve"> <data name="labelResultCount.Caption" xml:space="preserve">
<value>{0} Résultats</value> <value>{0} Résultats</value>
</data> </data>
<data name="labelResultCount.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="labelResultCount.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonBack.Caption" xml:space="preserve"> <data name="BarButtonBack.Caption" xml:space="preserve">
<value>Retourner à</value> <value>Retourner à</value>
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="BarButtonBack.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarButtonBack.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@ -304,9 +213,6 @@
a4S/HhL8/ZQrE1w52s8/k+WH37lI3sUnQlO0bha7AAAAAElFTkSuQmCC a4S/HhL8/ZQrE1w52s8/k+WH37lI3sUnQlO0bha7AAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="BarButtonBack.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonBack.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarButtonBack.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@ -324,21 +230,9 @@
9R2NAy0xdbc3UVqAub8fp91RTf0DZ0rWioS6adsAAAAASUVORK5CYII= 9R2NAy0xdbc3UVqAub8fp91RTf0DZ0rWioS6adsAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="BarButtonBack.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonBack.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="BarButtonResetGridLayout.Caption" xml:space="preserve"> <data name="BarButtonResetGridLayout.Caption" xml:space="preserve">
<value>Supprimer toutes les mises en page</value> <value>Supprimer toutes les mises en page</value>
</data> </data>
<data name="BarButtonResetGridLayout.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonResetGridLayout.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonResetGridLayout.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarButtonResetGridLayout.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -361,12 +255,6 @@
<data name="labelCriticalError.Caption" xml:space="preserve"> <data name="labelCriticalError.Caption" xml:space="preserve">
<value>Erreur critique</value> <value>Erreur critique</value>
</data> </data>
<data name="labelCriticalError.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="labelCriticalError.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="labelCriticalError.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="labelCriticalError.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -389,12 +277,6 @@
<data name="labelWarning.Caption" xml:space="preserve"> <data name="labelWarning.Caption" xml:space="preserve">
<value>Avertissement</value> <value>Avertissement</value>
</data> </data>
<data name="labelWarning.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="labelWarning.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="labelWarning.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="labelWarning.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -423,21 +305,9 @@
<data name="MenuItemFileOpen.Caption" xml:space="preserve"> <data name="MenuItemFileOpen.Caption" xml:space="preserve">
<value>Ouvrir le fichier</value> <value>Ouvrir le fichier</value>
</data> </data>
<data name="MenuItemFileOpen.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemFileOpen.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemPropertiesIDB.Caption" xml:space="preserve"> <data name="MenuItemPropertiesIDB.Caption" xml:space="preserve">
<value>Propriétés</value> <value>Propriétés</value>
</data> </data>
<data name="MenuItemPropertiesIDB.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemPropertiesIDB.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemPropertiesIDB.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="MenuItemPropertiesIDB.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -470,12 +340,6 @@
<data name="MenuItemFolderOpen.Caption" xml:space="preserve"> <data name="MenuItemFolderOpen.Caption" xml:space="preserve">
<value>Ouvrir un dossier</value> <value>Ouvrir un dossier</value>
</data> </data>
<data name="MenuItemFolderOpen.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemFolderOpen.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemFolderOpen.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="MenuItemFolderOpen.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -496,27 +360,9 @@
MS44LDQsNGgtNGw2LDZsNi02SDI4eiIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw== MS44LDQsNGgtNGw2LDZsNi02SDI4eiIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw==
</value> </value>
</data> </data>
<data name="MenuItemFilepathCopy.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemFilepathCopy.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemFolderpathCopy.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemFolderpathCopy.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemProperties.Caption" xml:space="preserve"> <data name="MenuItemProperties.Caption" xml:space="preserve">
<value>Propriétés</value> <value>Propriétés</value>
</data> </data>
<data name="MenuItemProperties.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemProperties.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemProperties.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="MenuItemProperties.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -549,186 +395,48 @@
<data name="MenuItemsOpenFileZooFlow.Caption" xml:space="preserve"> <data name="MenuItemsOpenFileZooFlow.Caption" xml:space="preserve">
<value>Fichier ouvert</value> <value>Fichier ouvert</value>
</data> </data>
<data name="MenuItemsOpenFileZooFlow.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemsOpenFileZooFlow.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemPropertiesZooFlow.Caption" xml:space="preserve"> <data name="MenuItemPropertiesZooFlow.Caption" xml:space="preserve">
<value>Propriétés</value> <value>Propriétés</value>
</data> </data>
<data name="MenuItemPropertiesZooFlow.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemPropertiesZooFlow.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="ButtonRefresh.Caption" xml:space="preserve"> <data name="ButtonRefresh.Caption" xml:space="preserve">
<value>Actualiser les résultats</value> <value>Actualiser les résultats</value>
</data> </data>
<data name="ButtonRefresh.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="ButtonRefresh.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem1.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem1.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem1.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="BarButtonItem2.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem2.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem2.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="BarButtonItem3.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem3.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem3.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="BarButtonItem4.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem4.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem4.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="BarButtonItem5.Caption" xml:space="preserve"> <data name="BarButtonItem5.Caption" xml:space="preserve">
<value>Réinitialisation de la mise en page</value> <value>Réinitialisation de la mise en page</value>
</data> </data>
<data name="BarButtonItem5.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem5.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem5.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="MenuItemStartAdhocWorkflow.Caption" xml:space="preserve"> <data name="MenuItemStartAdhocWorkflow.Caption" xml:space="preserve">
<value>Lancer le workflow Adhoc</value> <value>Lancer le workflow Adhoc</value>
</data> </data>
<data name="MenuItemStartAdhocWorkflow.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemStartAdhocWorkflow.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemCheckInFile.Caption" xml:space="preserve"> <data name="MenuItemCheckInFile.Caption" xml:space="preserve">
<value>Check-in</value> <value>Check-in</value>
</data> </data>
<data name="MenuItemCheckInFile.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemCheckInFile.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemCheckOutFile.Caption" xml:space="preserve"> <data name="MenuItemCheckOutFile.Caption" xml:space="preserve">
<value>Check-out</value> <value>Check-out</value>
</data> </data>
<data name="MenuItemCheckOutFile.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemCheckOutFile.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemVersionFile.Caption" xml:space="preserve"> <data name="MenuItemVersionFile.Caption" xml:space="preserve">
<value>Créer une version</value> <value>Créer une version</value>
</data> </data>
<data name="MenuItemVersionFile.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemVersionFile.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="chkGridShowQuickfilter.Caption" xml:space="preserve"> <data name="chkGridShowQuickfilter.Caption" xml:space="preserve">
<value>Afficher le filtre rapide</value> <value>Afficher le filtre rapide</value>
</data> </data>
<data name="chkGridShowQuickfilter.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="chkGridShowQuickfilter.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="chkGridShowGrouping.Caption" xml:space="preserve"> <data name="chkGridShowGrouping.Caption" xml:space="preserve">
<value>Afficher le regroupement</value> <value>Afficher le regroupement</value>
</data> </data>
<data name="chkGridShowGrouping.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="chkGridShowGrouping.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="chkGridShowTitle.Caption" xml:space="preserve"> <data name="chkGridShowTitle.Caption" xml:space="preserve">
<value>Afficher le titre</value> <value>Afficher le titre</value>
</data> </data>
<data name="chkGridShowTitle.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="chkGridShowTitle.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemSaveProperties.Caption" xml:space="preserve"> <data name="MenuItemSaveProperties.Caption" xml:space="preserve">
<value>Sauvegarder les changements</value> <value>Sauvegarder les changements</value>
</data> </data>
<data name="MenuItemSaveProperties.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="MenuItemSaveProperties.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem11.Caption" xml:space="preserve"> <data name="BarButtonItem11.Caption" xml:space="preserve">
<value>Sélectionner les colonnes</value> <value>Sélectionner les colonnes</value>
</data> </data>
<data name="BarButtonItem11.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarButtonItem11.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarEditItemGridFontSize.Caption" xml:space="preserve"> <data name="BarEditItemGridFontSize.Caption" xml:space="preserve">
<value>Taille de la police</value> <value>Taille de la police</value>
</data> </data>
<data name="BarEditItemGridFontSize.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarEditItemGridFontSize.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarEditItemGridFontSize.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="btnSaveWorkspace.Caption" xml:space="preserve"> <data name="btnSaveWorkspace.Caption" xml:space="preserve">
<value>Sauvegarder les changements</value> <value>Sauvegarder les changements</value>
</data> </data>
<data name="btnSaveWorkspace.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="btnSaveWorkspace.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarWorkspaceMenuItem1.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="BarWorkspaceMenuItem1.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="DockPanelPreview.Text" xml:space="preserve"> <data name="DockPanelPreview.Text" xml:space="preserve">
<value>Aperçu</value> <value>Aperçu</value>
</data> </data>
@ -747,12 +455,6 @@
<data name="lblCurrentWorkspace.Caption" xml:space="preserve"> <data name="lblCurrentWorkspace.Caption" xml:space="preserve">
<value>Espace de travail</value> <value>Espace de travail</value>
</data> </data>
<data name="lblCurrentWorkspace.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="lblCurrentWorkspace.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="frmDocumentResultList.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="frmDocumentResultList.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA
@ -839,21 +541,9 @@
<data name="btnSaveWorkspaceAs.Caption" xml:space="preserve"> <data name="btnSaveWorkspaceAs.Caption" xml:space="preserve">
<value>Sauvegarder en tant que</value> <value>Sauvegarder en tant que</value>
</data> </data>
<data name="btnSaveWorkspaceAs.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="btnSaveWorkspaceAs.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="btnSaveAsMySearch.Caption" xml:space="preserve"> <data name="btnSaveAsMySearch.Caption" xml:space="preserve">
<value>Enregistrer comme ma recherche</value> <value>Enregistrer comme ma recherche</value>
</data> </data>
<data name="btnSaveAsMySearch.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="btnSaveAsMySearch.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="RibbonPageGroupExport.Text" xml:space="preserve"> <data name="RibbonPageGroupExport.Text" xml:space="preserve">
<value>Exportation</value> <value>Exportation</value>
</data> </data>
@ -893,76 +583,4 @@
<data name="RibbonPage2.Text" xml:space="preserve"> <data name="RibbonPage2.Text" xml:space="preserve">
<value>Vue</value> <value>Vue</value>
</data> </data>
<data name="GridControl2.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="GridControl2.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="GridControl2.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
<value>Default</value>
</data>
<data name="GridControl2.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left</value>
</data>
<data name="GridControl2.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="GridControl2.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Tile</value>
</data>
<data name="GridControl2.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>Inherit</value>
</data>
<data name="GridControl2.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControl2.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
<value>Center</value>
</data>
<data name="GridControl2.EmbeddedNavigator.ToolTip" xml:space="preserve">
<value />
</data>
<data name="GridControl2.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
<value>None</value>
</data>
<data name="GridControl2.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
<value />
</data>
<data name="GridControl3.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="GridControl3.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="GridControl3.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
<value>Default</value>
</data>
<data name="GridControl3.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left</value>
</data>
<data name="GridControl3.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="GridControl3.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Tile</value>
</data>
<data name="GridControl3.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>Inherit</value>
</data>
<data name="GridControl3.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControl3.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
<value>Center</value>
</data>
<data name="GridControl3.EmbeddedNavigator.ToolTip" xml:space="preserve">
<value />
</data>
<data name="GridControl3.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
<value>None</value>
</data>
<data name="GridControl3.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
<value />
</data>
</root> </root>

File diff suppressed because it is too large Load Diff

View File

@ -18,6 +18,7 @@ Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow
Imports DigitalData.Modules.ZooFlow.Constants Imports DigitalData.Modules.ZooFlow.Constants
Imports DigitalData.Modules.Base.IDB.FileStore Imports DigitalData.Modules.Base.IDB.FileStore
Imports DigitalData.Modules.Base
'Imports DigitalData.GUIs.Common.Base 'Imports DigitalData.GUIs.Common.Base
Imports DigitalData.GUIs.Common.DocumentResultList Imports DigitalData.GUIs.Common.DocumentResultList
@ -56,6 +57,7 @@ Public Class frmDocumentResultList
Private IsLoading As Boolean = True Private IsLoading As Boolean = True
Private ClientIsOnline As Boolean = False Private ClientIsOnline As Boolean = False
Private PreventWorkspaceSaving As Boolean = False
Private _DragBoxFromMouseDown As Rectangle Private _DragBoxFromMouseDown As Rectangle
Private _ScreenOffset As Point Private _ScreenOffset As Point
@ -107,13 +109,17 @@ Public Class frmDocumentResultList
ColumnFilepath = pParams.ColumnNames.FullPathColumn ColumnFilepath = pParams.ColumnNames.FullPathColumn
ColumnIcon = pParams.ColumnNames.IconColumn ColumnIcon = pParams.ColumnNames.IconColumn
Environment = pEnvironment
Params = pParams
ResultLists = pParams.Results
LogConfig = pLogConfig LogConfig = pLogConfig
Logger = pLogConfig.GetLogger() Logger = pLogConfig.GetLogger()
FormHelper = New FormHelper(pLogConfig, Me) FormHelper = New FormHelper(pLogConfig, Me)
Environment = pEnvironment UserLanguage = Utils.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)
Params = pParams Language.LogApplicationLanguage(Logger)
ResultLists = pParams.Results Language.SetApplicationLanguage(Logger, UserLanguage)
Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath, oConfigPath) Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath, oConfigPath)
Helpers = New DocumentResultList.Helpers(pLogConfig) Helpers = New DocumentResultList.Helpers(pLogConfig)
@ -121,9 +127,8 @@ Public Class frmDocumentResultList
GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3}) GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3})
FileEx = New Modules.Windows.File(pLogConfig) FileEx = New Modules.Windows.File(pLogConfig)
LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}, pEnvironment) LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}, pEnvironment)
Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1) Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1, UserLanguage)
UserLanguage = Utils.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)
End Sub End Sub
Private Function GetOperationMode() As OperationMode Private Function GetOperationMode() As OperationMode
@ -163,6 +168,8 @@ Public Class frmDocumentResultList
End If End If
Language.LogApplicationLanguage(Logger)
Documentloader = New Loader(LogConfig, OperationMode, Client, Environment.User) Documentloader = New Loader(LogConfig, OperationMode, Client, Environment.User)
If OperationMode = OperationMode.NoAppServer Then If OperationMode = OperationMode.NoAppServer Then
@ -294,9 +301,13 @@ Public Class frmDocumentResultList
Try Try
LayoutManager.SaveWindowLocationAndSize(Me) LayoutManager.SaveWindowLocationAndSize(Me)
If PreventWorkspaceSaving = False Then
Workspace.SaveWorkspaces() Workspace.SaveWorkspaces()
Config.Config.SelectedWorkspace = Workspace.CurrentWorkspace Config.Config.SelectedWorkspace = Workspace.CurrentWorkspace
Config.Save() Config.Save()
Else
PreventWorkspaceSaving = False
End If
DocumentViewer1.Done() DocumentViewer1.Done()
Catch ex As Exception Catch ex As Exception
@ -563,11 +574,13 @@ Public Class frmDocumentResultList
Private Sub LoadGridData(View As GridView, Result As DocumentResultList.DocumentResult) Private Sub LoadGridData(View As GridView, Result As DocumentResultList.DocumentResult)
If Result.Datatable.Columns.Contains(ColumnDocumentId) = False Then If Result.Datatable.Columns.Contains(ColumnDocumentId) = False Then
Throw New ApplicationException($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!") Logger.Error($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!")
'Throw New ApplicationException($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!")
End If End If
If OperationMode = OperationMode.NoAppServer And Result.Datatable.Columns.Contains(ColumnFilepath) = False Then 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}!") Logger.Error($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!")
'Throw New ApplicationException($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!")
End If End If
SetGridDataSource(View, Result.Datatable) SetGridDataSource(View, Result.Datatable)
@ -1029,8 +1042,12 @@ Public Class frmDocumentResultList
Private Sub BarButtonResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonResetGridLayout.ItemClick Private Sub BarButtonResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonResetGridLayout.ItemClick
Try Try
If FormHelper.ShowQuestionMessage("Do you want to reset all workspaces? This window will be closed afterwards!", Text) = DialogResult.Yes Then
If Workspace.ResetWorkspaces() Then If Workspace.ResetWorkspaces() Then
FormHelper.ShowSuccessMessage("Die gespeicherten Workspaces wurden gelöscht, beim Nächsten Laden wird die Standard-Ansicht geladen.", Text) FormHelper.ShowSuccessMessage("Die gespeicherten Workspaces wurden gelöscht, beim Nächsten Laden wird die Standard-Ansicht geladen. Das Fenster wird nun geschlossen.", Text)
PreventWorkspaceSaving = True
Close()
End If
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) Logger.Error(ex)