Fix Cultures not applying, remove LIB_STANDARD dependency

This commit is contained in:
Jonathan Jenne 2023-05-15 16:34:08 +02:00
parent 227f514afa
commit 9a7ea86f2e
16 changed files with 10325 additions and 860 deletions

View File

@ -1,5 +1,5 @@
Imports System.ComponentModel Imports System.ComponentModel
Imports DD_LIB_Standards Imports DigitalData.Modules.License
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Language.Utils
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
@ -11,7 +11,7 @@ Imports System.Threading
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Public Class ClassInit Public Class ClassInit
Public _lizenzManager As clsLicenseManager Public _lizenzManager As LicenseManagerLegacy
Public _database As MSSQLServer Public _database As MSSQLServer
Private _DataASorDB As ClassDataASorDB Private _DataASorDB As ClassDataASorDB
@ -23,25 +23,10 @@ Public Class ClassInit
LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName) LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName)
Logger = LogConfig.GetLogger() Logger = LogConfig.GetLogger()
_DataASorDB = New ClassDataASorDB(LogConfig) _DataASorDB = New ClassDataASorDB(LogConfig)
Try
Dim directory As New IO.DirectoryInfo(LogConfig.LogDirectory)
For Each file As IO.FileInfo In directory.GetFiles
If (Now - file.CreationTime).Days > 29 Then
file.Delete()
Else
Exit For
End If
Next
Catch ex As Exception
End Try
End Sub End Sub
Public Function InitDatabase() Public Function InitDatabase()
clsDatabase.GUI = True 'clsDatabase.GUI = True
Dim Database_ECM As MSSQLServer = Nothing Dim Database_ECM As MSSQLServer = Nothing
Dim Database_IDB As MSSQLServer = Nothing Dim Database_IDB As MSSQLServer = Nothing
If MyConnectionString <> String.Empty Then If MyConnectionString <> String.Empty Then
@ -128,7 +113,7 @@ Public Class ClassInit
CONFIG = New ConfigManager(Of ClassConfig)(LogConfig, oUserAppDataPath, oCommonAppDataPath, oStartupPath) CONFIG = New ConfigManager(Of ClassConfig)(LogConfig, oUserAppDataPath, oCommonAppDataPath, oStartupPath)
With CONFIG.Config With CONFIG.Config
MyConnectionString = DecryptConnectionString(.ConnectionString) MyConnectionString = MSSQLServer.DecryptConnectionString(.ConnectionString)
LogErrorsOnly = .LogErrorsOnly LogErrorsOnly = .LogErrorsOnly
HotkeySearchKey = .HotkeySearchKey HotkeySearchKey = .HotkeySearchKey
LogConfig.Debug = Not .LogErrorsOnly LogConfig.Debug = Not .LogErrorsOnly
@ -137,7 +122,7 @@ Public Class ClassInit
HotkeyFunctionKey = CONFIG.Config.HotkeyFunctionKey HotkeyFunctionKey = CONFIG.Config.HotkeyFunctionKey
End If End If
If CONFIG.Config.ConnectionStringAppServer <> String.Empty Then If CONFIG.Config.ConnectionStringAppServer <> String.Empty Then
MyConStringAppserv = DecryptConnectionString(CONFIG.Config.ConnectionStringAppServer) MyConStringAppserv = MSSQLServer.DecryptConnectionString(CONFIG.Config.ConnectionStringAppServer)
If InitAppDatabase() Then If InitAppDatabase() Then
Logger.Debug("ConnectionStringAppServer will be used") Logger.Debug("ConnectionStringAppServer will be used")
End If End If
@ -173,27 +158,28 @@ Public Class ClassInit
Return True Return True
End Function End Function
Private Function DecryptConnectionString(EncryptedConnectionString As String) As String 'Private Function DecryptConnectionString(EncryptedConnectionString As String) As String
Dim oBuilder As New SqlClient.SqlConnectionStringBuilder With { ' Dim oBuilder As New SqlClient.SqlConnectionStringBuilder With {
.ConnectionString = EncryptedConnectionString ' .ConnectionString = EncryptedConnectionString
} ' }
If oBuilder.ConnectionString.Contains("Password=") Then ' If oBuilder.ConnectionString.Contains("Password=") Then
Dim oPlaintextPassword As String ' Dim oPlaintextPassword As String
Dim oDecryptor As New clsEncryption("!35452didalog=") ' Dim oDecryptor As New clsEncryption("!35452didalog=")
' Try
' oPlaintextPassword = oDecryptor.DecryptData(oBuilder.Password)
' Catch ex As Exception
' Logger.Error(ex)
' Logger.Debug("Password {0} could not be decrypted. Assuming plaintext password.")
' oPlaintextPassword = oBuilder.Password
' End Try
' Return EncryptedConnectionString.Replace(oBuilder.Password, oPlaintextPassword)
' Else
' Return EncryptedConnectionString
' End If
'End Function
Try
oPlaintextPassword = oDecryptor.DecryptData(oBuilder.Password)
Catch ex As Exception
Logger.Error(ex)
Logger.Debug("Password {0} could not be decrypted. Assuming plaintext password.")
oPlaintextPassword = oBuilder.Password
End Try
Return EncryptedConnectionString.Replace(oBuilder.Password, oPlaintextPassword)
Else
Return EncryptedConnectionString
End If
End Function
Public Function CheckModuleData() Public Function CheckModuleData()
Try Try
Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED) Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED)

