diff --git a/GUIs.Common/DocumentResultList/Layout.vb b/GUIs.Common/DocumentResultList/Layout.vb index 74c4d546..39af628f 100644 --- a/GUIs.Common/DocumentResultList/Layout.vb +++ b/GUIs.Common/DocumentResultList/Layout.vb @@ -7,6 +7,7 @@ Imports DigitalData.Modules.Base Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Language +Imports DigitalData.Modules.ZooFlow Namespace DocumentResultList Public Class Layout @@ -14,11 +15,13 @@ Namespace DocumentResultList Private ReadOnly Config As ConfigManager(Of Config) Private ReadOnly GridViews As List(Of GridView) + Private ReadOnly Environment As Environment - Public Sub New(pLogConfig As LogConfig, pConfig As ConfigManager(Of DocumentResultList.Config), pGridViews As List(Of GridView)) + Public Sub New(pLogConfig As LogConfig, pConfig As ConfigManager(Of DocumentResultList.Config), pGridViews As List(Of GridView), pEnvironment As Environment) MyBase.New(pLogConfig) Config = pConfig GridViews = pGridViews + Environment = pEnvironment End Sub #Region "Saving and Restoring layout" @@ -109,7 +112,7 @@ Namespace DocumentResultList End Function Public Function GetGrid_LayoutName(pGridView As GridView) As String - Dim Filename As String = $"DevExpressGridViewDocResult_{pGridView.Name}UserLayout.xml" + Dim Filename As String = $"DevExpressGridViewDocResult_{pGridView.Name}_{Environment.User.Language}_UserLayout.xml" Dim oDirectory As String = IO.Path.GetDirectoryName(Config.UserConfigPath) Return IO.Path.Combine(oDirectory, Filename) End Function diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 17bcc508..8a569c5c 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -120,7 +120,7 @@ Public Class frmDocumentResultList Filesystem = New Modules.Filesystem.File(pLogConfig) GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3}) FileEx = New Modules.Windows.File(pLogConfig) - LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}) + LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}, pEnvironment) Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1) UserLanguage = Utils.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)