This commit is contained in:
Jonathan Jenne 2021-02-02 16:13:43 +01:00
parent 8b5bb9a813
commit ea715dd9a9
4 changed files with 71 additions and 49 deletions

View File

@ -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

View File

@ -123,9 +123,6 @@
<metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>245, 17</value>
</metadata>
<metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>245, 17</value>
</metadata>
<metadata name="TBWH_UserBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>122, 56</value>
</metadata>
@ -909,25 +906,12 @@
LDE0LjMsMjZ6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
</value>
</data>
<data name="TabPageProfileAssignment.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJkCAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz
dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp
ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTIzLjcsMTQuNGMwLjUsMC4zLDAuNSwwLjgsMCwxLjFs
LTExLjgsNy4zdjIuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVsMTYuOC0xMC40YzAuNS0wLjMsMC41LTAu
OCwwLTEuMSAgIEwxMi44LDQuMWMtMC41LTAuMy0wLjktMC4xLTAuOSwwLjV2Mi42TDIzLjcsMTQuNHoi
IGNsYXNzPSJCbHVlIiAvPg0KICAgIDxwYXRoIGQ9Ik0xOS43LDE1LjVjMC41LTAuMywwLjUtMC44LDAt
MS4xTDIuOSw0LjFDMi40LDMuOCwyLDQsMiw0LjZ2MjAuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVMMTku
NywxNS41eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCiAgPGcgaWQ9IkxheWVyXzIiIC8+DQo8L3N2
Zz4L
</value>
</data>
<metadata name="VWCW_GROUP_PROFILEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>500, 95</value>
</metadata>
<metadata name="TBWH_GROUPBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>290, 95</value>
</metadata>
<data name="TabPageGroupAssignment.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
@ -976,12 +960,25 @@
MjAsMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
</value>
</data>
<metadata name="VWCW_GROUP_PROFILEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>500, 95</value>
</metadata>
<metadata name="TBWH_GROUPBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>290, 95</value>
</metadata>
<data name="TabPageProfileAssignment.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJkCAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz
dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp
ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTIzLjcsMTQuNGMwLjUsMC4zLDAuNSwwLjgsMCwxLjFs
LTExLjgsNy4zdjIuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVsMTYuOC0xMC40YzAuNS0wLjMsMC41LTAu
OCwwLTEuMSAgIEwxMi44LDQuMWMtMC41LTAuMy0wLjktMC4xLTAuOSwwLjV2Mi42TDIzLjcsMTQuNHoi
IGNsYXNzPSJCbHVlIiAvPg0KICAgIDxwYXRoIGQ9Ik0xOS43LDE1LjVjMC41LTAuMywwLjUtMC44LDAt
MS4xTDIuOSw0LjFDMi40LDMuOCwyLDQsMiw0LjZ2MjAuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVMMTku
NywxNS41eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCiAgPGcgaWQ9IkxheWVyXzIiIC8+DQo8L3N2
Zz4L
</value>
</data>
<metadata name="TBCW_PROF_DATA_SEARCHTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>862, 56</value>
</metadata>

View File

@ -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

View File

