AppStd/ClipboardWatcher
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Referenzen glattgezogen und MSI Paket neu konfiguriert

Browse Source
This commit is contained in:
Developer01
2026-05-04 14:35:33 +02:00
parent 45159b9ffc
commit bc75ea0d55
24 changed files with 528 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/DD_Clipboard_Searcher/App.config
View File

@@ -90,8 +90,7 @@
</DevExpress.LookAndFeel.Design.AppSettings> </DevExpress.LookAndFeel.Design.AppSettings>
</applicationSettings> </applicationSettings>
<connectionStrings> <connectionStrings>
<add name="easyFLOW.My.MySettings.DD_ECMConnectionString" connectionString="Data Source=172.24.12.44\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False" <add name="easyFLOW.My.MySettings.DD_ECMConnectionString" connectionString="Data Source=172.24.12.44\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False" providerName="System.Data.SqlClient" />
providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
@@ -106,6 +105,50 @@
<assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" /> <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-14.2.90.0" newVersion="14.2.90.0" /> <bindingRedirect oldVersion="0.0.0.0-14.2.90.0" newVersion="14.2.90.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.121.1.0" newVersion="4.121.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>

2
app/DD_Clipboard_Searcher/ClassAutomation.vb
View File

@@ -33,7 +33,7 @@ Public Class ClassAutomation
FrameworkId = oElement.Current.FrameworkId FrameworkId = oElement.Current.FrameworkId
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) modCurrent._Logger.Error(ex)
End Try End Try
End Sub End Sub
End Class End Class

22
app/DD_Clipboard_Searcher/ClassDataASorDB.vb
View File

