mark current profile bold

add new clipboard watcher class
check group membership when loading profiles
2019-10-22 16:09:31 +02:00 · 2019-10-22 16:08:33 +02:00 · 2019-10-22 15:53:08 +02:00 · 2019-10-22 15:52:44 +02:00
9 changed files with 234 additions and 177 deletions
--- a/app/DD_Clipboard_Searcher/ClassClipboardWatcher.vb
+++ b/app/DD_Clipboard_Searcher/ClassClipboardWatcher.vb
@@ -0,0 +1,75 @@
+Imports System.ComponentModel
+Imports System.Runtime.InteropServices
+
+Public Class ClassClipboardWatcher : Inherits NativeWindow : Implements IDisposable
+    <DllImport("user32", EntryPoint:="AddClipboardFormatListener")>
+    Private Shared Function AddClipboardFormatListener(ByVal hWnd As IntPtr) As Boolean
+    End Function
+
+    <DllImport("user32", EntryPoint:="RemoveClipboardFormatListener")>
+    Private Shared Function RemoveClipboardFormatListener(ByVal hWnd As IntPtr) As Boolean
+    End Function
+
+    Public Event Changed As EventHandler(Of String)
+
+    Private ReadOnly _Handle As IntPtr
+    Private _IsDisposed As Boolean = False
+
+    'nur eine globale Instanz zulassen
+    Public Shared Singleton As New ClassClipboardWatcher
+
+    Const WM_CLIPBOARDUPDATE As Integer = &H31D
+
+    Private Sub New()
+        MyBase.CreateHandle(New CreateParams)
+        _Handle = AddClipboardFormatListener(Handle)
+    End Sub
+
+    Protected Overrides Sub WndProc(ByRef m As Message)
+        Select Case m.Msg
+            Case WM_CLIPBOARDUPDATE
+                Dim oWindow = ClassWindowAPI.GetWindowInfo()
+
+                If IsNothing(oWindow.ProcessName) Then
+                    Exit Sub
+                End If
+
+                If oWindow.ProcessName.StartsWith("DD_Clipboard_Watcher") Then
+                    Exit Sub
+                End If
+
+                Dim oText = Clipboard.GetText
+
+                RaiseEvent Changed(Me, oText)
+        End Select
+        MyBase.WndProc(m)
+    End Sub
+
+    Protected Overridable Sub Dispose(ByVal disposing As Boolean)
+        If Not _IsDisposed Then
+            If disposing Then
+                ' TODO: Verwaltete Ressourcen freigeben, wenn sie explizit 
+                ' aufgerufen werden
+            End If
+            MyBase.DestroyHandle()
+            RemoveClipboardFormatListener(_Handle)
+        End If
+        _IsDisposed = True
+    End Sub
+
+    ' Dieser Code wird von Visual Basic hinzugefügt, um das Dispose-Muster 
+    ' richtig zu implementieren.
+    Public Sub Dispose() Implements IDisposable.Dispose
+        ' Sie sollten diesen Code nicht ändern, sondern stattdessen ihren
+        ' Bereinigungscode oben in 
+        ' Dispose(ByVal disposing As Boolean) einfügen.
+        Dispose(True)
+        GC.SuppressFinalize(Me)
+    End Sub
+
+    Protected Overrides Sub Finalize()
+        MyBase.Finalize()
+        Dispose(False)
+    End Sub
+End Class
+
--- a/app/DD_Clipboard_Searcher/ClassInit.vb
+++ b/app/DD_Clipboard_Searcher/ClassInit.vb
@@ -235,21 +235,24 @@ Public Class ClassInit
    End Sub

    Public Shared Sub Refresh_Profile_Links()
+        Dim oWhereClause = $"T1.USER_ID = {USER_ID} OR GROUP_ID IN (SELECT DISTINCT GUID FROM TBDD_GROUPS WHERE GUID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {USER_ID}))"
+
+        Dim ProfileSQL As String = $"SELECT DISTINCT GUID, NAME,REGEX_EXPRESSION,COMMENT,PROC_NAME,PROFILE_TYPE FROM VWCW_USER_PROFILE T1 WHERE {oWhereClause}"
+        Dim oProcessSQL As String = $"SELECT DISTINCT T.GUID, T.PROFILE_ID,T.PROC_NAME FROM TBCW_PROFILE_PROCESS T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.GUID AND ({oWhereClause})"
+        Dim oWindowSQL As String = $"SELECT DISTINCT * FROM VWCW_PROFILE_REL_WINDOW T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.GUID AND ({oWhereClause})"
+        Dim oControlSQL As String = $"SELECT DISTINCT * FROM VWCW_PROFILE_REL_CONTROL T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.GUID AND ({oWhereClause})"
+
        Try
