diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index 98db1e6..2507cf3 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb @@ -80,6 +80,7 @@ Partial Class frmAdministration Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem28 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem29 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem30 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonGroup_Profile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroup_DocSearch = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -241,7 +242,6 @@ Partial Class frmAdministration Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() Me.SimpleSeparator1 = New DevExpress.XtraLayout.SimpleSeparator() Me.BehaviorManager1 = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) - Me.BarButtonItem30 = New DevExpress.XtraBars.BarButtonItem() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlProfiles, System.ComponentModel.ISupportInitialize).BeginInit() @@ -825,6 +825,13 @@ Partial Class frmAdministration Me.BarButtonItem29.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem29.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem29.Name = "BarButtonItem29" ' + 'BarButtonItem30 + ' + Me.BarButtonItem30.Caption = "Regex bearbeiten" + Me.BarButtonItem30.Id = 16 + Me.BarButtonItem30.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem30.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem30.Name = "BarButtonItem30" + ' 'RibbonPage2 ' Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonGroup_Profile, Me.RibbonGroup_DocSearch, Me.RibbonGroup_DataSearch, Me.RibbonGroup_Process, Me.RibbonGroup_Window, Me.RibbonGroup_Control}) @@ -2199,7 +2206,7 @@ Partial Class frmAdministration Me.TabPageUserAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageUserAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageUserAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageUserAssignment.Name = "TabPageUserAssignment" - Me.TabPageUserAssignment.Size = New System.Drawing.Size(1114, 545) + Me.TabPageUserAssignment.Size = New System.Drawing.Size(1114, 547) Me.TabPageUserAssignment.Text = "Benutzer-Zuordnung" ' 'SplitContainer1 @@ -2218,7 +2225,7 @@ Partial Class frmAdministration ' Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlUserNotInProfile) Me.SplitContainer1.Panel2.Controls.Add(Me.Label2) - Me.SplitContainer1.Size = New System.Drawing.Size(1114, 545) + Me.SplitContainer1.Size = New System.Drawing.Size(1114, 547) Me.SplitContainer1.SplitterDistance = 264 Me.SplitContainer1.TabIndex = 99 ' @@ -2313,7 +2320,7 @@ Partial Class frmAdministration Me.GridControlUserNotInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlUserNotInProfile.MainView = Me.GridViewUserNotInProfile Me.GridControlUserNotInProfile.Name = "GridControlUserNotInProfile" - Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1114, 252) + Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1114, 254) Me.GridControlUserNotInProfile.TabIndex = 96 Me.GridControlUserNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserNotInProfile}) ' @@ -2466,13 +2473,6 @@ Partial Class frmAdministration Me.SimpleSeparator1.Name = "SimpleSeparator1" Me.SimpleSeparator1.Size = New System.Drawing.Size(280, 2) ' - 'BarButtonItem30 - ' - Me.BarButtonItem30.Caption = "Regex bearbeiten" - Me.BarButtonItem30.Id = 16 - Me.BarButtonItem30.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem30.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem30.Name = "BarButtonItem30" - ' 'frmAdministration ' Me.Appearance.Options.UseFont = True diff --git a/app/DD_Clipboard_Searcher/frmAdministration.resx b/app/DD_Clipboard_Searcher/frmAdministration.resx index c4eab3c..584587b 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.resx +++ b/app/DD_Clipboard_Searcher/frmAdministration.resx @@ -123,9 +123,6 @@ 245, 17 - - 245, 17 - 122, 56 @@ -909,25 +906,12 @@ LDE0LjMsMjZ6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJkCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz - dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp - ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTIzLjcsMTQuNGMwLjUsMC4zLDAuNSwwLjgsMCwxLjFs - LTExLjgsNy4zdjIuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVsMTYuOC0xMC40YzAuNS0wLjMsMC41LTAu - OCwwLTEuMSAgIEwxMi44LDQuMWMtMC41LTAuMy0wLjktMC4xLTAuOSwwLjV2Mi42TDIzLjcsMTQuNHoi - IGNsYXNzPSJCbHVlIiAvPg0KICAgIDxwYXRoIGQ9Ik0xOS43LDE1LjVjMC41LTAuMywwLjUtMC44LDAt - MS4xTDIuOSw0LjFDMi40LDMuOCwyLDQsMiw0LjZ2MjAuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVMMTku - NywxNS41eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCiAgPGcgaWQ9IkxheWVyXzIiIC8+DQo8L3N2 - Zz4L - - + + 500, 95 + + + 290, 95 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -976,12 +960,25 @@ MjAsMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 500, 95 - - - 290, 95 - + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJkCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz + dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp + ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTIzLjcsMTQuNGMwLjUsMC4zLDAuNSwwLjgsMCwxLjFs + LTExLjgsNy4zdjIuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVsMTYuOC0xMC40YzAuNS0wLjMsMC41LTAu + OCwwLTEuMSAgIEwxMi44LDQuMWMtMC41LTAuMy0wLjktMC4xLTAuOSwwLjV2Mi42TDIzLjcsMTQuNHoi + IGNsYXNzPSJCbHVlIiAvPg0KICAgIDxwYXRoIGQ9Ik0xOS43LDE1LjVjMC41LTAuMywwLjUtMC44LDAt + MS4xTDIuOSw0LjFDMi40LDMuOCwyLDQsMiw0LjZ2MjAuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVMMTku + NywxNS41eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCiAgPGcgaWQ9IkxheWVyXzIiIC8+DQo8L3N2 + Zz4L + + 862, 56 diff --git a/app/DD_Clipboard_Searcher/frmMain.vb b/app/DD_Clipboard_Searcher/frmMain.vb index 7300881..bf5a447 100644 --- a/app/DD_Clipboard_Searcher/frmMain.vb +++ b/app/DD_Clipboard_Searcher/frmMain.vb @@ -229,7 +229,7 @@ Public Class frmMain NotifyIconMain.BalloonTipTitle = "Clipboard Watcher" NotifyIconMain.BalloonTipText = "Es wurden keine passenden Profile gefunden." NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning - NotifyIconMain.ShowBalloonTip(2500)+ + NotifyIconMain.ShowBalloonTip(2500) Else Logger.Info("Popup will not be shown. NOMATCH_INFO Is True.") End If diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs index 27d7106..7762c6c 100644 --- a/app/SetupVS19/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -110,30 +110,30 @@ + + + + - + + + + - - - - - - - - + @@ -161,6 +161,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -172,6 +196,7 @@ +