@@ -38,14 +38,14 @@ Public Class ClassDataASorDB
DT_LOGIN_USER_MODULE = MyDB_DDECM.GetDatatable(oSql) DT_LOGIN_USER_MODULE = MyDB_DDECM.GetDatatable(oSql)
If DT_LOGIN_USER_MODULE.Rows.Count = 0 Then If DT_LOGIN_USER_MODULE.Rows.Count = 0 Then
Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True) modCurrent._Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
'ERROR_STATE = "NO USER" 'ERROR_STATE = "NO USER"
MsgBox("Sorry - Something went wrong in getting Your rights." & vbNewLine & "Please contact the system administrator!", MsgBoxStyle.Exclamation) MsgBox("Sorry - Something went wrong in getting Your rights." & vbNewLine & "Please contact the system administrator!", MsgBoxStyle.Exclamation)
Return False Return False
End If End If
If DT_LOGIN_USER_MODULE.Rows.Count = 1 Then If DT_LOGIN_USER_MODULE.Rows.Count = 1 Then
Logger.Info(">> Login Username: " & USER_USERNAME, False) modCurrent._Logger.Info(">> Login Username: " & USER_USERNAME, False)
Logger.Info(">> Login time: " & Now.ToString, False) modCurrent._Logger.Info(">> Login time: " & Now.ToString, False)
USER_ID = DT_LOGIN_USER_MODULE.Rows(0).Item("USER_ID") USER_ID = DT_LOGIN_USER_MODULE.Rows(0).Item("USER_ID")
USER_SURNAME = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SURNAME")) USER_SURNAME = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SURNAME"))
USER_PRENAME = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_PRENAME")) USER_PRENAME = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_PRENAME"))
@@ -70,14 +70,14 @@ Public Class ClassDataASorDB
Dim oSplitWorkMode As String() = WORKING_MODE.Split("#") Dim oSplitWorkMode As String() = WORKING_MODE.Split("#")
Dim oMode As String Dim oMode As String
For Each oMode In oSplitWorkMode For Each oMode In oSplitWorkMode
Logger.Debug($"oWorkingMode Parameter: {oMode}") modCurrent._Logger.Debug($"oWorkingMode Parameter: {oMode}")
If oMode = "NO_BASICCONF" Then If oMode = "NO_BASICCONF" Then
Logger.Info($"NO_BASICCONF will be set to false") modCurrent._Logger.Info($"NO_BASICCONF will be set to false")
BASIC_CONF_VISIBLE = False BASIC_CONF_VISIBLE = False
ElseIf oMode.StartsWith("NOMATCH_INFO") Then ElseIf oMode.StartsWith("NOMATCH_INFO") Then
Try Try
Dim oResult = oMode.Replace("NOMATCH_INFO=", "") Dim oResult = oMode.Replace("NOMATCH_INFO=", "")
Logger.Info($"NOMATCH_INFO will be set to {oResult}") modCurrent._Logger.Info($"NOMATCH_INFO will be set to {oResult}")
NOMATCH_INFO = CBool(oResult) NOMATCH_INFO = CBool(oResult)
Catch ex As Exception Catch ex As Exception
NOMATCH_INFO = False NOMATCH_INFO = False
@@ -85,7 +85,7 @@ Public Class ClassDataASorDB
ElseIf oMode.StartsWith("HotkeySearchKey") Then ElseIf oMode.StartsWith("HotkeySearchKey") Then
Try Try
Dim oResult = oMode.Replace("HotkeySearchKey=", "") Dim oResult = oMode.Replace("HotkeySearchKey=", "")
Logger.Info($"HotkeySearchKey via function will be set to [{oResult}]") modCurrent._Logger.Info($"HotkeySearchKey via function will be set to [{oResult}]")
HotkeySearchKey = oResult HotkeySearchKey = oResult
HotkeySearchKey_via_Server = True HotkeySearchKey_via_Server = True
Catch ex As Exception Catch ex As Exception
@@ -93,12 +93,12 @@ Public Class ClassDataASorDB
End Try End Try
Else Else
Logger.Info($"Wrong oMode [{oMode}]") modCurrent._Logger.Info($"Wrong oMode [{oMode}]")
End If End If
Next Next
Return True Return True
Else Else
Logger.Info(" - User '" & USER_USERNAME & "' not listed in Useradministration!", False) modCurrent._Logger.Info(" - User '" & USER_USERNAME & "' not listed in Useradministration!", False)
'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") 'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
'Me.Close() 'Me.Close()
Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.") Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
@@ -106,7 +106,7 @@ Public Class ClassDataASorDB
Return False Return False
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) modCurrent._Logger.Error(ex)
Return False Return False
End Try End Try
@@ -131,7 +131,7 @@ Public Class ClassDataASorDB
DT_CONNECTIONS = oDatatable DT_CONNECTIONS = oDatatable
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) modCurrent._Logger.Error(ex)
MsgBox("Unexpected Error in Refresh_Connections: " & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in Refresh_Connections: " & ex.Message, MsgBoxStyle.Critical)
End Try End Try
End Sub End Sub

4
app/DD_Clipboard_Searcher/ClassDragDrop.vb
View File

@@ -66,13 +66,13 @@ Public Class ClassDragDrop
DevExpress.Utils.DXMouseEventArgs.GetMouseArgs(e).Handled = True DevExpress.Utils.DXMouseEventArgs.GetMouseArgs(e).Handled = True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
End Try End Try
End If End If
End If End If
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Error in view_MouseMove: " & ex.Message, MsgBoxStyle.Critical) MsgBox("Error in view_MouseMove: " & ex.Message, MsgBoxStyle.Critical)
End Try End Try
End Sub End Sub

271
app/DD_Clipboard_Searcher/ClassInit.vb
View File

@@ -1,15 +1,16 @@
Imports System.ComponentModel Imports System.ComponentModel
Imports DigitalData.Modules.License Imports System.Globalization
Imports DigitalData.Modules.Logging Imports System.Threading
Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Database Imports DigitalData.Modules.Database
Imports DigitalData.Modules.EDMI.API Imports DigitalData.Modules.EDMI.API
Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
Imports System.Globalization
Imports System.Threading
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Imports DigitalData.Modules.Base Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
Imports DigitalData.Modules.Language.Utils
Imports DigitalData.Modules.License
Imports DigitalData.Modules.Logging
Imports NLog
Public Class ClassInit Public Class ClassInit
Public _lizenzManager As LicenseManagerLegacy Public _lizenzManager As LicenseManagerLegacy
@@ -21,9 +22,9 @@ Public Class ClassInit
End Class End Class
Public Sub InitLogger() Public Sub InitLogger()
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)
End Sub End Sub
Public Function InitDatabase() Public Function InitDatabase()
@@ -31,7 +32,7 @@ Public Class ClassInit
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
Database_ECM = New MSSQLServer(LogConfig, MyConnectionString) Database_ECM = New MSSQLServer(_LogConfig, MyConnectionString)
Else Else
MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information) MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information)
ERROR_INIT = "NO DB-CONNECTION" ERROR_INIT = "NO DB-CONNECTION"
@@ -39,7 +40,7 @@ Public Class ClassInit
InitBasics() InitBasics()
End If End If
If Database_ECM.DBInitialized = True Then If Database_ECM.DBInitialized = True Then
DatabaseFallback = New DatabaseWithFallback(LogConfig, _Client, Database_ECM, Database_IDB) DatabaseFallback = New DatabaseWithFallback(_LogConfig, _Client, Database_ECM, Database_IDB)
Return True Return True
Else Else
ERROR_INIT = "FAILED DBCONNECTION" ERROR_INIT = "FAILED DBCONNECTION"
@@ -57,7 +58,7 @@ Public Class ClassInit
End If End If
Try Try
MyDB_DDECM = New MSSQLServer(LogConfig, MyConnectionString) MyDB_DDECM = New MSSQLServer(_LogConfig, MyConnectionString)
If MyDB_DDECM.DBInitialized = True Then If MyDB_DDECM.DBInitialized = True Then
Return True Return True
Else Else
@@ -65,14 +66,14 @@ Public Class ClassInit
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
Public Function InitAppDatabase() As Boolean Public Function InitAppDatabase() As Boolean
Try Try
DatabaseAppServ = New MSSQLServer(LogConfig, MyConStringAppserv) DatabaseAppServ = New MSSQLServer(_LogConfig, MyConStringAppserv)
If DatabaseAppServ.DBInitialized = True Then If DatabaseAppServ.DBInitialized = True Then
Return True Return True
Else Else
@@ -80,7 +81,7 @@ Public Class ClassInit
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
@@ -96,12 +97,12 @@ Public Class ClassInit
If oConfigPrefix.Length > 0 Then If oConfigPrefix.Length > 0 Then
oUserAppDataPath = IO.Path.Combine(Application.UserAppDataPath, oConfigPrefix) oUserAppDataPath = IO.Path.Combine(Application.UserAppDataPath, oConfigPrefix)
Dim oConfigUtils As New ConfigUtils(LogConfig) Dim oConfigUtils As New ConfigUtils(_LogConfig)
If oConfigUtils.TestMigrationNeeded(oUserAppDataPath) Then If oConfigUtils.TestMigrationNeeded(oUserAppDataPath) Then
LogConfig.Debug = True _LogConfig.Debug = True
oConfigUtils.MigrateConfig(oLegacyAppDataPath, oUserAppDataPath) oConfigUtils.MigrateConfig(oLegacyAppDataPath, oUserAppDataPath)
LogConfig.Debug = False _LogConfig.Debug = False
End If End If
End If End If
@@ -111,13 +112,13 @@ Public Class ClassInit
oCommonAppDataPath = oStartupPath oCommonAppDataPath = oStartupPath
End If End If
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 = MSSQLServer.DecryptConnectionString(.ConnectionString) MyConnectionString = MSSQLServer.DecryptConnectionString(.ConnectionString)
LogErrorsOnly = .LogErrorsOnly LogErrorsOnly = .LogErrorsOnly
HotkeySearchKey = .HotkeySearchKey HotkeySearchKey = .HotkeySearchKey
LogConfig.Debug = Not .LogErrorsOnly _LogConfig.Debug = Not .LogErrorsOnly
End With End With
If HotkeySearchKey_via_Server = False Then If HotkeySearchKey_via_Server = False Then
HotkeyFunctionKey = CONFIG.Config.HotkeyFunctionKey HotkeyFunctionKey = CONFIG.Config.HotkeyFunctionKey
@@ -125,7 +126,7 @@ Public Class ClassInit
If CONFIG.Config.ConnectionStringAppServer <> String.Empty Then If CONFIG.Config.ConnectionStringAppServer <> String.Empty Then
MyConStringAppserv = MSSQLServer.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
End If End If
@@ -143,16 +144,16 @@ Public Class ClassInit
If oSplit.Length = 2 Then If oSplit.Length = 2 Then
oAppServerPort = oSplit(1) oAppServerPort = oSplit(1)
End If End If
_Client = New Client(LogConfig, oAppServerAddress, oAppServerPort) _Client = New Client(_LogConfig, oAppServerAddress, oAppServerPort)
If Not IsNothing(_Client) Then If Not IsNothing(_Client) Then
If _Client.Connect() Then If _Client.Connect() Then
APPSERVER_ACTIVE = True APPSERVER_ACTIVE = True
Else Else
Logger.Warn($"###!!!APPServer [{CONFIG.Config.AppServerConfig.ToString}] could not be initialized ") _Logger.Warn($"###!!!APPServer [{CONFIG.Config.AppServerConfig.ToString}] could not be initialized ")
End If End If
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Warn($"Could not initialize the AppServer: {ex.Message}") _Logger.Warn($"Could not initialize the AppServer: {ex.Message}")
End Try End Try
End If End If
@@ -165,14 +166,14 @@ Public Class ClassInit
DT_CHECKUSER_MODULE = MyDB_DDECM.GetDatatable(oSql) DT_CHECKUSER_MODULE = MyDB_DDECM.GetDatatable(oSql)
If DT_CHECKUSER_MODULE.Rows.Count = 0 Then If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True) _Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
'ERROR_STATE = "NO USER" 'ERROR_STATE = "NO USER"
MsgBox("Sorry - Something went wrong in getting Your rights." & vbNewLine & "Please contact the system administrator!", MsgBoxStyle.Exclamation) MsgBox("Sorry - Something went wrong in getting Your rights." & vbNewLine & "Please contact the system administrator!", MsgBoxStyle.Exclamation)
Return False Return False
End If End If
If DT_CHECKUSER_MODULE.Rows.Count = 1 Then If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
Logger.Info("Login Username: " & USER_ID, False) _Logger.Info("Login Username: " & USER_ID)
Logger.Info("Login time: " & Now.ToShortDateString, False) _Logger.Info("Login time: " & Now.ToShortDateString, False)
USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID") USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
USER_SURNAME = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"), "") USER_SURNAME = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"), "")
@@ -189,10 +190,10 @@ Public Class ClassInit
USER_IS_ADMIN = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN"), False) USER_IS_ADMIN = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN"), False)
ADDITIONAL_TITLE = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE"), "") ADDITIONAL_TITLE = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE"), "")
Logger.Debug("User Id: [{0}]", USER_ID) _Logger.Debug("User Id: [{0}]", USER_ID)
Logger.Debug("User Email: [{0}]", USER_EMAIL) _Logger.Debug("User Email: [{0}]", USER_EMAIL)
Logger.Debug("User Language: [{0}]", USER_LANGUAGE) _Logger.Debug("User Language: [{0}]", USER_LANGUAGE)
Logger.Debug("User Dateformat: [{0}]", USER_DATE_FORMAT) _Logger.Debug("User Dateformat: [{0}]", USER_DATE_FORMAT)
If ADDITIONAL_TITLE = String.Empty Then If ADDITIONAL_TITLE = String.Empty Then
ADDITIONAL_TITLE = My.Application.Info.ProductName ADDITIONAL_TITLE = My.Application.Info.ProductName
@@ -207,54 +208,152 @@ Public Class ClassInit
Dim oSplitWorkMode As String() = WORKING_MODE.Split("#") Dim oSplitWorkMode As String() = WORKING_MODE.Split("#")
Dim oMode As String Dim oMode As String
For Each oMode In oSplitWorkMode For Each oMode In oSplitWorkMode
Logger.Debug($"oWorkingMode Parameter [{oMode}]") ProcessWorkingModeParameter(oMode)
If oMode = "NO_BASICCONF" Then
BASIC_CONF_VISIBLE = False
ElseIf oMode.StartsWith("NOMATCH_INFO") Then
Try
Dim oResult = oMode.Replace("NOMATCH_INFO=", "")
Logger.Info($"NOMATCH_INFO: {oResult}")
NOMATCH_INFO = CBool(oResult)
Catch ex As Exception
NOMATCH_INFO = False
End Try
ElseIf oMode.StartsWith("HotkeySearchKey") Then
Try
Dim oResult = oMode.Replace("HotkeySearchKey=", "")
Logger.Info($"HotkeySearchKey: {oResult}")
HotkeySearchKey = oResult
HotkeySearchKey_via_Server = True
Catch ex As Exception
HotkeySearchKey = "d"
End Try
ElseIf oMode.StartsWith("NotifyMode") Then
Try
Dim oResult = oMode.Replace("NotifyMode=", "")
Logger.Info($"NotifyMode: {oResult}")
NOTIFY_MODE = oResult
Catch ex As Exception
End Try
Else
Logger.Info($"Wrong oMode: {oMode}")
End If
Next Next
Return True Return True
Else Else
Logger.Info(" - UserId '" & USER_ID & "' not listed in Useradministration!", False) _Logger.Info(" - UserId '" & USER_ID & "' not listed in Useradministration!")
'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") 'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
'Me.Close() 'Me.Close()
Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.") Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
MsgBox(msg, MsgBoxStyle.Exclamation) MsgBox(msg, MsgBoxStyle.Exclamation)
Return False Return False
End If End If
oSql = "select CAT_TITLE,CAT_STRING from TBDD_CATALOG"
Dim DT_CATALOG As DataTable
DT_CATALOG = MyDB_DDECM.GetDatatable(oSql)
For Each oROW As DataRow In DT_CATALOG.Rows
If oROW.Item("CAT_TITLE") = "WM_PRAEFIX" Then
WMSUFFIX = oROW.Item("CAT_STRING")
_Logger.Info($"WMSUFFIX from Catalog: {WMSUFFIX}")
End If
Next
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
Private Shared Sub ProcessWorkingModeParameter(oMode As String)
_Logger.Debug($"Processing Working Mode Parameter: {oMode}")
Select Case True
Case oMode = "DEBUG_LOG"
_LogConfig.Debug = True
_Logger.Info("DEBUG_LOG = True")
Case oMode = "IDBWITHWMFS"
SetBooleanParameter(IDB_USES_WMFILESTORE, True, "IDB_USES_WMFILESTORE", LogLevel.Info)
Case oMode = "NO_BASICCONF"
SetBooleanParameter(BASIC_CONF_VISIBLE, False, "BASIC_CONF_VISIBLE", LogLevel.Info)
Case oMode = "SYS_LOCKED_MAINTENANCE"
SetBooleanParameter(SYS_LOCKED_MAINTENANCE, True, "SYS_LOCKED_MAINTENANCE")
Case oMode.StartsWith("IDB_CONID!")
ProcessIDBConnection(oMode)
Case oMode.StartsWith("COPYWM2TEMP")
ProcessBooleanParameter(oMode, "COPYWM2TEMP", COPY_WMFILE_2TEMP, "COPY_WMFILE_2TEMP")
Case oMode.StartsWith("MAP_SHARE_DRIVE")
MAP_SHARE_DRIVE = ExtractParameterValue(oMode, "MAP_SHARE_DRIVE")
_Logger.Info($"MAP_SHARE_DRIVE = {MAP_SHARE_DRIVE}")
Case oMode.StartsWith("MAP_BLACKLIST")
MAP_BLACKLIST = ExtractParameterValue(oMode, "MAP_BLACKLIST")
_Logger.Info($"MAP_BLACKLIST = {MAP_BLACKLIST}")
' Fehlende Alt-Fälle ergänzt:
Case oMode.StartsWith("NOMATCH_INFO")
Try
Dim oResult = oMode.Replace("NOMATCH_INFO=", "")
_Logger.Info($"NOMATCH_INFO: {oResult}")
NOMATCH_INFO = CBool(oResult)
Catch ex As Exception
NOMATCH_INFO = False
End Try
Case oMode.StartsWith("HotkeySearchKey")
Try
Dim oResult = oMode.Replace("HotkeySearchKey=", "")
_Logger.Info($"HotkeySearchKey: {oResult}")
HotkeySearchKey = oResult
HotkeySearchKey_via_Server = True
Catch ex As Exception
HotkeySearchKey = "d"
End Try
Case oMode.StartsWith("NotifyMode")
Try
Dim oResult = oMode.Replace("NotifyMode=", "")
_Logger.Info($"NotifyMode: {oResult}")
NOTIFY_MODE = oResult
Catch ex As Exception
End Try
Case Else
_Logger.Info($"Unknown Working Mode Parameter: {oMode}")
End Select
End Sub
Private Shared Function ExtractParameterValue(parameterString As String, prefix As String) As String
Return parameterString.Replace($"{prefix}=", "")
End Function
Private Shared Sub SetBooleanParameter(ByRef target As Boolean, value As Boolean, paramName As String, Optional logLevel As LogLevel = LogLevel.Debug)
target = value
LogParameterValue(paramName, value.ToString(), logLevel)
End Sub
Private Shared Sub ProcessBooleanParameter(oMode As String, prefix As String, ByRef target As Boolean, paramName As String)
Dim value = ExtractParameterValue(oMode, prefix)
Try
target = CBool(value)
_Logger.Debug($"{paramName} = {target}")
Catch ex As Exception
target = False
_Logger.Warn($"Failed to parse {paramName}: {ex.Message}")
End Try
End Sub
Private Shared Sub ProcessIntegerParameter(oMode As String, prefix As String, ByRef target As Integer, paramName As String)
Dim value = ExtractParameterValue(oMode, prefix)
Try
target = CInt(value)
_Logger.Debug($"{paramName} = {target}")
Catch ex As Exception
_Logger.Warn($"Failed to parse {paramName}: {ex.Message}. Setting to 0")
target = 0
End Try
End Sub
Private Shared Sub ProcessIDBConnection(oMode As String)
Dim Database_IDB As MSSQLServer = Nothing
Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "")
Dim oConString = DatabaseFallback.GetConnectionString(CON_ID)
CONNECTION_STRING_IDB = oConString
Database_IDB = New MSSQLServer(_LogConfig, CONNECTION_STRING_IDB)
If Database_IDB.DBInitialized = True Then
IDB_ACTIVE = True
_Logger.Info($"IDB is active - IDB-Connection [{CON_ID}]")
DatabaseFallback.InitializeIDB(Database_IDB)
Else
IDB_ACTIVE = False
_Logger.Warn($"Failed to initialize IDB with Connection [{CON_ID}]")
End If
If CONNECTION_STRING_IDB <> "" AndAlso Database_IDB.DBInitialized = True Then
IDB_ACTIVE = True
_Logger.Debug("IDB already initialized and active")
Return
End If
End Sub
Private Shared Sub LogParameterValue(paramName As String, value As String, logLevel As LogLevel)
Select Case logLevel
Case LogLevel.Info
_Logger.Info($"{paramName} = {value}")
Case Else
_Logger.Debug($"{paramName} = {value}")
End Select
End Sub
Private Enum LogLevel
Debug
Info
End Enum
Public Function InitUserLogin(Optional _User As String = "") As Boolean Public Function InitUserLogin(Optional _User As String = "") As Boolean
Try Try
If _User = "" Then If _User = "" Then
@@ -283,20 +382,20 @@ Public Class ClassInit
ElseIf DT_CLIENT_USER.Rows.Count = 1 Then ElseIf DT_CLIENT_USER.Rows.Count = 1 Then
CLIENT_SELECTED = DT_CLIENT_USER.Rows(0).Item("CLIENT_ID") CLIENT_SELECTED = DT_CLIENT_USER.Rows(0).Item("CLIENT_ID")
Else Else
Logger.Info("User '" & USER_ID & "' not related to a client", True) _Logger.Info("User '" & USER_ID & "' not related to a client")
ERROR_INIT = "NO CLIENT" ERROR_INIT = "NO CLIENT"
'ERROR_STATE = "NO CLIENT" 'ERROR_STATE = "NO CLIENT"
Return False Return False
End If End If
Else Else
Logger.Info("User '" & USER_ID & "' not related to a client", True) _Logger.Info("User '" & USER_ID & "' not related to a client")
ERROR_INIT = "NO CLIENT" ERROR_INIT = "NO CLIENT"
'ERROR_STATE = "NO CLIENT" 'ERROR_STATE = "NO CLIENT"
Return False Return False
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Info("Unexpected error in checking CLIENT: " & ex.Message) _Logger.Info("Unexpected error in checking CLIENT: " & ex.Message)
CLIENT_SELECTED = 1 CLIENT_SELECTED = 1
End Try End Try
@@ -305,7 +404,7 @@ Public Class ClassInit
If USER_IN_MODULE = False Then If USER_IN_MODULE = False Then
If USER_IS_ADMIN = False Then If USER_IS_ADMIN = False Then
Logger.Info("User: " & USER_ID & " not related to module!", False) _Logger.Info("User: " & USER_ID & " not related to module!")
Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systemadministrator in Verbindung!") Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systemadministrator in Verbindung!")
If USER_LANGUAGE <> LANGUAGE_GERMAN Then If USER_LANGUAGE <> LANGUAGE_GERMAN Then
@@ -334,7 +433,7 @@ Public Class ClassInit
'frmLoginUserSelect.ShowDialog() 'frmLoginUserSelect.ShowDialog()
ESC_Hidden = False ESC_Hidden = False
If USER_USERNAME <> "" And GHOST_USERID <> 0 Then If USER_USERNAME <> "" And GHOST_USERID <> 0 Then
Logger.Info("GHOST USER ACTIVE") _Logger.Info("GHOST USER ACTIVE")
InitUserLogin(USER_USERNAME) InitUserLogin(USER_USERNAME)
End If End If
@@ -348,13 +447,13 @@ Public Class ClassInit
and VERSION = '{My.Settings.GDPICTURE_VERSION}' AND ACTIVE = 1" and VERSION = '{My.Settings.GDPICTURE_VERSION}' AND ACTIVE = 1"
GDPICTURE_LICENSE = MyDB_DDECM.GetScalarValue(oSQL) GDPICTURE_LICENSE = MyDB_DDECM.GetScalarValue(oSQL)
If GDPICTURE_LICENSE = String.Empty Then If GDPICTURE_LICENSE = String.Empty Then
Logger.Info($"ATTENTION: GDPICTURE VERSION is nothing. [{oSQL}]") _Logger.Info($"ATTENTION: GDPICTURE VERSION is nothing. [{oSQL}]")
End If End If
oSQL = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE" oSQL = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE"
BASEDATA_DT_LANGUAGE = MyDB_DDECM.GetDatatable(oSQL) BASEDATA_DT_LANGUAGE = MyDB_DDECM.GetDatatable(oSQL)
Logger.Debug(" >> Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString, False) _Logger.Debug(" >> Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString, False)
If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then
Dim msg = String.Format("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!") Dim msg = String.Format("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
@@ -363,12 +462,12 @@ Public Class ClassInit
"Number of licenses: " & LICENSE_COUNT.ToString & vbNewLine & "Please contact Your admin!") "Number of licenses: " & LICENSE_COUNT.ToString & vbNewLine & "Please contact Your admin!")
End If End If
MsgBox(msg, MsgBoxStyle.Exclamation) MsgBox(msg, MsgBoxStyle.Exclamation)
Logger.Info(" >> The number of logged Users (" & USERCOUNT_LOGGED_IN.ToString & ") exceeds the number of licenses (" & LICENSE_COUNT & ") ", False) _Logger.Info(" >> The number of logged Users (" & USERCOUNT_LOGGED_IN.ToString & ") exceeds the number of licenses (" & LICENSE_COUNT & ") ", False)
If USER_IS_ADMIN = False Then If USER_IS_ADMIN = False Then
'Anmeldung wieder herausnehmen 'Anmeldung wieder herausnehmen
oSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Clipboard-Watcher'" oSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Clipboard-Watcher'"
MyDB_DDECM.ExecuteNonQuery(oSQL) MyDB_DDECM.ExecuteNonQuery(oSQL)
Logger.Info(" - logged out the user", False) _Logger.Info(" - logged out the user", False)
Return False Return False
End If End If
End If End If
@@ -376,7 +475,7 @@ Public Class ClassInit
Catch ex As Exception Catch ex As Exception
Logger.Info("Unexpected Error in InitUserLogin: " & ex.Message, True) _Logger.Info("Unexpected Error in InitUserLogin: " & ex.Message, True)
MsgBox("Unexpected Error in InitUserLogin: " & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in InitUserLogin: " & ex.Message, MsgBoxStyle.Critical)
Return False Return False
End Try End Try
@@ -403,7 +502,7 @@ Public Class ClassInit
DT_CONNECTIONS = oDatatable DT_CONNECTIONS = oDatatable
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Unexpected Error in Refresh_Connections: " & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in Refresh_Connections: " & ex.Message, MsgBoxStyle.Critical)
End Try End Try
End Sub End Sub
@@ -420,37 +519,37 @@ Public Class ClassInit
DT_USER_PROFILES = MyDB_DDECM.GetDatatable(ProfileSQL) DT_USER_PROFILES = MyDB_DDECM.GetDatatable(ProfileSQL)
If DT_USER_PROFILES Is Nothing Or DT_USER_PROFILES.Rows.Count = 0 Then If DT_USER_PROFILES Is Nothing Or DT_USER_PROFILES.Rows.Count = 0 Then
Logger.Warn("Keine Profile für den User auswertbar. Konfiuration oder SQL prüfen: " + ProfileSQL) _Logger.Warn("Keine Profile für den User auswertbar. Konfiuration oder SQL prüfen: " + ProfileSQL)
Return S.Es_wurden_noch_keine_Profile_für_den_aktuellen_Benutzer_konfiguriert_ Return S.Es_wurden_noch_keine_Profile_für_den_aktuellen_Benutzer_konfiguriert_
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Unexpected Error in Refresh_Profile_Links: " & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in Refresh_Profile_Links: " & ex.Message, MsgBoxStyle.Critical)
Logger.Warn("SQL so far: " + ProfileSQL) _Logger.Warn("SQL so far: " + ProfileSQL)
Return S.Fehler_bei_der_Aktualisierung_ Return S.Fehler_bei_der_Aktualisierung_
End Try End Try
Try Try
DTPROFILE_REL_PROCESS = MyDB_DDECM.GetDatatable(oProcessSQL) DTPROFILE_REL_PROCESS = MyDB_DDECM.GetDatatable(oProcessSQL)
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Unexpected Error in Refresh_ProcessLinks: " & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in Refresh_ProcessLinks: " & ex.Message, MsgBoxStyle.Critical)
Logger.Warn("SQL so far: " + oProcessSQL) _Logger.Warn("SQL so far: " + oProcessSQL)
Return S.Fehler_bei_der_Aktualisierung_ Return S.Fehler_bei_der_Aktualisierung_
End Try End Try
Try Try
DTPROFILE_REL_WINDOW = MyDB_DDECM.GetDatatable(oWindowSQL) DTPROFILE_REL_WINDOW = MyDB_DDECM.GetDatatable(oWindowSQL)
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Unexpected Error in Refresh_windowLinks: " & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in Refresh_windowLinks: " & ex.Message, MsgBoxStyle.Critical)
Logger.Warn("SQL so far: " + oWindowSQL) _Logger.Warn("SQL so far: " + oWindowSQL)
Return S.Fehler_bei_der_Aktualisierung_ Return S.Fehler_bei_der_Aktualisierung_
End Try End Try
Try Try
DTPROFILE_REL_CONTROL = MyDB_DDECM.GetDatatable(oControlSQL) DTPROFILE_REL_CONTROL = MyDB_DDECM.GetDatatable(oControlSQL)
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Unexpected Error in Refresh_ControlLinks: " & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in Refresh_ControlLinks: " & ex.Message, MsgBoxStyle.Critical)
Logger.Warn("SQL so far: " + oControlSQL) _Logger.Warn("SQL so far: " + oControlSQL)
Return S.Fehler_bei_der_Aktualisierung_ Return S.Fehler_bei_der_Aktualisierung_
End Try End Try

