merge
This commit is contained in:
commit
54a0706138
@ -1,9 +1 @@
|
||||
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.Repository.RepositoryItemPopupGalleryEdit, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@ -221,8 +221,9 @@ Public Class frmMain
|
||||
oProfiles = oProfileFilter.FilterProfilesByFocusedControl(oProfiles, ClipboardContents, Handle)
|
||||
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesByFocusedControl")
|
||||
CURRENT_MATCHING_PROFILES = oProfiles.ToList()
|
||||
|
||||
Logger.Debug("WatcherChanged_New: CURRENT_MATCHING_PROFILES.Count: " & CURRENT_MATCHING_PROFILES.Count)
|
||||
oProfiles = oProfileFilter.FilterProfilesBySearchResults(oProfiles, oEnvironment.Database, oEnvironment.User, ClipboardContents)
|
||||
Logger.Debug("WatcherChanged_New: oProfiles.Count: " & oProfiles.Count)
|
||||
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesBySearchResults")
|
||||
|
||||
oProfiles = oProfileFilter.ClearNotMatchedProfiles(oProfiles)
|
||||
@ -231,6 +232,7 @@ 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)
|
||||
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)
|
||||
|
||||
@ -50,6 +50,7 @@ Public NotInheritable Class frmSplash
|
||||
Worker.ReportProgress(CalcProgress(4), "Initializing User-Configuration")
|
||||
If My.Settings.GHOSTUSER <> String.Empty Then
|
||||
Logger.Info($"GHOSTLogin [{My.Settings.GHOSTUSER}] is active!")
|
||||
LogConfig.Debug = True
|
||||
End If
|
||||
If Init.InitUserLogin(My.Settings.GHOSTUSER) = False Then
|
||||
If ERROR_INIT = "" Then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user