diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb index de1bacd..45f0420 100644 --- a/app/DD_Clipboard_Searcher/ClassInit.vb +++ b/app/DD_Clipboard_Searcher/ClassInit.vb @@ -237,9 +237,8 @@ Public Class ClassInit HotkeySearchKey = oResult HotkeySearchKey_via_Server = True Catch ex As Exception - HotkeySearchKey_via_Server = "d" + HotkeySearchKey = "d" End Try - Else Logger.Info($"Wrong oMode: {oMode}") End If diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj index 2f0c599..19e3adc 100644 --- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj +++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj @@ -113,7 +113,8 @@ False ..\..\..\DDMonorepo\Modules.Patterns\bin\Debug\DigitalData.Modules.Patterns.dll - + + False ..\..\..\DDMonorepo\Windows\bin\Debug\DigitalData.Modules.Windows.dll diff --git a/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb b/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb index 009409b..b7b960d 100644 --- a/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb +++ b/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb @@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices - - + + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index 98db1e6..0b83122 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() @@ -560,25 +560,25 @@ Partial Class frmAdministration Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1243, 199, 650, 400) Me.LayoutControl1.Root = Me.LayoutControlGroup1 - Me.LayoutControl1.Size = New System.Drawing.Size(388, 358) + Me.LayoutControl1.Size = New System.Drawing.Size(454, 462) Me.LayoutControl1.TabIndex = 22 Me.LayoutControl1.Text = "LayoutControl1" ' 'txtProfileName ' Me.txtProfileName.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True)) - Me.txtProfileName.Location = New System.Drawing.Point(131, 58) + Me.txtProfileName.Location = New System.Drawing.Point(139, 82) Me.txtProfileName.Name = "txtProfileName" - Me.txtProfileName.Size = New System.Drawing.Size(245, 20) + Me.txtProfileName.Size = New System.Drawing.Size(295, 20) Me.txtProfileName.StyleController = Me.LayoutControl1 Me.txtProfileName.TabIndex = 6 ' 'textEdit4 ' Me.textEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "COMMENT", True)) - Me.textEdit4.Location = New System.Drawing.Point(131, 114) + Me.textEdit4.Location = New System.Drawing.Point(139, 154) Me.textEdit4.Name = "textEdit4" - Me.textEdit4.Size = New System.Drawing.Size(245, 20) + Me.textEdit4.Size = New System.Drawing.Size(265, 20) Me.textEdit4.StyleController = Me.LayoutControl1 Me.textEdit4.TabIndex = 7 ' @@ -589,7 +589,7 @@ Partial Class frmAdministration Me.CheckEdit1.MenuManager = Me.RibbonControl2 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Profil Aktiv" - Me.CheckEdit1.Size = New System.Drawing.Size(364, 18) + Me.CheckEdit1.Size = New System.Drawing.Size(430, 18) Me.CheckEdit1.StyleController = Me.LayoutControl1 Me.CheckEdit1.TabIndex = 10 ' @@ -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}) @@ -911,7 +918,7 @@ Partial Class frmAdministration 'textEdit2 ' Me.textEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "PROFILE_TYPE", True)) - Me.textEdit2.Location = New System.Drawing.Point(131, 86) + Me.textEdit2.Location = New System.Drawing.Point(139, 118) Me.textEdit2.Name = "textEdit2" Me.textEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.textEdit2.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("TYPE_NAME", "Profil Typ", 68, DevExpress.Utils.FormatType.None, "", True, DevExpress.Utils.HorzAlignment.Near, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.[Default])}) @@ -921,7 +928,7 @@ Partial Class frmAdministration Me.textEdit2.Properties.PopupSizeable = False Me.textEdit2.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.textEdit2.Properties.ValueMember = "TYPE_ID" - Me.textEdit2.Size = New System.Drawing.Size(245, 20) + Me.textEdit2.Size = New System.Drawing.Size(295, 20) Me.textEdit2.StyleController = Me.LayoutControl1 Me.textEdit2.TabIndex = 5 ' @@ -933,77 +940,77 @@ Partial Class frmAdministration 'TextEdit8 ' Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True)) - Me.TextEdit8.Location = New System.Drawing.Point(12, 262) + Me.TextEdit8.Location = New System.Drawing.Point(20, 356) Me.TextEdit8.Name = "TextEdit8" Me.TextEdit8.Properties.ReadOnly = True - Me.TextEdit8.Size = New System.Drawing.Size(180, 20) + Me.TextEdit8.Size = New System.Drawing.Size(197, 20) Me.TextEdit8.StyleController = Me.LayoutControl1 Me.TextEdit8.TabIndex = 4 ' 'TextEdit7 ' Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True)) - Me.TextEdit7.Location = New System.Drawing.Point(196, 262) + Me.TextEdit7.Location = New System.Drawing.Point(237, 356) Me.TextEdit7.Name = "TextEdit7" Me.TextEdit7.Properties.ReadOnly = True - Me.TextEdit7.Size = New System.Drawing.Size(180, 20) + Me.TextEdit7.Size = New System.Drawing.Size(197, 20) Me.TextEdit7.StyleController = Me.LayoutControl1 Me.TextEdit7.TabIndex = 5 ' 'CHANGEDWHOTextBox ' Me.CHANGEDWHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True)) - Me.CHANGEDWHOTextBox.Location = New System.Drawing.Point(12, 302) + Me.CHANGEDWHOTextBox.Location = New System.Drawing.Point(20, 412) Me.CHANGEDWHOTextBox.Name = "CHANGEDWHOTextBox" Me.CHANGEDWHOTextBox.Properties.ReadOnly = True - Me.CHANGEDWHOTextBox.Size = New System.Drawing.Size(180, 20) + Me.CHANGEDWHOTextBox.Size = New System.Drawing.Size(197, 20) Me.CHANGEDWHOTextBox.StyleController = Me.LayoutControl1 Me.CHANGEDWHOTextBox.TabIndex = 6 ' 'TextEdit6 ' Me.TextEdit6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit6.Location = New System.Drawing.Point(196, 302) + Me.TextEdit6.Location = New System.Drawing.Point(237, 412) Me.TextEdit6.Name = "TextEdit6" Me.TextEdit6.Properties.ReadOnly = True - Me.TextEdit6.Size = New System.Drawing.Size(180, 20) + Me.TextEdit6.Size = New System.Drawing.Size(197, 20) Me.TextEdit6.StyleController = Me.LayoutControl1 Me.TextEdit6.TabIndex = 7 ' 'PROFILE_IDTextBox ' Me.PROFILE_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "GUID", True)) - Me.PROFILE_IDTextBox.Location = New System.Drawing.Point(131, 34) + Me.PROFILE_IDTextBox.Location = New System.Drawing.Point(139, 42) Me.PROFILE_IDTextBox.MenuManager = Me.RibbonControl2 Me.PROFILE_IDTextBox.Name = "PROFILE_IDTextBox" Me.PROFILE_IDTextBox.Properties.ReadOnly = True - Me.PROFILE_IDTextBox.Size = New System.Drawing.Size(245, 20) + Me.PROFILE_IDTextBox.Size = New System.Drawing.Size(295, 20) Me.PROFILE_IDTextBox.StyleController = Me.LayoutControl1 Me.PROFILE_IDTextBox.TabIndex = 11 ' 'textEdit5 ' Me.textEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "REGEX_EXPRESSION", True)) - Me.textEdit5.Location = New System.Drawing.Point(131, 142) + Me.textEdit5.Location = New System.Drawing.Point(139, 191) Me.textEdit5.Name = "textEdit5" - Me.textEdit5.Size = New System.Drawing.Size(245, 50) + Me.textEdit5.Size = New System.Drawing.Size(295, 47) Me.textEdit5.StyleController = Me.LayoutControl1 Me.textEdit5.TabIndex = 8 ' 'txtRegexTestString ' - Me.txtRegexTestString.Location = New System.Drawing.Point(131, 196) + Me.txtRegexTestString.Location = New System.Drawing.Point(139, 258) Me.txtRegexTestString.MenuManager = Me.RibbonControl2 Me.txtRegexTestString.Name = "txtRegexTestString" - Me.txtRegexTestString.Size = New System.Drawing.Size(245, 20) + Me.txtRegexTestString.Size = New System.Drawing.Size(295, 20) Me.txtRegexTestString.StyleController = Me.LayoutControl1 Me.txtRegexTestString.TabIndex = 12 ' 'SimpleButton1 ' - Me.SimpleButton1.Location = New System.Drawing.Point(12, 220) + Me.SimpleButton1.Location = New System.Drawing.Point(20, 298) Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(364, 22) + Me.SimpleButton1.Size = New System.Drawing.Size(414, 22) Me.SimpleButton1.StyleController = Me.LayoutControl1 Me.SimpleButton1.TabIndex = 13 Me.SimpleButton1.Text = "Regular Expression prüfen" @@ -1014,17 +1021,18 @@ Partial Class frmAdministration Me.LayoutControlGroup1.GroupBordersVisible = False Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.layoutControlItem2, Me.layoutControlItem4, Me.layoutControlItem5, Me.LayoutControlItem7, Me.layoutControlItem1, Me.layoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem9, Me.LayoutControlItem20, Me.EmptySpaceItem3, Me.layoutControlItem3, Me.LayoutControlItem35, Me.LayoutControlItem36}) Me.LayoutControlGroup1.Name = "Root" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(388, 358) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(454, 462) Me.LayoutControlGroup1.TextVisible = False ' 'layoutControlItem2 ' Me.layoutControlItem2.Control = Me.textEdit2 Me.layoutControlItem2.CustomizationFormText = "Profil Typ" - Me.layoutControlItem2.Location = New System.Drawing.Point(0, 74) + Me.layoutControlItem2.Location = New System.Drawing.Point(0, 98) Me.layoutControlItem2.MinSize = New System.Drawing.Size(149, 24) Me.layoutControlItem2.Name = "layoutControlItem2" - Me.layoutControlItem2.Size = New System.Drawing.Size(368, 28) + Me.layoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.layoutControlItem2.Size = New System.Drawing.Size(434, 36) Me.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom Me.layoutControlItem2.Text = "Profil Typ" Me.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Left @@ -1034,11 +1042,12 @@ Partial Class frmAdministration ' Me.layoutControlItem4.Control = Me.textEdit4 Me.layoutControlItem4.CustomizationFormText = "Kommentar" - Me.layoutControlItem4.Location = New System.Drawing.Point(0, 102) + Me.layoutControlItem4.Location = New System.Drawing.Point(0, 134) Me.layoutControlItem4.MaxSize = New System.Drawing.Size(404, 0) Me.layoutControlItem4.MinSize = New System.Drawing.Size(149, 24) Me.layoutControlItem4.Name = "layoutControlItem4" - Me.layoutControlItem4.Size = New System.Drawing.Size(368, 28) + Me.layoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.layoutControlItem4.Size = New System.Drawing.Size(434, 37) Me.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom Me.layoutControlItem4.Text = "Kommentar" Me.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Left @@ -1048,10 +1057,11 @@ Partial Class frmAdministration ' Me.layoutControlItem5.Control = Me.textEdit5 Me.layoutControlItem5.CustomizationFormText = "Regular Expression" - Me.layoutControlItem5.Location = New System.Drawing.Point(0, 130) + Me.layoutControlItem5.Location = New System.Drawing.Point(0, 171) Me.layoutControlItem5.MinSize = New System.Drawing.Size(50, 25) Me.layoutControlItem5.Name = "layoutControlItem5" - Me.layoutControlItem5.Size = New System.Drawing.Size(368, 54) + Me.layoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.layoutControlItem5.Size = New System.Drawing.Size(434, 67) Me.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom Me.layoutControlItem5.Text = "Regular Expression" Me.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Left @@ -1062,7 +1072,7 @@ Partial Class frmAdministration Me.LayoutControlItem7.Control = Me.CheckEdit1 Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem7.Name = "LayoutControlItem7" - Me.LayoutControlItem7.Size = New System.Drawing.Size(368, 22) + Me.LayoutControlItem7.Size = New System.Drawing.Size(434, 22) Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem7.TextVisible = False ' @@ -1070,9 +1080,10 @@ Partial Class frmAdministration ' Me.layoutControlItem1.Control = Me.TextEdit8 Me.layoutControlItem1.CustomizationFormText = "layoutControlItem1" - Me.layoutControlItem1.Location = New System.Drawing.Point(0, 234) + Me.layoutControlItem1.Location = New System.Drawing.Point(0, 320) Me.layoutControlItem1.Name = "layoutControlItem1" - Me.layoutControlItem1.Size = New System.Drawing.Size(184, 40) + Me.layoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.layoutControlItem1.Size = New System.Drawing.Size(217, 56) Me.layoutControlItem1.Text = "Erstellt Wer" Me.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top Me.layoutControlItem1.TextSize = New System.Drawing.Size(116, 13) @@ -1081,9 +1092,10 @@ Partial Class frmAdministration ' Me.layoutControlItem6.Control = Me.TextEdit7 Me.layoutControlItem6.CustomizationFormText = "layoutControlItem2" - Me.layoutControlItem6.Location = New System.Drawing.Point(184, 234) + Me.layoutControlItem6.Location = New System.Drawing.Point(217, 320) Me.layoutControlItem6.Name = "layoutControlItem6" - Me.layoutControlItem6.Size = New System.Drawing.Size(184, 40) + Me.layoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.layoutControlItem6.Size = New System.Drawing.Size(217, 56) Me.layoutControlItem6.Text = "Erstellt wann" Me.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top Me.layoutControlItem6.TextSize = New System.Drawing.Size(116, 13) @@ -1092,9 +1104,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem8.Control = Me.CHANGEDWHOTextBox Me.LayoutControlItem8.CustomizationFormText = "layoutControlItem3" - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 274) + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 376) Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Size = New System.Drawing.Size(184, 40) + Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem8.Size = New System.Drawing.Size(217, 56) Me.LayoutControlItem8.Text = "Geändert wer" Me.LayoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem8.TextSize = New System.Drawing.Size(116, 13) @@ -1103,9 +1116,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem9.Control = Me.TextEdit6 Me.LayoutControlItem9.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem9.Location = New System.Drawing.Point(184, 274) + Me.LayoutControlItem9.Location = New System.Drawing.Point(217, 376) Me.LayoutControlItem9.Name = "LayoutControlItem9" - Me.LayoutControlItem9.Size = New System.Drawing.Size(184, 40) + Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem9.Size = New System.Drawing.Size(217, 56) Me.LayoutControlItem9.Text = "Geändert wann" Me.LayoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem9.TextSize = New System.Drawing.Size(116, 13) @@ -1115,26 +1129,28 @@ Partial Class frmAdministration Me.LayoutControlItem20.Control = Me.PROFILE_IDTextBox Me.LayoutControlItem20.Location = New System.Drawing.Point(0, 22) Me.LayoutControlItem20.Name = "LayoutControlItem20" - Me.LayoutControlItem20.Size = New System.Drawing.Size(368, 24) + Me.LayoutControlItem20.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem20.Size = New System.Drawing.Size(434, 40) Me.LayoutControlItem20.Text = "ID" Me.LayoutControlItem20.TextSize = New System.Drawing.Size(116, 13) ' 'EmptySpaceItem3 ' Me.EmptySpaceItem3.AllowHotTrack = False - Me.EmptySpaceItem3.Location = New System.Drawing.Point(0, 314) + Me.EmptySpaceItem3.Location = New System.Drawing.Point(0, 432) Me.EmptySpaceItem3.Name = "EmptySpaceItem3" - Me.EmptySpaceItem3.Size = New System.Drawing.Size(368, 24) + Me.EmptySpaceItem3.Size = New System.Drawing.Size(434, 10) Me.EmptySpaceItem3.TextSize = New System.Drawing.Size(0, 0) ' 'layoutControlItem3 ' Me.layoutControlItem3.Control = Me.txtProfileName Me.layoutControlItem3.CustomizationFormText = "Name" - Me.layoutControlItem3.Location = New System.Drawing.Point(0, 46) + Me.layoutControlItem3.Location = New System.Drawing.Point(0, 62) Me.layoutControlItem3.MinSize = New System.Drawing.Size(149, 24) Me.layoutControlItem3.Name = "layoutControlItem3" - Me.layoutControlItem3.Size = New System.Drawing.Size(368, 28) + Me.layoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.layoutControlItem3.Size = New System.Drawing.Size(434, 36) Me.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom Me.layoutControlItem3.Text = "Name" Me.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Left @@ -1143,18 +1159,20 @@ Partial Class frmAdministration 'LayoutControlItem35 ' Me.LayoutControlItem35.Control = Me.txtRegexTestString - Me.LayoutControlItem35.Location = New System.Drawing.Point(0, 184) + Me.LayoutControlItem35.Location = New System.Drawing.Point(0, 238) Me.LayoutControlItem35.Name = "LayoutControlItem35" - Me.LayoutControlItem35.Size = New System.Drawing.Size(368, 24) + Me.LayoutControlItem35.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem35.Size = New System.Drawing.Size(434, 40) Me.LayoutControlItem35.Text = "Regular Expression Test" Me.LayoutControlItem35.TextSize = New System.Drawing.Size(116, 13) ' 'LayoutControlItem36 ' Me.LayoutControlItem36.Control = Me.SimpleButton1 - Me.LayoutControlItem36.Location = New System.Drawing.Point(0, 208) + Me.LayoutControlItem36.Location = New System.Drawing.Point(0, 278) Me.LayoutControlItem36.Name = "LayoutControlItem36" - Me.LayoutControlItem36.Size = New System.Drawing.Size(368, 26) + Me.LayoutControlItem36.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem36.Size = New System.Drawing.Size(434, 42) Me.LayoutControlItem36.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem36.TextVisible = False ' @@ -1200,47 +1218,47 @@ Partial Class frmAdministration Me.CheckEdit3.Location = New System.Drawing.Point(12, 12) Me.CheckEdit3.Name = "CheckEdit3" Me.CheckEdit3.Properties.Caption = "Suche Aktiv" - Me.CheckEdit3.Size = New System.Drawing.Size(299, 18) + Me.CheckEdit3.Size = New System.Drawing.Size(362, 18) Me.CheckEdit3.StyleController = Me.LayoutControlDocs Me.CheckEdit3.TabIndex = 8 ' 'TextEdit17 ' Me.TextEdit17.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHO", True)) - Me.TextEdit17.Location = New System.Drawing.Point(12, 146) + Me.TextEdit17.Location = New System.Drawing.Point(20, 218) Me.TextEdit17.Name = "TextEdit17" Me.TextEdit17.Properties.ReadOnly = True - Me.TextEdit17.Size = New System.Drawing.Size(142, 20) + Me.TextEdit17.Size = New System.Drawing.Size(126, 20) Me.TextEdit17.StyleController = Me.LayoutControlDocs Me.TextEdit17.TabIndex = 4 ' 'TextEdit15 ' Me.TextEdit15.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHEN", True)) - Me.TextEdit15.Location = New System.Drawing.Point(158, 146) + Me.TextEdit15.Location = New System.Drawing.Point(166, 218) Me.TextEdit15.Name = "TextEdit15" Me.TextEdit15.Properties.ReadOnly = True - Me.TextEdit15.Size = New System.Drawing.Size(153, 20) + Me.TextEdit15.Size = New System.Drawing.Size(200, 20) Me.TextEdit15.StyleController = Me.LayoutControlDocs Me.TextEdit15.TabIndex = 5 ' 'TextEdit18 ' Me.TextEdit18.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit18.Location = New System.Drawing.Point(158, 186) + Me.TextEdit18.Location = New System.Drawing.Point(166, 274) Me.TextEdit18.Name = "TextEdit18" Me.TextEdit18.Properties.ReadOnly = True - Me.TextEdit18.Size = New System.Drawing.Size(153, 20) + Me.TextEdit18.Size = New System.Drawing.Size(200, 20) Me.TextEdit18.StyleController = Me.LayoutControlDocs Me.TextEdit18.TabIndex = 7 ' 'CHANGED_WHOTextBox2 ' Me.CHANGED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHO", True)) - Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(12, 186) + Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(20, 274) Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2" Me.CHANGED_WHOTextBox2.Properties.ReadOnly = True - Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(142, 20) + Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(126, 20) Me.CHANGED_WHOTextBox2.StyleController = Me.LayoutControlDocs Me.CHANGED_WHOTextBox2.TabIndex = 6 ' @@ -1248,16 +1266,16 @@ Partial Class frmAdministration ' Me.txtDocSearchName.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_TITLE", True)) Me.txtDocSearchName.EditValue = "" - Me.txtDocSearchName.Location = New System.Drawing.Point(140, 58) + Me.txtDocSearchName.Location = New System.Drawing.Point(148, 82) Me.txtDocSearchName.Name = "txtDocSearchName" - Me.txtDocSearchName.Size = New System.Drawing.Size(171, 20) + Me.txtDocSearchName.Size = New System.Drawing.Size(218, 20) Me.txtDocSearchName.StyleController = Me.LayoutControlDocs Me.txtDocSearchName.TabIndex = 9 ' 'LookUpEdit1 ' Me.LookUpEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CONN_ID", True)) - Me.LookUpEdit1.Location = New System.Drawing.Point(140, 106) + Me.LookUpEdit1.Location = New System.Drawing.Point(148, 162) Me.LookUpEdit1.Name = "LookUpEdit1" Me.LookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.LookUpEdit1.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("BEZEICHNUNG", "Verbindung", 80, DevExpress.Utils.FormatType.None, "", True, DevExpress.Utils.HorzAlignment.Near, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.[Default])}) @@ -1267,7 +1285,7 @@ Partial Class frmAdministration Me.LookUpEdit1.Properties.PopupSizeable = False Me.LookUpEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.LookUpEdit1.Properties.ValueMember = "GUID" - Me.LookUpEdit1.Size = New System.Drawing.Size(171, 20) + Me.LookUpEdit1.Size = New System.Drawing.Size(218, 20) Me.LookUpEdit1.StyleController = Me.LayoutControlDocs Me.LookUpEdit1.TabIndex = 11 ' @@ -1279,39 +1297,39 @@ Partial Class frmAdministration 'MemoEdit5 ' Me.MemoEdit5.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "SQL_COMMAND", True)) - Me.MemoEdit5.Location = New System.Drawing.Point(315, 54) + Me.MemoEdit5.Location = New System.Drawing.Point(378, 54) Me.MemoEdit5.Name = "MemoEdit5" Me.MemoEdit5.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit5.Properties.Appearance.Options.UseFont = True - Me.MemoEdit5.Size = New System.Drawing.Size(587, 163) + Me.MemoEdit5.Size = New System.Drawing.Size(524, 163) Me.MemoEdit5.StyleController = Me.LayoutControlDocs Me.MemoEdit5.TabIndex = 12 ' 'MemoEdit6 ' Me.MemoEdit6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.MemoEdit6.Location = New System.Drawing.Point(315, 300) + Me.MemoEdit6.Location = New System.Drawing.Point(378, 300) Me.MemoEdit6.Name = "MemoEdit6" Me.MemoEdit6.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit6.Properties.Appearance.Options.UseFont = True - Me.MemoEdit6.Size = New System.Drawing.Size(587, 235) + Me.MemoEdit6.Size = New System.Drawing.Size(524, 235) Me.MemoEdit6.StyleController = Me.LayoutControlDocs Me.MemoEdit6.TabIndex = 13 ' 'txtDOC_GUID ' Me.txtDOC_GUID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "GUID", True)) - Me.txtDOC_GUID.Location = New System.Drawing.Point(140, 34) + Me.txtDOC_GUID.Location = New System.Drawing.Point(148, 42) Me.txtDOC_GUID.Name = "txtDOC_GUID" Me.txtDOC_GUID.Properties.ReadOnly = True - Me.txtDOC_GUID.Size = New System.Drawing.Size(171, 20) + Me.txtDOC_GUID.Size = New System.Drawing.Size(218, 20) Me.txtDOC_GUID.StyleController = Me.LayoutControlDocs Me.txtDOC_GUID.TabIndex = 14 ' 'TextEdit19 ' Me.TextEdit19.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_INDEX", True)) - Me.TextEdit19.Location = New System.Drawing.Point(140, 82) + Me.TextEdit19.Location = New System.Drawing.Point(148, 122) Me.TextEdit19.Name = "TextEdit19" Me.TextEdit19.Properties.AutoHeight = False Me.TextEdit19.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -1322,7 +1340,7 @@ Partial Class frmAdministration Me.TextEdit19.Properties.PopupSizeable = False Me.TextEdit19.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.TextEdit19.Properties.ValueMember = "POSITION_INDEX" - Me.TextEdit19.Size = New System.Drawing.Size(171, 20) + Me.TextEdit19.Size = New System.Drawing.Size(218, 20) Me.TextEdit19.StyleController = Me.LayoutControlDocs Me.TextEdit19.TabIndex = 10 ' @@ -1333,38 +1351,38 @@ Partial Class frmAdministration ' 'ComboBoxEdit3 ' - Me.ComboBoxEdit3.Location = New System.Drawing.Point(443, 12) + Me.ComboBoxEdit3.Location = New System.Drawing.Point(506, 12) Me.ComboBoxEdit3.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit3.Name = "ComboBoxEdit3" Me.ComboBoxEdit3.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit3.Size = New System.Drawing.Size(357, 20) + Me.ComboBoxEdit3.Size = New System.Drawing.Size(343, 20) Me.ComboBoxEdit3.StyleController = Me.LayoutControlDocs Me.ComboBoxEdit3.TabIndex = 15 ' 'SimpleButton2 ' - Me.SimpleButton2.Location = New System.Drawing.Point(804, 12) + Me.SimpleButton2.Location = New System.Drawing.Point(853, 12) Me.SimpleButton2.Name = "SimpleButton2" - Me.SimpleButton2.Size = New System.Drawing.Size(98, 22) + Me.SimpleButton2.Size = New System.Drawing.Size(49, 22) Me.SimpleButton2.StyleController = Me.LayoutControlDocs Me.SimpleButton2.TabIndex = 16 Me.SimpleButton2.Text = "Einfügen" ' 'ComboBoxEdit4 ' - Me.ComboBoxEdit4.Location = New System.Drawing.Point(443, 258) + Me.ComboBoxEdit4.Location = New System.Drawing.Point(506, 258) Me.ComboBoxEdit4.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit4.Name = "ComboBoxEdit4" Me.ComboBoxEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit4.Size = New System.Drawing.Size(357, 20) + Me.ComboBoxEdit4.Size = New System.Drawing.Size(343, 20) Me.ComboBoxEdit4.StyleController = Me.LayoutControlDocs Me.ComboBoxEdit4.TabIndex = 17 ' 'SimpleButton3 ' - Me.SimpleButton3.Location = New System.Drawing.Point(804, 258) + Me.SimpleButton3.Location = New System.Drawing.Point(853, 258) Me.SimpleButton3.Name = "SimpleButton3" - Me.SimpleButton3.Size = New System.Drawing.Size(98, 22) + Me.SimpleButton3.Size = New System.Drawing.Size(49, 22) Me.SimpleButton3.StyleController = Me.LayoutControlDocs Me.SimpleButton3.TabIndex = 18 Me.SimpleButton3.Text = "Einfügen" @@ -1382,9 +1400,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem29.Control = Me.txtDocSearchName Me.LayoutControlItem29.CustomizationFormText = "Titel:" - Me.LayoutControlItem29.Location = New System.Drawing.Point(0, 46) + Me.LayoutControlItem29.Location = New System.Drawing.Point(0, 62) Me.LayoutControlItem29.Name = "LayoutControlItem29" - Me.LayoutControlItem29.Size = New System.Drawing.Size(303, 24) + Me.LayoutControlItem29.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem29.Size = New System.Drawing.Size(366, 40) Me.LayoutControlItem29.Text = "Titel:" Me.LayoutControlItem29.TextSize = New System.Drawing.Size(125, 13) ' @@ -1392,9 +1411,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem30.Control = Me.TextEdit19 Me.LayoutControlItem30.CustomizationFormText = "Position:" - Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 70) + Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 102) Me.LayoutControlItem30.Name = "LayoutControlItem30" - Me.LayoutControlItem30.Size = New System.Drawing.Size(303, 24) + Me.LayoutControlItem30.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem30.Size = New System.Drawing.Size(366, 40) Me.LayoutControlItem30.Text = "Position/Reihenfolge:" Me.LayoutControlItem30.TextSize = New System.Drawing.Size(125, 13) ' @@ -1402,9 +1422,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem31.Control = Me.LookUpEdit1 Me.LayoutControlItem31.CustomizationFormText = "Verbindung:" - Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 94) + Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 142) Me.LayoutControlItem31.Name = "LayoutControlItem31" - Me.LayoutControlItem31.Size = New System.Drawing.Size(303, 24) + Me.LayoutControlItem31.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem31.Size = New System.Drawing.Size(366, 40) Me.LayoutControlItem31.Text = "Datenbank-Verbindung:" Me.LayoutControlItem31.TextSize = New System.Drawing.Size(125, 13) ' @@ -1412,9 +1433,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem25.Control = Me.TextEdit17 Me.LayoutControlItem25.CustomizationFormText = "layoutControlItem1" - Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 118) + Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 182) Me.LayoutControlItem25.Name = "LayoutControlItem25" - Me.LayoutControlItem25.Size = New System.Drawing.Size(146, 40) + Me.LayoutControlItem25.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem25.Size = New System.Drawing.Size(146, 56) Me.LayoutControlItem25.Text = "Erstellt wer:" Me.LayoutControlItem25.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem25.TextSize = New System.Drawing.Size(125, 13) @@ -1423,9 +1445,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem27.Control = Me.TextEdit18 Me.LayoutControlItem27.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem27.Location = New System.Drawing.Point(146, 158) + Me.LayoutControlItem27.Location = New System.Drawing.Point(146, 238) Me.LayoutControlItem27.Name = "LayoutControlItem27" - Me.LayoutControlItem27.Size = New System.Drawing.Size(157, 40) + Me.LayoutControlItem27.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem27.Size = New System.Drawing.Size(220, 56) Me.LayoutControlItem27.Text = "Geändert wann:" Me.LayoutControlItem27.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem27.TextSize = New System.Drawing.Size(125, 13) @@ -1434,9 +1457,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem26.Control = Me.TextEdit15 Me.LayoutControlItem26.CustomizationFormText = "layoutControlItem2" - Me.LayoutControlItem26.Location = New System.Drawing.Point(146, 118) + Me.LayoutControlItem26.Location = New System.Drawing.Point(146, 182) Me.LayoutControlItem26.Name = "LayoutControlItem26" - Me.LayoutControlItem26.Size = New System.Drawing.Size(157, 40) + Me.LayoutControlItem26.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem26.Size = New System.Drawing.Size(220, 56) Me.LayoutControlItem26.Text = "Erstellt wann:" Me.LayoutControlItem26.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem26.TextSize = New System.Drawing.Size(125, 13) @@ -1444,18 +1468,18 @@ Partial Class frmAdministration 'EmptySpaceItem2 ' Me.EmptySpaceItem2.AllowHotTrack = False - Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 198) + Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 294) Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(303, 328) + Me.EmptySpaceItem2.Size = New System.Drawing.Size(366, 232) Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem33 ' Me.LayoutControlItem33.Control = Me.MemoEdit6 Me.LayoutControlItem33.CustomizationFormText = "SQL für Ergebnis Zählung:" - Me.LayoutControlItem33.Location = New System.Drawing.Point(303, 272) + Me.LayoutControlItem33.Location = New System.Drawing.Point(366, 272) Me.LayoutControlItem33.Name = "LayoutControlItem33" - Me.LayoutControlItem33.Size = New System.Drawing.Size(591, 255) + Me.LayoutControlItem33.Size = New System.Drawing.Size(528, 255) Me.LayoutControlItem33.Text = "SQL für Ergebnis Zählung:" Me.LayoutControlItem33.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem33.TextSize = New System.Drawing.Size(125, 13) @@ -1464,9 +1488,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem32.Control = Me.MemoEdit5 Me.LayoutControlItem32.CustomizationFormText = "SQL für Suche:" - Me.LayoutControlItem32.Location = New System.Drawing.Point(303, 26) + Me.LayoutControlItem32.Location = New System.Drawing.Point(366, 26) Me.LayoutControlItem32.Name = "LayoutControlItem32" - Me.LayoutControlItem32.Size = New System.Drawing.Size(591, 183) + Me.LayoutControlItem32.Size = New System.Drawing.Size(528, 183) Me.LayoutControlItem32.Text = "SQL für Suche:" Me.LayoutControlItem32.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem32.TextSize = New System.Drawing.Size(125, 13) @@ -1477,7 +1501,8 @@ Partial Class frmAdministration Me.LayoutControlItem34.CustomizationFormText = "ID:" Me.LayoutControlItem34.Location = New System.Drawing.Point(0, 22) Me.LayoutControlItem34.Name = "LayoutControlItem34" - Me.LayoutControlItem34.Size = New System.Drawing.Size(303, 24) + Me.LayoutControlItem34.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem34.Size = New System.Drawing.Size(366, 40) Me.LayoutControlItem34.Text = "ID:" Me.LayoutControlItem34.TextSize = New System.Drawing.Size(125, 13) ' @@ -1487,7 +1512,7 @@ Partial Class frmAdministration Me.LayoutControlItem24.CustomizationFormText = "LayoutControlItem10" Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem24.Name = "LayoutControlItem24" - Me.LayoutControlItem24.Size = New System.Drawing.Size(303, 22) + Me.LayoutControlItem24.Size = New System.Drawing.Size(366, 22) Me.LayoutControlItem24.Text = "LayoutControlItem10" Me.LayoutControlItem24.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem24.TextVisible = False @@ -1496,9 +1521,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem28.Control = Me.CHANGED_WHOTextBox2 Me.LayoutControlItem28.CustomizationFormText = "layoutControlItem3" - Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 158) + Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 238) Me.LayoutControlItem28.Name = "LayoutControlItem28" - Me.LayoutControlItem28.Size = New System.Drawing.Size(146, 40) + Me.LayoutControlItem28.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem28.Size = New System.Drawing.Size(146, 56) Me.LayoutControlItem28.Text = "Geändert wer:" Me.LayoutControlItem28.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem28.TextSize = New System.Drawing.Size(125, 13) @@ -1506,36 +1532,36 @@ Partial Class frmAdministration 'LayoutControlItem37 ' Me.LayoutControlItem37.Control = Me.ComboBoxEdit3 - Me.LayoutControlItem37.Location = New System.Drawing.Point(303, 0) + Me.LayoutControlItem37.Location = New System.Drawing.Point(366, 0) Me.LayoutControlItem37.Name = "LayoutControlItem37" - Me.LayoutControlItem37.Size = New System.Drawing.Size(489, 26) + Me.LayoutControlItem37.Size = New System.Drawing.Size(475, 26) Me.LayoutControlItem37.Text = "Platzhalter" Me.LayoutControlItem37.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem38 ' Me.LayoutControlItem38.Control = Me.SimpleButton2 - Me.LayoutControlItem38.Location = New System.Drawing.Point(792, 0) + Me.LayoutControlItem38.Location = New System.Drawing.Point(841, 0) Me.LayoutControlItem38.Name = "LayoutControlItem38" - Me.LayoutControlItem38.Size = New System.Drawing.Size(102, 26) + Me.LayoutControlItem38.Size = New System.Drawing.Size(53, 26) Me.LayoutControlItem38.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem38.TextVisible = False ' 'LayoutControlItem39 ' Me.LayoutControlItem39.Control = Me.ComboBoxEdit4 - Me.LayoutControlItem39.Location = New System.Drawing.Point(303, 246) + Me.LayoutControlItem39.Location = New System.Drawing.Point(366, 246) Me.LayoutControlItem39.Name = "LayoutControlItem39" - Me.LayoutControlItem39.Size = New System.Drawing.Size(489, 26) + Me.LayoutControlItem39.Size = New System.Drawing.Size(475, 26) Me.LayoutControlItem39.Text = "Platzhalter" Me.LayoutControlItem39.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem40 ' Me.LayoutControlItem40.Control = Me.SimpleButton3 - Me.LayoutControlItem40.Location = New System.Drawing.Point(792, 246) + Me.LayoutControlItem40.Location = New System.Drawing.Point(841, 246) Me.LayoutControlItem40.Name = "LayoutControlItem40" - Me.LayoutControlItem40.Size = New System.Drawing.Size(102, 26) + Me.LayoutControlItem40.Size = New System.Drawing.Size(53, 26) Me.LayoutControlItem40.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem40.TextVisible = False ' @@ -1543,9 +1569,9 @@ Partial Class frmAdministration ' Me.SimpleLabelItem1.AllowHotTrack = False Me.SimpleLabelItem1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleLabelItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleLabelItem1.Location = New System.Drawing.Point(303, 209) + Me.SimpleLabelItem1.Location = New System.Drawing.Point(366, 209) Me.SimpleLabelItem1.Name = "SimpleLabelItem1" - Me.SimpleLabelItem1.Size = New System.Drawing.Size(591, 36) + Me.SimpleLabelItem1.Size = New System.Drawing.Size(528, 36) Me.SimpleLabelItem1.Text = "Die folgenden Spalten müssen existieren: DocId (Eindeutige Id) und FULL_FILENAME " & "(Absoluter Pfad)" Me.SimpleLabelItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize @@ -1554,16 +1580,16 @@ Partial Class frmAdministration 'SimpleSeparator2 ' Me.SimpleSeparator2.AllowHotTrack = False - Me.SimpleSeparator2.Location = New System.Drawing.Point(303, 245) + Me.SimpleSeparator2.Location = New System.Drawing.Point(366, 245) Me.SimpleSeparator2.Name = "SimpleSeparator2" - Me.SimpleSeparator2.Size = New System.Drawing.Size(591, 1) + Me.SimpleSeparator2.Size = New System.Drawing.Size(528, 1) ' 'SimpleSeparator3 ' Me.SimpleSeparator3.AllowHotTrack = False Me.SimpleSeparator3.Location = New System.Drawing.Point(0, 526) Me.SimpleSeparator3.Name = "SimpleSeparator3" - Me.SimpleSeparator3.Size = New System.Drawing.Size(303, 1) + Me.SimpleSeparator3.Size = New System.Drawing.Size(366, 1) ' 'GridControl1 ' @@ -1637,7 +1663,7 @@ Partial Class frmAdministration 'TextEdit12 ' Me.TextEdit12.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "ADDED_WHO", True)) - Me.TextEdit12.Location = New System.Drawing.Point(12, 146) + Me.TextEdit12.Location = New System.Drawing.Point(20, 218) Me.TextEdit12.Name = "TextEdit12" Me.TextEdit12.Properties.ReadOnly = True Me.TextEdit12.Size = New System.Drawing.Size(125, 20) @@ -1647,17 +1673,17 @@ Partial Class frmAdministration 'TextEdit13 ' Me.TextEdit13.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "ADDED_WHEN", True)) - Me.TextEdit13.Location = New System.Drawing.Point(141, 146) + Me.TextEdit13.Location = New System.Drawing.Point(165, 218) Me.TextEdit13.Name = "TextEdit13" Me.TextEdit13.Properties.ReadOnly = True - Me.TextEdit13.Size = New System.Drawing.Size(172, 20) + Me.TextEdit13.Size = New System.Drawing.Size(202, 20) Me.TextEdit13.StyleController = Me.LayoutControlData Me.TextEdit13.TabIndex = 5 ' 'CHANGED_WHOTextBox1 ' Me.CHANGED_WHOTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "CHANGED_WHO", True)) - Me.CHANGED_WHOTextBox1.Location = New System.Drawing.Point(12, 186) + Me.CHANGED_WHOTextBox1.Location = New System.Drawing.Point(20, 274) Me.CHANGED_WHOTextBox1.Name = "CHANGED_WHOTextBox1" Me.CHANGED_WHOTextBox1.Properties.ReadOnly = True Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(125, 20) @@ -1667,10 +1693,10 @@ Partial Class frmAdministration 'TextEdit11 ' Me.TextEdit11.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit11.Location = New System.Drawing.Point(141, 186) + Me.TextEdit11.Location = New System.Drawing.Point(165, 274) Me.TextEdit11.Name = "TextEdit11" Me.TextEdit11.Properties.ReadOnly = True - Me.TextEdit11.Size = New System.Drawing.Size(172, 20) + Me.TextEdit11.Size = New System.Drawing.Size(202, 20) Me.TextEdit11.StyleController = Me.LayoutControlData Me.TextEdit11.TabIndex = 7 ' @@ -1681,7 +1707,7 @@ Partial Class frmAdministration Me.CheckEdit2.MenuManager = Me.RibbonControl2 Me.CheckEdit2.Name = "CheckEdit2" Me.CheckEdit2.Properties.Caption = "Suche Aktiv" - Me.CheckEdit2.Size = New System.Drawing.Size(301, 18) + Me.CheckEdit2.Size = New System.Drawing.Size(363, 18) Me.CheckEdit2.StyleController = Me.LayoutControlData Me.CheckEdit2.TabIndex = 8 ' @@ -1689,17 +1715,17 @@ Partial Class frmAdministration ' Me.txtDataSearchName.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "TAB_TITLE", True)) Me.txtDataSearchName.EditValue = "" - Me.txtDataSearchName.Location = New System.Drawing.Point(140, 58) + Me.txtDataSearchName.Location = New System.Drawing.Point(148, 82) Me.txtDataSearchName.MenuManager = Me.RibbonControl2 Me.txtDataSearchName.Name = "txtDataSearchName" - Me.txtDataSearchName.Size = New System.Drawing.Size(173, 20) + Me.txtDataSearchName.Size = New System.Drawing.Size(219, 20) Me.txtDataSearchName.StyleController = Me.LayoutControlData Me.txtDataSearchName.TabIndex = 9 ' 'ComboBoxEdit2 ' Me.ComboBoxEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "CONN_ID", True)) - Me.ComboBoxEdit2.Location = New System.Drawing.Point(140, 106) + Me.ComboBoxEdit2.Location = New System.Drawing.Point(148, 162) Me.ComboBoxEdit2.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit2.Name = "ComboBoxEdit2" Me.ComboBoxEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -1710,49 +1736,49 @@ Partial Class frmAdministration Me.ComboBoxEdit2.Properties.PopupSizeable = False Me.ComboBoxEdit2.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.ComboBoxEdit2.Properties.ValueMember = "GUID" - Me.ComboBoxEdit2.Size = New System.Drawing.Size(173, 20) + Me.ComboBoxEdit2.Size = New System.Drawing.Size(219, 20) Me.ComboBoxEdit2.StyleController = Me.LayoutControlData Me.ComboBoxEdit2.TabIndex = 11 ' 'MemoEdit3 ' Me.MemoEdit3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "SQL_COMMAND", True)) - Me.MemoEdit3.Location = New System.Drawing.Point(317, 54) + Me.MemoEdit3.Location = New System.Drawing.Point(379, 54) Me.MemoEdit3.MenuManager = Me.RibbonControl2 Me.MemoEdit3.Name = "MemoEdit3" Me.MemoEdit3.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit3.Properties.Appearance.Options.UseFont = True - Me.MemoEdit3.Size = New System.Drawing.Size(585, 220) + Me.MemoEdit3.Size = New System.Drawing.Size(523, 220) Me.MemoEdit3.StyleController = Me.LayoutControlData Me.MemoEdit3.TabIndex = 12 ' 'MemoEdit4 ' Me.MemoEdit4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.MemoEdit4.Location = New System.Drawing.Point(317, 320) + Me.MemoEdit4.Location = New System.Drawing.Point(379, 320) Me.MemoEdit4.MenuManager = Me.RibbonControl2 Me.MemoEdit4.Name = "MemoEdit4" Me.MemoEdit4.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit4.Properties.Appearance.Options.UseFont = True - Me.MemoEdit4.Size = New System.Drawing.Size(585, 215) + Me.MemoEdit4.Size = New System.Drawing.Size(523, 215) Me.MemoEdit4.StyleController = Me.LayoutControlData Me.MemoEdit4.TabIndex = 13 ' 'txtDATAGUID ' Me.txtDATAGUID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "GUID", True)) - Me.txtDATAGUID.Location = New System.Drawing.Point(140, 34) + Me.txtDATAGUID.Location = New System.Drawing.Point(148, 42) Me.txtDATAGUID.MenuManager = Me.RibbonControl2 Me.txtDATAGUID.Name = "txtDATAGUID" Me.txtDATAGUID.Properties.ReadOnly = True - Me.txtDATAGUID.Size = New System.Drawing.Size(173, 20) + Me.txtDATAGUID.Size = New System.Drawing.Size(219, 20) Me.txtDATAGUID.StyleController = Me.LayoutControlData Me.txtDATAGUID.TabIndex = 14 ' 'TextEdit10 ' Me.TextEdit10.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "TAB_INDEX", True)) - Me.TextEdit10.Location = New System.Drawing.Point(140, 82) + Me.TextEdit10.Location = New System.Drawing.Point(148, 122) Me.TextEdit10.MenuManager = Me.RibbonControl2 Me.TextEdit10.Name = "TextEdit10" Me.TextEdit10.Properties.AutoHeight = False @@ -1764,44 +1790,44 @@ Partial Class frmAdministration Me.TextEdit10.Properties.PopupSizeable = False Me.TextEdit10.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.TextEdit10.Properties.ValueMember = "POSITION_INDEX" - Me.TextEdit10.Size = New System.Drawing.Size(173, 20) + Me.TextEdit10.Size = New System.Drawing.Size(219, 20) Me.TextEdit10.StyleController = Me.LayoutControlData Me.TextEdit10.TabIndex = 10 ' 'ComboBoxEdit5 ' - Me.ComboBoxEdit5.Location = New System.Drawing.Point(445, 12) + Me.ComboBoxEdit5.Location = New System.Drawing.Point(507, 12) Me.ComboBoxEdit5.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit5.Name = "ComboBoxEdit5" Me.ComboBoxEdit5.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit5.Size = New System.Drawing.Size(351, 20) + Me.ComboBoxEdit5.Size = New System.Drawing.Size(337, 20) Me.ComboBoxEdit5.StyleController = Me.LayoutControlData Me.ComboBoxEdit5.TabIndex = 15 ' 'SimpleButton4 ' - Me.SimpleButton4.Location = New System.Drawing.Point(800, 12) + Me.SimpleButton4.Location = New System.Drawing.Point(848, 12) Me.SimpleButton4.Name = "SimpleButton4" - Me.SimpleButton4.Size = New System.Drawing.Size(102, 22) + Me.SimpleButton4.Size = New System.Drawing.Size(54, 22) Me.SimpleButton4.StyleController = Me.LayoutControlData Me.SimpleButton4.TabIndex = 16 Me.SimpleButton4.Text = "Einfügen" ' 'ComboBoxEdit6 ' - Me.ComboBoxEdit6.Location = New System.Drawing.Point(445, 278) + Me.ComboBoxEdit6.Location = New System.Drawing.Point(507, 278) Me.ComboBoxEdit6.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit6.Name = "ComboBoxEdit6" Me.ComboBoxEdit6.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit6.Size = New System.Drawing.Size(351, 20) + Me.ComboBoxEdit6.Size = New System.Drawing.Size(337, 20) Me.ComboBoxEdit6.StyleController = Me.LayoutControlData Me.ComboBoxEdit6.TabIndex = 17 ' 'SimpleButton5 ' - Me.SimpleButton5.Location = New System.Drawing.Point(800, 278) + Me.SimpleButton5.Location = New System.Drawing.Point(848, 278) Me.SimpleButton5.Name = "SimpleButton5" - Me.SimpleButton5.Size = New System.Drawing.Size(102, 22) + Me.SimpleButton5.Size = New System.Drawing.Size(54, 22) Me.SimpleButton5.StyleController = Me.LayoutControlData Me.SimpleButton5.TabIndex = 18 Me.SimpleButton5.Text = "Einfügen" @@ -1820,7 +1846,7 @@ Partial Class frmAdministration Me.LayoutControlItem10.Control = Me.CheckEdit2 Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem10.Name = "LayoutControlItem10" - Me.LayoutControlItem10.Size = New System.Drawing.Size(305, 22) + Me.LayoutControlItem10.Size = New System.Drawing.Size(367, 22) Me.LayoutControlItem10.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem10.TextVisible = False ' @@ -1828,9 +1854,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem14.Control = Me.TextEdit12 Me.LayoutControlItem14.CustomizationFormText = "layoutControlItem1" - Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 118) + Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 182) Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(129, 40) + Me.LayoutControlItem14.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem14.Size = New System.Drawing.Size(145, 56) Me.LayoutControlItem14.Text = "Erstellt wer:" Me.LayoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem14.TextSize = New System.Drawing.Size(125, 13) @@ -1839,9 +1866,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem15.Control = Me.TextEdit13 Me.LayoutControlItem15.CustomizationFormText = "layoutControlItem2" - Me.LayoutControlItem15.Location = New System.Drawing.Point(129, 118) + Me.LayoutControlItem15.Location = New System.Drawing.Point(145, 182) Me.LayoutControlItem15.Name = "LayoutControlItem15" - Me.LayoutControlItem15.Size = New System.Drawing.Size(176, 40) + Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem15.Size = New System.Drawing.Size(222, 56) Me.LayoutControlItem15.Text = "Erstellt wann:" Me.LayoutControlItem15.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem15.TextSize = New System.Drawing.Size(125, 13) @@ -1850,9 +1878,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem17.Control = Me.TextEdit11 Me.LayoutControlItem17.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem17.Location = New System.Drawing.Point(129, 158) + Me.LayoutControlItem17.Location = New System.Drawing.Point(145, 238) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(176, 40) + Me.LayoutControlItem17.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem17.Size = New System.Drawing.Size(222, 56) Me.LayoutControlItem17.Text = "Geändert wann:" Me.LayoutControlItem17.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem17.TextSize = New System.Drawing.Size(125, 13) @@ -1861,9 +1890,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem16.Control = Me.CHANGED_WHOTextBox1 Me.LayoutControlItem16.CustomizationFormText = "layoutControlItem3" - Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 158) + Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 238) Me.LayoutControlItem16.Name = "LayoutControlItem16" - Me.LayoutControlItem16.Size = New System.Drawing.Size(129, 40) + Me.LayoutControlItem16.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem16.Size = New System.Drawing.Size(145, 56) Me.LayoutControlItem16.Text = "Geändert wer:" Me.LayoutControlItem16.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem16.TextSize = New System.Drawing.Size(125, 13) @@ -1871,36 +1901,39 @@ Partial Class frmAdministration 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.txtDataSearchName - Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 46) + Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 62) Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem11.Size = New System.Drawing.Size(367, 40) Me.LayoutControlItem11.Text = "Titel:" Me.LayoutControlItem11.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem12 ' Me.LayoutControlItem12.Control = Me.TextEdit10 - Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 70) + Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 102) Me.LayoutControlItem12.Name = "LayoutControlItem12" - Me.LayoutControlItem12.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem12.Size = New System.Drawing.Size(367, 40) Me.LayoutControlItem12.Text = "Position/Reihenfolge:" Me.LayoutControlItem12.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem13 ' Me.LayoutControlItem13.Control = Me.ComboBoxEdit2 - Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 94) + Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 142) Me.LayoutControlItem13.Name = "LayoutControlItem13" - Me.LayoutControlItem13.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem13.Size = New System.Drawing.Size(367, 40) Me.LayoutControlItem13.Text = "Datenbank-Verbindung:" Me.LayoutControlItem13.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem21 ' Me.LayoutControlItem21.Control = Me.MemoEdit3 - Me.LayoutControlItem21.Location = New System.Drawing.Point(305, 26) + Me.LayoutControlItem21.Location = New System.Drawing.Point(367, 26) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(589, 240) + Me.LayoutControlItem21.Size = New System.Drawing.Size(527, 240) Me.LayoutControlItem21.Text = "SQL für Suche:" Me.LayoutControlItem21.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem21.TextSize = New System.Drawing.Size(125, 13) @@ -1908,9 +1941,9 @@ Partial Class frmAdministration 'LayoutControlItem22 ' Me.LayoutControlItem22.Control = Me.MemoEdit4 - Me.LayoutControlItem22.Location = New System.Drawing.Point(305, 292) + Me.LayoutControlItem22.Location = New System.Drawing.Point(367, 292) Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(589, 235) + Me.LayoutControlItem22.Size = New System.Drawing.Size(527, 235) Me.LayoutControlItem22.Text = "SQL für Ergebnis Zählung:" Me.LayoutControlItem22.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem22.TextSize = New System.Drawing.Size(125, 13) @@ -1918,9 +1951,9 @@ Partial Class frmAdministration 'EmptySpaceItem1 ' Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 198) + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 294) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(305, 329) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(367, 233) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem23 @@ -1928,43 +1961,44 @@ Partial Class frmAdministration Me.LayoutControlItem23.Control = Me.txtDATAGUID Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 22) Me.LayoutControlItem23.Name = "LayoutControlItem23" - Me.LayoutControlItem23.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem23.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem23.Size = New System.Drawing.Size(367, 40) Me.LayoutControlItem23.Text = "ID:" Me.LayoutControlItem23.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem41 ' Me.LayoutControlItem41.Control = Me.ComboBoxEdit5 - Me.LayoutControlItem41.Location = New System.Drawing.Point(305, 0) + Me.LayoutControlItem41.Location = New System.Drawing.Point(367, 0) Me.LayoutControlItem41.Name = "LayoutControlItem41" - Me.LayoutControlItem41.Size = New System.Drawing.Size(483, 26) + Me.LayoutControlItem41.Size = New System.Drawing.Size(469, 26) Me.LayoutControlItem41.Text = "Platzhalter" Me.LayoutControlItem41.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem42 ' Me.LayoutControlItem42.Control = Me.SimpleButton4 - Me.LayoutControlItem42.Location = New System.Drawing.Point(788, 0) + Me.LayoutControlItem42.Location = New System.Drawing.Point(836, 0) Me.LayoutControlItem42.Name = "LayoutControlItem42" - Me.LayoutControlItem42.Size = New System.Drawing.Size(106, 26) + Me.LayoutControlItem42.Size = New System.Drawing.Size(58, 26) Me.LayoutControlItem42.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem42.TextVisible = False ' 'LayoutControlItem43 ' Me.LayoutControlItem43.Control = Me.ComboBoxEdit6 - Me.LayoutControlItem43.Location = New System.Drawing.Point(305, 266) + Me.LayoutControlItem43.Location = New System.Drawing.Point(367, 266) Me.LayoutControlItem43.Name = "LayoutControlItem43" - Me.LayoutControlItem43.Size = New System.Drawing.Size(483, 26) + Me.LayoutControlItem43.Size = New System.Drawing.Size(469, 26) Me.LayoutControlItem43.Text = "Platzhalter" Me.LayoutControlItem43.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem44 ' Me.LayoutControlItem44.Control = Me.SimpleButton5 - Me.LayoutControlItem44.Location = New System.Drawing.Point(788, 266) + Me.LayoutControlItem44.Location = New System.Drawing.Point(836, 266) Me.LayoutControlItem44.Name = "LayoutControlItem44" - Me.LayoutControlItem44.Size = New System.Drawing.Size(106, 26) + Me.LayoutControlItem44.Size = New System.Drawing.Size(58, 26) Me.LayoutControlItem44.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem44.TextVisible = False ' @@ -2199,7 +2233,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 +2252,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 +2347,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 +2500,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 99f2bac..07c1237 100644 --- a/app/DD_Clipboard_Searcher/frmMain.vb +++ b/app/DD_Clipboard_Searcher/frmMain.vb @@ -4,13 +4,20 @@ Imports System.Globalization Imports DD_Clipboard_Watcher.ClassConstants Imports DD_Clipboard_Watcher.ClassWindowAPI Imports DigitalData.Modules.ZooFlow +Imports DigitalData.Modules.Windows Imports DigitalData.GUIs.ClipboardWatcher Public Class frmMain - Private WithEvents Hotkey As New ClassHotkey(Me) - 'Private WithEvents _Watcher As ClipboardWatcher = ClipboardWatcher.Singleton - Private WithEvents _Watcher2 As ClassClipboardWatcher = ClassClipboardWatcher.Singleton + Private WithEvents _Hotkey As New ClassHotkey(Me) + Private WithEvents _Watcher As ClassClipboardWatcher = ClassClipboardWatcher.Singleton + + Private _Animator As New Animator() With { + .PopupColor = Color.FromArgb(255, 214, 49), + .PopupOpacity = 0.8, + .PopupSize = New Size(100, 30) + } Private _MatchForm As frmMatch = Nothing Private _DataASorDB As ClassDataASorDB + Public Sub New() ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -54,16 +61,16 @@ Public Class frmMain ClassInit.Refresh_Profile_Links() _DataASorDB.Refresh_Connections() Try - Hotkey.AddHotKey(Keys.T, ClassHotkey.ModfierKey.MOD_CONTROL, HOTKEY_TOGGLE_WATCHER) + _Hotkey.AddHotKey(Keys.T, ClassHotkey.ModfierKey.MOD_CONTROL, HOTKEY_TOGGLE_WATCHER) Dim oKeyCode As Keys Dim oConverter As New KeysConverter Dim oObject As Object = oConverter.ConvertFromString(HotkeySearchKey.ToUpper) oKeyCode = CType(oObject, Keys) If HotkeyFunctionKey = HOTKEY_CTRL Then - Hotkey.AddHotKey(oKeyCode, ClassHotkey.ModfierKey.MOD_CONTROL, ClassConstants.HOTKEY_TRIGGER_WATCHER) + _Hotkey.AddHotKey(oKeyCode, ClassHotkey.ModfierKey.MOD_CONTROL, ClassConstants.HOTKEY_TRIGGER_WATCHER) ElseIf HotkeyFunctionKey = HOTKEY_SHIFT Then - Hotkey.AddHotKey(oKeyCode, ClassHotkey.ModfierKey.MOD_SHIFT, ClassConstants.HOTKEY_TRIGGER_WATCHER) + _Hotkey.AddHotKey(oKeyCode, ClassHotkey.ModfierKey.MOD_SHIFT, ClassConstants.HOTKEY_TRIGGER_WATCHER) End If Catch ex As Exception Logger.Warn($"Unexpected Error in Hotkey inititialize: {ex.Message}") @@ -114,8 +121,8 @@ Public Class frmMain End Try Try - Hotkey.RemoveHotKey(HOTKEY_TOGGLE_WATCHER) - Hotkey.RemoveHotKey(HOTKEY_TRIGGER_WATCHER) + _Hotkey.RemoveHotKey(HOTKEY_TOGGLE_WATCHER) + _Hotkey.RemoveHotKey(HOTKEY_TRIGGER_WATCHER) Catch ex As Exception Logger.Error(ex) Logger.Warn("Hotkeys could not be removed") @@ -124,7 +131,7 @@ Public Class frmMain 'TempDateien löschen For Each oFile In TEMP_FILES Try - File.Delete(oFile) + IO.File.Delete(oFile) Catch ex As Exception Logger.Warn("Temp file {0} could not be deleted", oFile) Logger.Error(ex) @@ -133,10 +140,10 @@ Public Class frmMain End Sub Private Sub frmClipboardWatch_Disposed(ByVal sender As Object, ByVal e As EventArgs) Handles Me.Disposed - _Watcher2.Dispose() + _Watcher.Dispose() End Sub - Private Sub WatcherChanged_New(ByVal sender As Object, ByVal e As String) Handles _Watcher2.Changed + Private Sub WatcherChanged_New(ByVal sender As Object, ByVal e As String) Handles _Watcher.Changed If MONITORING_ACTIVE = False Then Logger.Info("Clipboard Watcher is inactive!") 'NotifyIconMain.ShowBalloonTip(20000, "Clipboard Watcher", "Clipboard-watcher is inactive.", ToolTipIcon.Info) @@ -218,26 +225,34 @@ Public Class frmMain End Try End Sub - Private Sub ReceiveHotKey(ByVal HotKeyID As String) Handles Hotkey.HotKeyPressed + Private Sub ReceiveHotKey(ByVal HotKeyID As String) Handles _Hotkey.HotKeyPressed If HotKeyID = HOTKEY_TRIGGER_WATCHER Then + _Animator.Highlight(Cursor.Position) + If CURRENT_CLIPBOARD_CONTENTS IsNot Nothing Then If MONITORING_ACTIVE = True Then If CURRENT_MATCHING_PROFILES.Count = 0 Then Logger.Info("ReceiveHotKey - No profiles matched the Clipboard-Content!") + Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO) If NOMATCH_INFO = False Then NotifyIconMain.BalloonTipTitle = "Clipboard Watcher" NotifyIconMain.BalloonTipText = "Es wurden keine passenden Profile gefunden." NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning NotifyIconMain.ShowBalloonTip(2500) + Else + Logger.Info("Popup will not be shown. NOMATCH_INFO Is True.") End If ElseIf CURRENT_PROFILES_WITH_RESULTS.Count = 0 Then Logger.Info("ReceiveHotKey - No documents or data found for Clipboard-Content!") + Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO) If NOMATCH_INFO = False Then NotifyIconMain.BalloonTipTitle = "Clipboard Watcher" NotifyIconMain.BalloonTipText = "Es wurden weder Dokumente noch Daten gefunden!" NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning NotifyIconMain.ShowBalloonTip(2500) + Else + Logger.Info("Popup will not be shown. NOMATCH_INFO Is True.") End If Else 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 @@ +