4
app/DD_Clipboard_Searcher/ClassLayout.vb
View File

@@ -47,7 +47,7 @@ Public Class ClassWindowLocation
Next Next
Catch notFoundEx As System.IO.FileNotFoundException Catch notFoundEx As System.IO.FileNotFoundException
Logger.Info("Window Position & Size added for Form " & form.Name) _Logger.Info("Window Position & Size added for Form " & form.Name)
Catch ex As Exception Catch ex As Exception
MsgBox("Error while loading Window Position!" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Error while loading Window Position!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try End Try
@@ -82,7 +82,7 @@ Public Class ClassWindowLocation
layout.Save(settings) layout.Save(settings)
Catch notFoundEx As System.IO.FileNotFoundException Catch notFoundEx As System.IO.FileNotFoundException
Logger.Info("Window Position & Size added for Form " & form.Name) _Logger.Info("Window Position & Size added for Form " & form.Name)
Catch ex As Exception Catch ex As Exception
MsgBox("Error while saving Window Position!" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Error while saving Window Position!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try End Try

8
app/DD_Clipboard_Searcher/ClassLicense.vb
View File

@@ -19,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 LicenseManagerLegacy(LogConfig, "#DigitalData35452!#", "") Dim _lizenzManager = New LicenseManagerLegacy(_LogConfig, "#DigitalData35452!#", "")
Get_License(CLIENT_ID) Get_License(CLIENT_ID)
If lic_string = "" Then If lic_string = "" Then
@@ -42,12 +42,12 @@ Public Class ClassLicense
Dim oLicDate As Date = Convert.ToDateTime(split(1), cultureInfo) Dim oLicDate As Date = Convert.ToDateTime(split(1), cultureInfo)
LICENSE_DATE = oLicDate LICENSE_DATE = oLicDate
Catch ex As Exception Catch ex As Exception
Logger.Warn($"Error in Convert Licdate1 [{split(1)}] {ex.Message}") _Logger.Warn($"Error in Convert Licdate1 [{split(1)}] {ex.Message}")
End Try End Try
Catch ex As Exception Catch ex As Exception
LICENSE_DATE = split(1) LICENSE_DATE = split(1)
Logger.Warn($"Error in Convert Licdate1 [{split(1)}] {ex.Message}") _Logger.Warn($"Error in Convert Licdate1 [{split(1)}] {ex.Message}")
End Try End Try
End If End If
@@ -64,7 +64,7 @@ Public Class ClassLicense
Catch ex As Exception Catch ex As Exception
Logger.Warn($"Error in Convert Licdate2 [{split(1)}] {ex.Message}") _Logger.Warn($"Error in Convert Licdate2 [{split(1)}] {ex.Message}")
End Try End Try
Catch ex As Exception Catch ex As Exception

4
app/DD_Clipboard_Searcher/ClassWindowAPI.vb
View File

@@ -218,7 +218,7 @@ Public Class ClassWindowAPI
Return oControl Return oControl
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Finally Finally
AttachThreadInput(oThreadId, oMyThreadId, False) AttachThreadInput(oThreadId, oMyThreadId, False)
End Try End Try
@@ -226,7 +226,7 @@ Public Class ClassWindowAPI
Return Nothing Return Nothing
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return Nothing Return Nothing
End Try End Try

6
app/DD_Clipboard_Searcher/ClassWindowsAPI.vb
View File

@@ -39,7 +39,7 @@ Public Class ClassWindowsAPI
Public Sub ShowFileProperties(FilePath As String) Public Sub ShowFileProperties(FilePath As String)
If FilePath = String.Empty OrElse Not IO.File.Exists(FilePath) Then If FilePath = String.Empty OrElse Not IO.File.Exists(FilePath) Then
Logger.Warn("Could not show file properties. FilePath '{0}' is invalid or does not exist.", FilePath) modCurrent._Logger.Warn("Could not show file properties. FilePath '{0}' is invalid or does not exist.", FilePath)
Exit Sub Exit Sub
End If End If
@@ -53,8 +53,8 @@ Public Class ClassWindowsAPI
If Not ShellExecuteEx(oInfo) Then If Not ShellExecuteEx(oInfo) Then
Dim ex As New ComponentModel.Win32Exception(Marshal.GetLastWin32Error()) Dim ex As New ComponentModel.Win32Exception(Marshal.GetLastWin32Error())
Logger.Warn("Could not show file properties. Reason: {0}", ex.Message) modCurrent._Logger.Warn("Could not show file properties. Reason: {0}", ex.Message)
Logger.Error(ex) modCurrent._Logger.Error(ex)
End If End If
End Sub End Sub

4
app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb
View File

@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("easyFLOW")> <Assembly: AssemblyProduct("easyFLOW")>
<Assembly: AssemblyCopyright("Copyright © 2023")> <Assembly: AssemblyCopyright("easyFLOW 2026")>
<Assembly: AssemblyTrademark("")> <Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.7.5.0")> <Assembly: AssemblyVersion("2.7.8.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

16
app/DD_Clipboard_Searcher/clsPatterns.vb
View File

@@ -60,8 +60,8 @@ Public Class clsPatterns
Return result Return result
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Logger.Info("Error in ReplaceAllValues:" & ex.Message) _Logger.Info("Error in ReplaceAllValues:" & ex.Message)
End Try End Try
End Function End Function
@@ -96,8 +96,8 @@ Public Class clsPatterns
Return result Return result
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) _Logger.Error(ex)
LOGGER.Info("Error in ReplaceInternalValues:" & ex.Message) _Logger.Info("Error in ReplaceInternalValues:" & ex.Message)
End Try End Try
End Function End Function
@@ -131,8 +131,8 @@ Public Class clsPatterns
Return result Return result
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) _Logger.Error(ex)
LOGGER.Info("Error in ReplaceUserValues:" & ex.Message) _Logger.Info("Error in ReplaceUserValues:" & ex.Message)
End Try End Try
End Function End Function
@@ -159,8 +159,8 @@ Public Class clsPatterns
Return result Return result
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) _Logger.Error(ex)
LOGGER.Info("Error in ReplaceControlValues:" & ex.Message) _Logger.Info("Error in ReplaceControlValues:" & ex.Message)
End Try End Try
End Function End Function

