diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj index dcc93a8..0ae0690 100644 --- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj +++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj @@ -54,37 +54,21 @@ False ..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll - + + + + + False - D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll - + False - D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll - + False - D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll - + False - D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll - - - False - D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll - - - False - D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll - - - False - D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll - - - False - D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll @@ -180,6 +164,12 @@ True MyDataset.xsd + + WaitForm1.vb + + + Form + @@ -211,6 +201,9 @@ My.Resources Designer + + WaitForm1.vb + @@ -256,6 +249,7 @@ + diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj.bak b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj.bak new file mode 100644 index 0000000..cf4f50b --- /dev/null +++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj.bak @@ -0,0 +1,271 @@ + + + + + Debug + AnyCPU + {09BC9934-1A38-4752-8873-639B42779CDB} + WinExe + DD_Clipboard_Watcher.My.MyApplication + DD_Clipboard_Watcher + DD_Clipboard_Watcher + 512 + WindowsForms + v4.5.1 + true + + + AnyCPU + true + full + true + true + bin\Debug\ + DD_Clipboard_Watcher.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + DD_Clipboard_Watcher.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + DD_Icons_ICO_CBWATCHER_48px.ico + + + + False + ..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll + + + False + + + + False + + + + False + + + + False + + + + False + + + + False + + + False + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + frmAdministration.vb + + + Form + + + frmClientLogin.vb + + + Form + + + frmLicense.vb + + + Form + + + Form + + + frmMain.vb + Form + + + frmConfig_Basic.vb + + + Form + + + frmSplash.vb + + + Form + + + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + True + True + MyDataset.xsd + + + + + frmAdministration.vb + Designer + + + frmClientLogin.vb + + + frmClientLogin.vb + + + frmLicense.vb + + + frmMain.vb + + + frmConfig_Basic.vb + + + frmSplash.vb + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + MyDataset.xsd + + + Designer + MSDataSetGenerator + MyDataset.Designer.vb + + + MyDataset.xsd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/My Project/Resources.Designer.vb b/app/DD_Clipboard_Searcher/My Project/Resources.Designer.vb index e70e3f4..c7b3d55 100644 --- a/app/DD_Clipboard_Searcher/My Project/Resources.Designer.vb +++ b/app/DD_Clipboard_Searcher/My Project/Resources.Designer.vb @@ -70,6 +70,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property asterisk_orange() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("asterisk_orange", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD_Clipboard_Searcher/My Project/Resources.resx b/app/DD_Clipboard_Searcher/My Project/Resources.resx index 2fbcc9d..a00cbd6 100644 --- a/app/DD_Clipboard_Searcher/My Project/Resources.resx +++ b/app/DD_Clipboard_Searcher/My Project/Resources.resx @@ -118,20 +118,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\ReduceSize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\GoToDefinition_5575.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\KeyDown_8461.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\KeyOutput_8167.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\startwithoutdebugging_6556.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\control_start_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\KeyOutput_8167.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\StatusAnnotations_Stop_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -139,16 +139,19 @@ ..\Resources\Symbols_Stop_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ReduceSize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Annotation_New.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\KeyDown_8461.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\folder_Open_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Annotation_New.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\control_start_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\asterisk_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/My Project/licenses.licx b/app/DD_Clipboard_Searcher/My Project/licenses.licx index 16b05ba..824a99f 100644 --- a/app/DD_Clipboard_Searcher/My Project/licenses.licx +++ b/app/DD_Clipboard_Searcher/My Project/licenses.licx @@ -1 +1 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_Clipboard_Searcher/My Project/licenses.licx.bak b/app/DD_Clipboard_Searcher/My Project/licenses.licx.bak new file mode 100644 index 0000000..4308626 --- /dev/null +++ b/app/DD_Clipboard_Searcher/My Project/licenses.licx.bak @@ -0,0 +1 @@ +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_Clipboard_Searcher/MyDataset.Designer.vb b/app/DD_Clipboard_Searcher/MyDataset.Designer.vb index d249a75..5ae7673 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.Designer.vb +++ b/app/DD_Clipboard_Searcher/MyDataset.Designer.vb @@ -441,6 +441,8 @@ Partial Public Class MyDataset Private columnCHANGED_WHEN As Global.System.Data.DataColumn + Private columnACTIVE As Global.System.Data.DataColumn + _ Public Sub New() @@ -548,6 +550,14 @@ Partial Public Class MyDataset End Get End Property + _ + Public ReadOnly Property ACTIVEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnACTIVE + End Get + End Property + _ @@ -585,9 +595,9 @@ Partial Public Class MyDataset _ - Public Overloads Function AddTBCW_PROFILESRow(ByVal NAME As String, ByVal COMMENT As String, ByVal WD_SEARCH As String, ByVal REGEX_EXPRESSION As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBCW_PROFILESRow + Public Overloads Function AddTBCW_PROFILESRow(ByVal NAME As String, ByVal COMMENT As String, ByVal WD_SEARCH As String, ByVal REGEX_EXPRESSION As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal ACTIVE As Boolean) As TBCW_PROFILESRow Dim rowTBCW_PROFILESRow As TBCW_PROFILESRow = CType(Me.NewRow,TBCW_PROFILESRow) - Dim columnValuesArray() As Object = New Object() {Nothing, NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + Dim columnValuesArray() As Object = New Object() {Nothing, NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE} rowTBCW_PROFILESRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBCW_PROFILESRow) Return rowTBCW_PROFILESRow @@ -625,6 +635,7 @@ Partial Public Class MyDataset Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + Me.columnACTIVE = MyBase.Columns("ACTIVE") End Sub _ + Public Property ACTIVE() As Boolean + Get + Return CType(Me(Me.tableTBCW_PROFILES.ACTIVEColumn),Boolean) + End Get + Set + Me(Me.tableTBCW_PROFILES.ACTIVEColumn) = value + End Set + End Property + _ Public Function IsCOMMENTNull() As Boolean @@ -3030,6 +3056,7 @@ Namespace MyDatasetTableAdapters tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -3039,29 +3066,31 @@ Namespace MyDatasetTableAdapters Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO TBCW_PROFILES"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (NAME, COMMENT, WD_SEARCH, RE"& _ - "GEX_EXPRESSION, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@NAME,@COMMENT,@WD_SEARCH,@REGEX_EXPR"& _ - "ESSION,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, "& _ - "ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROFILES WHERE (GUID "& _ - "= SCOPE_IDENTITY())" + "GEX_EXPRESSION, ADDED_WHO, ACTIVE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@NAME,@COMMENT,@WD_SEARCH,@RE"& _ + "GEX_EXPRESSION,@ADDED_WHO,@ACTIVE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, COMMENT, WD_SEARCH, R"& _ + "EGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF"& _ + "ILES WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WD_SEARCH", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "WD_SEARCH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_EXPRESSION", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_EXPRESSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBCW_PROFILES"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET NAME = @NAME, COMMENT = @COMMENT, "& _ "WD_SEARCH = @WD_SEARCH, REGEX_EXPRESSION = @REGEX_EXPRESSION, CHANGED_WHO = @CHA"& _ - "NGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, COMMENT, WD"& _ - "_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM"& _ - " TBCW_PROFILES WHERE (GUID = @GUID)" + "NGED_WHO, ACTIVE = @ACTIVE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID"& _ + ", NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO"& _ + ", CHANGED_WHEN FROM TBCW_PROFILES WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WD_SEARCH", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "WD_SEARCH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_EXPRESSION", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_EXPRESSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -3079,7 +3108,8 @@ Namespace MyDatasetTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT TBCW_PROFILES.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBCW_PROFILES" + Me._commandCollection(0).CommandText = "SELECT GUID, NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ADDED_"& _ + "WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBCW_PROFILES" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -3160,7 +3190,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal COMMENT As String, ByVal WD_SEARCH As String, ByVal REGEX_EXPRESSION As String, ByVal ADDED_WHO As String) As Integer + Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal COMMENT As String, ByVal WD_SEARCH As String, ByVal REGEX_EXPRESSION As String, ByVal ADDED_WHO As String, ByVal ACTIVE As Boolean) As Integer If (NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("NAME") Else @@ -3186,6 +3216,7 @@ Namespace MyDatasetTableAdapters Else Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHO,String) End If + Me.Adapter.InsertCommand.Parameters(5).Value = CType(ACTIVE,Boolean) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -3205,7 +3236,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ - Public Overloads Overridable Function Update(ByVal NAME As String, ByVal COMMENT As String, ByVal WD_SEARCH As String, ByVal REGEX_EXPRESSION As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Update(ByVal NAME As String, ByVal COMMENT As String, ByVal WD_SEARCH As String, ByVal REGEX_EXPRESSION As String, ByVal CHANGED_WHO As String, ByVal ACTIVE As Boolean, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer If (NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("NAME") Else @@ -3231,8 +3262,9 @@ Namespace MyDatasetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String) End If - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(ACTIVE,Boolean) + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/app/DD_Clipboard_Searcher/MyDataset.xsd b/app/DD_Clipboard_Searcher/MyDataset.xsd index 9d805e8..1917f66 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.xsd +++ b/app/DD_Clipboard_Searcher/MyDataset.xsd @@ -9,21 +9,21 @@ - + - + DELETE FROM TBCW_PROFILES WHERE (GUID = @Original_GUID) - + INSERT INTO TBCW_PROFILES - (NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO) -VALUES (@NAME,@COMMENT,@WD_SEARCH,@REGEX_EXPRESSION,@ADDED_WHO); + (NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ACTIVE) +VALUES (@NAME,@COMMENT,@WD_SEARCH,@REGEX_EXPRESSION,@ADDED_WHO,@ACTIVE); SELECT GUID, NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROFILES WHERE (GUID = SCOPE_IDENTITY()) @@ -31,12 +31,13 @@ SELECT GUID, NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, + - - SELECT TBCW_PROFILES.* + + SELECT GUID, NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE FROM TBCW_PROFILES @@ -44,17 +45,18 @@ FROM TBCW_PROFILES UPDATE TBCW_PROFILES -SET NAME = @NAME, COMMENT = @COMMENT, WD_SEARCH = @WD_SEARCH, REGEX_EXPRESSION = @REGEX_EXPRESSION, CHANGED_WHO = @CHANGED_WHO -WHERE (GUID = @Original_GUID); +SET NAME = @NAME, COMMENT = @COMMENT, WD_SEARCH = @WD_SEARCH, REGEX_EXPRESSION = @REGEX_EXPRESSION, CHANGED_WHO = @CHANGED_WHO, ACTIVE = @ACTIVE +WHERE (GUID = @Original_GUID); SELECT GUID, NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROFILES WHERE (GUID = @GUID) - - - - - - - + + + + + + + + @@ -70,6 +72,7 @@ SELECT GUID, NAME, COMMENT, WD_SEARCH, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, + @@ -229,7 +232,7 @@ WHERE (PROFILE_ID = @PID) - + @@ -277,10 +280,11 @@ WHERE (PROFILE_ID = @PID) + - + @@ -297,7 +301,7 @@ WHERE (PROFILE_ID = @PID) - + @@ -326,7 +330,7 @@ WHERE (PROFILE_ID = @PID) - + @@ -338,7 +342,7 @@ WHERE (PROFILE_ID = @PID) - + diff --git a/app/DD_Clipboard_Searcher/MyDataset.xss b/app/DD_Clipboard_Searcher/MyDataset.xss index 2b57ca5..2059d60 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.xss +++ b/app/DD_Clipboard_Searcher/MyDataset.xss @@ -6,7 +6,7 @@ --> - + diff --git a/app/DD_Clipboard_Searcher/Resources/asterisk_orange.png b/app/DD_Clipboard_Searcher/Resources/asterisk_orange.png new file mode 100644 index 0000000..c2b31c2 Binary files /dev/null and b/app/DD_Clipboard_Searcher/Resources/asterisk_orange.png differ diff --git a/app/DD_Clipboard_Searcher/WaitForm1.Designer.vb b/app/DD_Clipboard_Searcher/WaitForm1.Designer.vb new file mode 100644 index 0000000..631f692 --- /dev/null +++ b/app/DD_Clipboard_Searcher/WaitForm1.Designer.vb @@ -0,0 +1,88 @@ + _ +Partial Class WaitForm1 + Inherits DevExpress.XtraWaitForm.WaitForm + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.progressPanel1 = New DevExpress.XtraWaitForm.ProgressPanel() + Me.tableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() + Me.tableLayoutPanel1.SuspendLayout() + Me.SuspendLayout() + ' + 'progressPanel1 + ' + Me.progressPanel1.Appearance.BackColor = System.Drawing.Color.Transparent + Me.progressPanel1.Appearance.Options.UseBackColor = True + Me.progressPanel1.AppearanceCaption.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) + Me.progressPanel1.AppearanceCaption.Options.UseFont = True + Me.progressPanel1.AppearanceDescription.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.progressPanel1.AppearanceDescription.Options.UseFont = True + Me.progressPanel1.BarAnimationElementThickness = 2 + Me.progressPanel1.Caption = "ClipboardWatcher gestartet" + Me.progressPanel1.Description = "Auswertung läuft" + Me.progressPanel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.progressPanel1.ImageHorzOffset = 20 + Me.progressPanel1.Location = New System.Drawing.Point(0, 17) + Me.progressPanel1.Margin = New System.Windows.Forms.Padding(0, 3, 0, 3) + Me.progressPanel1.Name = "progressPanel1" + Me.progressPanel1.Size = New System.Drawing.Size(314, 44) + Me.progressPanel1.TabIndex = 0 + Me.progressPanel1.Text = "progressPanel1" + ' + 'tableLayoutPanel1 + ' + Me.tableLayoutPanel1.AutoSize = True + Me.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.tableLayoutPanel1.BackColor = System.Drawing.Color.Transparent + Me.tableLayoutPanel1.ColumnCount = 1 + Me.tableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) + Me.tableLayoutPanel1.Controls.Add(Me.progressPanel1, 0, 0) + Me.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.tableLayoutPanel1.Location = New System.Drawing.Point(0, 0) + Me.tableLayoutPanel1.Name = "tableLayoutPanel1" + Me.tableLayoutPanel1.Padding = New System.Windows.Forms.Padding(0, 14, 0, 14) + Me.tableLayoutPanel1.RowCount = 1 + Me.tableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) + Me.tableLayoutPanel1.Size = New System.Drawing.Size(314, 78) + Me.tableLayoutPanel1.TabIndex = 1 + ' + 'WaitForm1 + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoSize = True + Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ClientSize = New System.Drawing.Size(314, 78) + Me.Controls.Add(Me.tableLayoutPanel1) + Me.DoubleBuffered = True + Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Name = "WaitForm1" + Me.StartPosition = System.Windows.Forms.FormStartPosition.WindowsDefaultLocation + Me.Text = "Form1" + Me.tableLayoutPanel1.ResumeLayout(False) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Private WithEvents progressPanel1 As DevExpress.XtraWaitForm.ProgressPanel + Private WithEvents tableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel +End Class diff --git a/app/DD_Clipboard_Searcher/WaitForm1.resx b/app/DD_Clipboard_Searcher/WaitForm1.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/app/DD_Clipboard_Searcher/WaitForm1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/WaitForm1.vb b/app/DD_Clipboard_Searcher/WaitForm1.vb new file mode 100644 index 0000000..cf46e65 --- /dev/null +++ b/app/DD_Clipboard_Searcher/WaitForm1.vb @@ -0,0 +1,24 @@ +Public Class WaitForm1 + Sub New + InitializeComponent() + Me.progressPanel1.AutoHeight = True + End Sub + + Public Overrides Sub SetCaption(ByVal caption As String) + MyBase.SetCaption(caption) + Me.progressPanel1.Caption = caption + End Sub + + Public Overrides Sub SetDescription(ByVal description As String) + MyBase.SetDescription(description) + Me.progressPanel1.Description = description + End Sub + + Public Overrides Sub ProcessCommand(ByVal cmd As System.Enum, ByVal arg As Object) + MyBase.ProcessCommand(cmd, arg) + End Sub + + Public Enum WaitFormCommand + SomeCommandId + End Enum +End Class diff --git a/app/DD_Clipboard_Searcher/clsHotkey.vb b/app/DD_Clipboard_Searcher/clsHotkey.vb index 0362927..a519981 100644 --- a/app/DD_Clipboard_Searcher/clsHotkey.vb +++ b/app/DD_Clipboard_Searcher/clsHotkey.vb @@ -22,7 +22,8 @@ Public Class clsHotkey Private Declare Function GlobalDeleteAtom Lib "kernel32" ( _ ByVal Atom As Short) _ As Short - + Private Declare Function GetForegroundWindow Lib "user32" Alias "GetForegroundWindow" () As IntPtr + Private Declare Auto Function GetWindowText Lib "user32" (ByVal hWnd As System.IntPtr, ByVal lpString As System.Text.StringBuilder, ByVal cch As Integer) As Integer Public Class HotKeyObject Private mHotKey As Keys Private mModifier As MODKEY @@ -73,7 +74,7 @@ Public Class clsHotkey End Class Public Shared Sub Refresh_Profile_Links() Try - Dim sql = String.Format("SELECT T.*, T2.PROC_NAME FROM TBCW_PROFILES T, TBCW_USER_PROFILE T1, TBCW_PROFILE_PROCESS T2 WHERE T.GUID = T1.PROFILE_ID AND T.GUID = T2.PROFILE_ID AND T1.USER_ID = {0}", USER_ID) + Dim sql = String.Format("SELECT T.*, T2.PROC_NAME FROM TBCW_PROFILES T, TBCW_USER_PROFILE T1, TBCW_PROFILE_PROCESS T2 WHERE T.GUID = T1.PROFILE_ID AND T.GUID = T2.PROFILE_ID AND T1.USER_ID = {0} AND T.ACTIVE = 1", USER_ID) DT_USER_PROFILES = clsDatabase.Return_Datatable(sql) If DT_USER_PROFILES.Rows.Count = 0 Then MsgBox("No profiles configured for this user so far!", MsgBoxStyle.Exclamation) @@ -136,4 +137,11 @@ Public Class clsHotkey RaiseEvent HotKeyPressed(mHotKeyList(CShort(m.WParam)).HotKeyID) End If End Function + Public Shared Function GetCaption() As String + Dim Caption As New System.Text.StringBuilder(256) + Dim hWnd As IntPtr = GetForegroundWindow() + GetWindowText(hWnd, Caption, Caption.Capacity) + CURR_FOCUSED_WINDOWNAME = Caption.ToString() + Return Caption.ToString() + End Function End Class diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index 7d81040..13d56ba 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb @@ -92,8 +92,8 @@ Partial Class frmAdministration Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog() Me.VWUSER_PROFILETableAdapter = New DD_Clipboard_Watcher.MyDatasetTableAdapters.VWUSER_PROFILETableAdapter() Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.lblprocessCheckActive = New System.Windows.Forms.Label() Me.btnStartStopProcess = New System.Windows.Forms.Button() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.txtProcessName = New System.Windows.Forms.TextBox() Me.txtPID = New System.Windows.Forms.TextBox() Me.Label4 = New System.Windows.Forms.Label() @@ -117,6 +117,7 @@ Partial Class frmAdministration Me.Label6 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) + Me.ACTIVECheckBox = New System.Windows.Forms.CheckBox() GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() COMMENTLabel = New System.Windows.Forms.Label() @@ -143,7 +144,6 @@ Partial Class frmAdministration CType(Me.GridViewProfileUser, System.ComponentModel.ISupportInitialize).BeginInit() Me.StatusStrip1.SuspendLayout() Me.GroupBox3.SuspendLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROFILE_PROCESSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewProcessProfile, System.ComponentModel.ISupportInitialize).BeginInit() @@ -243,21 +243,20 @@ Partial Class frmAdministration ' 'GroupBox1 ' - Me.GroupBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.GroupBox1.Controls.Add(Me.grpbxProfiles) Me.GroupBox1.Controls.Add(Me.GridControl1) Me.GroupBox1.Controls.Add(Me.TBCW_PROFILESBindingNavigator) Me.GroupBox1.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox1.Location = New System.Drawing.Point(12, 12) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(570, 318) + Me.GroupBox1.Size = New System.Drawing.Size(629, 322) Me.GroupBox1.TabIndex = 0 Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Profile" + Me.GroupBox1.Text = "Konfigurierte Profile" ' 'grpbxProfiles ' + Me.grpbxProfiles.Controls.Add(Me.ACTIVECheckBox) Me.grpbxProfiles.Controls.Add(GUIDLabel) Me.grpbxProfiles.Controls.Add(Me.btnaddSearch) Me.grpbxProfiles.Controls.Add(Me.CHANGED_WHENTextBox) @@ -280,14 +279,14 @@ Partial Class frmAdministration Me.grpbxProfiles.Enabled = False Me.grpbxProfiles.Location = New System.Drawing.Point(177, 48) Me.grpbxProfiles.Name = "grpbxProfiles" - Me.grpbxProfiles.Size = New System.Drawing.Size(381, 264) + Me.grpbxProfiles.Size = New System.Drawing.Size(442, 268) Me.grpbxProfiles.TabIndex = 20 Me.grpbxProfiles.TabStop = False ' 'btnaddSearch ' Me.btnaddSearch.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnaddSearch.Location = New System.Drawing.Point(333, 111) + Me.btnaddSearch.Location = New System.Drawing.Point(401, 111) Me.btnaddSearch.Name = "btnaddSearch" Me.btnaddSearch.Size = New System.Drawing.Size(28, 23) Me.btnaddSearch.TabIndex = 19 @@ -369,7 +368,7 @@ Partial Class frmAdministration Me.COMMENTTextBox.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.COMMENTTextBox.Location = New System.Drawing.Point(13, 73) Me.COMMENTTextBox.Name = "COMMENTTextBox" - Me.COMMENTTextBox.Size = New System.Drawing.Size(348, 21) + Me.COMMENTTextBox.Size = New System.Drawing.Size(416, 21) Me.COMMENTTextBox.TabIndex = 1 ' 'REGEX_EXPRESSIONTextBox @@ -378,7 +377,7 @@ Partial Class frmAdministration Me.REGEX_EXPRESSIONTextBox.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.REGEX_EXPRESSIONTextBox.Location = New System.Drawing.Point(13, 153) Me.REGEX_EXPRESSIONTextBox.Name = "REGEX_EXPRESSIONTextBox" - Me.REGEX_EXPRESSIONTextBox.Size = New System.Drawing.Size(348, 21) + Me.REGEX_EXPRESSIONTextBox.Size = New System.Drawing.Size(416, 21) Me.REGEX_EXPRESSIONTextBox.TabIndex = 3 ' 'WD_SEARCHTextBox @@ -387,7 +386,7 @@ Partial Class frmAdministration Me.WD_SEARCHTextBox.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.WD_SEARCHTextBox.Location = New System.Drawing.Point(13, 113) Me.WD_SEARCHTextBox.Name = "WD_SEARCHTextBox" - Me.WD_SEARCHTextBox.Size = New System.Drawing.Size(314, 21) + Me.WD_SEARCHTextBox.Size = New System.Drawing.Size(380, 21) Me.WD_SEARCHTextBox.TabIndex = 2 ' 'GridControl1 @@ -557,8 +556,8 @@ Partial Class frmAdministration ' 'GroupBox2 ' - Me.GroupBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.GroupBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GroupBox2.Controls.Add(Me.Label2) Me.GroupBox2.Controls.Add(Me.GridControlUsers2Menue) Me.GroupBox2.Controls.Add(Me.btndeleteUserConstructorRel) @@ -566,12 +565,12 @@ Partial Class frmAdministration Me.GroupBox2.Controls.Add(Me.Label1) Me.GroupBox2.Controls.Add(Me.GridControl2) Me.GroupBox2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox2.Location = New System.Drawing.Point(591, 12) + Me.GroupBox2.Location = New System.Drawing.Point(647, 12) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(637, 292) + Me.GroupBox2.Size = New System.Drawing.Size(627, 315) Me.GroupBox2.TabIndex = 1 Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "User Profilzuordnung" + Me.GroupBox2.Text = "Zuordnung Profil - User" ' 'Label2 ' @@ -591,7 +590,7 @@ Partial Class frmAdministration Me.GridControlUsers2Menue.MainView = Me.GridViewlUsers2Menue Me.GridControlUsers2Menue.Name = "GridControlUsers2Menue" Me.GridControlUsers2Menue.ShowOnlyPredefinedDetails = True - Me.GridControlUsers2Menue.Size = New System.Drawing.Size(256, 198) + Me.GridControlUsers2Menue.Size = New System.Drawing.Size(256, 221) Me.GridControlUsers2Menue.TabIndex = 91 Me.GridControlUsers2Menue.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewlUsers2Menue}) ' @@ -665,7 +664,7 @@ Partial Class frmAdministration Me.btndeleteUserConstructorRel.Image = CType(resources.GetObject("btndeleteUserConstructorRel.Image"), System.Drawing.Image) Me.btndeleteUserConstructorRel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.btndeleteUserConstructorRel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btndeleteUserConstructorRel.Location = New System.Drawing.Point(9, 263) + Me.btndeleteUserConstructorRel.Location = New System.Drawing.Point(9, 510) Me.btndeleteUserConstructorRel.Name = "btndeleteUserConstructorRel" Me.btndeleteUserConstructorRel.Size = New System.Drawing.Size(351, 23) Me.btndeleteUserConstructorRel.TabIndex = 60 @@ -704,7 +703,7 @@ Partial Class frmAdministration Me.GridControl2.Location = New System.Drawing.Point(9, 36) Me.GridControl2.MainView = Me.GridViewProfileUser Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(351, 221) + Me.GridControl2.Size = New System.Drawing.Size(351, 273) Me.GridControl2.TabIndex = 19 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfileUser}) ' @@ -787,9 +786,9 @@ Partial Class frmAdministration 'StatusStrip1 ' Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.statuslabel}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 708) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 650) Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(1240, 22) + Me.StatusStrip1.Size = New System.Drawing.Size(1283, 22) Me.StatusStrip1.TabIndex = 1 Me.StatusStrip1.Text = "StatusStrip1" ' @@ -810,24 +809,39 @@ Partial Class frmAdministration ' 'GroupBox3 ' + Me.GroupBox3.Controls.Add(Me.lblprocessCheckActive) Me.GroupBox3.Controls.Add(Me.btnStartStopProcess) - Me.GroupBox3.Controls.Add(Me.PictureBox1) Me.GroupBox3.Controls.Add(Me.txtProcessName) Me.GroupBox3.Controls.Add(Me.txtPID) Me.GroupBox3.Controls.Add(Me.Label4) Me.GroupBox3.Controls.Add(Me.Label3) - Me.GroupBox3.Location = New System.Drawing.Point(12, 351) + Me.GroupBox3.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GroupBox3.Location = New System.Drawing.Point(618, 389) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(570, 81) + Me.GroupBox3.Size = New System.Drawing.Size(570, 100) Me.GroupBox3.TabIndex = 2 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Auswahl Fenster/Prozess:" ' + 'lblprocessCheckActive + ' + Me.lblprocessCheckActive.Font = New System.Drawing.Font("Tahoma", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblprocessCheckActive.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.asterisk_orange + Me.lblprocessCheckActive.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.lblprocessCheckActive.Location = New System.Drawing.Point(209, 9) + Me.lblprocessCheckActive.Name = "lblprocessCheckActive" + Me.lblprocessCheckActive.Size = New System.Drawing.Size(153, 31) + Me.lblprocessCheckActive.TabIndex = 23 + Me.lblprocessCheckActive.Text = "Auswertung aktiv" + Me.lblprocessCheckActive.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.lblprocessCheckActive.Visible = False + ' 'btnStartStopProcess ' + Me.btnStartStopProcess.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnStartStopProcess.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.startwithoutdebugging_6556 Me.btnStartStopProcess.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnStartStopProcess.Location = New System.Drawing.Point(6, 35) + Me.btnStartStopProcess.Location = New System.Drawing.Point(6, 43) Me.btnStartStopProcess.Name = "btnStartStopProcess" Me.btnStartStopProcess.Size = New System.Drawing.Size(190, 23) Me.btnStartStopProcess.TabIndex = 8 @@ -835,38 +849,29 @@ Partial Class frmAdministration Me.btnStartStopProcess.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnStartStopProcess.UseVisualStyleBackColor = True ' - 'PictureBox1 - ' - Me.PictureBox1.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.Annotation_New - Me.PictureBox1.Location = New System.Drawing.Point(510, 28) - Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(48, 40) - Me.PictureBox1.TabIndex = 7 - Me.PictureBox1.TabStop = False - Me.PictureBox1.Visible = False - ' 'txtProcessName ' - Me.txtProcessName.Font = New System.Drawing.Font("Tahoma", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtProcessName.Location = New System.Drawing.Point(270, 37) + Me.txtProcessName.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtProcessName.Location = New System.Drawing.Point(293, 72) Me.txtProcessName.Name = "txtProcessName" Me.txtProcessName.ReadOnly = True - Me.txtProcessName.Size = New System.Drawing.Size(229, 21) + Me.txtProcessName.Size = New System.Drawing.Size(180, 21) Me.txtProcessName.TabIndex = 4 ' 'txtPID ' - Me.txtPID.Font = New System.Drawing.Font("Tahoma", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtPID.Location = New System.Drawing.Point(206, 37) + Me.txtPID.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtPID.Location = New System.Drawing.Point(293, 45) Me.txtPID.Name = "txtPID" Me.txtPID.ReadOnly = True - Me.txtPID.Size = New System.Drawing.Size(59, 21) + Me.txtPID.Size = New System.Drawing.Size(180, 21) Me.txtPID.TabIndex = 3 ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(267, 21) + Me.Label4.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label4.Location = New System.Drawing.Point(209, 75) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(78, 13) Me.Label4.TabIndex = 1 @@ -875,7 +880,8 @@ Partial Class frmAdministration 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(206, 21) + Me.Label3.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label3.Location = New System.Drawing.Point(209, 48) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(59, 13) Me.Label3.TabIndex = 0 @@ -962,16 +968,18 @@ Partial Class frmAdministration Me.GroupBox4.Controls.Add(Me.btndeleteProcessProfileLink) Me.GroupBox4.Controls.Add(Me.btnLinkProcessPRofile) Me.GroupBox4.Controls.Add(Me.GridControl3) - Me.GroupBox4.Location = New System.Drawing.Point(12, 438) + Me.GroupBox4.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GroupBox4.Location = New System.Drawing.Point(12, 335) Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Size = New System.Drawing.Size(570, 308) Me.GroupBox4.TabIndex = 21 Me.GroupBox4.TabStop = False - Me.GroupBox4.Text = "Aktuell zugeordnete Prozesse:" + Me.GroupBox4.Text = "Zuordnung Profil - Prozess" ' 'btndeleteProcessProfileLink ' Me.btndeleteProcessProfileLink.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.btndeleteProcessProfileLink.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btndeleteProcessProfileLink.Image = CType(resources.GetObject("btndeleteProcessProfileLink.Image"), System.Drawing.Image) Me.btndeleteProcessProfileLink.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btndeleteProcessProfileLink.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -985,6 +993,7 @@ Partial Class frmAdministration ' 'btnLinkProcessPRofile ' + Me.btnLinkProcessPRofile.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnLinkProcessPRofile.Image = CType(resources.GetObject("btnLinkProcessPRofile.Image"), System.Drawing.Image) Me.btnLinkProcessPRofile.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnLinkProcessPRofile.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -998,13 +1007,12 @@ Partial Class frmAdministration ' 'GroupBox5 ' - Me.GroupBox5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GroupBox5.Controls.Add(Me.lblLicenseDate) Me.GroupBox5.Controls.Add(Me.lbllicenseCount) Me.GroupBox5.Controls.Add(Me.Label6) Me.GroupBox5.Controls.Add(Me.Label5) Me.GroupBox5.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox5.Location = New System.Drawing.Point(957, 628) + Me.GroupBox5.Location = New System.Drawing.Point(597, 572) Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Size = New System.Drawing.Size(271, 71) Me.GroupBox5.TabIndex = 22 @@ -1051,11 +1059,21 @@ Partial Class frmAdministration Me.Label5.TabIndex = 0 Me.Label5.Text = "Anzahl der Lizenzen:" ' + 'ACTIVECheckBox + ' + Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBCW_PROFILESBindingSource, "ACTIVE", True)) + Me.ACTIVECheckBox.Location = New System.Drawing.Point(367, 31) + Me.ACTIVECheckBox.Name = "ACTIVECheckBox" + Me.ACTIVECheckBox.Size = New System.Drawing.Size(62, 24) + Me.ACTIVECheckBox.TabIndex = 20 + Me.ACTIVECheckBox.Text = "Active" + Me.ACTIVECheckBox.UseVisualStyleBackColor = True + ' 'frmAdministration ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1240, 730) + Me.ClientSize = New System.Drawing.Size(1283, 672) Me.Controls.Add(Me.GroupBox5) Me.Controls.Add(Me.GroupBox4) Me.Controls.Add(Me.GroupBox3) @@ -1090,7 +1108,6 @@ Partial Class frmAdministration Me.StatusStrip1.PerformLayout() Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.PerformLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROFILE_PROCESSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewProcessProfile, System.ComponentModel.ISupportInitialize).EndInit() @@ -1162,7 +1179,6 @@ Partial Class frmAdministration Friend WithEvents Label4 As System.Windows.Forms.Label Friend WithEvents Label3 As System.Windows.Forms.Label Friend WithEvents TimerTest As System.Windows.Forms.Timer - Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox Friend WithEvents TBWH_UserBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBCW_PROFILE_PROCESSBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBCW_PROFILE_PROCESSTableAdapter As DD_Clipboard_Watcher.MyDatasetTableAdapters.TBCW_PROFILE_PROCESSTableAdapter @@ -1185,4 +1201,6 @@ Partial Class frmAdministration Friend WithEvents ToolTip1 As ToolTip Friend WithEvents ToolStripButton1 As ToolStripButton Friend WithEvents grpbxProfiles As GroupBox + Friend WithEvents lblprocessCheckActive As Label + Friend WithEvents ACTIVECheckBox As CheckBox End Class diff --git a/app/DD_Clipboard_Searcher/frmAdministration.resx b/app/DD_Clipboard_Searcher/frmAdministration.resx index 7c34a82..ee502b7 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.resx +++ b/app/DD_Clipboard_Searcher/frmAdministration.resx @@ -225,6 +225,9 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + 17, 17 + 736, 56 diff --git a/app/DD_Clipboard_Searcher/frmAdministration.vb b/app/DD_Clipboard_Searcher/frmAdministration.vb index b1ec5c4..4a23018 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.vb @@ -172,12 +172,12 @@ Public Class frmAdministration Private Sub TimerTest_Tick(sender As Object, e As EventArgs) Handles TimerTest.Tick clsWINDOWSApi.Get_ForegroundWindow_Info() If PID <> PROC_PID And PROC_Name <> "DD_Clipboard_Watcher" Then - PictureBox1.Visible = True + lblprocessCheckActive.Visible = True PID = PROC_PID txtPID.Text = PROC_PID txtProcessName.Text = PROC_Name Else - PictureBox1.Visible = False + lblprocessCheckActive.Visible = False End If End Sub @@ -288,4 +288,8 @@ Public Class frmAdministration Private Sub BindingNavigatorAddNewItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorAddNewItem.Click grpbxProfiles.Enabled = True End Sub + + Private Sub ACTIVECheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles ACTIVECheckBox.CheckedChanged + + End Sub End Class \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/frmLicense.vb b/app/DD_Clipboard_Searcher/frmLicense.vb index 3ba54a3..3ebb78e 100644 --- a/app/DD_Clipboard_Searcher/frmLicense.vb +++ b/app/DD_Clipboard_Searcher/frmLicense.vb @@ -38,7 +38,6 @@ Public Class frmLicense End If End If End Sub - Private Sub btnnewLicenses_Click(sender As System.Object, e As System.EventArgs) Handles btnnewLicenses.Click Try _lizenzManager = New clsLicenseManager("#DigitalData35452!#", "") diff --git a/app/DD_Clipboard_Searcher/frmMain.Designer.vb b/app/DD_Clipboard_Searcher/frmMain.Designer.vb index e4a77c2..5fe4757 100644 --- a/app/DD_Clipboard_Searcher/frmMain.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmMain.Designer.vb @@ -22,28 +22,32 @@ Partial Class frmMain 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) - Me.NotifyIconMain = New System.Windows.Forms.NotifyIcon(Me.components) - Me.cmstrpNotifyIcon = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.SplashScreenManager1 = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.DD_Clipboard_Watcher.WaitForm1), True, True) + Me.NotifyIconMain = New System.Windows.Forms.NotifyIcon() + Me.cmstrpNotifyIcon = New System.Windows.Forms.ContextMenuStrip() Me.tsmiChangeState = New System.Windows.Forms.ToolStripMenuItem() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tslblUser = New System.Windows.Forms.ToolStripStatusLabel() - Me.TimerClose = New System.Windows.Forms.Timer(Me.components) - Me.ContextMenuStripForm = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.TimerClose = New System.Windows.Forms.Timer() + Me.ContextMenuStripForm = New System.Windows.Forms.ContextMenuStrip() Me.MinimierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.btnAdminConfig = New System.Windows.Forms.Button() - Me.btnUserConfig = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.lbHKFunction = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.btnAdminConfig = New System.Windows.Forms.Button() + Me.btnUserConfig = New System.Windows.Forms.Button() Me.cmstrpNotifyIcon.SuspendLayout() Me.StatusStrip1.SuspendLayout() Me.ContextMenuStripForm.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.SuspendLayout() ' + 'SplashScreenManager1 + ' + Me.SplashScreenManager1.ClosingDelay = 500 + ' 'NotifyIconMain ' Me.NotifyIconMain.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info @@ -101,31 +105,6 @@ Partial Class frmMain Me.MinimierenToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.MinimierenToolStripMenuItem.Text = "Minimieren" ' - 'btnAdminConfig - ' - Me.btnAdminConfig.Image = CType(resources.GetObject("btnAdminConfig.Image"), System.Drawing.Image) - Me.btnAdminConfig.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnAdminConfig.Location = New System.Drawing.Point(169, 12) - Me.btnAdminConfig.Name = "btnAdminConfig" - Me.btnAdminConfig.Size = New System.Drawing.Size(151, 29) - Me.btnAdminConfig.TabIndex = 6 - Me.btnAdminConfig.Text = "Admin Einstellungen" - Me.btnAdminConfig.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnAdminConfig.UseVisualStyleBackColor = True - Me.btnAdminConfig.Visible = False - ' - 'btnUserConfig - ' - Me.btnUserConfig.Image = CType(resources.GetObject("btnUserConfig.Image"), System.Drawing.Image) - Me.btnUserConfig.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnUserConfig.Location = New System.Drawing.Point(12, 12) - Me.btnUserConfig.Name = "btnUserConfig" - Me.btnUserConfig.Size = New System.Drawing.Size(151, 29) - Me.btnUserConfig.TabIndex = 2 - Me.btnUserConfig.Text = "Grundeinstellungen User" - Me.btnUserConfig.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnUserConfig.UseVisualStyleBackColor = True - ' 'Label1 ' Me.Label1.AutoSize = True @@ -169,6 +148,31 @@ Partial Class frmMain Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Aktueller GlobalHook:" ' + 'btnAdminConfig + ' + Me.btnAdminConfig.Image = CType(resources.GetObject("btnAdminConfig.Image"), System.Drawing.Image) + Me.btnAdminConfig.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAdminConfig.Location = New System.Drawing.Point(169, 12) + Me.btnAdminConfig.Name = "btnAdminConfig" + Me.btnAdminConfig.Size = New System.Drawing.Size(151, 29) + Me.btnAdminConfig.TabIndex = 6 + Me.btnAdminConfig.Text = "Admin Einstellungen" + Me.btnAdminConfig.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAdminConfig.UseVisualStyleBackColor = True + Me.btnAdminConfig.Visible = False + ' + 'btnUserConfig + ' + Me.btnUserConfig.Image = CType(resources.GetObject("btnUserConfig.Image"), System.Drawing.Image) + Me.btnUserConfig.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnUserConfig.Location = New System.Drawing.Point(12, 12) + Me.btnUserConfig.Name = "btnUserConfig" + Me.btnUserConfig.Size = New System.Drawing.Size(151, 29) + Me.btnUserConfig.TabIndex = 2 + Me.btnUserConfig.Text = "Grundeinstellungen User" + Me.btnUserConfig.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnUserConfig.UseVisualStyleBackColor = True + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -212,4 +216,5 @@ Partial Class frmMain Friend WithEvents Label3 As Label Friend WithEvents lbHKFunction As Label Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents SplashScreenManager1 As DevExpress.XtraSplashScreen.SplashScreenManager End Class diff --git a/app/DD_Clipboard_Searcher/frmMain.resx b/app/DD_Clipboard_Searcher/frmMain.resx index 77d6820..058a97f 100644 --- a/app/DD_Clipboard_Searcher/frmMain.resx +++ b/app/DD_Clipboard_Searcher/frmMain.resx @@ -118,10 +118,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 17, 17 + 196, 17 - 132, 17 + 332, 17 @@ -1257,7 +1257,7 @@ - 278, 17 + 478, 17 @@ -1271,10 +1271,10 @@ - 395, 17 + 595, 17 - 507, 17 + 707, 17 diff --git a/app/DD_Clipboard_Searcher/frmMain.vb b/app/DD_Clipboard_Searcher/frmMain.vb index 4bef0e4..e288cf7 100644 --- a/app/DD_Clipboard_Searcher/frmMain.vb +++ b/app/DD_Clipboard_Searcher/frmMain.vb @@ -13,6 +13,9 @@ Public Class frmMain Private Sub _Watcher_Changed(ByVal sender As Object, ByVal e As EventArgs) Handles _Watcher.Changed + + clsHotkey.GetCaption() + If DT_USER_PROFILES Is Nothing Then Exit Sub End If @@ -168,8 +171,12 @@ Public Class frmMain End Sub Private Sub ReceiveHotKey(ByVal HotKeyID As String) Handles Hotkey.HotKeyPressed If HotKeyID = 354523017 Then + If Not IsNothing(CURR_MATCH_RESULT) And Not IsNothing(CURR_MATCH_WM_SEARCH) Then + SplashScreenManager1.ShowForm(Me, GetType(WaitForm1), True, True, False) clsSearch.RUN_WD_SEARCH(CURR_MATCH_WM_SEARCH) + 'Close Wait Form + SplashScreenManager1.CloseForm(False) End If ElseIf HotKeyID = 354522017 Then Change_Monitoring_State() diff --git a/app/DD_Clipboard_Searcher/modCurrent.vb b/app/DD_Clipboard_Searcher/modCurrent.vb index 7b9b404..66fba22 100644 --- a/app/DD_Clipboard_Searcher/modCurrent.vb +++ b/app/DD_Clipboard_Searcher/modCurrent.vb @@ -41,7 +41,7 @@ Public CLIPBOARD_TEXT As String Public CURR_MATCH_RESULT Public CURR_MATCH_WM_SEARCH - + Public CURR_FOCUSED_WINDOWNAME Public MONITORING_ACTIVE As Boolean = True Public PROC_PID As String