View File

@ -1,4 +1,6 @@
Imports DD_LIB_Standards Imports DD_LIB_Standards
Imports DigitalData.Modules.License
Public Class ClassLicense Public Class ClassLicense
Private Shared lic_string As String Private Shared lic_string As String
Private Shared Sub Get_License(CLIENT_ID As Integer) Private Shared Sub Get_License(CLIENT_ID As Integer)
@ -17,7 +19,7 @@ Public Class ClassLicense
End Sub End Sub
Public Shared Sub Refresh_Licence(CLIENT_ID As Integer) Public Shared Sub Refresh_Licence(CLIENT_ID As Integer)
Try Try
Dim _lizenzManager = New clsLicenseManager("#DigitalData35452!#", "") Dim _lizenzManager = New LicenseManagerLegacy(LogConfig, "#DigitalData35452!#", "")
Get_License(CLIENT_ID) Get_License(CLIENT_ID)
If lic_string = "" Then If lic_string = "" Then

View File

@ -70,9 +70,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Accessibility" /> <Reference Include="Accessibility" />
<Reference Include="DD_LIB_Standards">
<HintPath>..\..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Images.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Images.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@ -127,6 +124,9 @@
<Reference Include="DigitalData.Modules.Language"> <Reference Include="DigitalData.Modules.Language">
<HintPath>..\..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath> <HintPath>..\..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.License">
<HintPath>..\..\..\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging"> <Reference Include="DigitalData.Modules.Logging">
<HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
@ -351,6 +351,9 @@
<EmbeddedResource Include="frmLicenseInfo.resx"> <EmbeddedResource Include="frmLicenseInfo.resx">
<DependentUpon>frmLicenseInfo.vb</DependentUpon> <DependentUpon>frmLicenseInfo.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="frmMain.en-US.resx">
<DependentUpon>frmMain.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmMain.en.resx"> <EmbeddedResource Include="frmMain.en.resx">
<DependentUpon>frmMain.vb</DependentUpon> <DependentUpon>frmMain.vb</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>

View File

@ -83,7 +83,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Clipboard-Watcher starten ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die EasyFlow starten ähnelt.
'''</summary> '''</summary>
Friend Shared ReadOnly Property Clipboard_Watcher_starten() As String Friend Shared ReadOnly Property Clipboard_Watcher_starten() As String
Get Get
@ -92,7 +92,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Clipboard-Watcher stoppen ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die EasyFlow stoppen ähnelt.
'''</summary> '''</summary>
Friend Shared ReadOnly Property Clipboard_Watcher_stoppen() As String Friend Shared ReadOnly Property Clipboard_Watcher_stoppen() As String
Get Get
@ -101,7 +101,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Clipboard-Watcher wurde deaktiviert! ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die EasyFlow wurde deaktiviert! ähnelt.
'''</summary> '''</summary>
Friend Shared ReadOnly Property Clipboard_Watcher_wurde_deaktiviert_() As String Friend Shared ReadOnly Property Clipboard_Watcher_wurde_deaktiviert_() As String
Get Get
@ -110,7 +110,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Clipboard-Watcher wurde wieder aktiviert! ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die EasyFlow wurde wieder aktiviert! ähnelt.
'''</summary> '''</summary>
Friend Shared ReadOnly Property Clipboard_Watcher_wurde_wieder_aktiviert_() As String Friend Shared ReadOnly Property Clipboard_Watcher_wurde_wieder_aktiviert_() As String
Get Get
@ -202,7 +202,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Wollen Sie Clipboard-Watcher wirklich beenden? ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die Wollen Sie EasyFlow wirklich beenden? ähnelt.
'''</summary> '''</summary>
Friend Shared ReadOnly Property Wollen_Sie_Clipboard_Watcher_wirklich_beenden_() As String Friend Shared ReadOnly Property Wollen_Sie_Clipboard_Watcher_wirklich_beenden_() As String
Get Get

View File