-            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)
+            DT_USER_PROFILES = Database.GetDatatable(ProfileSQL)
+
            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 DISTINCT T.GUID, T.PROFILE_ID,T.PROC_NAME 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}"
-                DTPROFILE_REL_WINDOW = Database.GetDatatable(oSql)
-
-                oSql = $"SELECT * FROM VWCW_PROFILE_REL_CONTROL WHERE USER_ID = {USER_ID}"
-                DTPROFILE_REL_CONTROL = Database.GetDatatable(oSql)
+                Exit Sub
            End If
+
+            DTPROFILE_REL_PROCESS = Database.GetDatatable(oProcessSQL)
+            DTPROFILE_REL_WINDOW = Database.GetDatatable(oWindowSQL)
+            DTPROFILE_REL_CONTROL = Database.GetDatatable(oControlSQL)
        Catch ex As Exception
            Logger.Error(ex)
            MsgBox("Unexpected Error in Refresh_Profile_Links: " & ex.Message, MsgBoxStyle.Critical)
--- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
+++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
@@ -149,6 +149,7 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="ClassAutomation.vb" />
+    <Compile Include="ClassClipboardWatcher.vb" />
    <Compile Include="ClassWindow.vb" />
    <Compile Include="ClassConfig.vb" />
    <Compile Include="ClassConstants.vb" />
--- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb
+++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb
@@ -359,7 +359,7 @@ Partial Class frmAdministration
        Me.GridControlProfiles.Location = New System.Drawing.Point(0, 0)
        Me.GridControlProfiles.MainView = Me.GridViewProfiles
        Me.GridControlProfiles.Name = "GridControlProfiles"
-        Me.GridControlProfiles.Size = New System.Drawing.Size(159, 615)
+        Me.GridControlProfiles.Size = New System.Drawing.Size(149, 615)
        Me.GridControlProfiles.TabIndex = 18
        Me.GridControlProfiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfiles})
        '
@@ -367,12 +367,15 @@ Partial Class frmAdministration
        '
        Me.GridViewProfiles.Appearance.EvenRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
        Me.GridViewProfiles.Appearance.EvenRow.Options.UseBackColor = True
+        Me.GridViewProfiles.Appearance.FocusedRow.FontStyleDelta = System.Drawing.FontStyle.Bold
+        Me.GridViewProfiles.Appearance.FocusedRow.Options.UseFont = True
        Me.GridViewProfiles.Appearance.SelectedRow.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.GridViewProfiles.Appearance.SelectedRow.Options.UseFont = True
        Me.GridViewProfiles.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colNAME})
        Me.GridViewProfiles.GridControl = Me.GridControlProfiles
        Me.GridViewProfiles.Name = "GridViewProfiles"
        Me.GridViewProfiles.OptionsBehavior.Editable = False
+        Me.GridViewProfiles.OptionsSelection.EnableAppearanceHideSelection = False
        Me.GridViewProfiles.OptionsView.ColumnAutoWidth = False
        Me.GridViewProfiles.OptionsView.EnableAppearanceEvenRow = True
        Me.GridViewProfiles.OptionsView.ShowAutoFilterRow = True
@@ -386,8 +389,6 @@ Partial Class frmAdministration
        Me.colGUID.Caption = "ID"
        Me.colGUID.FieldName = "GUID"
        Me.colGUID.Name = "colGUID"
-        Me.colGUID.Visible = True
-        Me.colGUID.VisibleIndex = 0
        Me.colGUID.Width = 30
        '
        'colNAME
@@ -457,7 +458,7 @@ Partial Class frmAdministration
        Me.XtraTabControl3.Location = New System.Drawing.Point(0, 0)
        Me.XtraTabControl3.Name = "XtraTabControl3"
        Me.XtraTabControl3.SelectedTabPage = Me.TabPageGeneralSettings
