Compare commits

...

3 Commits

Author SHA1 Message Date
Jonathan Jenne
8169bb5a7a Version 2.6.0.3 2022-11-07 15:43:14 +01:00
Jonathan Jenne
d294e328b1 remove frmLanguage 2022-11-07 15:42:57 +01:00
Jonathan Jenne
8cdaa16c82 Fix languages 2022-11-07 15:42:02 +01:00
7 changed files with 5220 additions and 5194 deletions

View File

@ -6,6 +6,8 @@ Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Database
Imports DigitalData.Modules.EDMI.API
Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
Imports System.Globalization
Imports System.Threading
Public Class ClassInit
Public _lizenzManager As clsLicenseManager
@ -146,18 +148,18 @@ Public Class ClassInit
End If
Dim oSplit() As String = ConfigManager.Config.AppServerConfig.ToString.Split(oDynSplitCharacter)
Dim oAppServerAddress As String = oSplit(0)
Dim oAppServerPort As Integer = 9000
If oSplit.Length = 2 Then
oAppServerPort = oSplit(1)
End If
_Client = New Client(LogConfig, oAppServerAddress, oAppServerPort)
If Not IsNothing(_Client) Then
If _Client.Connect() Then
APPSERVER_ACTIVE = True
Else
Dim oAppServerPort As Integer = 9000
If oSplit.Length = 2 Then
oAppServerPort = oSplit(1)
End If
_Client = New Client(LogConfig, oAppServerAddress, oAppServerPort)
If Not IsNothing(_Client) Then
If _Client.Connect() Then
APPSERVER_ACTIVE = True
Else
Logger.Warn($"###!!!APPServer [{ConfigManager.Config.AppServerConfig.ToString}] could not be initialized ")
End If
End If
End If
Catch ex As Exception
Logger.Warn($"Could not initialize the AppServer: {ex.Message}")
End Try

View File

@ -14,6 +14,21 @@
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -330,16 +345,15 @@
<EmbeddedResource Include="frmLicenseInfo.resx">
<DependentUpon>frmLicenseInfo.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmMain.resx">
<DependentUpon>frmMain.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="frmMain.en.resx">
<DependentUpon>frmMain.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmMain.fr.resx">
<DependentUpon>frmMain.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmMain.resx">
<DependentUpon>frmMain.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmPrint.resx">
<DependentUpon>frmPrint.vb</DependentUpon>
</EmbeddedResource>
@ -481,6 +495,18 @@
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

View File