4
app/DD_Clipboard_Searcher/clsWMDocGrid.vb
View File

@@ -42,7 +42,7 @@ Public Class clsWMDocGrid
DTDocuments = oNewDataTable DTDocuments = oNewDataTable
Return True Return True
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) _Logger.Error(ex)
DTDocuments = Nothing DTDocuments = Nothing
Return False Return False
End Try End Try
@@ -53,7 +53,7 @@ Public Class clsWMDocGrid
'_Helper = New ClassHelper '_Helper = New ClassHelper
SELECTED_DOC_ID = 0 SELECTED_DOC_ID = 0
If Init_Table() = True Then If Init_Table() = True Then
LOGGER.Debug("gridView.SelectedRowsCount: " & ActiveDocGrid.SelectedRowsCount.ToString) _Logger.Debug("gridView.SelectedRowsCount: " & ActiveDocGrid.SelectedRowsCount.ToString)
If ActiveDocGrid.SelectedRowsCount >= 1 Then If ActiveDocGrid.SelectedRowsCount >= 1 Then
DTDocuments.Clear() DTDocuments.Clear()
For Each row In ActiveDocGrid.GetSelectedRows For Each row In ActiveDocGrid.GetSelectedRows

33
app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb
View File

@@ -1,5 +1,4 @@
Imports DD_LIB_Standards Imports DevExpress.XtraEditors
Imports DevExpress.XtraEditors
Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraEditors.Controls
Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid
Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid
@@ -40,7 +39,7 @@ Public Class ctrlApplicationAssignment
SelectedProfileId = ProfileId SelectedProfileId = ProfileId
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
@@ -49,7 +48,7 @@ Public Class ctrlApplicationAssignment
TBCW_PROFILE_PROCESSTableAdapter.Fill(MyDataset.TBCW_PROFILE_PROCESS, ProfileId) TBCW_PROFILE_PROCESSTableAdapter.Fill(MyDataset.TBCW_PROFILE_PROCESS, ProfileId)
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
@@ -85,7 +84,7 @@ Public Class ctrlApplicationAssignment
Process_Load(SelectedProfileId) Process_Load(SelectedProfileId)
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
Else Else
@@ -104,7 +103,7 @@ Public Class ctrlApplicationAssignment
Return False Return False
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
@@ -115,7 +114,7 @@ Public Class ctrlApplicationAssignment
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
@@ -155,7 +154,7 @@ Public Class ctrlApplicationAssignment
Window_Load() Window_Load()
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
Else Else
@@ -174,7 +173,7 @@ Public Class ctrlApplicationAssignment
Return False Return False
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
@@ -191,7 +190,7 @@ Public Class ctrlApplicationAssignment
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
@@ -203,13 +202,13 @@ Public Class ctrlApplicationAssignment
If oRow IsNot Nothing Then If oRow IsNot Nothing Then
Dim oRegex = oRow.Item("REGEX") Dim oRegex = oRow.Item("REGEX")
Dim oForm As New frmRegexEditor(oRegex) Dim oForm As New DigitalData.Controls.RegexEditor.frmRegexEditor(oRegex)
If oForm.ShowDialog() = DialogResult.OK Then If oForm.ShowDialog() = DialogResult.OK Then
oRow.Item("REGEX") = oForm.RegexString oRow.Item("REGEX") = oForm.RegexString
End If End If
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
@@ -220,7 +219,7 @@ Public Class ctrlApplicationAssignment
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
@@ -254,7 +253,7 @@ Public Class ctrlApplicationAssignment
Control_Load() Control_Load()
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
Else Else
@@ -344,7 +343,7 @@ Public Class ctrlApplicationAssignment
Control_Load() Control_Load()
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
Else Else
@@ -363,7 +362,7 @@ Public Class ctrlApplicationAssignment
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function
@@ -379,7 +378,7 @@ Public Class ctrlApplicationAssignment
Return False Return False
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function