@ -124,16 +124,16 @@
<value>Refresh successful.</value> <value>Refresh successful.</value>
</data> </data>
<data name="Clipboard-Watcher starten" xml:space="preserve"> <data name="Clipboard-Watcher starten" xml:space="preserve">
<value>Start Clipboard-Watcher</value> <value>Start EasyFlow</value>
</data> </data>
<data name="Clipboard-Watcher stoppen" xml:space="preserve"> <data name="Clipboard-Watcher stoppen" xml:space="preserve">
<value>Stop Clipboard-Watcher</value> <value>Stop EasyFlow</value>
</data> </data>
<data name="Clipboard-Watcher wurde deaktiviert!" xml:space="preserve"> <data name="Clipboard-Watcher wurde deaktiviert!" xml:space="preserve">
<value>Clipboard-Watcher was deactivated!</value> <value>EasyFlow was deactivated!</value>
</data> </data>
<data name="Clipboard-Watcher wurde wieder aktiviert!" xml:space="preserve"> <data name="Clipboard-Watcher wurde wieder aktiviert!" xml:space="preserve">
<value>Clipboard-Watcher was activated again!</value> <value>EasyFlow was activated again!</value>
</data> </data>
<data name="Die Benutzerkonfiguration konnte nicht erfolgreich durchgeführt werden!{0}Grund: {1}{2}Bitte kontaktieren sie Ihren Administrator!" xml:space="preserve"> <data name="Die Benutzerkonfiguration konnte nicht erfolgreich durchgeführt werden!{0}Grund: {1}{2}Bitte kontaktieren sie Ihren Administrator!" xml:space="preserve">
<value>User Configuration could not be performed successfully!</value> <value>User Configuration could not be performed successfully!</value>
@ -163,6 +163,6 @@
<value>You are not related to a mandator{0}Please contact your administrator.</value> <value>You are not related to a mandator{0}Please contact your administrator.</value>
</data> </data>
<data name="Wollen Sie Clipboard-Watcher wirklich beenden?" xml:space="preserve"> <data name="Wollen Sie Clipboard-Watcher wirklich beenden?" xml:space="preserve">
<value>Do you really want to quit Clipboard-Watcher?</value> <value>Do you really want to quit EasyFlow?</value>
</data> </data>
</root> </root>

View File

@ -124,16 +124,16 @@
<value>Mise à jour réussie.</value> <value>Mise à jour réussie.</value>
</data> </data>
<data name="Clipboard-Watcher starten" xml:space="preserve"> <data name="Clipboard-Watcher starten" xml:space="preserve">
<value>Démarrer Clipboard-Watcher</value> <value>Démarrer EasyFlow</value>
</data> </data>
<data name="Clipboard-Watcher stoppen" xml:space="preserve"> <data name="Clipboard-Watcher stoppen" xml:space="preserve">
<value>Arrêt Clipboard-Watcher</value> <value>Arrêt EasyFlow</value>
</data> </data>
<data name="Clipboard-Watcher wurde deaktiviert!" xml:space="preserve"> <data name="Clipboard-Watcher wurde deaktiviert!" xml:space="preserve">
<value>Clipboard-Watcher a été désactivé !</value> <value>EasyFlow a été désactivé !</value>
</data> </data>
<data name="Clipboard-Watcher wurde wieder aktiviert!" xml:space="preserve"> <data name="Clipboard-Watcher wurde wieder aktiviert!" xml:space="preserve">
<value>Clipboard-Watcher a été réactivé !</value> <value>EasyFlow a été réactivé !</value>
</data> </data>
<data name="Die Benutzerkonfiguration konnte nicht erfolgreich durchgeführt werden!{0}Grund: {1}{2}Bitte kontaktieren sie Ihren Administrator!" xml:space="preserve"> <data name="Die Benutzerkonfiguration konnte nicht erfolgreich durchgeführt werden!{0}Grund: {1}{2}Bitte kontaktieren sie Ihren Administrator!" xml:space="preserve">
<value>La configuration de l'utilisateur n'a pas pu être effectuée avec succès !</value> <value>La configuration de l'utilisateur n'a pas pu être effectuée avec succès !</value>
@ -163,6 +163,6 @@
<value>Vous n'êtes pas lié à un mandataire{0}Veuillez contacter votre administrateur.</value> <value>Vous n'êtes pas lié à un mandataire{0}Veuillez contacter votre administrateur.</value>
</data> </data>
<data name="Wollen Sie Clipboard-Watcher wirklich beenden?" xml:space="preserve"> <data name="Wollen Sie Clipboard-Watcher wirklich beenden?" xml:space="preserve">
<value>Voulez-vous vraiment quitter Clipboard-Watcher ?</value> <value>Voulez-vous vraiment quitter EasyFlow ?</value>
</data> </data>
</root> </root>

View File

