update to devexpress 15.2.16, add logger, add config

This commit is contained in:
Jonathan Jenne
2019-07-04 10:40:48 +02:00
parent 18b8cd5c23
commit 40460d7af9
17 changed files with 455 additions and 102 deletions

View File

@@ -27,7 +27,7 @@ Public Class clsSearch
Dim extension = Path.GetExtension(BaseSearch)
Dim windream_temp_search As String = ""
If IO.File.Exists(BaseSearch) = False Then
clsLogger.Add("Die Windream-Suche existiert nicht oder ist nicht zugreifbar!", True)
Logger.Info("Die Windream-Suche existiert nicht oder ist nicht zugreifbar!", True)
MsgBox("Die Windream-Suche existiert nicht oder ist nicht zugreifbar!", MsgBoxStyle.Critical)
Return Nothing
End If
@@ -47,15 +47,15 @@ Public Class clsSearch
If WD_UNICODE = True Then
EncodingFormat = Encoding.GetEncoding(1252) '1252
If LogErrorsOnly = False Then clsLogger.Add(" ...Unicode is used (Encoding.GetEncoding(1252))", False)
Logger.Debug(" ...Unicode is used (Encoding.GetEncoding(1252))", False)
Else
If LogErrorsOnly = False Then clsLogger.Add(" ...UTF8 (Encoding.GetEncoding(65001))", False)
Logger.Debug(" ...UTF8 (Encoding.GetEncoding(65001))", False)
EncodingFormat = Encoding.GetEncoding(65001)
End If
If LogErrorsOnly = False Then clsLogger.Add(" ...ReadAlltext: " & BaseSearch, False)
Logger.Debug(" ...ReadAlltext: " & BaseSearch, False)
fileContents = My.Computer.FileSystem.ReadAllText(BaseSearch, EncodingFormat) ', System.Text.Encoding.Unicode
If LogErrorsOnly = False Then clsLogger.Add(" ...fileContents geladen", False)
Logger.Debug(" ...fileContents geladen", False)
fileContents = fileContents.Replace("Í", "Ö")
fileContents = fileContents.Replace("@Clipboard", CURR_MATCH_RESULT)
fileContents = fileContents.Replace("@CLIPBOARD", CURR_MATCH_RESULT)
@@ -68,7 +68,7 @@ Public Class clsSearch
Try
'Die File schreiben
My.Computer.FileSystem.WriteAllText(windream_temp_search, fileContents, False, EncodingFormat)
If LogErrorsOnly = False Then clsLogger.Add(" ...wrote Text to windream_temp_search: " & windream_temp_search, False)
Logger.Debug(" ...wrote Text to windream_temp_search: " & windream_temp_search, False)
' XML-Datei öffnen und laden
Dim Stream As New IO.StreamReader(CStr(windream_temp_search), EncodingFormat)
Dim Reader As New System.Xml.XmlTextReader(Stream)
@@ -79,9 +79,9 @@ Public Class clsSearch
xml.Load(Reader)
Reader.Close()
xml.Save(windream_temp_search)
If LogErrorsOnly = False Then clsLogger.Add(" ...Xml Generiert: " & windream_temp_search, False)
Logger.Debug(" ...Xml Generiert: " & windream_temp_search, False)
Catch ex As Exception
clsLogger.Add("TempFile could not be created: " & ex.Message, True)
Logger.Info("TempFile could not be created: " & ex.Message, True)
MsgBox(ex.Message, MsgBoxStyle.Critical, "Unerwarteter Fehler in Write XmlSearch:")
End Try
@@ -103,14 +103,14 @@ Public Class clsSearch
Dim rctMain As RECT
GetWindowRect(p.MainWindowHandle, rctMain)
If LogErrorsOnly = False Then
clsLogger.Add(" ...Top-Position: " & rctMain.Top.ToString, False)
clsLogger.Add(" ...Left-Position: " & rctMain.Left.ToString, False)
clsLogger.Add(" ...Right-Position: " & rctMain.Right.ToString, False)
clsLogger.Add(" ...Bottom-Position: " & rctMain.Bottom.ToString, False)
Logger.Debug(" ...Top-Position: " & rctMain.Top.ToString, False)
Logger.Debug(" ...Left-Position: " & rctMain.Left.ToString, False)
Logger.Debug(" ...Right-Position: " & rctMain.Right.ToString, False)
Logger.Debug(" ...Bottom-Position: " & rctMain.Bottom.ToString, False)
End If
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Ausführen der windream-Suche:")
clsLogger.Add("Unexpected error while executing search: " & ex.Message, True)
Logger.Info("Unexpected error while executing search: " & ex.Message, True)
Return "Unexpected error while executing search"
End Try
Dim psList() As Process
@@ -134,19 +134,19 @@ Public Class clsSearch
Next p
Catch ex As Exception
clsLogger.Add("Unexpected error while Setting foreground: " & ex.Message)
Logger.Info("Unexpected error while Setting foreground: " & ex.Message)
End Try
CURR_MATCH_WM_SEARCH = Nothing
CURR_MATCH_RESULT = Nothing
Return ""
Catch ex As Exception
clsLogger.Add("Unexpected error in Create Search: " & ex.Message)
Logger.Info("Unexpected error in Create Search: " & ex.Message)
MsgBox("Error in Create Search:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
Return "Unexpected error in Create Search"
End Try
Catch ex As Exception
clsLogger.Add("Unexpected error in RUN_WD_SEARCH: " & ex.Message)
Logger.Info("Unexpected error in RUN_WD_SEARCH: " & ex.Message)
MsgBox("Error in RUN_WD_SEARCH:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
Return "Unerwarteter Unexpected error in RUN_WD_SEARCH"
End Try