148
app/DD_Clipboard_Searcher/easyFLOW.vbproj
View File

@@ -72,6 +72,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Accessibility" /> <Reference Include="Accessibility" />
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.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" />
@@ -99,7 +102,7 @@
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Controls.RegexEditor"> <Reference Include="DigitalData.Controls.RegexEditor">
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\Controls\DigitalData.Controls.RegexEditor.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.RegexEditor\bin\Debug\DigitalData.Controls.RegexEditor.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.GUIs.ClipboardWatcher, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.GUIs.ClipboardWatcher, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
@@ -126,9 +129,6 @@
<Reference Include="DigitalData.Modules.Filesystem"> <Reference Include="DigitalData.Modules.Filesystem">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Language">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.License"> <Reference Include="DigitalData.Modules.License">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
</Reference> </Reference>
@@ -144,17 +144,111 @@
<Reference Include="DigitalData.Modules.ZooFlow"> <Reference Include="DigitalData.Modules.ZooFlow">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
</Reference> </Reference>
<Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL"> <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath> <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
<Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.0.2\lib\net46\NLog.dll</HintPath> <HintPath>..\packages\NLog.5.0.2\lib\net46\NLog.dll</HintPath>
</Reference> </Reference>
<Reference Include="Oracle.ManagedDataAccess"> <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath> <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
</Reference>
<Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
</Reference>
<Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
<HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
@@ -162,11 +256,44 @@
<Reference Include="System.Deployment" /> <Reference Include="System.Deployment" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" /> <Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Formatters.Soap" /> <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.Security" /> <Reference Include="System.Security" />
<Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" /> <Reference Include="System.Transactions" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web.Services" /> <Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
@@ -174,6 +301,7 @@
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="UIAutomationClient" /> <Reference Include="UIAutomationClient" />
<Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />
@@ -540,12 +668,12 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" /> <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText> <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" /> <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

14
app/DD_Clipboard_Searcher/frmAdministration.vb
View File

