From f8f2ee098dbf397ee4736d7c1195573b5330cde4 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 17 Sep 2018 15:36:47 +0200 Subject: [PATCH] jj: fix resetting layout, remove .default layout file --- .../DD_PM_WINDREAM/DesignTimeBuild/.dtbcache | Bin 218 -> 218 bytes app/DD_PM_WINDREAM/frmMain.vb | 32 +++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/app/.vs/DD_PM_WINDREAM/DesignTimeBuild/.dtbcache b/app/.vs/DD_PM_WINDREAM/DesignTimeBuild/.dtbcache index 715c91bb439b5d68c69962a8f4a3c4d0343f04fc..671ed4a1339e1ed6980c0b51ee8bfb3acd087d30 100644 GIT binary patch delta 51 zcmcb`c#Cm@h-erC1A{Ar6+;Yz7egvT9uTH7cuh2vpBT|3P{2^ckk63Ca7Vr_5QG6f C`wfNw delta 48 zcmcb`c#Cm@h-@4K1A{Ar6+;X|Fhep!215};Dnlki5|Aun@SUhB&+5+L$q+KpwG{vb C=nAp` diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index dfcee38..34617a7 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -186,12 +186,6 @@ Public Class frmMain Private Sub SaveGridLayout() Try Dim xml As String = GetXML_LayoutName() - Dim xmlDefault = xml & ".default" - - If IO.File.Exists(xmlDefault) = False Then - GridView_Docs.SaveLayoutToXml(xmlDefault, OptionsLayoutBase.FullLayout) - End If - GridView_Docs.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout) Catch ex As Exception ClassLogger.Add("Error while saving GridLayout: " & ex.Message) @@ -210,10 +204,24 @@ Public Class frmMain Private Sub ResetLayout() Try Dim xml As String = GetXML_LayoutName() - Dim xmlDefault = xml & ".default" IO.File.Delete(xml) - GridView_Docs.RestoreLayoutFromXml(xmlDefault, OptionsLayoutBase.FullLayout) + GridView_Docs.Columns.Clear() + GridView_Docs.PopulateColumns() + + GridView_Docs.Columns.Item("PROFILE_ID").Visible = False + GridView_Docs.Columns.Item("GUID").Visible = False + GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False + GridView_Docs.Columns.Item("DOC_ID").Visible = False + GridView_Docs.Columns.Item("TL_STATE").Visible = False + GridView_Docs.Columns.Item("ICON").MaxWidth = 24 + GridView_Docs.Columns.Item("ICON").MinWidth = 24 + GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White + GridView_Docs.Columns.Item("ICON").Fixed = FixedStyle.Left + GridView_Docs.Columns("Last edited").DisplayFormat.FormatType = FormatType.DateTime + GridView_Docs.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + GridView_Docs.Columns.Item("PROFILE_GROUP_TEXT").Visible = False + GridView_Docs.Columns.Item("PROFILE_GROUP_COLOR").Visible = False Catch ex As Exception ClassLogger.Add("Error while resetting layout: " & ex.Message) End Try @@ -1100,10 +1108,9 @@ Public Class frmMain GridView_Docs.Columns.Item("PROFILE_GROUP_TEXT").GroupIndex = 0 GridView_Docs.Columns.Item("PROFILE_GROUP_TEXT").Visible = False GridView_Docs.Columns.Item("PROFILE_GROUP_COLOR").Visible = False - For I = 0 To GridView_Docs.GroupCount - 1 - Dim v = GridView_Docs.GroupedColumns(I).ToString - Dim ii = Nothing - GridView_Docs.GroupedColumns(I).Tag = GridView_Docs.Columns.Item("PROFILE_ID") + For index = 0 To GridView_Docs.GroupCount - 1 + Dim v = GridView_Docs.GroupedColumns(index).ToString + GridView_Docs.GroupedColumns(index).Tag = GridView_Docs.Columns.Item("PROFILE_ID") Next GridView_Docs.Columns.Item("PROFILE_ID").Visible = False @@ -1200,6 +1207,7 @@ Public Class frmMain Private Sub TabellenlayoutZurücksetzenToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TabellenlayoutZurücksetzenToolStripMenuItem.Click ' Layout zurücksetzen ResetLayout() + SaveGridLayout() ' Ansicht neu laden Load_Profile_items()