-        Me.XtraTabControl3.Size = New System.Drawing.Size(1194, 615)
+        Me.XtraTabControl3.Size = New System.Drawing.Size(1204, 615)
        Me.XtraTabControl3.TabIndex = 21
        Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageGeneralSettings, Me.TabPageDocuments, Me.TabPageData, Me.TabPageProcessAssignment, Me.TabPageUserAssignment, Me.TabPageGroupAssignment})
        '
@@ -467,7 +468,7 @@ Partial Class frmAdministration
        Me.TabPageGeneralSettings.Controls.Add(Me.LayoutControl1)
        Me.TabPageGeneralSettings.ImageOptions.Image = CType(resources.GetObject("TabPageGeneralSettings.ImageOptions.Image"), System.Drawing.Image)
        Me.TabPageGeneralSettings.Name = "TabPageGeneralSettings"
-        Me.TabPageGeneralSettings.Size = New System.Drawing.Size(1192, 587)
+        Me.TabPageGeneralSettings.Size = New System.Drawing.Size(1202, 587)
        Me.TabPageGeneralSettings.Text = "Allgemein"
        '
        'LayoutControl1
@@ -2115,7 +2116,7 @@ Partial Class frmAdministration
        Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControl3)
        Me.SplitContainerControl1.Panel2.Text = "Panel2"
        Me.SplitContainerControl1.Size = New System.Drawing.Size(1365, 615)
-        Me.SplitContainerControl1.SplitterPosition = 159
+        Me.SplitContainerControl1.SplitterPosition = 149
        Me.SplitContainerControl1.TabIndex = 27
        Me.SplitContainerControl1.Text = "SplitContainerControl1"
        '
--- a/app/DD_Clipboard_Searcher/frmAdministration.resx
+++ b/app/DD_Clipboard_Searcher/frmAdministration.resx
@@ -159,69 +159,10 @@
  <metadata name="TBCW_PROF_DATA_SEARCHBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>578, 56</value>
  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="TabPageGeneralSettings.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAANRJREFUOE+d
-        kT0OgkAQhbG18WQmXsA7AI0dCWZbo7fRxMJGUC9j/MN2nDdhyC6wsLH4YHg770vIRsYYHxNmw+SazdcH
-        AvoNmqEFylsGy0AkoQK7fGTKes65nI0J2uUpM2McCb+bzlhZzyApVmYnEitvBENlRSSMI8EjpKx0JAhx
-        VQjAUFmBRPczBEtmXwe6pAtt7PMTs9AAv+EsVNeEHkUqfC5JnwAd5xachTeX7udUeJW9ApkjIhLsEPP3
-        FtOzTIXqGncE2vMKPAQLxvAKgukI/oOiH3DIH9LquF+BAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="TabPageDocuments.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAFRleHQ7UGFnZTtSZXBvcnR2YWEA
-        AAAAVUlEQVQ4T2P4//8/RRjOaGlp+Y8H/4PSxsiaQRjFAHwAJN/X13cX3RCSDACCX+iGkGQAMgYC0gxA
-        BngN8G3agReDwKgLaO0CYgDtDCAFYxhAHv7PAAC6Jy+iz67OxwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="TabPageData.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAERhdGFiYXNlO0RCO1NvdXJjZTtT
-        dG9yrLHqcgAAAIhJREFUOE9j+P//P8O7I0UgLADEUUA8C4jPAfEnJAzig8RB8iB1YH0gDDPACIiXAvF/
-        IjBInRG6AXOQFBCD56Ab8A5NASH8juoGUOwFMyAmJRDN0A1IA2JPICYmGkHq0tANAIXBAyAGKYoDYl0g
-        5kHCID5IHCQPUjcaBrQIA4ozEwiTkZ3/MwAAShbqQY39CKgAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="TabPageProcessAssignment.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAFNldHVwO0N1c3RvbWl6O0Rlc2ln
-        bjtTZXR0aW5nO1Byb3BlcnQ4H7UhAAAAvklEQVQ4T62TMQ7DIAxFc4woysqSJcpBeqZIHXuUnqAX6p45
-        C/0P4ciDhwg6PAnbny9jYMg5hzyenySOSoo0cC0kGsXk4lXkyurykxgt9psRvsUmZvESZ4U1OWpo0BYT
-        72qFO6At3RaDaoJ7JI7YbJ83oEUTfMUulgprclafLwMFTJuBcU4T7CYwyLk6WvYkClwTSYZlgiUwoBOr
-        m/b4i0HfEZygbYjOoP0aleh7SAr6nrIzaftMERLd+M55+AHESXAXw39ssQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="TabPageUserAssignment.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAydEVYdFRpdGxlAEN1c3RvbWVyO0VtcGxveWVlO1Bl
-        cnNvbjtDb250YWN0O1VzZXI7Q2xpZW50fhE26AAAAM1JREFUOE+l0TEOQUEUBdBfiN4ySDQqKvTfGuxF
-        pbEIi5DoRcIa/gqovwKRca/MvMw8/zGhODKZd98NpnDO/eX1MVtstSHs4eIdYAxJzipowQmccoY2SNYq
-        6IJeDnogWatgAk3LNAXJWgVLaFomziRrFYzgAXqZd/xzJWsV0A50Ae+S3KcCPtkNwjLP2c8YzOHo8fyW
-        sQo6sIL4zXnmHWeS1QUD2MAd+LXX0Pd45h1nzDCbFJRwhfCbv2G2jAuqaJirigtqNcxRS8HvXPEEp3w/
-        tQHvKFEAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="TabPageGroupAssignment.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAYdEVYdFRpdGxlAFRlYW07UGVvcGxlO0dyb3VwO1w5
-        6BYAAADzSURBVDhPpdA9CsJAEAVglYBYeQYPoJ2tBxDEMq2FJ5BASsVrWNhqmc4rKHgJsbAXTKXre2En
-        TNZJESw+iPPzzKTlnPuLWWyifJhtT23YwdPbQwfMuhUwBhdgzaxbAbEauMISIm8BZ5B+bAWkvvmBunPe
-        wJnUCujDCy5Qdw57nOn/BPiQBA6gzxGssZfoHb3MW4cwADlHY429EURlAH50YQM3uMMU5BxZLl4b2OMM
-        Z7nTY8AR9D/RCniO/OYza3qGMgbkqvCANcg5E694bWCPMzKfl9/Af4fwnLlXeW29EwZY54QyvRMG6HPq
-        5HqnEtCca30Bw6t+WSTe8moAAAAASUVORK5CYII=
-</value>
-  </data>
  <metadata name="ApplicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1270, 95</value>
  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="BarButtonItem16.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -834,6 +775,65 @@
  <metadata name="TBWH_PROFILE_TYPEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1024, 95</value>
  </metadata>