@ -124,16 +124,16 @@
<value>Aktualisierung erfolgreich.</value> <value>Aktualisierung erfolgreich.</value>
</data> </data>
<data name="Clipboard-Watcher starten" xml:space="preserve"> <data name="Clipboard-Watcher starten" xml:space="preserve">
<value>Clipboard-Watcher starten</value> <value>EasyFlow starten</value>
</data> </data>
<data name="Clipboard-Watcher stoppen" xml:space="preserve"> <data name="Clipboard-Watcher stoppen" xml:space="preserve">
<value>Clipboard-Watcher stoppen</value> <value>EasyFlow stoppen</value>
</data> </data>
<data name="Clipboard-Watcher wurde deaktiviert!" xml:space="preserve"> <data name="Clipboard-Watcher wurde deaktiviert!" xml:space="preserve">
<value>Clipboard-Watcher wurde deaktiviert!</value> <value>EasyFlow wurde deaktiviert!</value>
</data> </data>
<data name="Clipboard-Watcher wurde wieder aktiviert!" xml:space="preserve"> <data name="Clipboard-Watcher wurde wieder aktiviert!" xml:space="preserve">
<value>Clipboard-Watcher wurde wieder aktiviert!</value> <value>EasyFlow wurde wieder aktiviert!</value>
</data> </data>
<data name="Die Benutzerkonfiguration konnte nicht erfolgreich durchgeführt werden!{0}Grund: {1}{2}Bitte kontaktieren sie Ihren Administrator!" xml:space="preserve"> <data name="Die Benutzerkonfiguration konnte nicht erfolgreich durchgeführt werden!{0}Grund: {1}{2}Bitte kontaktieren sie Ihren Administrator!" xml:space="preserve">
<value>Die Benutzerkonfiguration konnte nicht erfolgreich durchgeführt werden!{0}Grund: {1}{2}Bitte kontaktieren sie Ihren Administrator!</value> <value>Die Benutzerkonfiguration konnte nicht erfolgreich durchgeführt werden!{0}Grund: {1}{2}Bitte kontaktieren sie Ihren Administrator!</value>
@ -163,6 +163,6 @@
<value>Sie sind keinem Mandanten zugewiesen.{0}Bitte wenden Sie sich an Ihren Administrator!</value> <value>Sie sind keinem Mandanten zugewiesen.{0}Bitte wenden Sie sich an Ihren Administrator!</value>
</data> </data>
<data name="Wollen Sie Clipboard-Watcher wirklich beenden?" xml:space="preserve"> <data name="Wollen Sie Clipboard-Watcher wirklich beenden?" xml:space="preserve">
<value>Wollen Sie Clipboard-Watcher wirklich beenden?</value> <value>Wollen Sie EasyFlow wirklich beenden?</value>
</data> </data>
</root> </root>

View File

