Referenzen glattgezogen und MSI Paket neu konfiguriert
This commit is contained in:
@@ -51,7 +51,7 @@ Public Class frmMain
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
|
||||
_DataASorDB = New ClassDataASorDB(LogConfig)
|
||||
_DataASorDB = New ClassDataASorDB(_LogConfig)
|
||||
End Sub
|
||||
|
||||
Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
@@ -61,7 +61,7 @@ Public Class frmMain
|
||||
End If
|
||||
lblUser.Caption = USER_USERNAME
|
||||
|
||||
LanguageEx.LogApplicationLanguage(Logger)
|
||||
LanguageEx.LogApplicationLanguage(_Logger)
|
||||
|
||||
If MyDB_DDECM.DBInitialized = True Then
|
||||
If ERROR_INIT <> "" Then
|
||||
@@ -90,7 +90,7 @@ Public Class frmMain
|
||||
_Hotkey.AddHotKey(oKeyCode, ClassHotkey.ModfierKey.MOD_SHIFT, ClassConstants.HOTKEY_TRIGGER_WATCHER)
|
||||
End If
|
||||
Catch ex As Exception
|
||||
Logger.Warn($"Unexpected Error in Hotkey inititialize: {ex.Message}")
|
||||
_Logger.Warn($"Unexpected Error in Hotkey inititialize: {ex.Message}")
|
||||
End Try
|
||||
|
||||
Try
|
||||
@@ -116,14 +116,14 @@ Public Class frmMain
|
||||
If BASEDATA_DT_LANGUAGE.Rows.Count >= 1 Then
|
||||
bbtniKonfig.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
|
||||
Else
|
||||
Logger.Info("Keine Grundeinstellungen weil keine Sprachen definiert!")
|
||||
_Logger.Info("Keine Grundeinstellungen weil keine Sprachen definiert!")
|
||||
bbtniKonfig.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
|
||||
End If
|
||||
|
||||
lblVersion.Caption = My.Application.Info.Version.ToString
|
||||
lblUser.Caption = String.Format(lblUser.Caption, USER_USERNAME)
|
||||
Catch ex As Exception
|
||||
Logger.Warn($"Unexpected Error in FormLoad2: {ex.Message}")
|
||||
_Logger.Warn($"Unexpected Error in FormLoad2: {ex.Message}")
|
||||
End Try
|
||||
|
||||
End If
|
||||
@@ -140,7 +140,7 @@ Public Class frmMain
|
||||
End Function
|
||||
|
||||
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
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -156,8 +156,8 @@ Public Class frmMain
|
||||
_Hotkey.RemoveHotKey(HOTKEY_TOGGLE_WATCHER)
|
||||
_Hotkey.RemoveHotKey(HOTKEY_TRIGGER_WATCHER)
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
Logger.Warn("Hotkeys could not be removed")
|
||||
_Logger.Error(ex)
|
||||
_Logger.Warn("Hotkeys could not be removed")
|
||||
End Try
|
||||
|
||||
'TempDateien löschen
|
||||
@@ -165,8 +165,8 @@ Public Class frmMain
|
||||
Try
|
||||
IO.File.Delete(oFile)
|
||||
Catch ex As Exception
|
||||
Logger.Warn("Temp file {0} could not be deleted", oFile)
|
||||
Logger.Error(ex)
|
||||
_Logger.Warn("Temp file {0} could not be deleted", oFile)
|
||||
_Logger.Error(ex)
|
||||
End Try
|
||||
Next
|
||||
End Sub
|
||||
@@ -177,28 +177,28 @@ Public Class frmMain
|
||||
|
||||
Private Sub WatcherChanged_New(ByVal sender As Object, ByVal e As String) Handles _Watcher.Changed
|
||||
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)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
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
|
||||
End If
|
||||
|
||||
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
|
||||
End If
|
||||
|
||||
If DTPROFILE_REL_WINDOW Is Nothing Then
|
||||
Logger.Warn("DTPROFILE_REL_WINDOW is Nothing!")
|
||||
_Logger.Warn("DTPROFILE_REL_WINDOW is Nothing!")
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If DTPROFILE_REL_CONTROL Is Nothing Then
|
||||
Logger.Warn("DTPROFILE_REL_CONTROL is Nothing!")
|
||||
_Logger.Warn("DTPROFILE_REL_CONTROL is Nothing!")
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
@@ -212,7 +212,7 @@ Public Class frmMain
|
||||
CurrMatchTreeView.SelectedImageIndex = 0
|
||||
|
||||
oProfileFilter = New ProfileFilter(
|
||||
LogConfig,
|
||||
_LogConfig,
|
||||
DT_USER_PROFILES,
|
||||
DTPROFILE_REL_PROCESS,
|
||||
DTPROFILE_REL_WINDOW,
|
||||
@@ -220,7 +220,7 @@ Public Class frmMain
|
||||
CurrMatchTreeView
|
||||
)
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
_Logger.Error(ex)
|
||||
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)
|
||||
Exit Sub
|
||||
@@ -253,11 +253,11 @@ Public Class frmMain
|
||||
|
||||
CURRENT_PROFILES_WITH_RESULTS = oProfiles.ToList()
|
||||
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
|
||||
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)
|
||||
Logger.Error(ex)
|
||||
_Logger.Error(ex)
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
@@ -268,8 +268,8 @@ Public Class frmMain
|
||||
If CURRENT_CLIPBOARD_CONTENTS IsNot Nothing Then
|
||||
If MONITORING_ACTIVE = True Then
|
||||
If CURRENT_MATCHING_PROFILES.Count = 0 Then
|
||||
Logger.Info("ReceiveHotKey - No profiles matched the Clipboard-Content!")
|
||||
Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO)
|
||||
_Logger.Info("ReceiveHotKey - No profiles matched the Clipboard-Content!")
|
||||
_Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO)
|
||||
If NOMATCH_INFO = False Then
|
||||
Dim oMessageTitle As String
|
||||
Dim oMessageText As String
|
||||
@@ -290,12 +290,12 @@ Public Class frmMain
|
||||
AlertControl1.Show(Me, oMessageTitle, oMessageText)
|
||||
End If
|
||||
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
|
||||
|
||||
ElseIf CURRENT_PROFILES_WITH_RESULTS.Count = 0 Then
|
||||
Logger.Info("ReceiveHotKey - No documents or data found for Clipboard-Content!")
|
||||
Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO)
|
||||
_Logger.Info("ReceiveHotKey - No documents or data found for Clipboard-Content!")
|
||||
_Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO)
|
||||
If NOMATCH_INFO = False Then
|
||||
Dim oMessageTitle As String
|
||||
Dim oMessageText As String
|
||||
@@ -315,7 +315,7 @@ Public Class frmMain
|
||||
AlertControl1.Show(Me, oMessageTitle, oMessageText)
|
||||
End If
|
||||
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
|
||||
Else
|
||||
OpenMatchForm()
|
||||
@@ -328,7 +328,7 @@ Public Class frmMain
|
||||
End If
|
||||
End Sub
|
||||
Sub OpenMatchForm()
|
||||
Logger.Debug("...now CHECK_PROFILE_MATCH...")
|
||||
_Logger.Debug("...now CHECK_PROFILE_MATCH...")
|
||||
Dim oProfiles = CURRENT_PROFILES_WITH_RESULTS
|
||||
Dim oEnv = GetEnvironment()
|
||||
|
||||
@@ -341,8 +341,8 @@ Public Class frmMain
|
||||
DigitalData.Modules.ZooFlow.Constants.OperationMode.WithAppServer,
|
||||
DigitalData.Modules.ZooFlow.Constants.OperationMode.NoAppServer)
|
||||
}
|
||||
|
||||
Dim oForm As New frmMatch(LogConfig, oEnv, oParams)
|
||||
'DigitalData.GUIs.ClipboardWatcher.frmMatch
|
||||
Dim oForm As New frmMatch(_LogConfig, oEnv, oParams)
|
||||
|
||||
_MatchForm = oForm
|
||||
oForm.Show()
|
||||
@@ -369,7 +369,11 @@ Public Class frmMain
|
||||
}
|
||||
|
||||
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 {
|
||||
@@ -379,7 +383,6 @@ Public Class frmMain
|
||||
.Settings = oSettings,
|
||||
.Service = oService
|
||||
}
|
||||
|
||||
Return oEnvironment
|
||||
End Function
|
||||
|
||||
@@ -511,7 +514,7 @@ Public Class frmMain
|
||||
End Sub
|
||||
|
||||
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()
|
||||
|
||||
If oNForm.pChanged = True Then
|
||||
|
||||
Reference in New Issue
Block a user