+  <data name="TabPageGeneralSettings.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAANRJREFUOE+d
+        kT0OgkAQhbG18WQmXsA7AI0dCWZbo7fRxMJGUC9j/MN2nDdhyC6wsLH4YHg770vIRsYYHxNmw+SazdcH
+        AvoNmqEFylsGy0AkoQK7fGTKes65nI0J2uUpM2McCb+bzlhZzyApVmYnEitvBENlRSSMI8EjpKx0JAhx
+        VQjAUFmBRPczBEtmXwe6pAtt7PMTs9AAv+EsVNeEHkUqfC5JnwAd5xachTeX7udUeJW9ApkjIhLsEPP3
+        FtOzTIXqGncE2vMKPAQLxvAKgukI/oOiH3DIH9LquF+BAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="TabPageDocuments.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAFRleHQ7UGFnZTtSZXBvcnR2YWEA
+        AAAAVUlEQVQ4T2P4//8/RRjOaGlp+Y8H/4PSxsiaQRjFAHwAJN/X13cX3RCSDACCX+iGkGQAMgYC0gxA
+        BngN8G3agReDwKgLaO0CYgDtDCAFYxhAHv7PAAC6Jy+iz67OxwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="TabPageData.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAERhdGFiYXNlO0RCO1NvdXJjZTtT
+        dG9yrLHqcgAAAIhJREFUOE9j+P//P8O7I0UgLADEUUA8C4jPAfEnJAzig8RB8iB1YH0gDDPACIiXAvF/
+        IjBInRG6AXOQFBCD56Ab8A5NASH8juoGUOwFMyAmJRDN0A1IA2JPICYmGkHq0tANAIXBAyAGKYoDYl0g
+        5kHCID5IHCQPUjcaBrQIA4ozEwiTkZ3/MwAAShbqQY39CKgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="TabPageProcessAssignment.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAFNldHVwO0N1c3RvbWl6O0Rlc2ln
+        bjtTZXR0aW5nO1Byb3BlcnQ4H7UhAAAAvklEQVQ4T62TMQ7DIAxFc4woysqSJcpBeqZIHXuUnqAX6p45
+        C/0P4ciDhwg6PAnbny9jYMg5hzyenySOSoo0cC0kGsXk4lXkyurykxgt9psRvsUmZvESZ4U1OWpo0BYT
+        72qFO6At3RaDaoJ7JI7YbJ83oEUTfMUulgprclafLwMFTJuBcU4T7CYwyLk6WvYkClwTSYZlgiUwoBOr
+        m/b4i0HfEZygbYjOoP0aleh7SAr6nrIzaftMERLd+M55+AHESXAXw39ssQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="TabPageUserAssignment.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAydEVYdFRpdGxlAEN1c3RvbWVyO0VtcGxveWVlO1Bl
+        cnNvbjtDb250YWN0O1VzZXI7Q2xpZW50fhE26AAAAM1JREFUOE+l0TEOQUEUBdBfiN4ySDQqKvTfGuxF
+        pbEIi5DoRcIa/gqovwKRca/MvMw8/zGhODKZd98NpnDO/eX1MVtstSHs4eIdYAxJzipowQmccoY2SNYq
+        6IJeDnogWatgAk3LNAXJWgVLaFomziRrFYzgAXqZd/xzJWsV0A50Ae+S3KcCPtkNwjLP2c8YzOHo8fyW
+        sQo6sIL4zXnmHWeS1QUD2MAd+LXX0Pd45h1nzDCbFJRwhfCbv2G2jAuqaJirigtqNcxRS8HvXPEEp3w/
+        tQHvKFEAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="TabPageGroupAssignment.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAYdEVYdFRpdGxlAFRlYW07UGVvcGxlO0dyb3VwO1w5
+        6BYAAADzSURBVDhPpdA9CsJAEAVglYBYeQYPoJ2tBxDEMq2FJ5BASsVrWNhqmc4rKHgJsbAXTKXre2En
+        TNZJESw+iPPzzKTlnPuLWWyifJhtT23YwdPbQwfMuhUwBhdgzaxbAbEauMISIm8BZ5B+bAWkvvmBunPe
+        wJnUCujDCy5Qdw57nOn/BPiQBA6gzxGssZfoHb3MW4cwADlHY429EURlAH50YQM3uMMU5BxZLl4b2OMM
+        Z7nTY8AR9D/RCniO/OYza3qGMgbkqvCANcg5E694bWCPMzKfl9/Af4fwnLlXeW29EwZY54QyvRMG6HPq
+        5HqnEtCca30Bw6t+WSTe8moAAAAASUVORK5CYII=
+</value>
+  </data>
  <metadata name="TBDD_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 134</value>
  </metadata>