@ -1,5 +1,6 @@
Imports DD_LIB_Standards Imports DD_LIB_Standards
Imports DD_Clipboard_Watcher.ClassHotkey.ModfierKey Imports DD_Clipboard_Watcher.ClassHotkey.ModfierKey
Imports DigitalData.Modules.Database
Public Class frmConfig_Basic Public Class frmConfig_Basic
Dim WithEvents Hotkey As New ClassHotkey(Me) Dim WithEvents Hotkey As New ClassHotkey(Me)
@ -32,10 +33,10 @@ Public Class frmConfig_Basic
MyConnectionString = con 'csb.ConnectionString MyConnectionString = con 'csb.ConnectionString
'clsDatabase.Init(MyConnectionString) 'clsDatabase.Init(MyConnectionString)
If chkbxUserAut.Checked = False Then If chkbxUserAut.Checked = False Then
Dim wrapper As New clsEncryption("!35452didalog=") con = MSSQLServer.EncryptConnectionString("Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & Me.txtPasswort.Text & ";")
Dim cipherText As String = wrapper.EncryptData(Me.txtPasswort.Text) 'Dim wrapper As New clsEncryption("!35452didalog=")
Dim pw As String = cipherText 'Dim cipherText As String = wrapper.EncryptData(Me.txtPasswort.Text)
con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & pw & ";" 'Dim pw As String = cipherText
End If End If
'SaveConfigValue("MyConnectionString", con) 'SaveConfigValue("MyConnectionString", con)

View File

@ -1,8 +1,9 @@
Imports System.Globalization Imports System.Globalization
Imports DD_LIB_Standards Imports DigitalData.Modules.License
Public Class frmLicense Public Class frmLicense
Dim CLIENT_ID As Integer Dim CLIENT_ID As Integer
Public _lizenzManager As clsLicenseManager Public _lizenzManager As LicenseManagerLegacy
Private Sub btnPW_check_Click(sender As System.Object, e As System.EventArgs) Handles btnPW_check.Click Private Sub btnPW_check_Click(sender As System.Object, e As System.EventArgs) Handles btnPW_check.Click
OpenLicenseManager() OpenLicenseManager()
@ -48,7 +49,7 @@ Public Class frmLicense
End Sub End Sub
Private Sub btnnewLicenses_Click(sender As System.Object, e As System.EventArgs) Handles btnnewLicenses.Click Private Sub btnnewLicenses_Click(sender As System.Object, e As System.EventArgs) Handles btnnewLicenses.Click
Try Try
_lizenzManager = New clsLicenseManager("#DigitalData35452!#", "") _lizenzManager = New LicenseManagerLegacy(LogConfig, "#DigitalData35452!#", "")
If Me.txtNewlicences.Text <> "" Then If Me.txtNewlicences.Text <> "" Then
'Encode the license 'Encode the license
Dim oDate = CDate(dtpGueltig_GI.Value) Dim oDate = CDate(dtpGueltig_GI.Value)

View File

@ -65,14 +65,20 @@ Partial Class frmMain
' '
'RibbonControl1 'RibbonControl1
' '
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified
Me.RibbonControl1.ExpandCollapseItem.Id = 0 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, Me.bbtnitmLanguage}) 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, Me.bbtnitmLanguage})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 8 Me.RibbonControl1.MaxItemId = 8
Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl1.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
Me.RibbonControl1.ShowToolbarCustomizeItem = False Me.RibbonControl1.ShowToolbarCustomizeItem = False
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
@ -82,6 +88,8 @@ Partial Class frmMain
' '
resources.ApplyResources(Me.lblUser, "lblUser") resources.ApplyResources(Me.lblUser, "lblUser")
Me.lblUser.Id = 1 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.ImageOptions.SvgImage = CType(resources.GetObject("lblUser.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.lblUser.Name = "lblUser" Me.lblUser.Name = "lblUser"
Me.lblUser.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.lblUser.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
@ -90,6 +98,8 @@ Partial Class frmMain
' '
resources.ApplyResources(Me.lblVersion, "lblVersion") resources.ApplyResources(Me.lblVersion, "lblVersion")
Me.lblVersion.Id = 2 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.ImageOptions.SvgImage = CType(resources.GetObject("lblVersion.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.lblVersion.Name = "lblVersion" Me.lblVersion.Name = "lblVersion"
Me.lblVersion.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.lblVersion.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
@ -98,6 +108,8 @@ Partial Class frmMain
' '
resources.ApplyResources(Me.lblApplicationServer, "lblApplicationServer") resources.ApplyResources(Me.lblApplicationServer, "lblApplicationServer")
Me.lblApplicationServer.Id = 3 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.ImageOptions.SvgImage = CType(resources.GetObject("lblApplicationServer.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.lblApplicationServer.Name = "lblApplicationServer" Me.lblApplicationServer.Name = "lblApplicationServer"
Me.lblApplicationServer.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.lblApplicationServer.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
@ -106,6 +118,8 @@ Partial Class frmMain
' '
resources.ApplyResources(Me.bbtniKonfig, "bbtniKonfig") resources.ApplyResources(Me.bbtniKonfig, "bbtniKonfig")
Me.bbtniKonfig.Id = 4 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.ImageOptions.SvgImage = CType(resources.GetObject("bbtniKonfig.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.bbtniKonfig.Name = "bbtniKonfig" Me.bbtniKonfig.Name = "bbtniKonfig"
' '
@ -113,6 +127,8 @@ Partial Class frmMain
' '
resources.ApplyResources(Me.bbtnitemAdmin, "bbtnitemAdmin") resources.ApplyResources(Me.bbtnitemAdmin, "bbtnitemAdmin")
Me.bbtnitemAdmin.Id = 5 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.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitemAdmin.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.bbtnitemAdmin.Name = "bbtnitemAdmin" Me.bbtnitemAdmin.Name = "bbtnitemAdmin"
' '
@ -120,6 +136,8 @@ Partial Class frmMain
' '
resources.ApplyResources(Me.lblRefresh, "lblRefresh") resources.ApplyResources(Me.lblRefresh, "lblRefresh")
Me.lblRefresh.Id = 6 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.ImageOptions.SvgImage = CType(resources.GetObject("lblRefresh.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.lblRefresh.Name = "lblRefresh" Me.lblRefresh.Name = "lblRefresh"
Me.lblRefresh.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.lblRefresh.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
@ -128,6 +146,8 @@ Partial Class frmMain
' '
resources.ApplyResources(Me.bbtnitmLanguage, "bbtnitmLanguage") resources.ApplyResources(Me.bbtnitmLanguage, "bbtnitmLanguage")
Me.bbtnitmLanguage.Id = 7 Me.bbtnitmLanguage.Id = 7
Me.bbtnitmLanguage.ImageOptions.ImageIndex = CType(resources.GetObject("bbtnitmLanguage.ImageOptions.ImageIndex"), Integer)
Me.bbtnitmLanguage.ImageOptions.LargeImageIndex = CType(resources.GetObject("bbtnitmLanguage.ImageOptions.LargeImageIndex"), Integer)
Me.bbtnitmLanguage.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmLanguage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.bbtnitmLanguage.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmLanguage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.bbtnitmLanguage.Name = "bbtnitmLanguage" Me.bbtnitmLanguage.Name = "bbtnitmLanguage"
' '
@ -153,11 +173,11 @@ Partial Class frmMain
' '
'RibbonStatusBar1 'RibbonStatusBar1
' '
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
Me.RibbonStatusBar1.ItemLinks.Add(Me.lblUser) Me.RibbonStatusBar1.ItemLinks.Add(Me.lblUser)
Me.RibbonStatusBar1.ItemLinks.Add(Me.lblVersion) Me.RibbonStatusBar1.ItemLinks.Add(Me.lblVersion)
Me.RibbonStatusBar1.ItemLinks.Add(Me.lblApplicationServer) Me.RibbonStatusBar1.ItemLinks.Add(Me.lblApplicationServer)
Me.RibbonStatusBar1.ItemLinks.Add(Me.lblRefresh) Me.RibbonStatusBar1.ItemLinks.Add(Me.lblRefresh)
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
' '
@ -168,9 +188,9 @@ Partial Class frmMain
' '
'GroupBox2 'GroupBox2
' '
resources.ApplyResources(Me.GroupBox2, "GroupBox2")
Me.GroupBox2.Controls.Add(Me.labelStatus) Me.GroupBox2.Controls.Add(Me.labelStatus)
Me.GroupBox2.Controls.Add(Me.labelRefresh) Me.GroupBox2.Controls.Add(Me.labelRefresh)
resources.ApplyResources(Me.GroupBox2, "GroupBox2")
Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.TabStop = False Me.GroupBox2.TabStop = False
' '
@ -186,9 +206,9 @@ Partial Class frmMain
' '
'GroupBox1 'GroupBox1
' '
resources.ApplyResources(Me.GroupBox1, "GroupBox1")
Me.GroupBox1.Controls.Add(Me.Label2) Me.GroupBox1.Controls.Add(Me.Label2)
Me.GroupBox1.Controls.Add(Me.labelHotkey) Me.GroupBox1.Controls.Add(Me.labelHotkey)
resources.ApplyResources(Me.GroupBox1, "GroupBox1")
Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.TabStop = False Me.GroupBox1.TabStop = False
' '
@ -211,38 +231,38 @@ Partial Class frmMain
' '
'cmstrpNotifyIcon '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.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FunktionenToolStripMenuItem, Me.tsmiChangeState, Me.ClientÖffnenToolStripMenuItem, Me.ClientBeendenToolStripMenuItem})
Me.cmstrpNotifyIcon.Name = "cmstrpNotifyIcon" Me.cmstrpNotifyIcon.Name = "cmstrpNotifyIcon"
resources.ApplyResources(Me.cmstrpNotifyIcon, "cmstrpNotifyIcon")
' '
'FunktionenToolStripMenuItem 'FunktionenToolStripMenuItem
' '
resources.ApplyResources(Me.FunktionenToolStripMenuItem, "FunktionenToolStripMenuItem")
Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BisherigenAblaufAnzeigenToolStripMenuItem}) Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BisherigenAblaufAnzeigenToolStripMenuItem})
Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem" Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem"
resources.ApplyResources(Me.FunktionenToolStripMenuItem, "FunktionenToolStripMenuItem")
' '
'BisherigenAblaufAnzeigenToolStripMenuItem 'BisherigenAblaufAnzeigenToolStripMenuItem
' '
Me.BisherigenAblaufAnzeigenToolStripMenuItem.Name = "BisherigenAblaufAnzeigenToolStripMenuItem"
resources.ApplyResources(Me.BisherigenAblaufAnzeigenToolStripMenuItem, "BisherigenAblaufAnzeigenToolStripMenuItem") resources.ApplyResources(Me.BisherigenAblaufAnzeigenToolStripMenuItem, "BisherigenAblaufAnzeigenToolStripMenuItem")
Me.BisherigenAblaufAnzeigenToolStripMenuItem.Name = "BisherigenAblaufAnzeigenToolStripMenuItem"
' '
'tsmiChangeState 'tsmiChangeState
' '
resources.ApplyResources(Me.tsmiChangeState, "tsmiChangeState")
Me.tsmiChangeState.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.Symbols_Stop_16xLG Me.tsmiChangeState.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.Symbols_Stop_16xLG
Me.tsmiChangeState.Name = "tsmiChangeState" Me.tsmiChangeState.Name = "tsmiChangeState"
resources.ApplyResources(Me.tsmiChangeState, "tsmiChangeState")
' '
'ClientÖffnenToolStripMenuItem '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.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.door_open
Me.ClientÖffnenToolStripMenuItem.Name = "ClientÖffnenToolStripMenuItem" Me.ClientÖffnenToolStripMenuItem.Name = "ClientÖffnenToolStripMenuItem"
resources.ApplyResources(Me.ClientÖffnenToolStripMenuItem, "ClientÖffnenToolStripMenuItem")
' '
'ClientBeendenToolStripMenuItem 'ClientBeendenToolStripMenuItem
' '
resources.ApplyResources(Me.ClientBeendenToolStripMenuItem, "ClientBeendenToolStripMenuItem")
Me.ClientBeendenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.cancel Me.ClientBeendenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.cancel
Me.ClientBeendenToolStripMenuItem.Name = "ClientBeendenToolStripMenuItem" Me.ClientBeendenToolStripMenuItem.Name = "ClientBeendenToolStripMenuItem"
resources.ApplyResources(Me.ClientBeendenToolStripMenuItem, "ClientBeendenToolStripMenuItem")
' '
'TimerClose 'TimerClose
' '
@ -254,15 +274,15 @@ Partial Class frmMain
' '
'ContextMenuStripForm 'ContextMenuStripForm
' '
resources.ApplyResources(Me.ContextMenuStripForm, "ContextMenuStripForm")
Me.ContextMenuStripForm.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MinimierenToolStripMenuItem}) Me.ContextMenuStripForm.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MinimierenToolStripMenuItem})
Me.ContextMenuStripForm.Name = "ContextMenuStripForm" Me.ContextMenuStripForm.Name = "ContextMenuStripForm"
resources.ApplyResources(Me.ContextMenuStripForm, "ContextMenuStripForm")
' '
'MinimierenToolStripMenuItem 'MinimierenToolStripMenuItem
' '
resources.ApplyResources(Me.MinimierenToolStripMenuItem, "MinimierenToolStripMenuItem")
Me.MinimierenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.ReduceSize Me.MinimierenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.ReduceSize
Me.MinimierenToolStripMenuItem.Name = "MinimierenToolStripMenuItem" Me.MinimierenToolStripMenuItem.Name = "MinimierenToolStripMenuItem"
resources.ApplyResources(Me.MinimierenToolStripMenuItem, "MinimierenToolStripMenuItem")
' '
'ImageList1 'ImageList1
' '