@@ -57,7 +57,7 @@ Public Class frmAdministration
End Function End Function
Private Sub frmAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load
_DataASorDB = New ClassDataASorDB(modCurrent.LogConfig) _DataASorDB = New ClassDataASorDB(modCurrent._LogConfig)
' Select first tab to prevent profile textbox from being empty ' Select first tab to prevent profile textbox from being empty
XtraTabControl3.SelectedTabPageIndex = 0 XtraTabControl3.SelectedTabPageIndex = 0
@@ -152,7 +152,7 @@ Public Class frmAdministration
Status_Changed("Keine Änderung") Status_Changed("Keine Änderung")
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
'MsgBox("Unerwarteter Fehler beim Speichern des Profils: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text) 'MsgBox("Unerwarteter Fehler beim Speichern des Profils: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text)
End Try End Try
End Sub End Sub
@@ -522,7 +522,7 @@ Public Class frmAdministration
RibbonGroup_DataSearch.Enabled = False RibbonGroup_DataSearch.Enabled = False
End Select End Select
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
End Try End Try
End Sub End Sub
@@ -567,7 +567,7 @@ Public Class frmAdministration
Status_Changed("Daten-Suche gespeichert") Status_Changed("Daten-Suche gespeichert")
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Unexpected Error while saving Data Search: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text) MsgBox("Unexpected Error while saving Data Search: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text)
End Try End Try
End Sub End Sub
@@ -614,7 +614,7 @@ Public Class frmAdministration
End If End If
Catch ex As Exception Catch ex As Exception
MsgBox("Unexpected Error while saving Document Search: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error while saving Document Search: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
Logger.Error(ex) _Logger.Error(ex)
End Try End Try
End Sub End Sub
@@ -887,7 +887,7 @@ Public Class frmAdministration
Status_Changed($"{oSelectedRows.Count} Benutzerzuordnungen gelöscht") Status_Changed($"{oSelectedRows.Count} Benutzerzuordnungen gelöscht")
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Unexpected Error in deleting ProfileUserRelation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in deleting ProfileUserRelation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try End Try
End Sub End Sub
@@ -938,7 +938,7 @@ Public Class frmAdministration
Status_Changed($"{oSelectedRows.Count} Benutzer zugeordnet") Status_Changed($"{oSelectedRows.Count} Benutzer zugeordnet")
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Unexpected Error while adding user-rights: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error while adding user-rights: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try End Try
End Sub End Sub

4
app/DD_Clipboard_Searcher/frmConfig_Basic.vb
View File

@@ -138,12 +138,12 @@ Public Class frmConfig_Basic
End Sub End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Process.Start(LogConfig.LogDirectory) Process.Start(_LogConfig.LogDirectory)
End Sub End Sub
Private Sub chkLogErrorsOnly_CheckedChanged(sender As Object, e As EventArgs) Handles chkLogErrorsOnly.CheckedChanged Private Sub chkLogErrorsOnly_CheckedChanged(sender As Object, e As EventArgs) Handles chkLogErrorsOnly.CheckedChanged
LogErrorsOnly = chkLogErrorsOnly.Checked LogErrorsOnly = chkLogErrorsOnly.Checked
LogConfig.Debug = Not LogErrorsOnly _LogConfig.Debug = Not LogErrorsOnly
CONFIG.Config.LogErrorsOnly = LogErrorsOnly CONFIG.Config.LogErrorsOnly = LogErrorsOnly
CONFIG.Save() CONFIG.Save()

16
app/DD_Clipboard_Searcher/frmConnection.vb
View File

@@ -31,7 +31,7 @@ Public Class frmConnection
TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
TBDD_CONNECTIONTableAdapter.Fill(MyDataset.TBDD_CONNECTION) TBDD_CONNECTIONTableAdapter.Fill(MyDataset.TBDD_CONNECTION)
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Fehler beim Laden der Verbindungen: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text) MsgBox("Fehler beim Laden der Verbindungen: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text)
End Try End Try
End Sub End Sub
@@ -53,7 +53,7 @@ Public Class frmConnection
Return oConnections Return oConnections
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Return oConnections Return oConnections
End Try End Try
End Function End Function
@@ -86,14 +86,14 @@ Public Class frmConnection
oConnection.Open() oConnection.Open()
MsgBox("Die Verbindung wurde erfolgreich aufgebaut!", MsgBoxStyle.Information, Text) MsgBox("Die Verbindung wurde erfolgreich aufgebaut!", MsgBoxStyle.Information, Text)
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Fehler beim Verbindungsaufbau (MSSQL): " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, Text) MsgBox("Fehler beim Verbindungsaufbau (MSSQL): " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, Text)
End Try End Try
End Using End Using
Case PROVIDER_ORACLE Case PROVIDER_ORACLE
Try Try
oConnectionString = $"Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST={Server})(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME={Database})));User Id={UserId};Password={Password};" oConnectionString = $"Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST={Server})(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME={Database})));User Id={UserId};Password={Password};"
Dim oOracle As New Database.Oracle(LogConfig, oConnectionString) Dim oOracle As New Database.Oracle(_LogConfig, oConnectionString)
If oOracle.DBInitialized Then If oOracle.DBInitialized Then
MsgBox("Die Verbindung wurde erfolgreich aufgebaut!", MsgBoxStyle.Information, Text) MsgBox("Die Verbindung wurde erfolgreich aufgebaut!", MsgBoxStyle.Information, Text)
@@ -101,7 +101,7 @@ Public Class frmConnection
MsgBox("Fehler beim Verbindungsaufbau (ORACLE): Fehler im Log", MsgBoxStyle.Critical, Text) MsgBox("Fehler beim Verbindungsaufbau (ORACLE): Fehler im Log", MsgBoxStyle.Critical, Text)
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Fehler beim Verbindungsaufbau (ORACLE): " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text) MsgBox("Fehler beim Verbindungsaufbau (ORACLE): " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text)
End Try End Try
Case PROVIDER_ODBC Case PROVIDER_ODBC
@@ -113,7 +113,7 @@ Public Class frmConnection
MsgBox("Die Verbindung wurde erfolgreich aufgebaut!", MsgBoxStyle.Information, Text) MsgBox("Die Verbindung wurde erfolgreich aufgebaut!", MsgBoxStyle.Information, Text)
End Using End Using
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Fehler beim Verbindungsaufbau (ODBC): " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text) MsgBox("Fehler beim Verbindungsaufbau (ODBC): " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text)
End Try End Try
End Select End Select
@@ -168,7 +168,7 @@ Public Class frmConnection
End Using End Using
End Using End Using
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Error while loading Databases:" & vbCrLf & ex.Message, MsgBoxStyle.Critical, Text) MsgBox("Error while loading Databases:" & vbCrLf & ex.Message, MsgBoxStyle.Critical, Text)
Finally Finally
Cursor = Cursors.Default Cursor = Cursors.Default
@@ -209,7 +209,7 @@ Public Class frmConnection
End If End If
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox("Fehler beim Löschen der Verbindung: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text) MsgBox("Fehler beim Löschen der Verbindung: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text)
End Try End Try
End Sub End Sub

6
app/DD_Clipboard_Searcher/frmControlCapture.vb
View File

@@ -28,7 +28,7 @@ Public Class frmControlCapture
End Sub End Sub
Private Sub frmControlCapture_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmControlCapture_Load(sender As Object, e As EventArgs) Handles Me.Load
Window = New Window(LogConfig) Window = New Window(_LogConfig)
rbControlName.Checked = True rbControlName.Checked = True
@@ -60,7 +60,7 @@ Public Class frmControlCapture
ControlName = oControl.ControlName ControlName = oControl.ControlName
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox($"Control Name konnte nicht ausgelesen werden!{vbNewLine}Dies kann ein temporärer Fehler sein. Bitte versuchen Sie es noch einmal.", MsgBoxStyle.Exclamation, Text) MsgBox($"Control Name konnte nicht ausgelesen werden!{vbNewLine}Dies kann ein temporärer Fehler sein. Bitte versuchen Sie es noch einmal.", MsgBoxStyle.Exclamation, Text)
End Try End Try
@@ -94,7 +94,7 @@ Public Class frmControlCapture
txtControlBounds.Text = GetBoundsString(TopLeft, TopRight, BottomLeft, BottomRight) txtControlBounds.Text = GetBoundsString(TopLeft, TopRight, BottomLeft, BottomRight)
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox($"Control Koordinaten konnten nicht ausgelesen werden!{vbNewLine}Dies kann ein temporärer Fehler sein. Bitte versuchen Sie es noch einmal.", MsgBoxStyle.Exclamation, Text) MsgBox($"Control Koordinaten konnten nicht ausgelesen werden!{vbNewLine}Dies kann ein temporärer Fehler sein. Bitte versuchen Sie es noch einmal.", MsgBoxStyle.Exclamation, Text)
End Try End Try

2
app/DD_Clipboard_Searcher/frmLicense.vb
View File

@@ -49,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 LicenseManagerLegacy(LogConfig, "#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)

65
app/DD_Clipboard_Searcher/frmMain.vb
View File

@@ -51,7 +51,7 @@ Public Class frmMain
' Dieser Aufruf ist für den Designer erforderlich. ' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent() InitializeComponent()
_DataASorDB = New ClassDataASorDB(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
@@ -61,7 +61,7 @@ Public Class frmMain
End If End If
lblUser.Caption = USER_USERNAME lblUser.Caption = USER_USERNAME
LanguageEx.LogApplicationLanguage(Logger) LanguageEx.LogApplicationLanguage(_Logger)
If MyDB_DDECM.DBInitialized = True Then If MyDB_DDECM.DBInitialized = True Then
If ERROR_INIT <> "" Then If ERROR_INIT <> "" Then
@@ -90,7 +90,7 @@ Public Class frmMain
_Hotkey.AddHotKey(oKeyCode, ClassHotkey.ModfierKey.MOD_SHIFT, ClassConstants.HOTKEY_TRIGGER_WATCHER) _Hotkey.AddHotKey(oKeyCode, ClassHotkey.ModfierKey.MOD_SHIFT, ClassConstants.HOTKEY_TRIGGER_WATCHER)
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Warn($"Unexpected Error in Hotkey inititialize: {ex.Message}") _Logger.Warn($"Unexpected Error in Hotkey inititialize: {ex.Message}")
End Try End Try
Try Try
@@ -116,14 +116,14 @@ Public Class frmMain
If BASEDATA_DT_LANGUAGE.Rows.Count >= 1 Then If BASEDATA_DT_LANGUAGE.Rows.Count >= 1 Then
bbtniKonfig.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtniKonfig.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
Else Else
Logger.Info("Keine Grundeinstellungen weil keine Sprachen definiert!") _Logger.Info("Keine Grundeinstellungen weil keine Sprachen definiert!")
bbtniKonfig.Visibility = DevExpress.XtraBars.BarItemVisibility.Never bbtniKonfig.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If End If
lblVersion.Caption = My.Application.Info.Version.ToString lblVersion.Caption = My.Application.Info.Version.ToString
lblUser.Caption = String.Format(lblUser.Caption, USER_USERNAME) lblUser.Caption = String.Format(lblUser.Caption, USER_USERNAME)
Catch ex As Exception Catch ex As Exception
Logger.Warn($"Unexpected Error in FormLoad2: {ex.Message}") _Logger.Warn($"Unexpected Error in FormLoad2: {ex.Message}")
End Try End Try
End If End If
@@ -140,7 +140,7 @@ Public Class frmMain
End Function End Function
Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
Logger.Info(">> Logout time: " & Now.ToString, False) _Logger.Info(">> Logout time: " & Now.ToString, False)
If ERROR_INIT = "INVALID USER" Or ERROR_INIT = "NO CLIENT" Then If ERROR_INIT = "INVALID USER" Or ERROR_INIT = "NO CLIENT" Then
Exit Sub Exit Sub
End If End If
@@ -156,8 +156,8 @@ Public Class frmMain
_Hotkey.RemoveHotKey(HOTKEY_TOGGLE_WATCHER) _Hotkey.RemoveHotKey(HOTKEY_TOGGLE_WATCHER)
_Hotkey.RemoveHotKey(HOTKEY_TRIGGER_WATCHER) _Hotkey.RemoveHotKey(HOTKEY_TRIGGER_WATCHER)
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
Logger.Warn("Hotkeys could not be removed") _Logger.Warn("Hotkeys could not be removed")
End Try End Try
'TempDateien löschen 'TempDateien löschen
@@ -165,8 +165,8 @@ Public Class frmMain
Try Try
IO.File.Delete(oFile) IO.File.Delete(oFile)
Catch ex As Exception Catch ex As Exception
Logger.Warn("Temp file {0} could not be deleted", oFile) _Logger.Warn("Temp file {0} could not be deleted", oFile)
Logger.Error(ex) _Logger.Error(ex)
End Try End Try
Next Next
End Sub End Sub
@@ -177,28 +177,28 @@ Public Class frmMain
Private Sub WatcherChanged_New(ByVal sender As Object, ByVal e As String) Handles _Watcher.Changed Private Sub WatcherChanged_New(ByVal sender As Object, ByVal e As String) Handles _Watcher.Changed
If MONITORING_ACTIVE = False Then If MONITORING_ACTIVE = False Then
Logger.Info($"{AppTitle} is inactive!") _Logger.Info($"{AppTitle} is inactive!")
'NotifyIconMain.ShowBalloonTip(20000, "easyFLOW", "Clipboard-watcher is inactive.", ToolTipIcon.Info) 'NotifyIconMain.ShowBalloonTip(20000, "easyFLOW", "Clipboard-watcher is inactive.", ToolTipIcon.Info)
Exit Sub Exit Sub
End If End If
If DT_USER_PROFILES Is Nothing OrElse DT_USER_PROFILES.Rows.Count = 0 Then If DT_USER_PROFILES Is Nothing OrElse DT_USER_PROFILES.Rows.Count = 0 Then
Logger.Warn("DT_USER_PROFILES is Nothing/contains no rows!") _Logger.Warn("DT_USER_PROFILES is Nothing/contains no rows!")
Exit Sub Exit Sub
End If End If
If DTPROFILE_REL_PROCESS Is Nothing OrElse DTPROFILE_REL_PROCESS.Rows.Count = 0 Then If DTPROFILE_REL_PROCESS Is Nothing OrElse DTPROFILE_REL_PROCESS.Rows.Count = 0 Then
Logger.Warn("DTPROFILE_REL_PROCESS is Nothing/contains no rows!") _Logger.Warn("DTPROFILE_REL_PROCESS is Nothing/contains no rows!")
Exit Sub Exit Sub
End If End If
If DTPROFILE_REL_WINDOW Is Nothing Then If DTPROFILE_REL_WINDOW Is Nothing Then
Logger.Warn("DTPROFILE_REL_WINDOW is Nothing!") _Logger.Warn("DTPROFILE_REL_WINDOW is Nothing!")
Exit Sub Exit Sub
End If End If
If DTPROFILE_REL_CONTROL Is Nothing Then If DTPROFILE_REL_CONTROL Is Nothing Then
Logger.Warn("DTPROFILE_REL_CONTROL is Nothing!") _Logger.Warn("DTPROFILE_REL_CONTROL is Nothing!")
Exit Sub Exit Sub
End If End If
@@ -212,7 +212,7 @@ Public Class frmMain
CurrMatchTreeView.SelectedImageIndex = 0 CurrMatchTreeView.SelectedImageIndex = 0
oProfileFilter = New ProfileFilter( oProfileFilter = New ProfileFilter(
LogConfig, _LogConfig,
DT_USER_PROFILES, DT_USER_PROFILES,
DTPROFILE_REL_PROCESS, DTPROFILE_REL_PROCESS,
DTPROFILE_REL_WINDOW, DTPROFILE_REL_WINDOW,
@@ -220,7 +220,7 @@ Public Class frmMain
CurrMatchTreeView CurrMatchTreeView
) )
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) _Logger.Error(ex)
MsgBox(S.Fehler_beim_Laden_der_Profile_, MsgBoxStyle.Critical, Text) MsgBox(S.Fehler_beim_Laden_der_Profile_, MsgBoxStyle.Critical, Text)
'MsgBox("Fehler beim Laden der Profile. Möglicherweise liegt ein Konfigurationsfehler vor. Mehr Informationen im Log.", MsgBoxStyle.Critical, Text) 'MsgBox("Fehler beim Laden der Profile. Möglicherweise liegt ein Konfigurationsfehler vor. Mehr Informationen im Log.", MsgBoxStyle.Critical, Text)
Exit Sub Exit Sub
@@ -253,11 +253,11 @@ Public Class frmMain
CURRENT_PROFILES_WITH_RESULTS = oProfiles.ToList() CURRENT_PROFILES_WITH_RESULTS = oProfiles.ToList()
CURRENT_CLIPBOARD_CONTENTS = ClipboardContents CURRENT_CLIPBOARD_CONTENTS = ClipboardContents
Logger.Debug("WatcherChanged_New: CURRENT_PROFILES_WITH_RESULTS.Count: " & CURRENT_PROFILES_WITH_RESULTS.Count) _Logger.Debug("WatcherChanged_New: CURRENT_PROFILES_WITH_RESULTS.Count: " & CURRENT_PROFILES_WITH_RESULTS.Count)
Catch ex As Exception Catch ex As Exception
MsgBox(S.Fehler_beim_Auswerten_der_Profile__Mehr_Informationen_im_Log_, MsgBoxStyle.Critical, Text) MsgBox(S.Fehler_beim_Auswerten_der_Profile__Mehr_Informationen_im_Log_, MsgBoxStyle.Critical, Text)
'MsgBox("Fehler beim Auswerten der Profile. Mehr Informationen im Log.", MsgBoxStyle.Critical, Text) 'MsgBox("Fehler beim Auswerten der Profile. Mehr Informationen im Log.", MsgBoxStyle.Critical, Text)
Logger.Error(ex) _Logger.Error(ex)
End Try End Try
End Sub End Sub
@@ -268,8 +268,8 @@ Public Class frmMain
If CURRENT_CLIPBOARD_CONTENTS IsNot Nothing Then If CURRENT_CLIPBOARD_CONTENTS IsNot Nothing Then
If MONITORING_ACTIVE = True Then If MONITORING_ACTIVE = True Then
If CURRENT_MATCHING_PROFILES.Count = 0 Then If CURRENT_MATCHING_PROFILES.Count = 0 Then
Logger.Info("ReceiveHotKey - No profiles matched the Clipboard-Content!") _Logger.Info("ReceiveHotKey - No profiles matched the Clipboard-Content!")
Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO) _Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO)
If NOMATCH_INFO = False Then If NOMATCH_INFO = False Then
Dim oMessageTitle As String Dim oMessageTitle As String
Dim oMessageText As String Dim oMessageText As String
@@ -290,12 +290,12 @@ Public Class frmMain
AlertControl1.Show(Me, oMessageTitle, oMessageText) AlertControl1.Show(Me, oMessageTitle, oMessageText)
End If End If
Else Else
Logger.Info("Popup will not be shown. NOMATCH_INFO Is True.") _Logger.Info("Popup will not be shown. NOMATCH_INFO Is True.")
End If End If
ElseIf CURRENT_PROFILES_WITH_RESULTS.Count = 0 Then ElseIf CURRENT_PROFILES_WITH_RESULTS.Count = 0 Then
Logger.Info("ReceiveHotKey - No documents or data found for Clipboard-Content!") _Logger.Info("ReceiveHotKey - No documents or data found for Clipboard-Content!")
Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO) _Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO)
If NOMATCH_INFO = False Then If NOMATCH_INFO = False Then
Dim oMessageTitle As String Dim oMessageTitle As String
Dim oMessageText As String Dim oMessageText As String
@@ -315,7 +315,7 @@ Public Class frmMain
AlertControl1.Show(Me, oMessageTitle, oMessageText) AlertControl1.Show(Me, oMessageTitle, oMessageText)
End If End If
Else Else
Logger.Info("Popup will not be shown. NOMATCH_INFO Is True.") _Logger.Info("Popup will not be shown. NOMATCH_INFO Is True.")
End If End If
Else Else
OpenMatchForm() OpenMatchForm()
@@ -328,7 +328,7 @@ Public Class frmMain
End If End If
End Sub End Sub
Sub OpenMatchForm() Sub OpenMatchForm()
Logger.Debug("...now CHECK_PROFILE_MATCH...") _Logger.Debug("...now CHECK_PROFILE_MATCH...")
Dim oProfiles = CURRENT_PROFILES_WITH_RESULTS Dim oProfiles = CURRENT_PROFILES_WITH_RESULTS
Dim oEnv = GetEnvironment() Dim oEnv = GetEnvironment()
@@ -341,8 +341,8 @@ Public Class frmMain
DigitalData.Modules.ZooFlow.Constants.OperationMode.WithAppServer, DigitalData.Modules.ZooFlow.Constants.OperationMode.WithAppServer,
DigitalData.Modules.ZooFlow.Constants.OperationMode.NoAppServer) DigitalData.Modules.ZooFlow.Constants.OperationMode.NoAppServer)
} }
'DigitalData.GUIs.ClipboardWatcher.frmMatch
Dim oForm As New frmMatch(LogConfig, oEnv, oParams) Dim oForm As New frmMatch(_LogConfig, oEnv, oParams)
_MatchForm = oForm _MatchForm = oForm
oForm.Show() oForm.Show()
@@ -369,7 +369,11 @@ Public Class frmMain
} }
Dim oSettings As New State.SettingsState() With { Dim oSettings As New State.SettingsState() With {
.GdPictureKey = GDPICTURE_LICENSE .GdPictureKey = GDPICTURE_LICENSE,
.CopyWMFile2Temp = True,
.WM_SUFFIX = WMSUFFIX,
.MAP_SHAREDRIVE = MAP_SHARE_DRIVE,
.MAP_BLACKLIST = MAP_BLACKLIST
} }
Dim oEnvironment As New Environment() With { Dim oEnvironment As New Environment() With {
@@ -379,7 +383,6 @@ Public Class frmMain
.Settings = oSettings, .Settings = oSettings,
.Service = oService .Service = oService
} }
Return oEnvironment Return oEnvironment
End Function End Function
@@ -511,7 +514,7 @@ Public Class frmMain
End Sub End Sub
Private Sub bbtnitmLanguage_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmLanguage.ItemClick Private Sub bbtnitmLanguage_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmLanguage.ItemClick
Dim oNForm As New frmLanguage_Select(LogConfig, MyConnectionString, USER_USERNAME, BASEDATA_DT_LANGUAGE, "EF") Dim oNForm As New frmLanguage_Select(_LogConfig, MyConnectionString, USER_USERNAME, BASEDATA_DT_LANGUAGE, "EF")
oNForm.ShowDialog() oNForm.ShowDialog()
If oNForm.pChanged = True Then If oNForm.pChanged = True Then