--- a/app/DD_Clipboard_Searcher/frmControlCapture.Designer.vb
+++ b/app/DD_Clipboard_Searcher/frmControlCapture.Designer.vb
@@ -26,18 +26,13 @@ Partial Class frmControlCapture
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmControlCapture))
        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Button1 = New System.Windows.Forms.Button()
-        Me.Button2 = New System.Windows.Forms.Button()
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.btnCancel = New System.Windows.Forms.Button()
        Me.rbControlName = New System.Windows.Forms.RadioButton()
        Me.rbControlPosition = New System.Windows.Forms.RadioButton()
-        Me.gbControlName = New System.Windows.Forms.GroupBox()
-        Me.Label2 = New System.Windows.Forms.Label()
        Me.txtControlName = New System.Windows.Forms.TextBox()
-        Me.gbControlPosition = New System.Windows.Forms.GroupBox()
        Me.txtControlBounds = New System.Windows.Forms.TextBox()
        Me.Label1 = New System.Windows.Forms.Label()
-        Me.gbControlName.SuspendLayout()
-        Me.gbControlPosition.SuspendLayout()
        Me.SuspendLayout()
        '
        'Timer1
@@ -49,38 +44,38 @@ Partial Class frmControlCapture
        '
        Me.Label3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label3.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.Label3.Location = New System.Drawing.Point(12, 269)
+        Me.Label3.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label3.Location = New System.Drawing.Point(9, 141)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(383, 27)
        Me.Label3.TabIndex = 11
        Me.Label3.Text = "Auswertung von aktivem Feld läuft!" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
        '
-        'Button1
+        'btnOK
        '
