Prepare for Version 2.0.0.0
This commit is contained in:
@@ -4,11 +4,8 @@ Imports DD_LIB_Standards
|
||||
|
||||
Public Class frmStart
|
||||
Dim WithEvents Hotkey As New clsHotkey(Me)
|
||||
|
||||
Private PID As Integer
|
||||
Private WithEvents _Watcher As ClipboardWatcher = ClipboardWatcher.Singleton
|
||||
|
||||
|
||||
Private Sub frmClipboardWatch_Disposed(ByVal sender As Object, ByVal e As EventArgs) Handles Me.Disposed
|
||||
_Watcher.Dispose()
|
||||
End Sub
|
||||
@@ -28,19 +25,17 @@ Public Class frmStart
|
||||
|
||||
Dim oProfileFilter As New ClassProfileFilter(DT_USER_PROFILES, DTPROFILE_REL_WINDOW)
|
||||
|
||||
Dim oProfiles = oProfileFilter.
|
||||
Profiles.
|
||||
AsEnumerable()
|
||||
Dim oProfiles = oProfileFilter.Profiles.AsEnumerable()
|
||||
|
||||
oProfiles = oProfileFilter.FilterProfilesByProcess(oProfiles, CurrPROC_Name)
|
||||
oProfiles = oProfileFilter.FilterProfilesByClipboardRegex(oProfiles, ClipboardContents)
|
||||
oProfiles = oProfileFilter.FilterWindowsByWindowTitle(oProfiles, WindowTitle)
|
||||
oProfiles = oProfileFilter.FilterProfilesByWindowRegex(oProfiles, ClipboardContents)
|
||||
oProfiles = oProfileFilter.FilterWindowsByWindowTitleRegex(oProfiles, WindowTitle)
|
||||
oProfiles = oProfileFilter.FilterProfilesByWindowClipboardRegex(oProfiles, ClipboardContents)
|
||||
oProfiles = oProfileFilter.RemoveDuplicateProfiles()
|
||||
oProfiles = oProfiles.ToList()
|
||||
|
||||
CURRENT_MATCHING_PROFILES = oProfiles
|
||||
CURR_MATCH_RESULT = ClipboardContents
|
||||
CURRENT_CLIPBOARD_CONTENTS = ClipboardContents
|
||||
End Sub
|
||||
|
||||
Public Sub New()
|
||||
@@ -62,18 +57,12 @@ Public Class frmStart
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub btnUserConfig_Click(sender As Object, e As EventArgs) Handles btnUserConfig.Click
|
||||
frmConfig_Basic.ShowDialog()
|
||||
End Sub
|
||||
|
||||
Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
|
||||
Logger.Info(">> Logout time: " & Now.ToString, False)
|
||||
If ERROR_INIT = "INVALID USER" Or ERROR_INIT = "NO CLIENT" Then
|
||||
Exit Sub
|
||||
End If
|
||||
Try
|
||||
'Dim sql = String.Format("UPDATE TBDD_USER SET LOGGED_IN = 0, LOGGED_WHERE = '{0}' WHERE (LOWER(USERNAME) = LOWER('{1}'))", "", USER_USERNAME)
|
||||
'clsDatabase.Execute_non_Query(sql, True)
|
||||
Dim sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Clipboard-Watcher')"
|
||||
clsDatabase.Execute_non_Query(sql, True)
|
||||
ClassWindowLocation.SaveFormLocationSize(Me, "")
|
||||
@@ -131,7 +120,7 @@ Public Class frmStart
|
||||
|
||||
End If
|
||||
tslblUser.Text = USER_USERNAME
|
||||
lbHKFunction.Text = HotkeyFunctionKey.ToUpper & " + " & HotkeySearchKey.ToUpper
|
||||
labelHotkey.Text = $"STRG+C {HotkeyFunctionKey.ToUpper}+{HotkeySearchKey.ToUpper}"
|
||||
End Sub
|
||||
Private Sub ReceiveHotKey(ByVal HotKeyID As String) Handles Hotkey.HotKeyPressed
|
||||
If HotKeyID = ClassConstants.HOTKEY_TRIGGER_WATCHER Then
|
||||
@@ -197,24 +186,8 @@ Public Class frmStart
|
||||
MsgBox("Ein oder mehrere Abfragen konnten nicht ausgeführt werden. Bitte überprüfen Sie das Log.", MsgBoxStyle.Exclamation, "Warnung")
|
||||
End If
|
||||
|
||||
If oProfiles.Count = 1 Then
|
||||
Dim oCountData = oProfiles.First().CountData
|
||||
Dim oCountDocs = oProfiles.First().CountDocs = 0
|
||||
|
||||
If oCountData = 0 Then
|
||||
CurrDocSearch2Load = oProfiles.First().Guid
|
||||
frmResultDoc.Show()
|
||||
ElseIf oCountDocs = 0 Then
|
||||
CurrDocSearch2Load = oProfiles.First().Guid
|
||||
frmResultDoc.Show()
|
||||
ElseIf oCountDocs = 0 And oCountData = 0 Then
|
||||
MsgBox("Es wurden keine Ergebnisse gefunden!")
|
||||
Else
|
||||
frmProfileMatch.ShowDialog()
|
||||
End If
|
||||
Else
|
||||
frmProfileMatch.ShowDialog()
|
||||
End If
|
||||
Dim oForm As New frmProfileMatch()
|
||||
oForm.ShowDialog()
|
||||
End Sub
|
||||
Sub Change_Monitoring_State()
|
||||
If MONITORING_ACTIVE = True Then
|
||||
@@ -282,14 +255,6 @@ Public Class frmStart
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub btnAdminConfig_Click(sender As Object, e As EventArgs) Handles btnAdminConfig.Click
|
||||
TimerClose.Stop()
|
||||
MONITORING_ACTIVE = False
|
||||
frmAdministration.ShowDialog()
|
||||
TimerClose.Start()
|
||||
MONITORING_ACTIVE = True
|
||||
End Sub
|
||||
|
||||
Private Sub TimerClose_Tick(sender As Object, e As EventArgs) Handles TimerClose.Tick
|
||||
Hide()
|
||||
End Sub
|
||||
@@ -307,4 +272,17 @@ Public Class frmStart
|
||||
Private Sub ClientÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ClientÖffnenToolStripMenuItem.Click
|
||||
OpenClose()
|
||||
End Sub
|
||||
|
||||
Private Sub btnUserConfig_Click(sender As Object, e As EventArgs) Handles btnUserConfig.Click
|
||||
frmConfig_Basic.ShowDialog()
|
||||
End Sub
|
||||
|
||||
Private Sub btnAdminConfig_Click(sender As Object, e As EventArgs) Handles btnAdminConfig.Click
|
||||
TimerClose.Stop()
|
||||
MONITORING_ACTIVE = False
|
||||
frmAdministration.ShowDialog()
|
||||
TimerClose.Start()
|
||||
MONITORING_ACTIVE = True
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
Reference in New Issue
Block a user