6
app/DD_Clipboard_Searcher/frmSplash.vb
View File

@@ -54,8 +54,8 @@ Public NotInheritable Class frmSplash
oProgress = "Initializing User-Configuration" oProgress = "Initializing User-Configuration"
Worker.ReportProgress(CalcProgress(4), oProgress) Worker.ReportProgress(CalcProgress(4), oProgress)
If My.Settings.GHOSTUSER <> String.Empty Then If My.Settings.GHOSTUSER <> String.Empty Then
Logger.Info($"GHOSTLogin [{My.Settings.GHOSTUSER}] is active!") _Logger.Info($"GHOSTLogin [{My.Settings.GHOSTUSER}] is active!")
LogConfig.Debug = True _LogConfig.Debug = True
End If End If
If Init.InitUserLogin(My.Settings.GHOSTUSER) = False Then If Init.InitUserLogin(My.Settings.GHOSTUSER) = False Then
If ERROR_INIT = "" Then If ERROR_INIT = "" Then
@@ -86,7 +86,7 @@ Public NotInheritable Class frmSplash
Application.Exit() Application.Exit()
End If End If
LanguageEx.SetApplicationLanguage(Logger, USER_LANGUAGE, USER_DATE_FORMAT) LanguageEx.SetApplicationLanguage(_Logger, USER_LANGUAGE, USER_DATE_FORMAT)
' Wenn kein Fehler, Splashscreen schließen ' Wenn kein Fehler, Splashscreen schließen
Close() Close()