-        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.Button1.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.add
-        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(12, 299)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(159, 34)
-        Me.Button1.TabIndex = 0
-        Me.Button1.Text = "Feld zuordnen"
-        Me.Button1.UseVisualStyleBackColor = True
+        Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnOK.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.add
+        Me.btnOK.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnOK.Location = New System.Drawing.Point(12, 190)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(159, 34)
+        Me.btnOK.TabIndex = 0
+        Me.btnOK.Text = "Feld zuordnen"
+        Me.btnOK.UseVisualStyleBackColor = True
        '
-        'Button2
+        'btnCancel
        '
-        Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Button2.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.Button2.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.cancel
-        Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button2.Location = New System.Drawing.Point(236, 299)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(159, 34)
-        Me.Button2.TabIndex = 0
-        Me.Button2.Text = "Abbruch"
-        Me.Button2.UseVisualStyleBackColor = True
+        Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btnCancel.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.cancel
+        Me.btnCancel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnCancel.Location = New System.Drawing.Point(236, 190)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(159, 34)
+        Me.btnCancel.TabIndex = 0
+        Me.btnCancel.Text = "Abbruch"
+        Me.btnCancel.UseVisualStyleBackColor = True
        '
        'rbControlName
        '
@@ -97,106 +92,74 @@ Partial Class frmControlCapture
        'rbControlPosition
        '
        Me.rbControlPosition.AutoSize = True
-        Me.rbControlPosition.Location = New System.Drawing.Point(12, 118)
+        Me.rbControlPosition.Location = New System.Drawing.Point(12, 36)
        Me.rbControlPosition.Name = "rbControlPosition"
        Me.rbControlPosition.Size = New System.Drawing.Size(100, 17)
        Me.rbControlPosition.TabIndex = 14
        Me.rbControlPosition.Text = "Control Position"
        Me.rbControlPosition.UseVisualStyleBackColor = True
        '
-        'gbControlName
-        '
-        Me.gbControlName.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.gbControlName.Controls.Add(Me.Label2)
-        Me.gbControlName.Controls.Add(Me.txtControlName)
-        Me.gbControlName.Location = New System.Drawing.Point(140, 12)
-        Me.gbControlName.Name = "gbControlName"
-        Me.gbControlName.Size = New System.Drawing.Size(255, 100)
-        Me.gbControlName.TabIndex = 15
-        Me.gbControlName.TabStop = False
-        Me.gbControlName.Text = "Control Name"
-        '
-        'Label2
-        '
-        Me.Label2.Location = New System.Drawing.Point(6, 49)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(243, 48)
-        Me.Label2.TabIndex = 0
-        Me.Label2.Text = "Markieren Sie Text in einem Feld und Kopieren Sie Text"
-        '
        'txtControlName
        '
-        Me.txtControlName.Location = New System.Drawing.Point(6, 20)
+        Me.txtControlName.Location = New System.Drawing.Point(152, 8)
        Me.txtControlName.Name = "txtControlName"
+        Me.txtControlName.ReadOnly = True
        Me.txtControlName.Size = New System.Drawing.Size(243, 21)
        Me.txtControlName.TabIndex = 0
        '
-        'gbControlPosition
-        '
-        Me.gbControlPosition.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.gbControlPosition.Controls.Add(Me.txtControlBounds)
-        Me.gbControlPosition.Controls.Add(Me.Label1)
-        Me.gbControlPosition.Location = New System.Drawing.Point(140, 118)
-        Me.gbControlPosition.Name = "gbControlPosition"
-        Me.gbControlPosition.Size = New System.Drawing.Size(255, 137)
-        Me.gbControlPosition.TabIndex = 15
-        Me.gbControlPosition.TabStop = False
-        Me.gbControlPosition.Text = "Control Position"
-        '
        'txtControlBounds
        '
-        Me.txtControlBounds.Location = New System.Drawing.Point(9, 20)
+        Me.txtControlBounds.Location = New System.Drawing.Point(152, 35)
        Me.txtControlBounds.Multiline = True
        Me.txtControlBounds.Name = "txtControlBounds"
-        Me.txtControlBounds.Size = New System.Drawing.Size(240, 77)
+        Me.txtControlBounds.ReadOnly = True
+        Me.txtControlBounds.Size = New System.Drawing.Size(240, 88)
        Me.txtControlBounds.TabIndex = 1
        '
        'Label1
        '
-        Me.Label1.Location = New System.Drawing.Point(6, 100)
+        Me.Label1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(9, 168)
        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(243, 34)
