diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb
index b0f97c6..e176925 100644
--- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb
+++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb
@@ -129,6 +129,10 @@ Partial Class frmAdministration
Me.txtDOC_GUID = New DevExpress.XtraEditors.TextEdit()
Me.TextEdit19 = New DevExpress.XtraEditors.LookUpEdit()
Me.TBWHSEARCHPOSITIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+ Me.ComboBoxEdit3 = New DevExpress.XtraEditors.ComboBoxEdit()
+ Me.SimpleButton2 = New DevExpress.XtraEditors.SimpleButton()
+ Me.ComboBoxEdit4 = New DevExpress.XtraEditors.ComboBoxEdit()
+ Me.SimpleButton3 = New DevExpress.XtraEditors.SimpleButton()
Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup()
Me.LayoutControlItem29 = New DevExpress.XtraLayout.LayoutControlItem()
Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem()
@@ -142,6 +146,10 @@ Partial Class frmAdministration
Me.LayoutControlItem34 = New DevExpress.XtraLayout.LayoutControlItem()
Me.LayoutControlItem24 = New DevExpress.XtraLayout.LayoutControlItem()
Me.LayoutControlItem28 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.LayoutControlItem37 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.LayoutControlItem38 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.LayoutControlItem39 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.LayoutControlItem40 = New DevExpress.XtraLayout.LayoutControlItem()
Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.colTAB_TITLE = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -281,6 +289,8 @@ Partial Class frmAdministration
CType(Me.txtDOC_GUID.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TextEdit19.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBWHSEARCHPOSITIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.ComboBoxEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -294,6 +304,10 @@ Partial Class frmAdministration
CType(Me.LayoutControlItem34, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem37, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem38, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem39, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem40, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPageData.SuspendLayout()
@@ -1145,6 +1159,10 @@ Partial Class frmAdministration
Me.LayoutControlDocs.Controls.Add(Me.MemoEdit6)
Me.LayoutControlDocs.Controls.Add(Me.txtDOC_GUID)
Me.LayoutControlDocs.Controls.Add(Me.TextEdit19)
+ Me.LayoutControlDocs.Controls.Add(Me.ComboBoxEdit3)
+ Me.LayoutControlDocs.Controls.Add(Me.SimpleButton2)
+ Me.LayoutControlDocs.Controls.Add(Me.ComboBoxEdit4)
+ Me.LayoutControlDocs.Controls.Add(Me.SimpleButton3)
Me.LayoutControlDocs.Dock = System.Windows.Forms.DockStyle.Fill
Me.LayoutControlDocs.Location = New System.Drawing.Point(200, 0)
Me.LayoutControlDocs.Name = "LayoutControlDocs"
@@ -1160,14 +1178,14 @@ 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(301, 20)
+ Me.CheckEdit3.Size = New System.Drawing.Size(299, 20)
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, 148)
+ Me.TextEdit17.Location = New System.Drawing.Point(12, 174)
Me.TextEdit17.Name = "TextEdit17"
Me.TextEdit17.Properties.ReadOnly = True
Me.TextEdit17.Size = New System.Drawing.Size(125, 20)
@@ -1177,27 +1195,27 @@ Partial Class frmAdministration
'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(141, 148)
+ Me.TextEdit15.Location = New System.Drawing.Point(141, 174)
Me.TextEdit15.Name = "TextEdit15"
Me.TextEdit15.Properties.ReadOnly = True
- Me.TextEdit15.Size = New System.Drawing.Size(172, 20)
+ Me.TextEdit15.Size = New System.Drawing.Size(170, 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(141, 188)
+ Me.TextEdit18.Location = New System.Drawing.Point(141, 214)
Me.TextEdit18.Name = "TextEdit18"
Me.TextEdit18.Properties.ReadOnly = True
- Me.TextEdit18.Size = New System.Drawing.Size(172, 20)
+ Me.TextEdit18.Size = New System.Drawing.Size(170, 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, 188)
+ Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(12, 214)
Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2"
Me.CHANGED_WHOTextBox2.Properties.ReadOnly = True
Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(125, 20)
@@ -1210,14 +1228,14 @@ Partial Class frmAdministration
Me.TextEdit16.EditValue = ""
Me.TextEdit16.Location = New System.Drawing.Point(140, 60)
Me.TextEdit16.Name = "TextEdit16"
- Me.TextEdit16.Size = New System.Drawing.Size(173, 20)
+ Me.TextEdit16.Size = New System.Drawing.Size(171, 20)
Me.TextEdit16.StyleController = Me.LayoutControlDocs
Me.TextEdit16.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, 108)
+ Me.LookUpEdit1.Location = New System.Drawing.Point(140, 134)
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])})
@@ -1227,7 +1245,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(173, 20)
+ Me.LookUpEdit1.Size = New System.Drawing.Size(171, 20)
Me.LookUpEdit1.StyleController = Me.LayoutControlDocs
Me.LookUpEdit1.TabIndex = 11
'
@@ -1239,22 +1257,22 @@ 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(317, 28)
+ Me.MemoEdit5.Location = New System.Drawing.Point(315, 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(585, 212)
+ Me.MemoEdit5.Size = New System.Drawing.Size(587, 181)
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(317, 260)
+ Me.MemoEdit6.Location = New System.Drawing.Point(315, 281)
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(585, 268)
+ Me.MemoEdit6.Size = New System.Drawing.Size(587, 247)
Me.MemoEdit6.StyleController = Me.LayoutControlDocs
Me.MemoEdit6.TabIndex = 13
'
@@ -1264,7 +1282,7 @@ Partial Class frmAdministration
Me.txtDOC_GUID.Location = New System.Drawing.Point(140, 36)
Me.txtDOC_GUID.Name = "txtDOC_GUID"
Me.txtDOC_GUID.Properties.ReadOnly = True
- Me.txtDOC_GUID.Size = New System.Drawing.Size(173, 20)
+ Me.txtDOC_GUID.Size = New System.Drawing.Size(171, 20)
Me.txtDOC_GUID.StyleController = Me.LayoutControlDocs
Me.txtDOC_GUID.TabIndex = 14
'
@@ -1282,7 +1300,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(173, 20)
+ Me.TextEdit19.Size = New System.Drawing.Size(171, 46)
Me.TextEdit19.StyleController = Me.LayoutControlDocs
Me.TextEdit19.TabIndex = 10
'
@@ -1291,11 +1309,49 @@ Partial Class frmAdministration
Me.TBWHSEARCHPOSITIONBindingSource.DataMember = "TBWH_SEARCH_POSITION"
Me.TBWHSEARCHPOSITIONBindingSource.DataSource = Me.MyDataset
'
+ 'ComboBoxEdit3
+ '
+ Me.ComboBoxEdit3.Location = New System.Drawing.Point(443, 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.StyleController = Me.LayoutControlDocs
+ Me.ComboBoxEdit3.TabIndex = 15
+ '
+ 'SimpleButton2
+ '
+ Me.SimpleButton2.Location = New System.Drawing.Point(804, 12)
+ Me.SimpleButton2.Name = "SimpleButton2"
+ Me.SimpleButton2.Size = New System.Drawing.Size(98, 22)
+ Me.SimpleButton2.StyleController = Me.LayoutControlDocs
+ Me.SimpleButton2.TabIndex = 16
+ Me.SimpleButton2.Text = "Einfügen"
+ '
+ 'ComboBoxEdit4
+ '
+ Me.ComboBoxEdit4.Location = New System.Drawing.Point(443, 239)
+ 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.StyleController = Me.LayoutControlDocs
+ Me.ComboBoxEdit4.TabIndex = 17
+ '
+ 'SimpleButton3
+ '
+ Me.SimpleButton3.Location = New System.Drawing.Point(804, 239)
+ Me.SimpleButton3.Name = "SimpleButton3"
+ Me.SimpleButton3.Size = New System.Drawing.Size(98, 22)
+ Me.SimpleButton3.StyleController = Me.LayoutControlDocs
+ Me.SimpleButton3.TabIndex = 18
+ Me.SimpleButton3.Text = "Einfügen"
+ '
'LayoutControlGroup2
'
Me.LayoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
Me.LayoutControlGroup2.GroupBordersVisible = False
- Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem29, Me.LayoutControlItem30, Me.LayoutControlItem31, Me.LayoutControlItem25, Me.LayoutControlItem27, Me.LayoutControlItem26, Me.EmptySpaceItem2, Me.LayoutControlItem33, Me.LayoutControlItem32, Me.LayoutControlItem34, Me.LayoutControlItem24, Me.LayoutControlItem28})
+ Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem29, Me.LayoutControlItem30, Me.LayoutControlItem31, Me.LayoutControlItem25, Me.LayoutControlItem27, Me.LayoutControlItem26, Me.EmptySpaceItem2, Me.LayoutControlItem33, Me.LayoutControlItem32, Me.LayoutControlItem34, Me.LayoutControlItem24, Me.LayoutControlItem28, Me.LayoutControlItem37, Me.LayoutControlItem38, Me.LayoutControlItem39, Me.LayoutControlItem40})
Me.LayoutControlGroup2.Name = "Root"
Me.LayoutControlGroup2.Size = New System.Drawing.Size(914, 540)
Me.LayoutControlGroup2.TextVisible = False
@@ -1306,7 +1362,7 @@ Partial Class frmAdministration
Me.LayoutControlItem29.CustomizationFormText = "Titel:"
Me.LayoutControlItem29.Location = New System.Drawing.Point(0, 48)
Me.LayoutControlItem29.Name = "LayoutControlItem29"
- Me.LayoutControlItem29.Size = New System.Drawing.Size(305, 24)
+ Me.LayoutControlItem29.Size = New System.Drawing.Size(303, 24)
Me.LayoutControlItem29.Text = "Titel:"
Me.LayoutControlItem29.TextSize = New System.Drawing.Size(125, 13)
'
@@ -1316,7 +1372,7 @@ Partial Class frmAdministration
Me.LayoutControlItem30.CustomizationFormText = "Position:"
Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 72)
Me.LayoutControlItem30.Name = "LayoutControlItem30"
- Me.LayoutControlItem30.Size = New System.Drawing.Size(305, 24)
+ Me.LayoutControlItem30.Size = New System.Drawing.Size(303, 50)
Me.LayoutControlItem30.Text = "Position/Reihenfolge:"
Me.LayoutControlItem30.TextSize = New System.Drawing.Size(125, 13)
'
@@ -1324,9 +1380,9 @@ Partial Class frmAdministration
'
Me.LayoutControlItem31.Control = Me.LookUpEdit1
Me.LayoutControlItem31.CustomizationFormText = "Verbindung:"
- Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 96)
+ Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 122)
Me.LayoutControlItem31.Name = "LayoutControlItem31"
- Me.LayoutControlItem31.Size = New System.Drawing.Size(305, 24)
+ Me.LayoutControlItem31.Size = New System.Drawing.Size(303, 24)
Me.LayoutControlItem31.Text = "Datenbank-Verbindung:"
Me.LayoutControlItem31.TextSize = New System.Drawing.Size(125, 13)
'
@@ -1334,7 +1390,7 @@ Partial Class frmAdministration
'
Me.LayoutControlItem25.Control = Me.TextEdit17
Me.LayoutControlItem25.CustomizationFormText = "layoutControlItem1"
- Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 120)
+ Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 146)
Me.LayoutControlItem25.Name = "LayoutControlItem25"
Me.LayoutControlItem25.Size = New System.Drawing.Size(129, 40)
Me.LayoutControlItem25.Text = "Erstellt wer:"
@@ -1345,9 +1401,9 @@ Partial Class frmAdministration
'
Me.LayoutControlItem27.Control = Me.TextEdit18
Me.LayoutControlItem27.CustomizationFormText = "layoutControlItem4"
- Me.LayoutControlItem27.Location = New System.Drawing.Point(129, 160)
+ Me.LayoutControlItem27.Location = New System.Drawing.Point(129, 186)
Me.LayoutControlItem27.Name = "LayoutControlItem27"
- Me.LayoutControlItem27.Size = New System.Drawing.Size(176, 40)
+ Me.LayoutControlItem27.Size = New System.Drawing.Size(174, 40)
Me.LayoutControlItem27.Text = "Geändert wann:"
Me.LayoutControlItem27.TextLocation = DevExpress.Utils.Locations.Top
Me.LayoutControlItem27.TextSize = New System.Drawing.Size(125, 13)
@@ -1356,9 +1412,9 @@ Partial Class frmAdministration
'
Me.LayoutControlItem26.Control = Me.TextEdit15
Me.LayoutControlItem26.CustomizationFormText = "layoutControlItem2"
- Me.LayoutControlItem26.Location = New System.Drawing.Point(129, 120)
+ Me.LayoutControlItem26.Location = New System.Drawing.Point(129, 146)
Me.LayoutControlItem26.Name = "LayoutControlItem26"
- Me.LayoutControlItem26.Size = New System.Drawing.Size(176, 40)
+ Me.LayoutControlItem26.Size = New System.Drawing.Size(174, 40)
Me.LayoutControlItem26.Text = "Erstellt wann:"
Me.LayoutControlItem26.TextLocation = DevExpress.Utils.Locations.Top
Me.LayoutControlItem26.TextSize = New System.Drawing.Size(125, 13)
@@ -1366,18 +1422,18 @@ Partial Class frmAdministration
'EmptySpaceItem2
'
Me.EmptySpaceItem2.AllowHotTrack = False
- Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 200)
+ Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 226)
Me.EmptySpaceItem2.Name = "EmptySpaceItem2"
- Me.EmptySpaceItem2.Size = New System.Drawing.Size(305, 320)
+ Me.EmptySpaceItem2.Size = New System.Drawing.Size(303, 294)
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(305, 232)
+ Me.LayoutControlItem33.Location = New System.Drawing.Point(303, 253)
Me.LayoutControlItem33.Name = "LayoutControlItem33"
- Me.LayoutControlItem33.Size = New System.Drawing.Size(589, 288)
+ Me.LayoutControlItem33.Size = New System.Drawing.Size(591, 267)
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)
@@ -1386,9 +1442,9 @@ Partial Class frmAdministration
'
Me.LayoutControlItem32.Control = Me.MemoEdit5
Me.LayoutControlItem32.CustomizationFormText = "SQL für Suche:"
- Me.LayoutControlItem32.Location = New System.Drawing.Point(305, 0)
+ Me.LayoutControlItem32.Location = New System.Drawing.Point(303, 26)
Me.LayoutControlItem32.Name = "LayoutControlItem32"
- Me.LayoutControlItem32.Size = New System.Drawing.Size(589, 232)
+ Me.LayoutControlItem32.Size = New System.Drawing.Size(591, 201)
Me.LayoutControlItem32.Text = "SQL für Suche:"
Me.LayoutControlItem32.TextLocation = DevExpress.Utils.Locations.Top
Me.LayoutControlItem32.TextSize = New System.Drawing.Size(125, 13)
@@ -1399,7 +1455,7 @@ Partial Class frmAdministration
Me.LayoutControlItem34.CustomizationFormText = "ID:"
Me.LayoutControlItem34.Location = New System.Drawing.Point(0, 24)
Me.LayoutControlItem34.Name = "LayoutControlItem34"
- Me.LayoutControlItem34.Size = New System.Drawing.Size(305, 24)
+ Me.LayoutControlItem34.Size = New System.Drawing.Size(303, 24)
Me.LayoutControlItem34.Text = "ID:"
Me.LayoutControlItem34.TextSize = New System.Drawing.Size(125, 13)
'
@@ -1409,7 +1465,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(305, 24)
+ Me.LayoutControlItem24.Size = New System.Drawing.Size(303, 24)
Me.LayoutControlItem24.Text = "LayoutControlItem10"
Me.LayoutControlItem24.TextSize = New System.Drawing.Size(0, 0)
Me.LayoutControlItem24.TextVisible = False
@@ -1418,13 +1474,49 @@ Partial Class frmAdministration
'
Me.LayoutControlItem28.Control = Me.CHANGED_WHOTextBox2
Me.LayoutControlItem28.CustomizationFormText = "layoutControlItem3"
- Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 160)
+ Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 186)
Me.LayoutControlItem28.Name = "LayoutControlItem28"
Me.LayoutControlItem28.Size = New System.Drawing.Size(129, 40)
Me.LayoutControlItem28.Text = "Geändert wer:"
Me.LayoutControlItem28.TextLocation = DevExpress.Utils.Locations.Top
Me.LayoutControlItem28.TextSize = New System.Drawing.Size(125, 13)
'
+ 'LayoutControlItem37
+ '
+ Me.LayoutControlItem37.Control = Me.ComboBoxEdit3
+ Me.LayoutControlItem37.Location = New System.Drawing.Point(303, 0)
+ Me.LayoutControlItem37.Name = "LayoutControlItem37"
+ Me.LayoutControlItem37.Size = New System.Drawing.Size(489, 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.Name = "LayoutControlItem38"
+ Me.LayoutControlItem38.Size = New System.Drawing.Size(102, 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, 227)
+ Me.LayoutControlItem39.Name = "LayoutControlItem39"
+ Me.LayoutControlItem39.Size = New System.Drawing.Size(489, 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, 227)
+ Me.LayoutControlItem40.Name = "LayoutControlItem40"
+ Me.LayoutControlItem40.Size = New System.Drawing.Size(102, 26)
+ Me.LayoutControlItem40.TextSize = New System.Drawing.Size(0, 0)
+ Me.LayoutControlItem40.TextVisible = False
+ '
'GridControl1
'
Me.GridControl1.DataSource = Me.TBCW_PROF_DOC_SEARCHBindingSource
@@ -1818,7 +1910,7 @@ Partial Class frmAdministration
Me.XtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill
Me.XtraTabControl2.Location = New System.Drawing.Point(0, 0)
Me.XtraTabControl2.Name = "XtraTabControl2"
- Me.XtraTabControl2.SelectedTabPage = Me.TabPageUserAssignment
+ Me.XtraTabControl2.SelectedTabPage = Me.TabPageGroupAssignment
Me.XtraTabControl2.Size = New System.Drawing.Size(1116, 568)
Me.XtraTabControl2.TabIndex = 0
Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageUserAssignment, Me.TabPageGroupAssignment})
@@ -2324,6 +2416,8 @@ Partial Class frmAdministration
CType(Me.txtDOC_GUID.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TextEdit19.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBWHSEARCHPOSITIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.ComboBoxEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit()
@@ -2337,6 +2431,10 @@ Partial Class frmAdministration
CType(Me.LayoutControlItem34, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem37, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem38, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem39, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem40, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPageData.ResumeLayout(False)
@@ -2603,4 +2701,12 @@ Partial Class frmAdministration
Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton
Friend WithEvents LayoutControlItem35 As DevExpress.XtraLayout.LayoutControlItem
Friend WithEvents LayoutControlItem36 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents ComboBoxEdit3 As DevExpress.XtraEditors.ComboBoxEdit
+ Friend WithEvents LayoutControlItem37 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents SimpleButton2 As DevExpress.XtraEditors.SimpleButton
+ Friend WithEvents LayoutControlItem38 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents ComboBoxEdit4 As DevExpress.XtraEditors.ComboBoxEdit
+ Friend WithEvents SimpleButton3 As DevExpress.XtraEditors.SimpleButton
+ Friend WithEvents LayoutControlItem39 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents LayoutControlItem40 As DevExpress.XtraLayout.LayoutControlItem
End Class
diff --git a/app/DD_Clipboard_Searcher/frmAdministration.resx b/app/DD_Clipboard_Searcher/frmAdministration.resx
index 1a13820..807e422 100644
--- a/app/DD_Clipboard_Searcher/frmAdministration.resx
+++ b/app/DD_Clipboard_Searcher/frmAdministration.resx
@@ -840,30 +840,6 @@
MCwwLjYsMC40LDEsMSwxaDV2NS45bDAsMC40YzAuNywwLjIsMS40LDAuNSwyLDAuOFY5bC03LTdINUM0
LjQsMiw0LDIuNCw0LDN2MjQgIGMwLDAuNiwwLjQsMSwxLDFoMTAuMUMxNC43LDI3LjQsMTQuNCwyNi43
LDE0LjMsMjZ6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOoDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
- MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
- bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW1wbG95ZWVzIj4NCiAgICA8cGF0
- aCBkPSJNMTAsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNHMtMC4xLDEuNywwLjksMS42YzAsMCww
- LDAuMSwwLDAuMmMwLjYsMi4zLDIsNC45LDQuNyw0LjlzNC4yLTIuNiw0LjctNC45ICAgVjEzYzEsMC4x
- LDAuNi0xLjEsMC45LTEuNmMwLjItMC41LDAuNC0wLjksMC4zLTEuNGMtMC4xLTAuNC0wLjQtMC40LTAu
- NS0wLjNDMjMuMiw0LjgsMjAuMyw1LDIwLjMsNVMyMCwyLDE0LjgsMiAgIEMxMCwyLDkuNCw2LDEwLjUs
- OS42QzEwLjQsOS42LDEwLjEsOS43LDEwLDkuOXogTTIwLDE4Yy0wLjgsMS41LTIuMSw0LTQsNHMtMy4y
- LTIuNS00LTRjLTIuMywzLjUtOCwxLTgsOC41VjMwaDI0di0zLjUgICBDMjgsMTkuMSwyMi4zLDIxLjQs
- MjAsMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
@@ -894,6 +870,30 @@
OS42QzEwLjQsOS42LDEwLjEsOS43LDEwLDkuOXogTTIwLDE4Yy0wLjgsMS41LTIuMSw0LTQsNHMtMy4y
LTIuNS00LTRjLTIuMywzLjUtOCwxLTgsOC41VjMwaDI0di0zLjUgICBDMjgsMTkuMSwyMi4zLDIxLjQs
MjAsMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+
+
+
+
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOoDAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+ LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+ MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
+ MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
+ bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW1wbG95ZWVzIj4NCiAgICA8cGF0
+ aCBkPSJNMTAsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNHMtMC4xLDEuNywwLjksMS42YzAsMCww
+ LDAuMSwwLDAuMmMwLjYsMi4zLDIsNC45LDQuNyw0LjlzNC4yLTIuNiw0LjctNC45ICAgVjEzYzEsMC4x
+ LDAuNi0xLjEsMC45LTEuNmMwLjItMC41LDAuNC0wLjksMC4zLTEuNGMtMC4xLTAuNC0wLjQtMC40LTAu
+ NS0wLjNDMjMuMiw0LjgsMjAuMyw1LDIwLjMsNVMyMCwyLDE0LjgsMiAgIEMxMCwyLDkuNCw2LDEwLjUs
+ OS42QzEwLjQsOS42LDEwLjEsOS43LDEwLDkuOXogTTIwLDE4Yy0wLjgsMS41LTIuMSw0LTQsNHMtMy4y
+ LTIuNS00LTRjLTIuMywzLjUtOCwxLTgsOC41VjMwaDI0di0zLjUgICBDMjgsMTkuMSwyMi4zLDIxLjQs
+ MjAsMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
diff --git a/app/DD_Clipboard_Searcher/frmAdministration.vb b/app/DD_Clipboard_Searcher/frmAdministration.vb
index da7ca71..6c66b0c 100644
--- a/app/DD_Clipboard_Searcher/frmAdministration.vb
+++ b/app/DD_Clipboard_Searcher/frmAdministration.vb
@@ -22,10 +22,42 @@ Public Class frmAdministration
InitializeComponent()
End Sub
+ Public Class SQLPlaceholder
+ Public Property Name
+ Public Property Value
+
+ Public Sub New(Name As String, Value As String)
+ Me.Name = Name
+ Me.Value = Value
+ End Sub
+
+ Public Overrides Function ToString() As String
+ Return Name
+ End Function
+ End Class
+
+ Private Function GetPlaceholders() As List(Of SQLPlaceholder)
+ Return New List(Of SQLPlaceholder) From {
+ New SQLPlaceholder("Zwischenablage", "@Clipboard"),
+ New SQLPlaceholder("Benutzer-Vorname", "{#USER#PRENAME}"),
+ New SQLPlaceholder("Benutzer-Nachname", "{#USER#SURNAME}"),
+ New SQLPlaceholder("Benutzer-Email", "{#USER#EMAIL}"),
+ New SQLPlaceholder("Benutzer-Kurzname", "{#USER#SHORTNAME}"),
+ New SQLPlaceholder("Benutzer-Id", "{#USER#USER_ID}"),
+ New SQLPlaceholder("Benutzer-Name", "{#INT#USERNAME}"),
+ New SQLPlaceholder("Computer-Name", "{#INT#MACHINE}"),
+ New SQLPlaceholder("Computer-Domäne", "{#INT#DOMAIN}"),
+ New SQLPlaceholder("Aktuelles Datum", "{#INT#DATE}")
+ }
+ End Function
+
Private Sub frmAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load
' Select first tab to prevent profile textbox from being empty
XtraTabControl3.SelectedTabPageIndex = 0
+ ComboBoxEdit3.Properties.Items.AddRange(GetPlaceholders())
+ ComboBoxEdit4.Properties.Items.AddRange(GetPlaceholders())
+
_DragDrop = New ClassDragDrop()
_DragDrop.AddGridView(GridViewGroupInProfile)
_DragDrop.AddGridView(GridViewGroupNotInProfile)
@@ -324,8 +356,9 @@ Public Class frmAdministration
Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
Save_Profile()
+
ClassInit.Refresh_Profile_Links()
- 'TableAdapterManager.UpdateAll(MyDataset)
+ Refresh_ProfileScreen()
End Sub
Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
@@ -765,4 +798,18 @@ Public Class frmAdministration
MsgBox("Unexpected Error while adding Group-Rights: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try
End Sub
+
+ Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles SimpleButton2.Click
+ If ComboBoxEdit3.SelectedIndex > -1 Then
+ Dim oItem As SQLPlaceholder = ComboBoxEdit3.SelectedItem
+ MemoEdit5.Text &= oItem.Value
+ End If
+ End Sub
+
+ Private Sub SimpleButton3_Click(sender As Object, e As EventArgs) Handles SimpleButton3.Click
+ If ComboBoxEdit4.SelectedIndex > -1 Then
+ Dim oItem As SQLPlaceholder = ComboBoxEdit4.SelectedItem
+ MemoEdit6.Text &= oItem.Value
+ End If
+ End Sub
End Class
\ No newline at end of file