AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: AppStd:e5971a093f76f475040e04eb508ee016badf73f6
Branches Tags
AppStd:master AppStd:upgrade-to-NET8-1 AppStd:Monorepo-Update-.NET-8 AppStd:Newest-GDPictureVersion AppStd:ZugferdService-Redesign
...
compare: AppStd:d8367df621f9393230e7dc6f39f4f9ab683e6963
Branches Tags
AppStd:master AppStd:upgrade-to-NET8-1 AppStd:Monorepo-Update-.NET-8 AppStd:Newest-GDPictureVersion AppStd:ZugferdService-Redesign

2 Commits
e5971a093f ... d8367df621

Author SHA1 Message Date
Jonathan Jenne
d8367df621 Common: Version 1.3.1 2021-02-08 16:31:34 +01:00
Jonathan Jenne
71ceb85b47 fix: icon column beijng at the end, layout file errors 2021-02-08 16:30:25 +01:00
2 changed files with 10 additions and 7 deletions
Expand all files Collapse all files

13
GUIs.Common/DocumentResultList/frmDocumentResultList.vb
View File

@@ -362,10 +362,11 @@ Public Class frmDocumentResultList
.Width = 20 .Width = 20
.MaxWidth = 20 .MaxWidth = 20
.MinWidth = 20 .MinWidth = 20
.VisibleIndex = 0
End With End With
GridView.Bands.First().Columns.Add(oIconColumn) Dim oFirstBand As GridBand = GridView.Bands.First()
oFirstBand.Columns.Add(oIconColumn)
oFirstBand.Columns.MoveTo(0, oIconColumn)
End If End If
Dim oCreated, oChanged As String Dim oCreated, oChanged As String
@@ -514,7 +515,7 @@ Public Class frmDocumentResultList
End Function End Function
Private Function GetDevexpressGrid_LayoutName(pGridView As GridView) Private Function GetDevexpressGrid_LayoutName(pGridView As GridView)
Dim Filename As String = $"DevExpressGridViewDocResult_{pGridView.Name}UserLayout.xml" Dim Filename As String = $"DevExpressGridViewDocResult_{pGridView.Name}UserLayout.xml"
Return System.IO.Path.Combine(_Config.UserConfigPath.Replace("UserConfig.xml", ""), Filename) Return Path.Combine(_Config.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
End Function End Function
Private Function GetActiveGridControl() As GridControl Private Function GetActiveGridControl() As GridControl
If _ActiveGrid Is Nothing Then If _ActiveGrid Is Nothing Then
@@ -535,8 +536,10 @@ Public Class frmDocumentResultList
End Sub End Sub
Private Sub RestoreLayout(pGridView As GridView) Private Sub RestoreLayout(pGridView As GridView)
Try Try
Dim oXml As String = GetDevexpressGrid_LayoutName(pGridView) Dim oLayoutFile As String = GetDevexpressGrid_LayoutName(pGridView)
pGridView.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout) If File.Exists(oLayoutFile) Then
pGridView.RestoreLayoutFromXml(oLayoutFile, OptionsLayoutBase.FullLayout)
End If
Catch ex As Exception Catch ex As Exception
_Logger.Error(ex) _Logger.Error(ex)
_Logger.Info("Error while restoring layout: " & ex.Message) _Logger.Info("Error while restoring layout: " & ex.Message)

4
GUIs.Common/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.3.0.0")> <Assembly: AssemblyVersion("1.3.1.0")>
<Assembly: AssemblyFileVersion("1.3.0.0")> <Assembly: AssemblyFileVersion("1.3.1.0")>