From 2ad498c8f234d1b4f5cfa51b8064659f2321fa6c Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 4 Jan 2021 16:37:57 +0100 Subject: [PATCH] MS NotifyIcon logging Init --- app/DD_Clipboard_Searcher/App.config | 3 +++ app/DD_Clipboard_Searcher/ClassInit.vb | 2 +- .../My Project/Settings.Designer.vb | 9 +++++++++ .../My Project/Settings.settings | 3 +++ app/DD_Clipboard_Searcher/frmMain.Designer.vb | 2 +- app/DD_Clipboard_Searcher/frmMain.resx | 2 +- app/DD_Clipboard_Searcher/frmSplash.Designer.vb | 1 + app/DD_Clipboard_Searcher/frmSplash.vb | 11 ++++++++++- 8 files changed, 29 insertions(+), 4 deletions(-) diff --git a/app/DD_Clipboard_Searcher/App.config b/app/DD_Clipboard_Searcher/App.config index ac3f765..0258571 100644 --- a/app/DD_Clipboard_Searcher/App.config +++ b/app/DD_Clipboard_Searcher/App.config @@ -14,6 +14,9 @@ True + + SchreiberM + diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb index b417899..1a1d6bb 100644 --- a/app/DD_Clipboard_Searcher/ClassInit.vb +++ b/app/DD_Clipboard_Searcher/ClassInit.vb @@ -269,7 +269,7 @@ Public Class ClassInit If CheckModuleData() = False Then Return False End If - Dim oSQL1 = String.Format("SELECT * FROM VWDD_USER_CLIENT WHERE UPPER(USERNAME) = UPPER('{0}')", Environment.UserName) + Dim oSQL1 = String.Format("SELECT * FROM VWDD_USER_CLIENT WHERE UPPER(USERNAME) = UPPER('{0}')", USER_USERNAME) DT_CLIENT_USER = _DataASorDB.GetDatatable(oSQL1, "VWDD_USER_CLIENT", $"USER_ID = {USER_ID}", "", "") 'If APPSERVER_ACTIVE = True Then diff --git a/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb b/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb index 111595c..32555a8 100644 --- a/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb +++ b/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb @@ -82,6 +82,15 @@ Namespace My Return CType(Me("UseAppConfigConString"),Boolean) End Get End Property + + _ + Public ReadOnly Property GHOSTUSER() As String + Get + Return CType(Me("GHOSTUSER"),String) + End Get + End Property End Class End Namespace diff --git a/app/DD_Clipboard_Searcher/My Project/Settings.settings b/app/DD_Clipboard_Searcher/My Project/Settings.settings index 9167628..024087b 100644 --- a/app/DD_Clipboard_Searcher/My Project/Settings.settings +++ b/app/DD_Clipboard_Searcher/My Project/Settings.settings @@ -16,5 +16,8 @@ True + + SchreiberM + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/frmMain.Designer.vb b/app/DD_Clipboard_Searcher/frmMain.Designer.vb index 0377e4e..ab517ab 100644 --- a/app/DD_Clipboard_Searcher/frmMain.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmMain.Designer.vb @@ -216,7 +216,7 @@ Partial Class frmMain Me.NotifyIconMain.BalloonTipTitle = "Title" Me.NotifyIconMain.ContextMenuStrip = Me.cmstrpNotifyIcon Me.NotifyIconMain.Icon = CType(resources.GetObject("NotifyIconMain.Icon"), System.Drawing.Icon) - Me.NotifyIconMain.Text = "NotifyIcon1" + Me.NotifyIconMain.Text = "Clipboard Watcher" Me.NotifyIconMain.Visible = True ' 'cmstrpNotifyIcon diff --git a/app/DD_Clipboard_Searcher/frmMain.resx b/app/DD_Clipboard_Searcher/frmMain.resx index c8ad871..2a0da4e 100644 --- a/app/DD_Clipboard_Searcher/frmMain.resx +++ b/app/DD_Clipboard_Searcher/frmMain.resx @@ -4751,7 +4751,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU - CwAAAk1TRnQBSQFMAgEBBQEAAYABAAGAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBQEAAYgBAAGIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD_Clipboard_Searcher/frmSplash.Designer.vb b/app/DD_Clipboard_Searcher/frmSplash.Designer.vb index ca99222..2433ee1 100644 --- a/app/DD_Clipboard_Searcher/frmSplash.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmSplash.Designer.vb @@ -105,6 +105,7 @@ Partial Class frmSplash Me.Controls.Add(Me.PictureBox2) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.KeyPreview = True Me.Name = "frmSplash" Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen diff --git a/app/DD_Clipboard_Searcher/frmSplash.vb b/app/DD_Clipboard_Searcher/frmSplash.vb index 653e6e9..6f53729 100644 --- a/app/DD_Clipboard_Searcher/frmSplash.vb +++ b/app/DD_Clipboard_Searcher/frmSplash.vb @@ -48,7 +48,10 @@ Public NotInheritable Class frmSplash Thread.Sleep(200) Worker.ReportProgress(CalcProgress(4), "Initializing User-Configuration") - If Init.InitUserLogin = False Then + If My.Settings.GHOSTUSER <> String.Empty Then + Logger.Info($"GHOSTLogin [{My.Settings.GHOSTUSER} is active!") + End If + If Init.InitUserLogin(My.Settings.GHOSTUSER) = False Then If ERROR_INIT = "" Then ERROR_INIT = "INVALID USER" End If @@ -80,4 +83,10 @@ Public NotInheritable Class frmSplash ' Wenn kein Fehler, Splashscreen schließen Close() End Sub + + Private Sub frmSplash_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown + If e.KeyCode = Keys.Escape Then + + End If + End Sub End Class