File diff suppressed because it is too large Load Diff

View File

@ -4944,7 +4944,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU
CwAAAk1TRnQBSQFMAgEBBQEAASQBAQEkAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CwAAAk1TRnQBSQFMAgEBBQEAASwBAQEsAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

File diff suppressed because it is too large Load Diff

View File

@ -31,23 +31,24 @@ Public Class frmMain
Dim splash As New frmSplash() Dim splash As New frmSplash()
splash.ShowDialog() splash.ShowDialog()
Try ' === Language is set in ClassInit ===
If USER_LANGUAGE <> "" Then 'Try
Dim cultureInfo As New System.Globalization.CultureInfo(USER_LANGUAGE) ' If USER_LANGUAGE <> "" Then
cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT ' Dim cultureInfo As New CultureInfo(USER_LANGUAGE)
Thread.CurrentThread.CurrentCulture = cultureInfo ' cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
Thread.CurrentThread.CurrentUICulture = cultureInfo ' Thread.CurrentThread.CurrentCulture = cultureInfo
CultureInfo.DefaultThreadCurrentCulture = cultureInfo ' Thread.CurrentThread.CurrentUICulture = cultureInfo
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo ' CultureInfo.DefaultThreadCurrentCulture = cultureInfo
End If ' CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
Catch ex As Exception ' End If
Logger.Error(ex) 'Catch ex As Exception
End Try ' Logger.Error(ex)
'End Try
' Dieser Aufruf ist für den Designer erforderlich. ' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent() InitializeComponent()
_DataASorDB = New ClassDataASorDB(modCurrent.LogConfig) _DataASorDB = New ClassDataASorDB(LogConfig)
End Sub End Sub
Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
@ -57,24 +58,35 @@ Public Class frmMain
End If End If
lblUser.Caption = USER_USERNAME lblUser.Caption = USER_USERNAME
If ERROR_INIT <> "INVALID USER" Then ' === Language is set in ClassInit ===
'If ERROR_INIT <> "INVALID USER" Then
'Dim Culture = CultureInfo.CreateSpecificCulture(USER_LANGUAGE) ' Try
Dim Culture As New CultureInfo(USER_LANGUAGE) ' Logger.Debug("Setting thread Culture..")
Culture.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
' The following line provides localization for data formats. ' 'Dim Culture = CultureInfo.CreateSpecificCulture(USER_LANGUAGE)
Thread.CurrentThread.CurrentCulture = Culture ' Dim Culture As New CultureInfo(USER_LANGUAGE)
' The following line provides localization for the application's user interface. ' Culture.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
Thread.CurrentThread.CurrentUICulture = Culture
' Set this culture as the default culture for all threads in this application. ' Logger.Debug("Culture object for language [{0}] created")
' Note: The following properties are supported in the .NET Framework 4.5+
CultureInfo.DefaultThreadCurrentCulture = Culture
CultureInfo.DefaultThreadCurrentUICulture = Culture
' ' The following line provides localization for data formats.
' Thread.CurrentThread.CurrentCulture = Culture
' ' The following line provides localization for the application's user interface.
' Thread.CurrentThread.CurrentUICulture = Culture
End If ' ' 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
' Logger.Debug("Thread Culture set to [{0}]", Culture.Name)
' Catch ex As Exception
' Logger.Warn("Could not set Thread Culture!")
' Logger.Error(ex)
' End Try
'End If
If Database.DBInitialized = True Then If Database.DBInitialized = True Then
If ERROR_INIT <> "" Then If ERROR_INIT <> "" Then
@ -494,13 +506,13 @@ Public Class frmMain
tsmiChangeState.Image = My.Resources.control_start_blue tsmiChangeState.Image = My.Resources.control_start_blue
tsmiChangeState.Text = S.Clipboard_Watcher_starten tsmiChangeState.Text = S.Clipboard_Watcher_starten
MONITORING_ACTIVE = False MONITORING_ACTIVE = False
NotifyIconMain.ShowBalloonTip(30000, "Search Flow", S.Clipboard_Watcher_wurde_deaktiviert_, ToolTipIcon.Info) NotifyIconMain.ShowBalloonTip(30000, "EasyFlow", S.Clipboard_Watcher_wurde_deaktiviert_, ToolTipIcon.Info)
Else Else
tsmiChangeState.Image = My.Resources.StatusAnnotations_Stop_16xLG tsmiChangeState.Image = My.Resources.StatusAnnotations_Stop_16xLG
tsmiChangeState.Tag = "stop" tsmiChangeState.Tag = "stop"
tsmiChangeState.Text = S.Clipboard_Watcher_stoppen tsmiChangeState.Text = S.Clipboard_Watcher_stoppen
MONITORING_ACTIVE = True MONITORING_ACTIVE = True
NotifyIconMain.ShowBalloonTip(30000, "Search Flow", S.Clipboard_Watcher_wurde_wieder_aktiviert_, ToolTipIcon.Info) NotifyIconMain.ShowBalloonTip(30000, "EasyFlow", S.Clipboard_Watcher_wurde_wieder_aktiviert_, ToolTipIcon.Info)
End If End If
End Sub End Sub