@ -110,30 +110,30 @@
<!-- DEVEXPRESS Bibliotheken -->
<Component Id="DevExpressLibs" Guid="665D0AC8-93FC-4499-BA89-F660CAC6C577">
<File Id="DevExpress.Charts.v19.2.Core" Name="DevExpress.Charts.v19.2.Core.dll" />
<File Id="DevExpress.Data.v19.2" Name="DevExpress.Data.v19.2.dll" KeyPath="yes" />
<File Id="DevExpress.DataAccess.v19.2.UI" Name="DevExpress.DataAccess.v19.2.UI.dll" />
<File Id="DevExpress.DataAccess.v19.2" Name="DevExpress.DataAccess.v19.2.dll" />
<File Id="DevExpress.Dialogs.v19.2.Core" Name="DevExpress.Dialogs.v19.2.Core.dll" />
<File Id="DevExpress.Images.v19.2" Name="DevExpress.Images.v19.2.dll" />
<File Id="DevExpress.Printing.v19.2.Core" Name="DevExpress.Printing.v19.2.Core.dll" />
<File Id="DevExpress.Office.v19.2.Core" Name="DevExpress.Office.v19.2.Core.dll" />
<File Id="DevExpress.Pdf.v19.2.Core" Name="DevExpress.Pdf.v19.2.Core.dll" />
<File Id="DevExpress.Printing.v19.2.Core" Name="DevExpress.Printing.v19.2.Core.dll" />
<File Id="DevExpress.RichEdit.v19.2.Core" Name="DevExpress.RichEdit.v19.2.Core.dll" />
<File Id="DevExpress.Sparkline.v19.2.Core" Name="DevExpress.Sparkline.v19.2.Core.dll" />
<File Id="DevExpress.Spreadsheet.v19.2.Core" Name="DevExpress.Spreadsheet.v19.2.Core.dll" />
<File Id="DevExpress.Utils.v19.2" Name="DevExpress.Utils.v19.2.dll" />
<File Id="DevExpress.XtraBars.v19.2" Name="DevExpress.XtraBars.v19.2.dll" />
<File Id="DevExpress.XtraDialogs.v19.2" Name="DevExpress.XtraDialogs.v19.2.dll" />
<File Id="DevExpress.XtraEditors.v19.2" Name="DevExpress.XtraEditors.v19.2.dll" />
<File Id="DevExpress.XtraGauges.v19.2.Core" Name="DevExpress.XtraGauges.v19.2.Core.dll" />
<File Id="DevExpress.XtraGauges.v19.2.Win" Name="DevExpress.XtraGauges.v19.2.Win.dll" />
<File Id="DevExpress.XtraGrid.v19.2" Name="DevExpress.XtraGrid.v19.2.dll" />
<File Id="DevExpress.XtraLayout.v19.2" Name="DevExpress.XtraLayout.v19.2.dll" />
<File Id="DevExpress.XtraPrinting.v19.2" Name="DevExpress.XtraPrinting.v19.2.dll" />
<File Id="DevExpress.XtraTreeList.v19.2" Name="DevExpress.XtraTreeList.v19.2.dll" />
<File Id="DevExpress.XtraDialogs.v19.2" Name="DevExpress.XtraDialogs.v19.2.dll" />
<File Id="DevExpress.XtraRichEdit.v19.2" Name="DevExpress.XtraRichEdit.v19.2.dll" />
<File Id="DevExpress.Dialogs.v19.2.Core" Name="DevExpress.Dialogs.v19.2.Core.dll" />
<File Id="DevExpress.RichEdit.v19.2.Core" Name="DevExpress.RichEdit.v19.2.Core.dll" />
<File Id="DevExpress.XtraSpreadsheet.v19.2" Name="DevExpress.XtraSpreadsheet.v19.2.dll" />
<File Id="DevExpress.Spreadsheet.v19.2.Core" Name="DevExpress.Spreadsheet.v19.2.Core.dll" />
<File Id="DevExpress.DataAccess.v19.2.UI" Name="DevExpress.DataAccess.v19.2.UI.dll" />
<File Id="DevExpress.DataAccess.v19.2" Name="DevExpress.DataAccess.v19.2.dll" />
<File Id="DevExpress.Charts.v19.2.Core" Name="DevExpress.Charts.v19.2.Core.dll" />
<File Id="DevExpress.XtraTreeList.v19.2" Name="DevExpress.XtraTreeList.v19.2.dll" />
</Component>
<Component Id="IndependentsoftLibs" Guid="136fd96d-3cae-4e50-b82b-423b5d695e7a">
@ -161,6 +161,30 @@
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
</Component>
<Directory Id="Resources.DE" Name="de">
<Component Id="Resources.DE.Devexpress" Guid="93cbf511-9a82-49e9-8283-678e508ac3b6">
<File Id="DevExpress.DataAccess.v19.2.UI.resources" Name="DevExpress.DataAccess.v19.2.UI.resources.dll" />
<File Id="DevExpress.DataAccess.v19.2.resources" Name="DevExpress.DataAccess.v19.2.resources.dll" />
<File Id="DevExpress.Dialogs.v19.2.Core.resources" Name="DevExpress.Dialogs.v19.2.Core.resources.dll" />
<File Id="DevExpress.Office.v19.2.Core.resources" Name="DevExpress.Office.v19.2.Core.resources.dll" />
<File Id="DevExpress.Pdf.v19.2.Core.resources" Name="DevExpress.Pdf.v19.2.Core.resources.dll" />
<File Id="DevExpress.Printing.v19.2.Core.resources" Name="DevExpress.Printing.v19.2.Core.resources.dll" />
<File Id="DevExpress.RichEdit.v19.2.Core.resources" Name="DevExpress.RichEdit.v19.2.Core.resources.dll" />
<File Id="DevExpress.Sparkline.v19.2.Core.resources" Name="DevExpress.Sparkline.v19.2.Core.resources.dll" />
<File Id="DevExpress.Spreadsheet.v19.2.Core.resources" Name="DevExpress.Spreadsheet.v19.2.Core.resources.dll" />
<File Id="DevExpress.Utils.v19.2.resources" Name="DevExpress.Utils.v19.2.resources.dll" />
<File Id="DevExpress.XtraBars.v19.2.resources" Name="DevExpress.XtraBars.v19.2.resources.dll" />
<File Id="DevExpress.XtraEditors.v19.2.resources" Name="DevExpress.XtraEditors.v19.2.resources.dll" />
<File Id="DevExpress.XtraGauges.v19.2.Core.resources" Name="DevExpress.XtraGauges.v19.2.Core.resources.dll" />
<File Id="DevExpress.XtraGrid.v19.2.resources" Name="DevExpress.XtraGrid.v19.2.resources.dll" />
<File Id="DevExpress.XtraLayout.v19.2.resources" Name="DevExpress.XtraLayout.v19.2.resources.dll" />
<File Id="DevExpress.XtraPrinting.v19.2.resources" Name="DevExpress.XtraPrinting.v19.2.resources.dll" />
<File Id="DevExpress.XtraRichEdit.v19.2.resources" Name="DevExpress.XtraRichEdit.v19.2.resources.dll" />
<File Id="DevExpress.XtraSpreadsheet.v19.2.resources" Name="DevExpress.XtraSpreadsheet.v19.2.resources.dll" />
<File Id="DevExpress.XtraTreeList.v19.2.resources" Name="DevExpress.XtraTreeList.v19.2.resources.dll" />
</Component>
</Directory>
</DirectoryRef>
<Feature Id="MainApplication" Title="Main Application" Level="1">
@ -172,6 +196,7 @@
<ComponentRef Id="IndependentsoftLibs"/>
<ComponentRef Id="GDPictureLibs"/>
<ComponentRef Id="RegistryKeys" />
<ComponentRef Id="Resources.DE.Devexpress" />
</Feature>
<Feature Id="DesktopShortcut" Title="Desktop Shortcut">