-        Me.Label1.TabIndex = 0
-        Me.Label1.Text = "Wechseln Sie durch die aktiven Anwendungen und klicken Sie in ein Feld"
+        Me.Label1.Size = New System.Drawing.Size(298, 13)
+        Me.Label1.TabIndex = 15
+        Me.Label1.Text = "Markieren Sie Text in einem Feld und Kopieren Sie einen Text"
        '
        'frmControlCapture
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(407, 345)
-        Me.Controls.Add(Me.gbControlPosition)
-        Me.Controls.Add(Me.gbControlName)
+        Me.ClientSize = New System.Drawing.Size(407, 236)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.txtControlBounds)
+        Me.Controls.Add(Me.txtControlName)
        Me.Controls.Add(Me.rbControlPosition)
        Me.Controls.Add(Me.rbControlName)
        Me.Controls.Add(Me.Label3)
-        Me.Controls.Add(Me.Button2)
-        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.btnCancel)
+        Me.Controls.Add(Me.btnOK)
        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.FixedDialog
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
        Me.Name = "frmControlCapture"
        Me.ShowIcon = False
        Me.Text = "Feld Auswertung"
        Me.TopMost = True
-        Me.gbControlName.ResumeLayout(False)
-        Me.gbControlName.PerformLayout()
-        Me.gbControlPosition.ResumeLayout(False)
-        Me.gbControlPosition.PerformLayout()
        Me.ResumeLayout(False)
        Me.PerformLayout()

    End Sub
    Friend WithEvents Timer1 As Timer
    Friend WithEvents Label3 As Label
-    Friend WithEvents Button1 As Button
-    Friend WithEvents Button2 As Button
+    Friend WithEvents btnOK As Button
+    Friend WithEvents btnCancel As Button
    Friend WithEvents rbControlName As RadioButton
    Friend WithEvents rbControlPosition As RadioButton
-    Friend WithEvents gbControlName As GroupBox
    Friend WithEvents txtControlName As TextBox
-    Friend WithEvents gbControlPosition As GroupBox
-    Friend WithEvents Label2 As Label
-    Friend WithEvents Label1 As Label
    Friend WithEvents txtControlBounds As TextBox
+    Friend WithEvents Label1 As Label
 End Class
--- a/app/DD_Clipboard_Searcher/frmControlCapture.vb
+++ b/app/DD_Clipboard_Searcher/frmControlCapture.vb
@@ -7,10 +7,11 @@ Public Class frmControlCapture
    Public Property BottomLeft As RectangleInfo
    Public Property BottomRight As RectangleInfo

-    Public Property ControlName As String
+    Public Property ControlName As String = String.Empty
    Public Property ControlBounds As String

-    Private WithEvents Watcher As ClipboardWatcher = ClipboardWatcher.Singleton
+    'Private WithEvents Watcher As ClipboardWatcher = ClipboardWatcher.Singleton
+    Private WithEvents Watcher2 As ClassClipboardWatcher = ClassClipboardWatcher.Singleton
    Private Window As Window

    Private EditMode As Boolean = False
@@ -41,10 +42,11 @@ Public Class frmControlCapture
            txtControlBounds.Text = ControlBounds
        End If

-        AddHandler Watcher.Changed, AddressOf Watcher_Changed
+        'AddHandler Watcher.Changed, AddressOf Watcher_Changed
+        AddHandler Watcher2.Changed, AddressOf Watcher_Changed
    End Sub

-    Private Sub Watcher_Changed(sender As Object, e As EventArgs)
+    Private Sub Watcher_Changed(sender As Object, e As String)
        Try
            ' === CONTROL NAME ===
            Dim oControl As WindowInfo = Window.GetFocusedControl(Handle)
@@ -120,16 +122,20 @@ Public Class frmControlCapture


    Private Sub RadioButton1_CheckedChanged(sender As Object, e As EventArgs) Handles rbControlName.CheckedChanged
-        gbControlName.Enabled = rbControlName.Checked
-        gbControlPosition.Enabled = Not rbControlName.Checked
+        txtControlName.Enabled = rbControlName.Checked
+        txtControlBounds.Enabled = Not rbControlName.Checked
+
+        btnOK.Enabled = rbControlName.Checked And ControlName <> String.Empty
    End Sub

    Private Sub RadioButton2_CheckedChanged(sender As Object, e As EventArgs) Handles rbControlPosition.CheckedChanged