View File

@ -1,9 +1,12 @@
Imports System.ComponentModel Imports System.ComponentModel
Imports System.Globalization
Imports System.Threading Imports System.Threading
Imports DigitalData.Modules.Base
Public NotInheritable Class frmSplash Public NotInheritable Class frmSplash
Private InitSteps As Integer = 4 Private ReadOnly InitSteps As Integer = 4
Private Worker As New BackgroundWorker() Private ReadOnly Worker As New BackgroundWorker()
Private MainForm As Form Private ReadOnly MainForm As Form
Private Sub frmSplash_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp Private Sub frmSplash_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp
If e.KeyCode = Keys.Escape Then If e.KeyCode = Keys.Escape Then
@ -81,13 +84,9 @@ Public NotInheritable Class frmSplash
Application.Exit() Application.Exit()
End If End If
Language.SetApplicationLanguage(Logger, USER_LANGUAGE, USER_DATE_FORMAT)
' Wenn kein Fehler, Splashscreen schließen ' Wenn kein Fehler, Splashscreen schließen
Close() Close()
End Sub End Sub
Private Sub frmSplash_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
If e.KeyCode = Keys.Escape Then
End If
End Sub
End Class End Class

View File

@ -89,14 +89,14 @@
</Component> </Component>
<Component Id="DDLibs" Guid="{13F5F24D-9D99-4783-B17B-5FFC9C42E261}"> <Component Id="DDLibs" Guid="{13F5F24D-9D99-4783-B17B-5FFC9C42E261}">
<File Id="DDLibStandarts" Name="DD_LIB_Standards.dll" KeyPath="yes" Checksum="yes"/> <File Id="DDBase" Name="DigitalData.Modules.Base.dll" KeyPath="yes" Checksum="yes"/>
<File Id="DDBase" Name="DigitalData.Modules.Base.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes"/> <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDConfig" Name="DigitalData.Modules.Config.dll" KeyPath="no" Checksum="yes"/> <File Id="DDConfig" Name="DigitalData.Modules.Config.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" KeyPath="no" Checksum="yes"/> <File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDDatabase" Name="DigitalData.Modules.Database.dll" KeyPath="no" Checksum="yes"/> <File Id="DDDatabase" Name="DigitalData.Modules.Database.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDEncryption" Name="DigitalData.Modules.Encryption.dll" KeyPath="no" Checksum="yes"/> <File Id="DDEncryption" Name="DigitalData.Modules.Encryption.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDLanguage" Name="DigitalData.Modules.Language.dll" KeyPath="no" Checksum="yes"/> <File Id="DDLanguage" Name="DigitalData.Modules.Language.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDLicense" Name="DigitalData.Modules.License.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDRegexEditor" Name="DigitalData.Controls.RegexEditor.dll" KeyPath="no" Checksum="yes"/> <File Id="DDRegexEditor" Name="DigitalData.Controls.RegexEditor.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDprotobuf" Name="protobuf-net.dll" KeyPath="no" Checksum="yes"/> <File Id="DDprotobuf" Name="protobuf-net.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" Checksum="yes"/> <File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" Checksum="yes"/>