@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("Search Flow")>
<Assembly: AssemblyCopyright("Copyright © 2022")>
<Assembly: AssemblyTrademark("2.6.0.2")>
<Assembly: AssemblyTrademark("2.6.0.3")>
<Assembly: ComVisible(False)>
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.6.0.2")>
<Assembly: AssemblyVersion("2.6.0.3")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@ -63,14 +63,10 @@ Partial Class frmMain
'
'RibbonControl1
'
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified
Me.RibbonControl1.ExpandCollapseItem.Id = 0
Me.RibbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer)
Me.RibbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer)
Me.RibbonControl1.ExpandCollapseItem.ImageOptions.SvgImage = CType(resources.GetObject("RibbonControl1.ExpandCollapseItem.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.RibbonControl1.ExpandCollapseItem.SearchTags = resources.GetString("RibbonControl1.ExpandCollapseItem.SearchTags")
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.lblUser, Me.lblVersion, Me.lblApplicationServer, Me.bbtniKonfig, Me.bbtnitemAdmin, Me.lblRefresh})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 7
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
@ -84,18 +80,13 @@ Partial Class frmMain
'
resources.ApplyResources(Me.lblUser, "lblUser")
Me.lblUser.Id = 1
Me.lblUser.ImageOptions.ImageIndex = CType(resources.GetObject("lblUser.ImageOptions.ImageIndex"), Integer)
Me.lblUser.ImageOptions.LargeImageIndex = CType(resources.GetObject("lblUser.ImageOptions.LargeImageIndex"), Integer)
Me.lblUser.ImageOptions.SvgImage = CType(resources.GetObject("lblUser.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.lblUser.Name = "lblUser"
Me.lblUser.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
'
'lblVersion
'
resources.ApplyResources(Me.lblVersion, "lblVersion")
Me.lblVersion.Id = 2
Me.lblVersion.ImageOptions.ImageIndex = CType(resources.GetObject("lblVersion.ImageOptions.ImageIndex"), Integer)
Me.lblVersion.ImageOptions.LargeImageIndex = CType(resources.GetObject("lblVersion.ImageOptions.LargeImageIndex"), Integer)
Me.lblVersion.ImageOptions.SvgImage = CType(resources.GetObject("lblVersion.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.lblVersion.Name = "lblVersion"
Me.lblVersion.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
@ -104,8 +95,6 @@ Partial Class frmMain
'
resources.ApplyResources(Me.lblApplicationServer, "lblApplicationServer")
Me.lblApplicationServer.Id = 3
Me.lblApplicationServer.ImageOptions.ImageIndex = CType(resources.GetObject("lblApplicationServer.ImageOptions.ImageIndex"), Integer)
Me.lblApplicationServer.ImageOptions.LargeImageIndex = CType(resources.GetObject("lblApplicationServer.ImageOptions.LargeImageIndex"), Integer)
Me.lblApplicationServer.ImageOptions.SvgImage = CType(resources.GetObject("lblApplicationServer.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.lblApplicationServer.Name = "lblApplicationServer"
Me.lblApplicationServer.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
@ -114,8 +103,6 @@ Partial Class frmMain
'
resources.ApplyResources(Me.bbtniKonfig, "bbtniKonfig")
Me.bbtniKonfig.Id = 4
Me.bbtniKonfig.ImageOptions.ImageIndex = CType(resources.GetObject("bbtniKonfig.ImageOptions.ImageIndex"), Integer)
Me.bbtniKonfig.ImageOptions.LargeImageIndex = CType(resources.GetObject("bbtniKonfig.ImageOptions.LargeImageIndex"), Integer)
Me.bbtniKonfig.ImageOptions.SvgImage = CType(resources.GetObject("bbtniKonfig.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.bbtniKonfig.Name = "bbtniKonfig"
'
@ -123,8 +110,6 @@ Partial Class frmMain
'
resources.ApplyResources(Me.bbtnitemAdmin, "bbtnitemAdmin")
Me.bbtnitemAdmin.Id = 5
Me.bbtnitemAdmin.ImageOptions.ImageIndex = CType(resources.GetObject("bbtnitemAdmin.ImageOptions.ImageIndex"), Integer)
Me.bbtnitemAdmin.ImageOptions.LargeImageIndex = CType(resources.GetObject("bbtnitemAdmin.ImageOptions.LargeImageIndex"), Integer)
Me.bbtnitemAdmin.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitemAdmin.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.bbtnitemAdmin.Name = "bbtnitemAdmin"
'
@ -132,8 +117,6 @@ Partial Class frmMain
'
resources.ApplyResources(Me.lblRefresh, "lblRefresh")
Me.lblRefresh.Id = 6
Me.lblRefresh.ImageOptions.ImageIndex = CType(resources.GetObject("lblRefresh.ImageOptions.ImageIndex"), Integer)
Me.lblRefresh.ImageOptions.LargeImageIndex = CType(resources.GetObject("lblRefresh.ImageOptions.LargeImageIndex"), Integer)
Me.lblRefresh.ImageOptions.SvgImage = CType(resources.GetObject("lblRefresh.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.lblRefresh.Name = "lblRefresh"
Me.lblRefresh.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
@ -153,11 +136,11 @@ Partial Class frmMain
'
'RibbonStatusBar1
'
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
Me.RibbonStatusBar1.ItemLinks.Add(Me.lblUser)
Me.RibbonStatusBar1.ItemLinks.Add(Me.lblVersion)
Me.RibbonStatusBar1.ItemLinks.Add(Me.lblApplicationServer)
Me.RibbonStatusBar1.ItemLinks.Add(Me.lblRefresh)
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
'
@ -168,9 +151,9 @@ Partial Class frmMain
'
'GroupBox2
'
resources.ApplyResources(Me.GroupBox2, "GroupBox2")
Me.GroupBox2.Controls.Add(Me.labelStatus)
Me.GroupBox2.Controls.Add(Me.labelRefresh)
resources.ApplyResources(Me.GroupBox2, "GroupBox2")
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.TabStop = False
'
@ -186,9 +169,9 @@ Partial Class frmMain
'
'GroupBox1
'
resources.ApplyResources(Me.GroupBox1, "GroupBox1")
Me.GroupBox1.Controls.Add(Me.Label2)
Me.GroupBox1.Controls.Add(Me.labelHotkey)
resources.ApplyResources(Me.GroupBox1, "GroupBox1")
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.TabStop = False
'
@ -211,38 +194,38 @@ Partial Class frmMain
'
'cmstrpNotifyIcon
'
resources.ApplyResources(Me.cmstrpNotifyIcon, "cmstrpNotifyIcon")
Me.cmstrpNotifyIcon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FunktionenToolStripMenuItem, Me.tsmiChangeState, Me.ClientÖffnenToolStripMenuItem, Me.ClientBeendenToolStripMenuItem})
Me.cmstrpNotifyIcon.Name = "cmstrpNotifyIcon"
resources.ApplyResources(Me.cmstrpNotifyIcon, "cmstrpNotifyIcon")
'
'FunktionenToolStripMenuItem
'
resources.ApplyResources(Me.FunktionenToolStripMenuItem, "FunktionenToolStripMenuItem")
Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BisherigenAblaufAnzeigenToolStripMenuItem})
Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem"
resources.ApplyResources(Me.FunktionenToolStripMenuItem, "FunktionenToolStripMenuItem")
'
'BisherigenAblaufAnzeigenToolStripMenuItem
'
resources.ApplyResources(Me.BisherigenAblaufAnzeigenToolStripMenuItem, "BisherigenAblaufAnzeigenToolStripMenuItem")
Me.BisherigenAblaufAnzeigenToolStripMenuItem.Name = "BisherigenAblaufAnzeigenToolStripMenuItem"
resources.ApplyResources(Me.BisherigenAblaufAnzeigenToolStripMenuItem, "BisherigenAblaufAnzeigenToolStripMenuItem")
'
'tsmiChangeState
'
resources.ApplyResources(Me.tsmiChangeState, "tsmiChangeState")
Me.tsmiChangeState.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.Symbols_Stop_16xLG
Me.tsmiChangeState.Name = "tsmiChangeState"
resources.ApplyResources(Me.tsmiChangeState, "tsmiChangeState")
'
'ClientÖffnenToolStripMenuItem
'
resources.ApplyResources(Me.ClientÖffnenToolStripMenuItem, "ClientÖffnenToolStripMenuItem")
Me.ClientÖffnenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.door_open
Me.ClientÖffnenToolStripMenuItem.Name = "ClientÖffnenToolStripMenuItem"
resources.ApplyResources(Me.ClientÖffnenToolStripMenuItem, "ClientÖffnenToolStripMenuItem")
'
'ClientBeendenToolStripMenuItem
'
resources.ApplyResources(Me.ClientBeendenToolStripMenuItem, "ClientBeendenToolStripMenuItem")
Me.ClientBeendenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.cancel
Me.ClientBeendenToolStripMenuItem.Name = "ClientBeendenToolStripMenuItem"
resources.ApplyResources(Me.ClientBeendenToolStripMenuItem, "ClientBeendenToolStripMenuItem")
'
'TimerClose
'
@ -254,15 +237,15 @@ Partial Class frmMain
'
'ContextMenuStripForm
'
resources.ApplyResources(Me.ContextMenuStripForm, "ContextMenuStripForm")
Me.ContextMenuStripForm.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MinimierenToolStripMenuItem})
Me.ContextMenuStripForm.Name = "ContextMenuStripForm"
resources.ApplyResources(Me.ContextMenuStripForm, "ContextMenuStripForm")
'
'MinimierenToolStripMenuItem
'
resources.ApplyResources(Me.MinimierenToolStripMenuItem, "MinimierenToolStripMenuItem")
Me.MinimierenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.ReduceSize
Me.MinimierenToolStripMenuItem.Name = "MinimierenToolStripMenuItem"
resources.ApplyResources(Me.MinimierenToolStripMenuItem, "MinimierenToolStripMenuItem")
'
'ImageList1
'

View File

@ -117,6 +117,26 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="RibbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="RibbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="RibbonControl1.ExpandCollapseItem.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="RibbonControl1.ExpandCollapseItem.SearchTags" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="lblUser.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="lblUser.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="lblUser.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@ -141,6 +161,12 @@
IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
</data>
<data name="lblVersion.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="lblVersion.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="lblVersion.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -170,6 +196,12 @@
<data name="lblApplicationServer.Caption" xml:space="preserve">
<value>Serveur d'application actif</value>
</data>
<data name="lblApplicationServer.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="lblApplicationServer.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="lblApplicationServer.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -195,6 +227,12 @@
<data name="bbtniKonfig.Caption" xml:space="preserve">
<value>Paramètres de base</value>
</data>
<data name="bbtniKonfig.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="bbtniKonfig.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="bbtniKonfig.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -218,6 +256,12 @@
IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
</data>
<data name="bbtnitemAdmin.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="bbtnitemAdmin.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="bbtnitemAdmin.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -248,6 +292,12 @@
NSwxMC43LDEyLDkuMyw5Ljl6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
</value>
</data>
<data name="lblRefresh.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="lblRefresh.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
<value>-1</value>
</data>
<data name="lblRefresh.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@ -4860,7 +4910,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU
CwAAAk1TRnQBSQFMAgEBBQEAASABAQEgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CwAAAk1TRnQBSQFMAgEBBQEAATABAQEwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

File diff suppressed because it is too large Load Diff

View File

@ -32,20 +32,26 @@ Public Class frmMain
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
Dim splash As New frmSplash()
splash.ShowDialog()
If ERROR_INIT <> "INVALID USER" Then
Dim Culture = CultureInfo.CreateSpecificCulture(USER_LANGUAGE)
' The following line provides localization for the application's user interface.
Thread.CurrentThread.CurrentUICulture = Culture
If ERROR_INIT <> "INVALID USER" Then
'Dim Culture = CultureInfo.CreateSpecificCulture(USER_LANGUAGE)
Dim Culture As New CultureInfo(USER_LANGUAGE)
Culture.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
' The following line provides localization for data formats.
Thread.CurrentThread.CurrentCulture = Culture
Thread.CurrentThread.CurrentUICulture = New CultureInfo(USER_LANGUAGE)
' The following line provides localization for the application's user interface.
Thread.CurrentThread.CurrentUICulture = Culture
' Set this culture as the default culture for all threads in this application.
' Note: The following properties are supported in the .NET Framework 4.5+
CultureInfo.DefaultThreadCurrentCulture = Culture
CultureInfo.DefaultThreadCurrentUICulture = Culture
Culture.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
End If
_DataASorDB = New ClassDataASorDB(modCurrent.LogConfig)
End Sub
@ -56,7 +62,6 @@ Public Class frmMain
End If
lblUser.Caption = USER_USERNAME
If Database.DBInitialized = True Then
If ERROR_INIT <> "" Then
If ERROR_INIT = "NO CLIENT" Then
@ -116,8 +121,16 @@ Public Class frmMain
End If
RefreshUI()
Dim resources = New System.ComponentModel.ComponentResourceManager(Me.[GetType]())
GetChildren(Me).ToList().ForEach(Sub(c) resources.ApplyResources(c, c.Name))
End Sub
Private Function GetChildren(pControl As Control) As IEnumerable(Of Control)
Dim oControls = pControl.Controls.Cast(Of Control)()
Return oControls.SelectMany(Of Control)(Function(ctrl) GetChildren(ctrl)).Concat(oControls)
End Function
Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
Logger.Info(">> Logout time: " & Now.ToString, False)
If ERROR_INIT = "INVALID USER" Or ERROR_INIT = "NO CLIENT" Then