From 36ef0d1938d56e6f9285e26668f98d53a6a2641e Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 25 Mar 2021 15:45:37 +0100 Subject: [PATCH] MS LAyouts --- app/DD_PM_WINDREAM/frmMain.resx | 2 +- app/DD_PM_WINDREAM/frmMain.vb | 46 +++++++++++++++++++++--------- app/DD_PM_WINDREAM/frmValidator.vb | 5 +++- 3 files changed, 38 insertions(+), 15 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index ec2e77e..326bd50 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAXgBBwF4AQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAYABBwGAAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index d4fc598..4c6e199 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -49,6 +49,7 @@ Public Class frmMain Private DT_CHECKUSER_MODULE As DataTable Private IsFilterMode As Boolean Private DetailLinkActive As Boolean = False + Private FRONTEND_ACTION As String = "NONE" Private Function GET_LAST_ADDED(pDatatable As DataTable) As String Dim oADDED As String Try @@ -317,7 +318,7 @@ Public Class frmMain End If Check_Timer_Notification() Timer_Inactivity_Reset_Disable() - FormShown = True + Restore_Form_Position() @@ -678,10 +679,13 @@ Public Class frmMain oStopWatch.Done() End Sub Private Async Sub navBar_LinkClicked(ByVal sender As Object, ByVal e As NavBarLinkEventArgs) + If GRID_LOAD_TYPE = "OVERVIEW" Then + 'SaveGridLayout() + End If Dim _tag = e.Link.Item.Tag + Timer_Inactivity_Reset_Disable() + If Not IsNothing(_tag) Then - 'Speichern Overview - SaveGridLayout() If _tag.ToString.Contains("itmProfile#") Then _tag = _tag.ToString.Replace("itmProfile#", "") If IsNumeric(_tag) Then @@ -747,6 +751,7 @@ Public Class frmMain Async Function Load_single_Profile(Optional ForceReload As Boolean = False) As Tasks.Task Try + FRONTEND_ACTION = "Load_single_Profile" Load_Profiles_for_User() Layout_Single_Profile() Dim expression As String @@ -810,10 +815,11 @@ Public Class frmMain LOGGER.Error(ex) LOGGER.Info("Load_single_Profile - Error: " & ex.Message) End Try - + FRONTEND_ACTION = "NONE" End Function Sub Create_Basic_View() Try + FRONTEND_ACTION = "Create_Basic_View" GridControl_Docs.DataSource = Nothing Try GridView_Docs.Columns.Clear() @@ -927,6 +933,7 @@ Public Class frmMain Catch ex As Exception LOGGER.Info("Create_Basic_View2 - Column CONVERSATION obviously is not part of GridView_Docs - Trying to Rest Layout") ResetLayout() + FRONTEND_ACTION = "NONE" Exit Sub End Try End If @@ -959,7 +966,7 @@ Public Class frmMain Catch ex As Exception LOGGER.Error(ex) End Try - + FRONTEND_ACTION = "NONE" End Sub @@ -1120,8 +1127,11 @@ Public Class frmMain Private Sub NotifyIcon1_Click(sender As System.Object, e As EventArgs) Handles NotifyIcon1.Click BringMonitor2Front() End Sub - Private Async Function Decide_Load(FormLoad As Boolean, Optional ForceReload As Boolean = False) As Tasks.Task + Private Async Function Decide_Load(pIsFormLoad As Boolean, Optional ForceReload As Boolean = False) As Tasks.Task Try + If pIsFormLoad = True Then + FormShown = False + End If GridIsLoaded = False If USER_EXISTS = False Then @@ -1141,7 +1151,7 @@ Public Class frmMain Exit For End If Next - Await Load_Grid_Overview(FormLoad, ForceReload) + Await Load_Grid_Overview(pIsFormLoad, ForceReload) ElseIf GRID_LOAD_TYPE.StartsWith("PROFILE#") Then Await Load_single_Profile(ForceReload) End If @@ -1171,6 +1181,9 @@ Public Class frmMain If TimerRefresh.Enabled = False Then TimerRefresh.Enabled = True End If + If pIsFormLoad = True Then + FormShown = True + End If End Function @@ -1957,12 +1970,13 @@ Public Class frmMain Private Async Sub TabellenlayoutZurücksetzenToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TabellenlayoutZurücksetzenToolStripMenuItem.Click + FRONTEND_ACTION = "RESET_LAYOUT" Timer_Inactivity_Reset_Disable() Await Reset_GridLayout(False) Await Decide_Load(False, True) SaveGridLayout() - If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo() + FRONTEND_ACTION = "NONE" End Sub Async Function Reset_GridLayout(FormLoad As Boolean) As Tasks.Task If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.SaveViewInfo() @@ -2082,12 +2096,13 @@ Public Class frmMain GridLayout_Changed() End Sub Private Sub GridView_Docs_EndSorting(sender As Object, e As EventArgs) Handles GridView_Docs.EndSorting - ' SaveGridLayout() + GridLayout_Changed() End Sub Private Sub LayoutSpeichernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LayoutSpeichernToolStripMenuItem.Click - Timer_Inactivity_Reset_Disable() - SaveGridLayout() + FRONTEND_ACTION = "SAVE GRID LAYOUT" + GridLayout_Changed() + FRONTEND_ACTION = "NONE" End Sub Private Sub GridView_Docs_LostFocus(sender As Object, e As EventArgs) Handles GridView_Docs.LostFocus @@ -2175,9 +2190,10 @@ Public Class frmMain LOGGER.Debug($" RibbonControl1.ColorScheme [{RIBBON_COLOR_SCHEME}]") Me.Text = ADDITIONAL_TITLE CurrNavBarGroup = NavBarControl1.Groups(1) - + FormShown = True Await Decide_Load(True) Handling_DEBUG_USER() + End Sub Sub Handling_DEBUG_USER() If USER_DEBUG_LOG = True Then @@ -2617,11 +2633,15 @@ Public Class frmMain If FormShown = False Then Exit Sub End If + If FRONTEND_ACTION <> "NONE" Then + Exit Sub + End If Timer_Inactivity_Reset_Disable() SaveGridLayout() End Sub - Private Sub GridView_Docs_CustomColumnSort(sender As Object, e As CustomColumnSortEventArgs) Handles GridView_Docs.CustomColumnSort + + Private Sub GridView_Docs_EndGrouping(sender As Object, e As EventArgs) Handles GridView_Docs.EndGrouping GridLayout_Changed() End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 095c856..42eba17 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -399,7 +399,10 @@ Public Class frmValidator If INACTIVITY_DURATION <> 0 Then frmMain.Timer_Inactivity_Reset_Disable() Try - _frmValidatorSearch.Close() + If Not IsNothing(_frmValidatorSearch) Then + _frmValidatorSearch.Close() + End If + Catch ex As Exception End Try