-        gbControlName.Enabled = Not rbControlPosition.Checked
-        gbControlPosition.Enabled = rbControlPosition.Checked
+        txtControlBounds.Enabled = rbControlPosition.Checked
+        txtControlName.Enabled = Not rbControlPosition.Checked
+
+        btnOK.Enabled = rbControlPosition.Checked And TopLeft IsNot Nothing
    End Sub

-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnOK.Click
        If txtControlName.Text = String.Empty And txtControlBounds.Text = String.Empty Then
            MsgBox("Kein Control gefunden!")
            DialogResult = DialogResult.Cancel
--- a/app/DD_Clipboard_Searcher/frmStart.vb
+++ b/app/DD_Clipboard_Searcher/frmStart.vb
@@ -8,7 +8,8 @@ Imports DigitalData.Modules.ClipboardWatcher

 Public Class frmStart
    Private WithEvents Hotkey As New ClassHotkey(Me)
-    Private WithEvents _Watcher As ClipboardWatcher = ClipboardWatcher.Singleton
+    'Private WithEvents _Watcher As ClipboardWatcher = ClipboardWatcher.Singleton
+    Private WithEvents _Watcher2 As ClassClipboardWatcher = ClassClipboardWatcher.Singleton
    Private _MatchForm As frmMatch = Nothing

    Public Sub New()
@@ -97,10 +98,10 @@ Public Class frmStart
    End Sub

    Private Sub frmClipboardWatch_Disposed(ByVal sender As Object, ByVal e As EventArgs) Handles Me.Disposed
-        _Watcher.Dispose()
+        _Watcher2.Dispose()
    End Sub

-    Private Sub WatcherChanged_New(ByVal sender As Object, ByVal e As EventArgs) Handles _Watcher.Changed
+    Private Sub WatcherChanged_New(ByVal sender As Object, ByVal e As String) Handles _Watcher2.Changed
        If MONITORING_ACTIVE = False Then
            Logger.Info("Clipboard Watcher is inactive!")
            'NotifyIconMain.ShowBalloonTip(20000, "Clipboard Watcher", "Clipboard-watcher is inactive.", ToolTipIcon.Info)
--- a/app/SetupWix/Product.wxs
+++ b/app/SetupWix/Product.wxs
@@ -125,7 +125,13 @@
        <File Id="DevExpress.XtraPrinting.v18.1" Name="DevExpress.XtraPrinting.v18.1.dll" />
        <File Id="DevExpress.XtraTreeList.v18.1" Name="DevExpress.XtraTreeList.v18.1.dll" />
        <File Id="DevExpress.XtraDialogs.v18.1" Name="DevExpress.XtraDialogs.v18.1.dll" />
+        <File Id="DevExpress.XtraRichEdit.v18.1" Name="DevExpress.XtraRichEdit.v18.1.dll" />
        <File Id="DevExpress.Dialogs.v18.1.Core" Name="DevExpress.Dialogs.v18.1.Core.dll" />
+        <File Id="DevExpress.RichEdit.v18.1.Core" Name="DevExpress.RichEdit.v18.1.Core.dll" />
+      </Component>
+      
+      <Component Id="IndependentsoftLibs" Guid="136fd96d-3cae-4e50-b82b-423b5d695e7a">
+        <File Id="Msg.Net" Name="Independentsoft.Msg.dll" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Independentsoft.Msg.dll" KeyPath="yes" />
      </Component>

      <Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
@@ -154,6 +160,7 @@
      <ComponentRef Id="DDLibs"/>
      <ComponentRef Id="NLog"/>
      <ComponentRef Id="DevExpressLibs"/>
+      <ComponentRef Id="IndependentsoftLibs"/>
      <ComponentRef Id="GDPictureLibs"/>
      <ComponentRef Id="RegistryKeys" />
    </Feature>
Author	SHA1	Message	Date
Jonathan Jenne	6c3658853c	mark current profile bold	2019-10-22 16:09:31 +02:00
Jonathan Jenne	be7e314b32	add new clipboard watcher class	2019-10-22 16:08:33 +02:00
Jonathan Jenne	42a3aad5e2	check group membership when loading profiles	2019-10-22 15:53:08 +02:00
Jonathan Jenne	a09cb40412	add missing deps	2019-10-22 15:52:44 +02:00