13
app/DD_Clipboard_Searcher/modCurrent.vb
View File

@@ -5,8 +5,8 @@ Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.ZooFlow.Params Imports DigitalData.Modules.ZooFlow.Params
Module modCurrent Module modCurrent
Public LogConfig As LogConfig Public _LogConfig As LogConfig
Public Logger As Logger Public _Logger As Logger
Public MyDB_DDECM As MSSQLServer Public MyDB_DDECM As MSSQLServer
Public DatabaseAppServ As MSSQLServer Public DatabaseAppServ As MSSQLServer
Public Automation As ClassAutomation Public Automation As ClassAutomation
@@ -91,4 +91,13 @@ Module modCurrent
Public NOTIFY_MODE As String = "NotifyIcon" Public NOTIFY_MODE As String = "NotifyIcon"
Public BASEDATA_DT_LANGUAGE As DataTable Public BASEDATA_DT_LANGUAGE As DataTable
Public GHOST_USERID As Integer = 0 Public GHOST_USERID As Integer = 0
Public CONNECTION_STRING_IDB As String = String.Empty
Public IDB_ACTIVE As Boolean = False
Public IDB_USES_WMFILESTORE As Boolean
Public SYS_LOCKED_MAINTENANCE As Boolean = False
Public Property COPY_WMFILE_2TEMP As Boolean = False
Public Property MAP_SHARE_DRIVE As String = String.Empty
Public Property MAP_BLACKLIST As String = String.Empty
Public Property WMSUFFIX As String
End Module End Module

30
app/DD_Clipboard_Searcher/packages.config
View File

@@ -1,6 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="GdPicture" version="14.2.90" targetFramework="net462" /> <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" /> <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
<package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
<package id="GdPicture" version="14.3.3" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
<package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
<package id="NLog" version="5.0.2" targetFramework="net462" /> <package id="NLog" version="5.0.2" targetFramework="net462" />
<package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
<package id="protobuf-net" version="3.2.46" targetFramework="net462" />
<package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
<package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
<package id="System.Buffers" version="4.6.0" targetFramework="net462" />
<package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
<package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
<package id="System.Management" version="8.0.0" targetFramework="net462" />
<package id="System.Memory" version="4.6.0" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
<package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
<package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages> </packages>

21
app/SetupVS19/Product.wxs
View File

@@ -16,8 +16,13 @@
/> />
<!-- Liest den Installationsort über die Registry aus --> <!-- Liest den Installationsort über die Registry aus -->
<Property Id="INSTALLIDIR"> <Property Id="INSTALLDIR">
<RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" /> <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKLM" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
</Property>
<!-- Für util:RemoveFolderEx: Installationspfad auch als eigene Property bereitstellen -->
<Property Id="APPLICATIONFOLDER">
<RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKLM" Type="raw" Id="APPLICATIONFOLDER_REMOVEFOLDEREX_REGSEARCH" Name="Path" />
</Property> </Property>
<Media Id='1' Cabinet='$(var.ProgramName).cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)' /> <Media Id='1' Cabinet='$(var.ProgramName).cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)' />
@@ -40,7 +45,7 @@
<!-- Legt das Icon fest --> <!-- Legt das Icon fest -->
<Icon Id="AppIcon.exe" SourceFile="$(var.ProgramName).exe" /> <Icon Id="AppIcon.exe" SourceFile="$(var.ProgramName).exe" />
<!-- Zeige Icon in Systemsteuerung > Programme entfernen --> <!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
<Property Id="ARPPRODUCTICON" Value="AppIcon" /> <Property Id="ARPPRODUCTICON" Value="AppIcon.exe" />
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
@@ -81,7 +86,7 @@
<DirectoryRef Id="INSTALLDIR"> <DirectoryRef Id="INSTALLDIR">
<Component Id="MainApplicationExe" Guid="{BA4DC59A-6FCD-4672-9D58-456F255E5AAB}"> <Component Id="MainApplicationExe" Guid="{BA4DC59A-6FCD-4672-9D58-456F255E5AAB}">
<File Id="MainApplicationExe" Source="..\DD_Clipboard_Searcher\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" /> <File Id="MainApplicationExe" Source="..\DD_Clipboard_Searcher\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes" />
</Component> </Component>
<Component Id="MainApplicationExeConfig" Guid="{F40EA733-5734-4BF5-9668-63AC0D150DA7}"> <Component Id="MainApplicationExeConfig" Guid="{F40EA733-5734-4BF5-9668-63AC0D150DA7}">
@@ -155,10 +160,6 @@
<File Id="DevExpress.XtraVerticalGrid.v21.2" Name="DevExpress.XtraVerticalGrid.v21.2.dll" /> <File Id="DevExpress.XtraVerticalGrid.v21.2" Name="DevExpress.XtraVerticalGrid.v21.2.dll" />
</Component> </Component>
<Component Id="IndependentsoftLibs" Guid="136fd96d-3cae-4e50-b82b-423b5d695e7a">
<File Id="Msg.Net" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.2.0.570.21482.dll" KeyPath="yes" />
</Component>
<Component Id="Limilabs" Guid="b3c2193c-522a-4c5f-a031-9b80150a154a"> <Component Id="Limilabs" Guid="b3c2193c-522a-4c5f-a031-9b80150a154a">
<File Id="Mail" Name="Mail.dll" KeyPath="yes" /> <File Id="Mail" Name="Mail.dll" KeyPath="yes" />
<File Id="MailLicense" Name="MailLicense.xml" /> <File Id="MailLicense" Name="MailLicense.xml" />
@@ -178,11 +179,10 @@
<RegistryKey Root="HKLM" Key="Software"> <RegistryKey Root="HKLM" Key="Software">
<RegistryKey Key="[Manufacturer]"> <RegistryKey Key="[Manufacturer]">
<RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="no" Id="REGKEYINSTALLDIR"> <RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="no" Id="REGKEYINSTALLDIR">
<RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" /> <RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" KeyPath="yes" />
</RegistryKey> </RegistryKey>
</RegistryKey> </RegistryKey>
</RegistryKey> </RegistryKey>
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" /> <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
</Component> </Component>
@@ -218,7 +218,6 @@
<ComponentRef Id="NLog"/> <ComponentRef Id="NLog"/>
<ComponentRef Id="Limilabs"/> <ComponentRef Id="Limilabs"/>
<ComponentRef Id="DevExpressLibs"/> <ComponentRef Id="DevExpressLibs"/>
<ComponentRef Id="IndependentsoftLibs"/>
<ComponentRef Id="GDPictureLibs"/> <ComponentRef Id="GDPictureLibs"/>
<ComponentRef Id="RegistryKeys" /> <ComponentRef Id="RegistryKeys" />
<ComponentRef Id="Resources.DE.Devexpress" /> <ComponentRef Id="Resources.DE.Devexpress" />