diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb index 7953753..8909423 100644 --- a/app/DD_Clipboard_Searcher/ClassInit.vb +++ b/app/DD_Clipboard_Searcher/ClassInit.vb @@ -246,12 +246,12 @@ Public Class ClassInit Public Shared Sub Refresh_Profile_Links() Try - Dim oSql = String.Format("SELECT DISTINCT GUID, NAME,REGEX_EXPRESSION,COMMENT,PROC_NAME,PROFILE_TYPE FROM VWCW_USER_PROFILE WHERE ACTIVE = 1 AND USER_ID = {0} OR GROUP_ID IN (SELECT DISTINCT GUID FROM TBDD_GROUPS WHERE GUID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {0}))", USER_ID) + Dim oSql = String.Format("SELECT DISTINCT GUID, NAME,REGEX_EXPRESSION,COMMENT,PROC_NAME,PROFILE_TYPE FROM VWCW_USER_PROFILE WHERE USER_ID = {0} OR GROUP_ID IN (SELECT DISTINCT GUID FROM TBDD_GROUPS WHERE GUID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {0}))", USER_ID) DT_USER_PROFILES = Database.GetDatatable(oSql) If DT_USER_PROFILES Is Nothing OrElse DT_USER_PROFILES.Rows.Count = 0 Then MsgBox("No profiles configured for this user so far!", MsgBoxStyle.Exclamation) Else - oSql = $"SELECT T.* FROM TBCW_PROFILE_PROCESS T, VWPM_PROFILE_USER T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND T1.USER_ID = {USER_ID}" + oSql = $"SELECT T.* FROM TBCW_PROFILE_PROCESS T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.GUID AND T1.USER_ID = {USER_ID}" DTPROFILE_REL_PROCESS = Database.GetDatatable(oSql) oSql = $"SELECT * FROM VWCW_PROFILE_REL_WINDOW WHERE USER_ID = {USER_ID}" diff --git a/app/DD_Clipboard_Searcher/ClassProfileFilter.vb b/app/DD_Clipboard_Searcher/ClassProfileFilter.vb index 55674ac..b983ae5 100644 --- a/app/DD_Clipboard_Searcher/ClassProfileFilter.vb +++ b/app/DD_Clipboard_Searcher/ClassProfileFilter.vb @@ -116,7 +116,7 @@ Public Class ClassProfileFilter Dim oRegex As New Regex(oProfile.Regex) Dim oMatch = oRegex.Match(ClipboardContents) If oMatch.Success Then - Logger.Debug("Global Clipboard Regex Matched: {0}", ClipboardContents) + Logger.Debug("FilterProfilesByClipboardRegex: Clipboard Regex Matched: {0}", ClipboardContents) 'TODO: Add Debug Data oFilteredProfiles.Add(oProfile) oProfile.IsMatched = True @@ -143,15 +143,21 @@ Public Class ClassProfileFilter Dim oFilteredProfiles As New List(Of ProfileData) Try For Each oProfile In Profiles - If oProfile.IsMatched = False Then Continue For + Dim oGuid = oProfile.Guid + + If oProfile.IsMatched = False Then + Continue For + End If Dim oProcesses As New List(Of ProcessData) For Each oProcessDef As ProcessData In oProfile.Processes - - Logger.Debug($"Checking Profile: {oProfile.Name} ...") + If oProcessDef.PROFILE_ID <> oGuid Then + Continue For + End If + Logger.Debug($"FilterProfilesByProcess: Checking Profile: {oProfile.Name} ...") If oProcessDef.ProcessName.ToLower = CurrentProcessName.ToLower Then - Logger.Debug($"Processname Matched: {oProcessDef.ProcessName}") + Logger.Debug($"Yes...Processname Matched: {oProcessDef.ProcessName}") 'oProfile.MATCH_PROCESSNAME = $"Processname Matched: {oProfile.ProcessName}" 'TODO: Add Debug Data oFilteredProfiles.Add(oProfile) @@ -197,13 +203,12 @@ Public Class ClassProfileFilter Dim oProfiles As New List(Of ProfileData) For Each oProfile As ProfileData In Profiles - Logger.Debug("Checking Profile: {0} for WindowDefinition...", oProfile.Name) + Logger.Debug("Checking WindowDefinition for profile: {0}...", oProfile.Name) If oProfile.IsMatched = False Then Continue For Dim oWindows As New List(Of WindowData) For Each oWindowDef As WindowData In oProfile.Windows If oWindowDef.WindowProcessID <> oProfile.MatchedProcessID Then Continue For - Logger.Debug($"Checking Windowdefinition: {oWindowDef.Guid} ...") Try If oWindowDef.Regex = String.Empty Then oProfile.MatchedWindowID = oWindowDef.Guid @@ -311,7 +316,7 @@ Public Class ClassProfileFilter oFocusedControl = GetFocusedControl(oWindow.hWnd) If oFocusedControl Is Nothing Then - Logger.Warn("Could not get FocusedControl in Window (Old method) {0}", oWindow.WindowTitle) + Logger.Info("Could not get FocusedControl in Window (Old method) {0}", oWindow.WindowTitle) oFocusedControlName = String.Empty Else oFocusedControlName = oFocusedControl.ControlName @@ -326,6 +331,7 @@ Public Class ClassProfileFilter For Each oProfileMatchedSofar In Profiles If oProfileMatchedSofar.IsMatched = False Then Continue For + Logger.Debug("Checking ControlDefiniotion on profile: {0}", oProfileMatchedSofar.Name) If oProfileMatchedSofar.Controls.Count = 0 Then oFilteredProfiles.Add(oProfileMatchedSofar) @@ -344,7 +350,7 @@ Public Class ClassProfileFilter For Each oControlDefinition In oProfileMatchedSofar.Controls Try - 'If oControlDefinition.WINDOW_ID <> oProfile.MatchedWindowID Then Continue For + If oControlDefinition.WINDOW_ID <> oProfileMatchedSofar.MatchedWindowID Then Continue For Logger.Debug($"Working on ControlDefinition: {oControlDefinition.Guid}-{oControlDefinition.ControlName}...") If oControlDefinition.Regex = String.Empty Then oProfileMatchedSofar.MatchedControlID = oControlDefinition.Guid @@ -395,7 +401,7 @@ Public Class ClassProfileFilter If Not IsNothing(olowestNode) Then Dim oNode As New TreeNode($"MATCH on Focused Control [{oFocusedControlResult}] with Regex [{oControlDefinition.Regex}]") oNode.ImageIndex = 2 - oNode.Tag = oProfileMatchedSofar.Name & "-WINDOW" + oNode.Tag = oProfileMatchedSofar.Name & "-CONTROL" olowestNode.Nodes.Add(oNode) End If Exit For @@ -410,6 +416,14 @@ Public Class ClassProfileFilter If oControls.Count > 0 Then oProfileMatchedSofar.Controls = oControls oFilteredProfiles.Add(oProfileMatchedSofar) + Else + Dim olowestNode As TreeNode = Node_Get_Lowest_Node(oProfileMatchedSofar.Name & "-REGEX") + If Not IsNothing(olowestNode) Then + Dim oNode As New TreeNode($"NO MATCHES on Focused Control, Please check the Config") + oNode.ImageIndex = 2 + oNode.Tag = oProfileMatchedSofar.Name & "-CONTROLNoMatch" + olowestNode.Nodes.Add(oNode) + End If End If Next diff --git a/app/DD_Clipboard_Searcher/MyDataset.Designer.vb b/app/DD_Clipboard_Searcher/MyDataset.Designer.vb index 4d63c8c..1112d8f 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.Designer.vb +++ b/app/DD_Clipboard_Searcher/MyDataset.Designer.vb @@ -1966,8 +1966,6 @@ Partial Public Class MyDataset MyBase.Columns.Add(Me.columnADDED_WHEN) Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) Me.columnGUID.AutoIncrement = true - Me.columnGUID.AutoIncrementSeed = -1 - Me.columnGUID.AutoIncrementStep = -1 Me.columnGUID.AllowDBNull = false Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true @@ -2382,8 +2380,6 @@ Partial Public Class MyDataset MyBase.Columns.Add(Me.columnCOUNT_COMMAND) Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) Me.columnGUID.AutoIncrement = true - Me.columnGUID.AutoIncrementSeed = -1 - Me.columnGUID.AutoIncrementStep = -1 Me.columnGUID.AllowDBNull = false Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true @@ -2807,8 +2803,6 @@ Partial Public Class MyDataset MyBase.Columns.Add(Me.columnCOUNT_COMMAND) Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) Me.columnGUID.AutoIncrement = true - Me.columnGUID.AutoIncrementSeed = -1 - Me.columnGUID.AutoIncrementStep = -1 Me.columnGUID.AllowDBNull = false Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true @@ -3787,8 +3781,6 @@ Partial Public Class MyDataset MyBase.Columns.Add(Me.columnPROCESS_ID) Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) Me.columnGUID.AutoIncrement = true - Me.columnGUID.AutoIncrementSeed = -1 - Me.columnGUID.AutoIncrementStep = -1 Me.columnGUID.AllowDBNull = false Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true @@ -4626,8 +4618,6 @@ Partial Public Class MyDataset MyBase.Columns.Add(Me.columnFRAMEWORK_ID) Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) Me.columnGUID.AutoIncrement = true - Me.columnGUID.AutoIncrementSeed = -1 - Me.columnGUID.AutoIncrementStep = -1 Me.columnGUID.AllowDBNull = false Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true diff --git a/app/DD_Clipboard_Searcher/MyDataset.xsd b/app/DD_Clipboard_Searcher/MyDataset.xsd index 424c5eb..78da187 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.xsd +++ b/app/DD_Clipboard_Searcher/MyDataset.xsd @@ -769,7 +769,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -815,7 +815,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -832,7 +832,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -861,7 +861,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -872,10 +872,10 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + - + @@ -895,10 +895,10 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + - + @@ -943,10 +943,10 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + - + @@ -991,7 +991,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1008,7 +1008,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1016,7 +1016,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1030,7 +1030,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1038,10 +1038,10 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + - + @@ -1077,7 +1077,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1150,10 +1150,10 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + - + @@ -1252,10 +1252,10 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - - - - + + + + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/MyDataset.xss b/app/DD_Clipboard_Searcher/MyDataset.xss index 2501a22..a7ca54e 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.xss +++ b/app/DD_Clipboard_Searcher/MyDataset.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/app/DD_Clipboard_Searcher/frmConfig_Basic.Designer.vb b/app/DD_Clipboard_Searcher/frmConfig_Basic.Designer.vb index a2f6d7c..c834157 100644 --- a/app/DD_Clipboard_Searcher/frmConfig_Basic.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmConfig_Basic.Designer.vb @@ -227,7 +227,7 @@ Partial Class frmConfig_Basic Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) Me.TabPage2.Size = New System.Drawing.Size(668, 160) Me.TabPage2.TabIndex = 1 - Me.TabPage2.Text = "Tastaturkombination und Eisntellungen" + Me.TabPage2.Text = "Tastaturkombination und Einstellungen" Me.TabPage2.UseVisualStyleBackColor = True ' 'lblChanges diff --git a/app/DD_Clipboard_Searcher/frmControlCapture.vb b/app/DD_Clipboard_Searcher/frmControlCapture.vb index 7630799..dd03e35 100644 --- a/app/DD_Clipboard_Searcher/frmControlCapture.vb +++ b/app/DD_Clipboard_Searcher/frmControlCapture.vb @@ -37,6 +37,7 @@ Public Class frmControlCapture End Sub Private Sub frmControlCapture_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + Timer1.Stop() Automation.RemoveHandler() End Sub @@ -53,6 +54,7 @@ Public Class frmControlCapture MsgBox("Es muss entweder die AutomationId oder der Feldname ausgewählt sein!", MsgBoxStyle.Exclamation, Text) DialogResult = DialogResult.None End If + Timer1.Stop() End Sub Private Sub chkControlName_CheckedChanged(sender As Object, e As EventArgs) Handles chkControlName.CheckedChanged @@ -66,4 +68,8 @@ Public Class frmControlCapture chkControlName.Checked = False End If End Sub + + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Timer1.Stop() + End Sub End Class \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/frmDocView.vb b/app/DD_Clipboard_Searcher/frmDocView.vb index f5cdee7..46ca37f 100644 --- a/app/DD_Clipboard_Searcher/frmDocView.vb +++ b/app/DD_Clipboard_Searcher/frmDocView.vb @@ -23,43 +23,48 @@ Public Class frmDocView Private _toggleGamma As Boolean = True Private Sub frmMain_Load(ByVal sender As System.Object, ByVal e As EventArgs) Handles MyBase.Load - If GDPICTURE_LICENSE = String.Empty Then - Logger.Warn("GD Picture Missing! Please add a license to the Database!") - MsgBox($"Lizenz für den Dokumenten Viewer wurde nicht konfiguriert.{vbNewLine}Bitte wenden Sie sich an Digital Data!", MsgBoxStyle.Exclamation, "Clipboard Watcher") - Me.Close() + Try + If GDPICTURE_LICENSE = String.Empty Then + Logger.Warn("GD Picture Missing! Please add a license to the Database!") + MsgBox($"Lizenz für den Dokumenten Viewer wurde nicht konfiguriert.{vbNewLine}Bitte wenden Sie sich an Digital Data!", MsgBoxStyle.Exclamation, "Clipboard Watcher") + Me.Close() - End If + End If - Dim oLicenceManager As New GdPicture14.LicenseManager() - oLicenceManager.RegisterKEY(GDPICTURE_LICENSE) 'Please, replace XXXX by a valid demo or commercial license key. + Dim oLicenceManager As New GdPicture14.LicenseManager() + oLicenceManager.RegisterKEY(GDPICTURE_LICENSE) 'Please, replace XXXX by a valid demo or commercial license key. - Dim zoomModes As New Dictionary(Of ZoomMode, String) From { - {ZoomMode.Zoom50, "50%"}, - {ZoomMode.Zoom100, "100%"}, - {ZoomMode.Zoom150, "150%"}, - {ZoomMode.Zoom200, "200%"}, - {ZoomMode.ZoomSelectedArea, "Zoom to selected area"}, - {ZoomMode.ZoomFitToViewer, "Fit to viewer"}, - {ZoomMode.ZoomFitWidth, "Fit to viewer width"}, - {ZoomMode.ZoomFitHeight, "Fit to viewer height"} - } - For Each item In zoomModes - cbZoom.Items.Add(item.Value) - Next + Dim zoomModes As New Dictionary(Of ZoomMode, String) From { + {ZoomMode.Zoom50, "50%"}, + {ZoomMode.Zoom100, "100%"}, + {ZoomMode.Zoom150, "150%"}, + {ZoomMode.Zoom200, "200%"}, + {ZoomMode.ZoomSelectedArea, "Zoom to selected area"}, + {ZoomMode.ZoomFitToViewer, "Fit to viewer"}, + {ZoomMode.ZoomFitWidth, "Fit to viewer width"}, + {ZoomMode.ZoomFitHeight, "Fit to viewer height"} + } + For Each item In zoomModes + cbZoom.Items.Add(item.Value) + Next - Dim imageListSearchResults As New ImageList - imageListSearchResults.ImageSize = New Size(20, 20) - imageListSearchResults.Images.Add(CType(My.Resources.ResourceManager.GetObject("search"), Image)) + Dim imageListSearchResults As New ImageList + imageListSearchResults.ImageSize = New Size(20, 20) + imageListSearchResults.Images.Add(CType(My.Resources.ResourceManager.GetObject("search"), Image)) - UpdateMainUi() + UpdateMainUi() - If Not ConfigManager.Config.ViewerWindowLocation.IsEmpty Then - Location = ConfigManager.Config.ViewerWindowLocation - End If + If Not ConfigManager.Config.ViewerWindowLocation.IsEmpty Then + Location = ConfigManager.Config.ViewerWindowLocation + End If + + If Not ConfigManager.Config.ViewerWindowSize.IsEmpty Then + Size = ConfigManager.Config.ViewerWindowSize + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical) + End Try - If Not ConfigManager.Config.ViewerWindowSize.IsEmpty Then - Size = ConfigManager.Config.ViewerWindowSize - End If End Sub Public Sub Load_File_from_Path(filepath As String) CloseDocument() diff --git a/app/DD_Clipboard_Searcher/frmResultDoc.vb b/app/DD_Clipboard_Searcher/frmResultDoc.vb index 11e6f37..e791da1 100644 --- a/app/DD_Clipboard_Searcher/frmResultDoc.vb +++ b/app/DD_Clipboard_Searcher/frmResultDoc.vb @@ -448,55 +448,60 @@ Public Class frmResultDoc End Try End Sub Sub Refresh_DocID(myGrid As GridView) - _activeGridView = myGrid - clsWMDocGrid.ActiveDocGrid = myGrid - clsWMDocGrid.ActiveDocGrid.EndSelection() - clsWMDocGrid.GetDocItems() Try - ContextMenuStripWMFile.Close() - Catch ex As Exception + _activeGridView = myGrid + clsWMDocGrid.ActiveDocGrid = myGrid + clsWMDocGrid.ActiveDocGrid.EndSelection() + clsWMDocGrid.GetDocItems() + Try + ContextMenuStripWMFile.Close() + Catch ex As Exception + End Try + + If ToolStripDropDownButtonFile.Visible = False Then + ToolStripDropDownButtonFile.Visible = True + End If + If clsWMDocGrid.SELECTED_DOC_ID <> 0 Then + Dim msg = "Doc-ID: " & clsWMDocGrid.SELECTED_DOC_ID.ToString + tslblDocID.Text = msg + ToolStripDropDownButtonFile.Enabled = True + Dim frmCollection As New FormCollection() + frmCollection = Application.OpenForms() + Try + If frmCollection.Item("frmDocView").IsHandleCreated Then + 'MsgBox("Yes Opened") + _frmDocView.Load_File_from_Path(clsWMDocGrid.SELECTED_DOC_PATH) + Else + Dim f As New frmDocView + With f + .Show() + .Load_File_from_Path(clsWMDocGrid.SELECTED_DOC_PATH) + + End With + End If + Catch ex As Exception + If ConfigManager.Config.LoadDocumentView = True Then + Dim newDocView As New frmDocView + With newDocView + .Show() + .Load_File_from_Path(clsWMDocGrid.SELECTED_DOC_PATH) + End With + _frmDocView = newDocView + ToolStripButtonDocView.Checked = True + Else + ToolStripButtonDocView.Checked = False + End If + End Try + BringToFront() + Else + tslblDocID.Text = "DocRow not selected" + ToolStripDropDownButtonFile.Enabled = False + End If + Catch ex As Exception + Logger.Error(ex) End Try - If ToolStripDropDownButtonFile.Visible = False Then - ToolStripDropDownButtonFile.Visible = True - End If - If clsWMDocGrid.SELECTED_DOC_ID <> 0 Then - Dim msg = "Doc-ID: " & clsWMDocGrid.SELECTED_DOC_ID.ToString - tslblDocID.Text = msg - ToolStripDropDownButtonFile.Enabled = True - Dim frmCollection As New FormCollection() - frmCollection = Application.OpenForms() - Try - If frmCollection.Item("frmDocView").IsHandleCreated Then - 'MsgBox("Yes Opened") - _frmDocView.Load_File_from_Path(clsWMDocGrid.SELECTED_DOC_PATH) - Else - Dim f As New frmDocView - With f - .Show() - .Load_File_from_Path(clsWMDocGrid.SELECTED_DOC_PATH) - - End With - End If - Catch ex As Exception - If ConfigManager.Config.LoadDocumentView = True Then - Dim newDocView As New frmDocView - With newDocView - .Show() - .Load_File_from_Path(clsWMDocGrid.SELECTED_DOC_PATH) - End With - _frmDocView = newDocView - ToolStripButtonDocView.Checked = True - Else - ToolStripButtonDocView.Checked = False - End If - End Try - BringToFront() - Else - tslblDocID.Text = "DocRow not selected" - ToolStripDropDownButtonFile.Enabled = False - End If End Sub Private Sub GridViewDocSearch_FocusedRowChanged(sender As GridView, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewDocSearch1.FocusedRowChanged, GridViewDocSearch2.FocusedRowChanged, GridViewDocSearch3.FocusedRowChanged, GridViewDocSearch4.FocusedRowChanged, GridViewDocSearch5.FocusedRowChanged _activeGridView = sender diff --git a/app/DD_Clipboard_Searcher/frmStart.Designer.vb b/app/DD_Clipboard_Searcher/frmStart.Designer.vb index 9bd8352..88def45 100644 --- a/app/DD_Clipboard_Searcher/frmStart.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmStart.Designer.vb @@ -43,6 +43,8 @@ Partial Class frmStart Me.btnAdminConfig = New System.Windows.Forms.Button() Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components) Me.TimerRefresh = New System.Windows.Forms.Timer(Me.components) + Me.AblaufAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.BisherigenAblaufAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmstrpNotifyIcon.SuspendLayout() Me.StatusStrip1.SuspendLayout() Me.ContextMenuStripForm.SuspendLayout() @@ -61,9 +63,9 @@ Partial Class frmStart ' 'cmstrpNotifyIcon ' - Me.cmstrpNotifyIcon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiChangeState, Me.ClientÖffnenToolStripMenuItem, Me.ClientBeendenToolStripMenuItem}) + Me.cmstrpNotifyIcon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AblaufAnzeigenToolStripMenuItem, Me.tsmiChangeState, Me.ClientÖffnenToolStripMenuItem, Me.ClientBeendenToolStripMenuItem}) Me.cmstrpNotifyIcon.Name = "cmstrpNotifyIcon" - Me.cmstrpNotifyIcon.Size = New System.Drawing.Size(250, 70) + Me.cmstrpNotifyIcon.Size = New System.Drawing.Size(250, 114) ' 'tsmiChangeState ' @@ -211,6 +213,19 @@ Partial Class frmStart ' Me.TimerRefresh.Interval = 120000 ' + 'AblaufAnzeigenToolStripMenuItem + ' + Me.AblaufAnzeigenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BisherigenAblaufAnzeigenToolStripMenuItem}) + Me.AblaufAnzeigenToolStripMenuItem.Name = "AblaufAnzeigenToolStripMenuItem" + Me.AblaufAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(249, 22) + Me.AblaufAnzeigenToolStripMenuItem.Text = "Funktionen" + ' + 'BisherigenAblaufAnzeigenToolStripMenuItem + ' + Me.BisherigenAblaufAnzeigenToolStripMenuItem.Name = "BisherigenAblaufAnzeigenToolStripMenuItem" + Me.BisherigenAblaufAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(217, 22) + Me.BisherigenAblaufAnzeigenToolStripMenuItem.Text = "Bisherigen Ablauf anzeigen" + ' 'frmStart ' Me.Appearance.Options.UseFont = True @@ -260,4 +275,6 @@ Partial Class frmStart Friend WithEvents ImageList1 As ImageList Friend WithEvents TimerRefresh As Timer Friend WithEvents lblrefresh As ToolStripStatusLabel + Friend WithEvents AblaufAnzeigenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents BisherigenAblaufAnzeigenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/app/DD_Clipboard_Searcher/frmStart.resx b/app/DD_Clipboard_Searcher/frmStart.resx index 1f7fa8e..481d33e 100644 --- a/app/DD_Clipboard_Searcher/frmStart.resx +++ b/app/DD_Clipboard_Searcher/frmStart.resx @@ -4663,7 +4663,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU - CwAAAk1TRnQBSQFMAgEBBQEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBQEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD_Clipboard_Searcher/frmStart.vb b/app/DD_Clipboard_Searcher/frmStart.vb index e295929..b344c28 100644 --- a/app/DD_Clipboard_Searcher/frmStart.vb +++ b/app/DD_Clipboard_Searcher/frmStart.vb @@ -314,4 +314,8 @@ Public Class frmStart lblrefresh.Text = $"Refreshed: {Now.ToShortTimeString} - UserLoggedIn: {USERCOUNT_LOGGED_IN}" End Sub + + Private Sub BisherigenAblaufAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BisherigenAblaufAnzeigenToolStripMenuItem.Click + frmTreeView.ShowDialog() + End Sub End Class