Rename Shared to Common

MultiTool.Form/frmMain.vb

@@ -6,14 +6,14 @@ Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline
+Imports MultiTool.Common.Winline.Entities
 
 Public Class frmMain
     Private LogConfig As LogConfig
     Private Logger As Logger
-    Private ConfigManager As ConfigManager(Of [Shared].Config)
+    Private ConfigManager As ConfigManager(Of Common.Config)
     Private Database As MSSQLServer
     Private TemplateLoader As TemplateLoader
     Private GridBuilder As GridBuilder
@@ -40,7 +40,7 @@ Public Class frmMain
             SplashScreenManager.SetWaitFormDescription("Initialisierung der Grundfunktionen")
 
             FormHelper = New FormHelper(LogConfig, Me)
-            ConfigManager = New ConfigManager(Of [Shared].Config)(LogConfig,
+            ConfigManager = New ConfigManager(Of Common.Config)(LogConfig,
                 Application.UserAppDataPath,
                 Application.CommonAppDataPath,
                 Application.StartupPath
@@ -70,13 +70,10 @@ Public Class frmMain
             Database = New MSSQLServer(LogConfig, oConnectionString)
 
             SplashScreenManager.SetWaitFormDescription("Lade Vorlagen")
-            Await LoadTemplateData()
+            GridControl1.DataSource = Await LoadTemplateData()
 
             SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten")
             My.Winline = New WinlineData(LogConfig, Database, My.GeneralConfiguration, My.MappingConfiguration, My.MandatorConfiguration)
-            Dim oBindingSource As BindingList(Of Template) = Await LoadWinlineData(My.Winline)
-            GridControl1.DataSource = oBindingSource
-
 
             txtVersion.Caption = String.Format(My.Resources.frmMainExtra.Version___0_, My.Application.Info.Version.ToString)
             txtCulture.Caption = String.Format(My.Resources.frmMainExtra.Sprache___0_, My.Application.UICulture.ToString)
@@ -89,7 +86,7 @@ Public Class frmMain
         End Try
     End Sub
 
-    Private Async Function LoadWinlineData(Winline As WinlineData) As Task(Of BindingList(Of Template))
+    Private Async Function LoadWinlineData(Winline As WinlineData) As Task
         Winline.Mandators.Clear()
         Winline.LoadEconomicYears()
         Await Winline.LoadMandators()
@@ -104,15 +101,9 @@ Public Class frmMain
         Next
 
         My.Winline = Winline
-
-        Dim oBindingSource = New BindingList(Of Template)
-        For Each oTemplate As Template In TemplateLoader.TemplateList
-            oBindingSource.Add(oTemplate)
-        Next
-        Return oBindingSource
     End Function
 
-    Private Async Function LoadTemplateData() As Task
+    Private Async Function LoadTemplateData() As Task(Of BindingList(Of Template))
         ' Initialize Schemas
         TemplateLoader = New TemplateLoader(LogConfig, Database)
         Await TemplateLoader.LoadTemplates()
@@ -126,6 +117,12 @@ Public Class frmMain
         My.TemplateConfiguration = TemplateLoader.TemplateConfiguration
         My.MandatorConfiguration = TemplateLoader.MandatorConfiguration
         My.GeneralConfiguration = TemplateLoader.GeneralConfiguration
+
+        Dim oBindingSource = New BindingList(Of Template)
+        For Each oTemplate As Template In TemplateLoader.TemplateList
+            oBindingSource.Add(oTemplate)
+        Next
+        Return oBindingSource
     End Function
 
     Private Sub btnOpenImportExportForm_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenImportExportForm.ItemClick
@@ -233,7 +230,7 @@ Public Class frmMain
         End Try
     End Sub
 
-    Private Async Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+    Private Async Sub btnReloadTemplates_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadTemplates.ItemClick
         If SplashScreenManager.IsSplashFormVisible Then
             Exit Sub
         End If
@@ -242,11 +239,27 @@ Public Class frmMain
 
         Try
             SplashScreenManager.SetWaitFormDescription("Lade Vorlagen")
-            Await LoadTemplateData()
+            GridControl1.DataSource = Await LoadTemplateData()
 
+        Catch ex As Exception
+            FormHelper.ShowError(ex, "Laden der Vorlagen")
+
+        Finally
+            SplashScreenManager.CloseWaitForm()
+
+        End Try
+    End Sub
+
+    Private Async Sub btnReloadWinlineData_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadWinlineData.ItemClick
+        If SplashScreenManager.IsSplashFormVisible Then
+            Exit Sub
+        End If
+
+        SplashScreenManager.ShowWaitForm()
+
+        Try
             SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten")
-            Dim oBindingSource As BindingList(Of Template) = Await LoadWinlineData(My.Winline)
-            GridControl1.DataSource = oBindingSource
+            Await LoadWinlineData(My.Winline)
 
         Catch ex As Exception
             FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Winline_Daten)