Clean up

MultiTool.Form/MultiTool.Form.vbproj

@@ -315,6 +315,7 @@
   <ItemGroup>
     <Content Include="CREATE_DATABASE.sql" />
     <Content Include="MultiTool.ico" />
+    <None Include="Resources\followupall.svg" />
     <None Include="Resources\actions_send2.svg" />
     <None Include="Resources\bo_product.svg" />
     <None Include="Resources\bo_country.svg" />

MultiTool.Form/My Project/Resources.Designer.vb

@@ -200,6 +200,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property followupall() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("followupall", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>

MultiTool.Form/My Project/Resources.resx

@@ -121,9 +121,6 @@
   <data name="logical" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\logical.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\redo.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -145,6 +142,9 @@
   <data name="mailmergepreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="tilelabels" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\tilelabels.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -163,6 +163,9 @@
   <data name="paymentrefund" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="open1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -196,8 +199,8 @@
   <data name="rotatecounterclockwise" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_arrow4down" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -232,7 +235,7 @@
   <data name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="followupall" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\followupall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

MultiTool.Form/Resources/followupall.svg

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{display:none;}
+	.st2{display:inline;fill:#039C23;}
+	.st3{display:inline;fill:#D11C1C;}
+	.st4{display:inline;fill:#727272;}
+</style>
+  <g id="FollowUpAll">
+    <path d="M10,2v16l18-8L10,2z M12,5.1L23.1,10L12,14.9V5.1z M6,2h2v28H6V2z" class="Black" />
+  </g>
+</svg>

MultiTool.Form/frmImportMain.Designer.vb

@@ -341,9 +341,8 @@ Partial Class frmImportMain
         Me.txtCulture.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
         resources.ApplyResources(Me.txtCulture, "txtCulture")
         Me.txtCulture.Id = 26
-        Me.txtCulture.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_country
+        Me.txtCulture.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.followupall
         Me.txtCulture.Name = "txtCulture"
-        Me.txtCulture.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         Me.txtCulture.Tag = "Culture: {0}"
         '
         'btnRemoveRow

MultiTool.Form/frmImportMain.vb

@@ -98,8 +98,10 @@ Public Class frmImportMain
             Winline = New WinlineData(LogConfig, Database, ConfigManager.Config)
             WebService = New WebService(LogConfig, ConfigManager.Config, Application.UserAppDataPath)
             AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress
+
         Catch ex As Exception
             FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Initialisieren_der_Anwendungs_Daten)
+
         End Try
 
         txtVersion.Caption = String.Format(My.Resources.frmImportMainExtra.Version__0_, My.Application.Info.Version.ToString)
@@ -141,7 +143,7 @@ Public Class frmImportMain
 
             DocumentLoader = New DocumentLoader(LogConfig, Winline)
             SchemaLoader = New SchemaLoader(LogConfig)
-            GridLoader = New GridLoader(LogConfig, Winline.TemplateConfiguration)
+            GridLoader = New GridLoader(LogConfig)
 
             SplashScreenManager.SetWaitFormDescription(My.Resources.frmImportMainExtra.Lade_Vorlagen)
 
@@ -151,6 +153,8 @@ Public Class frmImportMain
             CurrentSchema = SchemaLoader.GetSchemaFromFile(CurrentSchemaName)
             CurrentSchema = SchemaLoader.UpdateSchemaWithDatabaseConfiguration(CurrentSchema, Winline.TemplateConfiguration)
 
+
+
             Grids = CreateGridsAndColumns(CurrentSchema)
 
             For Each oGrid As GridControl In Grids