From 50b3bc8d9e26881f88c26a6c363d9b94f54de897 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 1 Sep 2020 14:46:50 +0200 Subject: [PATCH] MS --- Controls.ChatControl/ChatControl.Designer.vb | 357 ++++++++++--------- Controls.ChatControl/ChatControl.vb | 11 +- GUIs.ZooFlow/ClassControlCreator.vb | 37 +- GUIs.ZooFlow/frmSearchStart.Designer.vb | 58 +-- GUIs.ZooFlow/frmSearchStart.resx | 29 +- GUIs.ZooFlow/frmSearchStart.vb | 208 ++++++++--- 6 files changed, 415 insertions(+), 285 deletions(-) diff --git a/Controls.ChatControl/ChatControl.Designer.vb b/Controls.ChatControl/ChatControl.Designer.vb index cb91bf11..4cc09370 100644 --- a/Controls.ChatControl/ChatControl.Designer.vb +++ b/Controls.ChatControl/ChatControl.Designer.vb @@ -23,39 +23,39 @@ Partial Class ChatControl Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim ItemTemplate4 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate() - Dim TableColumnDefinition9 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TableColumnDefinition10 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TileViewItemElement11 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement12 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement13 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TableRowDefinition10 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim TableRowDefinition11 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim TableSpan4 As DevExpress.XtraEditors.TableLayout.TableSpan = New DevExpress.XtraEditors.TableLayout.TableSpan() - Dim ItemTemplate5 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate() - Dim TableColumnDefinition11 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TableColumnDefinition12 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TileViewItemElement14 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement15 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement16 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TableRowDefinition12 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim TableRowDefinition13 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim ItemTemplate6 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate() - Dim TableColumnDefinition13 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TableColumnDefinition14 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TileViewItemElement17 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement18 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement19 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement20 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TableRowDefinition14 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim TableRowDefinition15 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim TableRowDefinition16 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim TableSpan5 As DevExpress.XtraEditors.TableLayout.TableSpan = New DevExpress.XtraEditors.TableLayout.TableSpan() - Dim TableSpan6 As DevExpress.XtraEditors.TableLayout.TableSpan = New DevExpress.XtraEditors.TableLayout.TableSpan() - Dim TableColumnDefinition15 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TableColumnDefinition16 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TableRowDefinition17 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim TableRowDefinition18 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim ItemTemplate1 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate() + Dim TableColumnDefinition1 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition2 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TileViewItemElement1 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement2 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement3 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TableRowDefinition1 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition2 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableSpan1 As DevExpress.XtraEditors.TableLayout.TableSpan = New DevExpress.XtraEditors.TableLayout.TableSpan() + Dim ItemTemplate2 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate() + Dim TableColumnDefinition3 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition4 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TileViewItemElement4 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement5 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement6 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TableRowDefinition3 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition4 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim ItemTemplate3 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate() + Dim TableColumnDefinition5 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition6 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TileViewItemElement7 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement8 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement9 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement10 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TableRowDefinition5 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition6 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition7 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableSpan2 As DevExpress.XtraEditors.TableLayout.TableSpan = New DevExpress.XtraEditors.TableLayout.TableSpan() + Dim TableSpan3 As DevExpress.XtraEditors.TableLayout.TableSpan = New DevExpress.XtraEditors.TableLayout.TableSpan() + Dim TableColumnDefinition7 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition8 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableRowDefinition8 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition9 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(ChatControl)) Me.columnUsername = New DevExpress.XtraGrid.Columns.TileViewColumn() Me.columnMessage = New DevExpress.XtraGrid.Columns.TileViewColumn() @@ -68,8 +68,8 @@ Partial Class ChatControl Me.btnSendMessage = New DevExpress.XtraEditors.SimpleButton() Me.ChatSource = New System.Windows.Forms.BindingSource(Me.components) Me.pnlMessage = New System.Windows.Forms.Panel() - Me.ListBoxUserMention = New System.Windows.Forms.ListBox() Me.RichTextBox1 = New System.Windows.Forms.RichTextBox() + Me.ListBoxUserMention = New System.Windows.Forms.ListBox() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() Me.tsmitmTitle = New System.Windows.Forms.ToolStripMenuItem() Me.tsmenitmHamburger = New System.Windows.Forms.ToolStripMenuItem() @@ -154,6 +154,7 @@ Partial Class ChatControl Me.GridChatOld.Size = New System.Drawing.Size(421, 213) Me.GridChatOld.TabIndex = 0 Me.GridChatOld.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ChatViewOld}) + Me.GridChatOld.Visible = False ' 'ChatViewOld ' @@ -174,138 +175,138 @@ Partial Class ChatControl Me.ChatViewOld.OptionsTiles.Padding = New System.Windows.Forms.Padding(5) Me.ChatViewOld.OptionsTiles.RowCount = 0 Me.ChatViewOld.OptionsTiles.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollBar - TableColumnDefinition9.Length.Value = 250.0R - TableColumnDefinition10.Length.Value = 100.0R - ItemTemplate4.Columns.Add(TableColumnDefinition9) - ItemTemplate4.Columns.Add(TableColumnDefinition10) - TileViewItemElement11.Column = Me.columnUsername - TileViewItemElement11.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement11.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement11.Text = "columnUsername" - TileViewItemElement11.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft - TileViewItemElement11.TextLocation = New System.Drawing.Point(10, 0) - TileViewItemElement12.Column = Me.columnMessage - TileViewItemElement12.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement12.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement12.RowIndex = 1 - TileViewItemElement12.StretchHorizontal = True - TileViewItemElement12.StretchVertical = True - TileViewItemElement12.Text = "columnMessage" - TileViewItemElement12.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.TopLeft - TileViewItemElement12.TextLocation = New System.Drawing.Point(10, 0) - TileViewItemElement13.Column = Me.columnDate - TileViewItemElement13.ColumnIndex = 1 - TileViewItemElement13.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement13.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement13.Text = "columnDate" - TileViewItemElement13.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight - TileViewItemElement13.TextLocation = New System.Drawing.Point(-10, 0) - ItemTemplate4.Elements.Add(TileViewItemElement11) - ItemTemplate4.Elements.Add(TileViewItemElement12) - ItemTemplate4.Elements.Add(TileViewItemElement13) - ItemTemplate4.Name = "ChatLeft" - TableRowDefinition10.Length.Value = 19.0R - TableRowDefinition11.Length.Value = 45.0R - ItemTemplate4.Rows.Add(TableRowDefinition10) - ItemTemplate4.Rows.Add(TableRowDefinition11) - TableSpan4.ColumnSpan = 2 - TableSpan4.RowIndex = 1 - ItemTemplate4.Spans.Add(TableSpan4) - TableColumnDefinition11.Length.Value = 100.0R - TableColumnDefinition12.Length.Value = 250.0R - ItemTemplate5.Columns.Add(TableColumnDefinition11) - ItemTemplate5.Columns.Add(TableColumnDefinition12) - TileViewItemElement14.Column = Me.columnUsername - TileViewItemElement14.ColumnIndex = 1 - TileViewItemElement14.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement14.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement14.Text = "columnUsername" - TileViewItemElement14.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight - TileViewItemElement14.TextLocation = New System.Drawing.Point(-10, 0) - TileViewItemElement15.Column = Me.columnMessage - TileViewItemElement15.ColumnIndex = 1 - TileViewItemElement15.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement15.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement15.MaxWidth = 350 - TileViewItemElement15.RowIndex = 1 - TileViewItemElement15.Text = "columnMessage" - TileViewItemElement15.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight - TileViewItemElement15.TextLocation = New System.Drawing.Point(-10, 0) - TileViewItemElement16.Column = Me.columnDate - TileViewItemElement16.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement16.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement16.Text = "columnDate" - TileViewItemElement16.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft - TileViewItemElement16.TextLocation = New System.Drawing.Point(10, 0) - ItemTemplate5.Elements.Add(TileViewItemElement14) - ItemTemplate5.Elements.Add(TileViewItemElement15) - ItemTemplate5.Elements.Add(TileViewItemElement16) - ItemTemplate5.Name = "ChatRight" - TableRowDefinition12.Length.Value = 19.0R - TableRowDefinition13.Length.Value = 45.0R - ItemTemplate5.Rows.Add(TableRowDefinition12) - ItemTemplate5.Rows.Add(TableRowDefinition13) - TableColumnDefinition13.Length.Value = 250.0R - TableColumnDefinition14.Length.Value = 100.0R - ItemTemplate6.Columns.Add(TableColumnDefinition13) - ItemTemplate6.Columns.Add(TableColumnDefinition14) - TileViewItemElement17.Column = Me.columnUsername - TileViewItemElement17.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement17.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement17.RowIndex = 1 - TileViewItemElement17.Text = "columnUsername" - TileViewItemElement17.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft - TileViewItemElement17.TextLocation = New System.Drawing.Point(10, 0) - TileViewItemElement18.Column = Me.columnMessage - TileViewItemElement18.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement18.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement18.RowIndex = 2 - TileViewItemElement18.StretchHorizontal = True - TileViewItemElement18.StretchVertical = True - TileViewItemElement18.Text = "columnMessage" - TileViewItemElement18.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.TopLeft - TileViewItemElement18.TextLocation = New System.Drawing.Point(10, 0) - TileViewItemElement19.Column = Me.columnDate - TileViewItemElement19.ColumnIndex = 1 - TileViewItemElement19.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement19.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement19.RowIndex = 1 - TileViewItemElement19.Text = "columnDate" - TileViewItemElement19.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight - TileViewItemElement19.TextLocation = New System.Drawing.Point(-10, 0) - TileViewItemElement20.Appearance.Normal.BackColor = System.Drawing.Color.PaleGreen - TileViewItemElement20.Appearance.Normal.Options.UseBackColor = True - TileViewItemElement20.Column = Me.columnTO_USER - TileViewItemElement20.Height = 19 - TileViewItemElement20.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement20.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement20.StretchHorizontal = True - TileViewItemElement20.Text = "columnTO_USER" - TileViewItemElement20.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft - TileViewItemElement20.TextLocation = New System.Drawing.Point(10, 0) - ItemTemplate6.Elements.Add(TileViewItemElement17) - ItemTemplate6.Elements.Add(TileViewItemElement18) - ItemTemplate6.Elements.Add(TileViewItemElement19) - ItemTemplate6.Elements.Add(TileViewItemElement20) - ItemTemplate6.Name = "ChatTo" - TableRowDefinition14.Length.Value = 17.0R - TableRowDefinition15.Length.Value = 19.0R - TableRowDefinition16.Length.Value = 54.0R - ItemTemplate6.Rows.Add(TableRowDefinition14) - ItemTemplate6.Rows.Add(TableRowDefinition15) - ItemTemplate6.Rows.Add(TableRowDefinition16) - TableSpan5.ColumnSpan = 2 - TableSpan6.ColumnSpan = 2 - TableSpan6.RowIndex = 2 - ItemTemplate6.Spans.Add(TableSpan5) - ItemTemplate6.Spans.Add(TableSpan6) - Me.ChatViewOld.Templates.Add(ItemTemplate4) - Me.ChatViewOld.Templates.Add(ItemTemplate5) - Me.ChatViewOld.Templates.Add(ItemTemplate6) - Me.ChatViewOld.TileColumns.Add(TableColumnDefinition15) - Me.ChatViewOld.TileColumns.Add(TableColumnDefinition16) - Me.ChatViewOld.TileRows.Add(TableRowDefinition17) - Me.ChatViewOld.TileRows.Add(TableRowDefinition18) + TableColumnDefinition1.Length.Value = 250.0R + TableColumnDefinition2.Length.Value = 100.0R + ItemTemplate1.Columns.Add(TableColumnDefinition1) + ItemTemplate1.Columns.Add(TableColumnDefinition2) + TileViewItemElement1.Column = Me.columnUsername + TileViewItemElement1.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement1.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement1.Text = "columnUsername" + TileViewItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft + TileViewItemElement1.TextLocation = New System.Drawing.Point(10, 0) + TileViewItemElement2.Column = Me.columnMessage + TileViewItemElement2.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement2.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement2.RowIndex = 1 + TileViewItemElement2.StretchHorizontal = True + TileViewItemElement2.StretchVertical = True + TileViewItemElement2.Text = "columnMessage" + TileViewItemElement2.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.TopLeft + TileViewItemElement2.TextLocation = New System.Drawing.Point(10, 0) + TileViewItemElement3.Column = Me.columnDate + TileViewItemElement3.ColumnIndex = 1 + TileViewItemElement3.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement3.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement3.Text = "columnDate" + TileViewItemElement3.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight + TileViewItemElement3.TextLocation = New System.Drawing.Point(-10, 0) + ItemTemplate1.Elements.Add(TileViewItemElement1) + ItemTemplate1.Elements.Add(TileViewItemElement2) + ItemTemplate1.Elements.Add(TileViewItemElement3) + ItemTemplate1.Name = "ChatLeft" + TableRowDefinition1.Length.Value = 19.0R + TableRowDefinition2.Length.Value = 45.0R + ItemTemplate1.Rows.Add(TableRowDefinition1) + ItemTemplate1.Rows.Add(TableRowDefinition2) + TableSpan1.ColumnSpan = 2 + TableSpan1.RowIndex = 1 + ItemTemplate1.Spans.Add(TableSpan1) + TableColumnDefinition3.Length.Value = 100.0R + TableColumnDefinition4.Length.Value = 250.0R + ItemTemplate2.Columns.Add(TableColumnDefinition3) + ItemTemplate2.Columns.Add(TableColumnDefinition4) + TileViewItemElement4.Column = Me.columnUsername + TileViewItemElement4.ColumnIndex = 1 + TileViewItemElement4.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement4.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement4.Text = "columnUsername" + TileViewItemElement4.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight + TileViewItemElement4.TextLocation = New System.Drawing.Point(-10, 0) + TileViewItemElement5.Column = Me.columnMessage + TileViewItemElement5.ColumnIndex = 1 + TileViewItemElement5.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement5.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement5.MaxWidth = 350 + TileViewItemElement5.RowIndex = 1 + TileViewItemElement5.Text = "columnMessage" + TileViewItemElement5.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight + TileViewItemElement5.TextLocation = New System.Drawing.Point(-10, 0) + TileViewItemElement6.Column = Me.columnDate + TileViewItemElement6.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement6.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement6.Text = "columnDate" + TileViewItemElement6.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft + TileViewItemElement6.TextLocation = New System.Drawing.Point(10, 0) + ItemTemplate2.Elements.Add(TileViewItemElement4) + ItemTemplate2.Elements.Add(TileViewItemElement5) + ItemTemplate2.Elements.Add(TileViewItemElement6) + ItemTemplate2.Name = "ChatRight" + TableRowDefinition3.Length.Value = 19.0R + TableRowDefinition4.Length.Value = 45.0R + ItemTemplate2.Rows.Add(TableRowDefinition3) + ItemTemplate2.Rows.Add(TableRowDefinition4) + TableColumnDefinition5.Length.Value = 250.0R + TableColumnDefinition6.Length.Value = 100.0R + ItemTemplate3.Columns.Add(TableColumnDefinition5) + ItemTemplate3.Columns.Add(TableColumnDefinition6) + TileViewItemElement7.Column = Me.columnUsername + TileViewItemElement7.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement7.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement7.RowIndex = 1 + TileViewItemElement7.Text = "columnUsername" + TileViewItemElement7.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft + TileViewItemElement7.TextLocation = New System.Drawing.Point(10, 0) + TileViewItemElement8.Column = Me.columnMessage + TileViewItemElement8.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement8.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement8.RowIndex = 2 + TileViewItemElement8.StretchHorizontal = True + TileViewItemElement8.StretchVertical = True + TileViewItemElement8.Text = "columnMessage" + TileViewItemElement8.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.TopLeft + TileViewItemElement8.TextLocation = New System.Drawing.Point(10, 0) + TileViewItemElement9.Column = Me.columnDate + TileViewItemElement9.ColumnIndex = 1 + TileViewItemElement9.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement9.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement9.RowIndex = 1 + TileViewItemElement9.Text = "columnDate" + TileViewItemElement9.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight + TileViewItemElement9.TextLocation = New System.Drawing.Point(-10, 0) + TileViewItemElement10.Appearance.Normal.BackColor = System.Drawing.Color.PaleGreen + TileViewItemElement10.Appearance.Normal.Options.UseBackColor = True + TileViewItemElement10.Column = Me.columnTO_USER + TileViewItemElement10.Height = 19 + TileViewItemElement10.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement10.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement10.StretchHorizontal = True + TileViewItemElement10.Text = "columnTO_USER" + TileViewItemElement10.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft + TileViewItemElement10.TextLocation = New System.Drawing.Point(10, 0) + ItemTemplate3.Elements.Add(TileViewItemElement7) + ItemTemplate3.Elements.Add(TileViewItemElement8) + ItemTemplate3.Elements.Add(TileViewItemElement9) + ItemTemplate3.Elements.Add(TileViewItemElement10) + ItemTemplate3.Name = "ChatTo" + TableRowDefinition5.Length.Value = 17.0R + TableRowDefinition6.Length.Value = 19.0R + TableRowDefinition7.Length.Value = 54.0R + ItemTemplate3.Rows.Add(TableRowDefinition5) + ItemTemplate3.Rows.Add(TableRowDefinition6) + ItemTemplate3.Rows.Add(TableRowDefinition7) + TableSpan2.ColumnSpan = 2 + TableSpan3.ColumnSpan = 2 + TableSpan3.RowIndex = 2 + ItemTemplate3.Spans.Add(TableSpan2) + ItemTemplate3.Spans.Add(TableSpan3) + Me.ChatViewOld.Templates.Add(ItemTemplate1) + Me.ChatViewOld.Templates.Add(ItemTemplate2) + Me.ChatViewOld.Templates.Add(ItemTemplate3) + Me.ChatViewOld.TileColumns.Add(TableColumnDefinition7) + Me.ChatViewOld.TileColumns.Add(TableColumnDefinition8) + Me.ChatViewOld.TileRows.Add(TableRowDefinition8) + Me.ChatViewOld.TileRows.Add(TableRowDefinition9) ' 'btnSendMessage ' @@ -333,6 +334,17 @@ Partial Class ChatControl Me.pnlMessage.Size = New System.Drawing.Size(421, 102) Me.pnlMessage.TabIndex = 3 ' + 'RichTextBox1 + ' + Me.RichTextBox1.AutoWordSelection = True + Me.RichTextBox1.Dock = System.Windows.Forms.DockStyle.Fill + Me.RichTextBox1.Location = New System.Drawing.Point(0, 0) + Me.RichTextBox1.Name = "RichTextBox1" + Me.RichTextBox1.ShowSelectionMargin = True + Me.RichTextBox1.Size = New System.Drawing.Size(372, 102) + Me.RichTextBox1.TabIndex = 3 + Me.RichTextBox1.Text = "" + ' 'ListBoxUserMention ' Me.ListBoxUserMention.BackColor = System.Drawing.SystemColors.Window @@ -346,17 +358,6 @@ Partial Class ChatControl Me.ListBoxUserMention.TabIndex = 4 Me.ListBoxUserMention.Visible = False ' - 'RichTextBox1 - ' - Me.RichTextBox1.AutoWordSelection = True - Me.RichTextBox1.Dock = System.Windows.Forms.DockStyle.Fill - Me.RichTextBox1.Location = New System.Drawing.Point(0, 0) - Me.RichTextBox1.Name = "RichTextBox1" - Me.RichTextBox1.ShowSelectionMargin = True - Me.RichTextBox1.Size = New System.Drawing.Size(372, 102) - Me.RichTextBox1.TabIndex = 3 - Me.RichTextBox1.Text = "" - ' 'MenuStrip1 ' Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmitmTitle, Me.tsmenitmHamburger, Me.TeilnehmerToolStripMenuItem}) @@ -400,7 +401,7 @@ Partial Class ChatControl Me.TeilnehmerToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.TeilnehmerToolStripMenuItem.ForeColor = System.Drawing.Color.DarkCyan Me.TeilnehmerToolStripMenuItem.Name = "TeilnehmerToolStripMenuItem" - Me.TeilnehmerToolStripMenuItem.Size = New System.Drawing.Size(77, 21) + Me.TeilnehmerToolStripMenuItem.Size = New System.Drawing.Size(78, 21) Me.TeilnehmerToolStripMenuItem.Text = "Teilnehmer" ' 'GridChat diff --git a/Controls.ChatControl/ChatControl.vb b/Controls.ChatControl/ChatControl.vb index c33eaa11..cfa0392c 100644 --- a/Controls.ChatControl/ChatControl.vb +++ b/Controls.ChatControl/ChatControl.vb @@ -198,8 +198,15 @@ Public Class ChatControl oConvUser = $"No Identification for UserID '{oROW.Item("USER_ID")}'" End If Else - ListBoxUserMention.Items.Add("@" & oConvUser.ToString.Substring(0, oConvUser.ToString.IndexOf("@"))) - AssistListBox.Items.Add("@" & oConvUser.ToString.Substring(0, oConvUser.ToString.IndexOf("@"))) + Dim oToUser As String + If oConvUser.ToString.Contains("@") Then + oToUser = "@" & oConvUser.ToString.Substring(0, oConvUser.ToString.IndexOf("@")) + Else + oToUser = "@" & oConvUser.ToString + End If + + ListBoxUserMention.Items.Add(oToUser) + AssistListBox.Items.Add(oToUser) End If Dim oToolStripItem As ToolStripMenuItem = New ToolStripMenuItem(oConvUser.ToString) diff --git a/GUIs.ZooFlow/ClassControlCreator.vb b/GUIs.ZooFlow/ClassControlCreator.vb index 41d8306c..df766ae8 100644 --- a/GUIs.ZooFlow/ClassControlCreator.vb +++ b/GUIs.ZooFlow/ClassControlCreator.vb @@ -126,28 +126,18 @@ Public Class ClassControlCreator Logger = My.LogConfig.GetLogger() End Sub - Public Function CreateExistingDataGridView(row As DataRow, pXPosition As Integer, pYPosition As Integer) As DataGridView - Dim oDataGridView As DataGridView = CreateBaseControl(New DataGridView(), row, pXPosition, pYPosition) - - oDataGridView.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_GRIDVIEW) - oDataGridView.AllowUserToAddRows = False - oDataGridView.AllowUserToDeleteRows = False - oDataGridView.AllowUserToResizeColumns = False - oDataGridView.AllowUserToResizeRows = False - oDataGridView.AlternatingRowsDefaultCellStyle.BackColor = Color.Aqua - - Dim col As New DataGridViewTextBoxColumn - col.HeaderText = "" - col.Name = "column1" - col.Width = oDataGridView.Width - 30 - oDataGridView.Columns.Add(col) - - 'If Not designMode Then - ' control.Enabled = Not row.Item("READ_ONLY") - ' control.TabStop = Not row.Item("READ_ONLY") - 'End If - - Return oDataGridView + Public Function CreateExistingCheckbox(pAttributeRow As DataRow, pXPosition As Integer, pYPosition As Integer) As CheckBox + Dim oCheckBox As CheckBox = CType(CreateBaseControl(New CheckBox(), pAttributeRow, pXPosition, pYPosition), CheckBox) + + oCheckBox.AutoSize = True + Try + oCheckBox.Text = pAttributeRow.Item("ATTRIBUTE_TITLE") + Catch ex As Exception + oCheckBox.Text = "NO CAPTION AVAILABLE" + End Try + oCheckBox.CheckState = CheckState.Indeterminate + + Return oCheckBox End Function Public Function CreateExistingDatepicker(pAttributeRow As DataRow, pXPosition As Integer, pYPosition As Integer) As DateEdit Dim oDateControl As DateEdit = CType(CreateBaseControl(New DateEdit(), pAttributeRow, pXPosition, pYPosition), DateEdit) @@ -191,8 +181,7 @@ Public Class ClassControlCreator oView.OptionsView.NewItemRowPosition = NewItemRowPosition.None oView.OptionsView.ShowAutoFilterRow = True oView.OptionsView.EnableAppearanceEvenRow = True - - oMyNewGridControl.Size = New Size(DEFAULT_WIDTH_GRIDVIEW, DEFAULT_HEIGHT_GRIDVIEW) + oMyNewGridControl.Size = New Size(CInt(pAttributeRow.Item("WIDTH")), CInt(pAttributeRow.Item("HEIGHT"))) ' Add and configure navigator to delete rows oMyNewGridControl.UseEmbeddedNavigator = True diff --git a/GUIs.ZooFlow/frmSearchStart.Designer.vb b/GUIs.ZooFlow/frmSearchStart.Designer.vb index 3c345fb9..82b40cc0 100644 --- a/GUIs.ZooFlow/frmSearchStart.Designer.vb +++ b/GUIs.ZooFlow/frmSearchStart.Designer.vb @@ -30,9 +30,10 @@ Partial Class frmSearchStart Me.BarHeaderItem1 = New DevExpress.XtraBars.BarHeaderItem() Me.BarEditItem1 = New DevExpress.XtraBars.BarEditItem() Me.RepositoryItemRadioGroup1 = New DevExpress.XtraEditors.Repository.RepositoryItemRadioGroup() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.Panel1 = New System.Windows.Forms.Panel() Me.cmbProfile = New System.Windows.Forms.ComboBox() @@ -40,6 +41,7 @@ Partial Class frmSearchStart Me.WindowsUIButtonPanel1 = New DevExpress.XtraBars.Docking2010.WindowsUIButtonPanel() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.TokenEdit1 = New DevExpress.XtraEditors.TokenEdit() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage() @@ -49,20 +51,20 @@ Partial Class frmSearchStart Me.XtraTabPage8 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage9 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage10 = New DevExpress.XtraTab.XtraTabPage() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemRadioGroup1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() + CType(Me.TokenEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemNewSearch, Me.BarButtonItem2, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemNewSearch, Me.BarButtonItem2, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonItem1, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 6 + Me.RibbonControl1.MaxItemId = 7 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemRadioGroup1}) @@ -103,9 +105,23 @@ Partial Class frmSearchStart ' Me.RepositoryItemRadioGroup1.Name = "RepositoryItemRadioGroup1" ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Suche leeren" + Me.BarButtonItem1.Id = 5 + Me.BarButtonItem1.ImageOptions.Image = CType(resources.GetObject("BarButtonItem1.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "BarButtonItem3" + Me.BarButtonItem3.Id = 6 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -117,12 +133,6 @@ Partial Class frmSearchStart Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.AllowTextClipping = False - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "Aktuelle Filter" - ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 574) @@ -195,6 +205,19 @@ Partial Class frmSearchStart Me.XtraTabPage1.Size = New System.Drawing.Size(872, 274) Me.XtraTabPage1.Text = "Search#1" ' + 'TokenEdit1 + ' + Me.TokenEdit1.Location = New System.Drawing.Point(191, 60) + Me.TokenEdit1.MenuManager = Me.RibbonControl1 + Me.TokenEdit1.Name = "TokenEdit1" + Me.TokenEdit1.Properties.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.TokenEdit1.Properties.Appearance.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TokenEdit1.Properties.Appearance.Options.UseBackColor = True + Me.TokenEdit1.Properties.Appearance.Options.UseFont = True + Me.TokenEdit1.Properties.Separators.AddRange(New String() {","}) + Me.TokenEdit1.Size = New System.Drawing.Size(683, 22) + Me.TokenEdit1.TabIndex = 0 + ' 'XtraTabPage2 ' Me.XtraTabPage2.Name = "XtraTabPage2" @@ -249,19 +272,12 @@ Partial Class frmSearchStart Me.XtraTabPage10.Size = New System.Drawing.Size(872, 274) Me.XtraTabPage10.Text = "Search#10" ' - 'BarButtonItem1 - ' - Me.BarButtonItem1.Caption = "Suche leeren" - Me.BarButtonItem1.Id = 5 - Me.BarButtonItem1.ImageOptions.Image = CType(resources.GetObject("BarButtonItem1.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem1.Name = "BarButtonItem1" - ' 'frmSearchStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(874, 601) + Me.Controls.Add(Me.TokenEdit1) Me.Controls.Add(Me.XtraTabControl1) Me.Controls.Add(Me.WindowsUIButtonPanel1) Me.Controls.Add(Me.Panel1) @@ -278,6 +294,7 @@ Partial Class frmSearchStart Me.Panel1.PerformLayout() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) + CType(Me.TokenEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -307,6 +324,7 @@ Partial Class frmSearchStart Friend WithEvents BarHeaderItem1 As DevExpress.XtraBars.BarHeaderItem Friend WithEvents BarEditItem1 As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemRadioGroup1 As DevExpress.XtraEditors.Repository.RepositoryItemRadioGroup - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents TokenEdit1 As DevExpress.XtraEditors.TokenEdit + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/frmSearchStart.resx b/GUIs.ZooFlow/frmSearchStart.resx index 67d43f14..17fbd072 100644 --- a/GUIs.ZooFlow/frmSearchStart.resx +++ b/GUIs.ZooFlow/frmSearchStart.resx @@ -163,25 +163,24 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJXRFWHRUaXRsZQBDbGVhcjtF - cmFzZTtSZW1vdmU7QmFycztSaWJib247h4CDcwAAAKVJREFUOE+lzMENwjAMQNHOhDhmAA5swB2uTICE - xIkNGIAJWIOdzHcUV4ljQoHDq1rX35OI/CUceimlrYr+dQOvxLeiO9J8eC42u3qnCWosRvEdgpPtdaFi - YRSbfOTXWJ27AwxXOGJR3BxgqPG+sCPDeD7AsI7NFcM4H2AYxRc88cDb2A6sEcVGj4Sxyg8W7IiP1cFH - tfmFxY0LP8YqHH4jHC4n0wurkEbWwnScwwAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENsZWFyO0VyYXNlO1JlbW92ZTtC + YXJzO1JpYmJvbjuHgINzAAAApUlEQVQ4T6XMwQ3CMAxA0c6EOGYADmzAHa5MgITEiQ0YgAlYg53MdxRX + iWNCgcOrWtffk4j8JRx6KaWtiv51A6/Et6I70nx4Lja7eqcJaixG8R2Ck+11oWJhFJt85NdYnbsDDFc4 + YlHcHGCo8b6wI8N4PsCwjs0VwzgfYBjFFzzxwNvYDqwRxUaPhLHKDxbsiI/VwUe1+YXFjQs/xiocfiMc + LifTC6uQRtbCdJzDAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJXRFWHRUaXRsZQBDbGVhcjtF - cmFzZTtSZW1vdmU7QmFycztSaWJib247h4CDcwAAAT9JREFUWEfFjsFNAzEURFNHykC5ZQ8UQB3hSgVI - SJzoIAVQAW2kJ2cG7Y/s7/Fie3fN4UXrif68OYQQ/hUZjkSGI5HhGqZpeiHqP4UMe5nl15mqETLswcmr - R8iwFYqcOGZxhAxboMAJFcURMqyFxU5U4hu8q44sqAWFLfIwk41IHrWgqEcuRyTFNaBgjdx4tr5MsAQO - t5B/xJ2JYAkcbi4nyaMEDs9AyTxNcpIFHhw+gQt4A0pqNMuJDA0cmtwojeiSExkSHHp5aUS3nMgQhyW5 - YSNWyUkW4PAvufEFlJhUyUnywGGt/BPcwA/olpPHBw5b5UY8oklOfn9weARK5vHyeESznDw+UHACSmqU - 5OQ1Lm0heaCoNGIXOckCFPoRu8mJDFFsI3aVExkSCDhCickmciLDkchwJDIciQzHEQ53bCSwNhgc18QA - AAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENsZWFyO0VyYXNlO1JlbW92ZTtC + YXJzO1JpYmJvbjuHgINzAAABP0lEQVRYR8WOwU0DMRREU0fKQLllDxRAHeFKBUhInOggBVABbaQnZwbt + j+zv8WJ7d83hReuJ/rw5hBD+FRmORIYjkeEapml6Ieo/hQx7meXXmaoRMuzByatHyLAVipw4ZnGEDFug + wAkVxREyrIXFTlTiG7yrjiyoBYUt8jCTjUgetaCoRy5HJMU1oGCN3Hi2vkywBA63kH/EnYlgCRxuLifJ + owQOz0DJPE1ykgUeHD6BC3gDSmo0y4kMDRya3CiN6JITGRIcenlpRLecyBCHJblhI1bJSRbg8C+58QWU + mFTJSfLAYa38E9zAD+iWk8cHDlvlRjyiSU5+f3B4BErm8fJ4RLOcPD5QcAJKapTk5DUubSF5oKg0Yhc5 + yQIU+hG7yYkMUWwjdpUTGRIIOEKJySZyIsORyHAkMhyJDMcRDndsJLA2GBzXxAAAAABJRU5ErkJggg== diff --git a/GUIs.ZooFlow/frmSearchStart.vb b/GUIs.ZooFlow/frmSearchStart.vb index e2fe6ba9..07e595d9 100644 --- a/GUIs.ZooFlow/frmSearchStart.vb +++ b/GUIs.ZooFlow/frmSearchStart.vb @@ -9,6 +9,7 @@ Public Class frmSearchStart Private DTSearchProfiles As DataTable Private TabSelected As XtraTabPage Private PSEARCH_ID As Integer = 0 + Private PSEARCH_BASE_RESULT_SQL As String Public FormShown As Boolean = False Private Const DEFAULT_X As Integer = 10 Private Const DEFAULT_Y As Integer = 10 @@ -34,8 +35,14 @@ Public Class frmSearchStart End Sub Public Sub AddSearchAttribute(pAttrID As String, pAttrTitle As String, pSearchTerm As String, Optional pCriteria As String = "=") + For Each oSearchTerm As DataRow In DTSearchTerms.Rows + If oSearchTerm.Item("AttrID") = pAttrID Then 'And oSearchTerm.Item("Criteria") = pCriteria And oSearchTerm.Item("SearchTerm") = pSearchTerm + oSearchTerm.Delete() + End If + Next DTSearchTerms.Rows.Add(pAttrID, pAttrTitle, pCriteria, pSearchTerm) DTSearchTerms.AcceptChanges() + AddToken(pAttrTitle & " " & pCriteria & " '" & pSearchTerm & "'") End Sub Public Sub SearchAttribute(pAttrID As String, pAttrTitle As String, pSearchTerm As String, Optional pCriteria As String = "=") @@ -63,6 +70,7 @@ Public Class frmSearchStart TabSelected = XtraTabControl1.TabPages(0) TabSelected.PageVisible = True PSEARCH_ID = DTSearchProfiles.Rows(0).Item("SEARCH_PROFILE_ID") + PSEARCH_BASE_RESULT_SQL = DTSearchProfiles.Rows(0).Item("RESULT_SQL") TabSelected.Text = DTSearchProfiles.Rows(0).Item("TITLE") Load_Search_Attributes() BarButtonItemNewSearch.Visibility = DevExpress.XtraBars.BarItemVisibility.Never @@ -77,64 +85,102 @@ Public Class frmSearchStart Sub Load_Search_Attributes() Dim oSQL = $"SELECT * FROM VWIDB_SEARCH_PROFILE_ATTRIBUTES WHERE SEARCH_PROFIL_ID = {PSEARCH_ID} ORDER BY [SEQUENCE]" Dim oDT As DataTable = My.Database_IDB.GetDatatable(oSQL) - Dim oXPosition As Integer = 10 - Dim oYPosition As Integer = 10 - Dim oControlXPosition As Integer = 33 + Dim oControlCount As Integer = 1 Dim oControlRow As Integer = 0 Dim oControls As New ClassControlCreator(TabSelected, Me) + Dim YMax As Integer = 0 + Dim YActControlHeight As Integer = 0 + Dim XActControlWidth As Integer = 0 + Dim iList As New List(Of Integer)() + iList.Add(2) + iList.Add(3) + iList.Add(5) + iList.Add(6) + iList.Add(8) + iList.Add(9) For Each oAttributeRow As DataRow In oDT.Rows + Dim oXPosition As Integer + Dim oYPositionControl As Integer + Dim oYPositionLabel As Integer + Dim oSingleResult As Boolean = False Dim oAttriTitle As String = oAttributeRow.Item("ATTRIBUTE_TITLE").ToString Dim oAttriID As String = oAttributeRow.Item("ATTRIBUTE_ID").ToString Dim oAttriTYPE As String = oAttributeRow.Item("ATTRIBUTE_TYPE").ToString - If oControlCount = 1 Or oControlCount = 3 Or oControlCount = 5 Then - 'linke Spalte + If oControlCount = 1 Or oControlCount = 5 Or oControlCount = 9 Then oControlRow += 1 End If - Select Case oControlCount - Case 2 - oXPosition = oXPosition + 150 + 15 - End Select - Select Case oControlRow - Case 1 - oYPosition = DEFAULT_Y - If oControlCount > 1 Then - oXPosition = DEFAULT_X + 170 - End If - Case 2 - oYPosition = DEFAULT_Y + 150 + 20 - If oControlCount = 4 Then - oXPosition = DEFAULT_X + 170 - End If + If oControlRow = 1 Then + If oControlCount = 1 Then + oXPosition = 10 + oYPositionLabel = 10 + oYPositionControl = oYPositionLabel + 20 + End If + ElseIf oControlRow = 2 Then + If oControlCount = 5 Then + oXPosition = 10 + oYPositionLabel = YActControlHeight + 10 + oYPositionControl = oYPositionLabel + 20 + + End If + ElseIf oControlRow = 3 Then + If oControlCount = 9 Then + oXPosition = 10 + End If + End If + + Dim oControlHeight As Integer = CInt(oAttributeRow.Item("HEIGHT")) + Dim oControlWidth As Integer = CInt(oAttributeRow.Item("WIDTH")) + - End Select + 'Erst mal das Label hinzufügen + 'If oAttriTYPE <> "BIT" Then + addLabel(oAttriTitle, oXPosition, oYPositionLabel) + 'End If + 'Nun das Control mit dem entsprechenden Abstand und der Größe + Dim oXDistance As Integer, oYDistance As Integer + Dim oCalcHeight As Integer + Dim oCalcWidth As Integer + If oAttriTYPE = "VARCHAR" Or oAttriTYPE = "BIG INTEGER" Then + oCalcHeight = oControlHeight + oYPositionControl + oCalcWidth = oControlWidth + ElseIf (oAttriTYPE = "DATE" Or oAttriTYPE = "BIT") Then + oCalcHeight = 20 + oYPositionControl + oCalcWidth = 100 + End If + If oCalcHeight > YActControlHeight Then + YActControlHeight = oCalcHeight + End If - addLabel(oAttriTitle, oXPosition, oYPosition) Dim oMyControl As Control - Select Case oAttriTYPE - Case "VARCHAR" - oMyControl = oControls.CreateExistingGridControl(oAttributeRow, oXPosition, oYPosition + 20) - Dim myDGV As GridControl = CType(oMyControl, GridControl) - Dim omyDTSource As DataTable = CType(myDGV.DataSource, DataTable) - Dim oView As DevExpress.XtraGrid.Views.Grid.GridView - oView = CType(myDGV.MainView, GridView) - AddHandler oView.FocusedRowChanged, AddressOf FocusedRowChanged - If omyDTSource.Rows.Count = 1 Then - oSingleResult = True - AddSearchAttribute(oAttriID, oAttriTitle, omyDTSource.Rows(0).Item(oAttriTitle).ToString) - End If - Case "DATE" - oMyControl = oControls.CreateExistingDatepicker(oAttributeRow, oXPosition, oYPosition + 20) - Dim myDTP As DateEdit = CType(oMyControl, DateEdit) - AddHandler myDTP.DisableCalendarDate, AddressOf DisableCalendarDate - End Select + If oAttriTYPE = "VARCHAR" Or oAttriTYPE = "BIG INTEGER" Then + oMyControl = oControls.CreateExistingGridControl(oAttributeRow, oXPosition, oYPositionControl) + Dim myDGV As GridControl = CType(oMyControl, GridControl) + Dim omyDTSource As DataTable = CType(myDGV.DataSource, DataTable) + Dim oView As DevExpress.XtraGrid.Views.Grid.GridView + oView = CType(myDGV.MainView, GridView) + AddHandler oView.FocusedRowChanged, AddressOf FocusedRowChanged + If omyDTSource.Rows.Count = 1 Then + oSingleResult = True + AddSearchAttribute(oAttriID, oAttriTitle, omyDTSource.Rows(0).Item(oAttriTitle).ToString) + End If + ElseIf oAttriTYPE = "DATE" Then + oMyControl = oControls.CreateExistingDatepicker(oAttributeRow, oXPosition, oYPositionControl) + Dim myDTP As DateEdit = CType(oMyControl, DateEdit) + AddHandler myDTP.DisableCalendarDate, AddressOf DisableCalendarDate + ElseIf oAttriTYPE = "BIT" Then + oMyControl = oControls.CreateExistingCheckbox(oAttributeRow, oXPosition, oYPositionControl) + Dim myCheckBox As CheckBox = CType(oMyControl, CheckBox) + AddHandler myCheckBox.CheckedChanged, AddressOf CheckBox_CheckedChanged + End If + oControlCount += 1 TabSelected.Controls.Add(oMyControl) - + oXPosition += oControlWidth + 20 Next End Sub @@ -185,7 +231,14 @@ Public Class frmSearchStart End If End Sub - + Private Sub CheckBox_CheckedChanged(sender As Object, e As EventArgs) + If FormShown = False Then Exit Sub + Dim oCurrentCB As CheckBox = DirectCast(sender, CheckBox) + Dim oChecked = oCurrentCB.Checked + Dim oAttrID = DirectCast(oCurrentCB.Tag, ClassControlCreator.ControlMetadata).AttrID + Dim oAttrTitle = DirectCast(oCurrentCB.Tag, ClassControlCreator.ControlMetadata).AttrTitle + AddSearchAttribute(oAttrID, oAttrTitle, oChecked.ToString) + End Sub Private Sub frmSearchStart_Shown(sender As Object, e As EventArgs) Handles Me.Shown FormShown = True End Sub @@ -214,18 +267,81 @@ Public Class frmSearchStart Next Return oIsValid End Function + Private Sub Clear_token() + Try + TokenEdit1.Properties.BeginUpdate() + Dim oCount As Int16 = 1 + For Each oRow As DataRow In DTSearchTerms.Rows + TokenEdit1.RemoveItem($"criteria{oCount}") + oCount += 1 + Next + TokenEdit1.Properties.EndUpdate() + Catch ex As Exception + End Try + + End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick Try + Clear_token() DTSearchTerms.Clear() + Catch ex As Exception MsgBox("Unexpected Error in Clearing Search Items: " & ex.Message, MsgBoxStyle.Critical) End Try - For Each oControl As Control In TabSelected.Controls - Select Case oControl.GetType.ToString - Case "" - End Select - Next + TabSelected.Controls.Clear() + End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + + TokenEdit1.Properties.BeginUpdate() + 'TokenEdit1.Properties.Tokens.AddToken("Column1 = 'Value1'", "criteria1") + + TokenEdit1.Properties.Tokens.AddToken("Column1 = 'Value1'", "criteria1") + TokenEdit1.Properties.Tokens.AddToken("Column2 > 20", "criteria2") + TokenEdit1.Properties.Tokens.AddToken("Column3 <> 'Harry'", "criteria3") + TokenEdit1.EditValue = "criteria1, criteria2, criteria3" + ' ... add more tokens + TokenEdit1.Properties.EndUpdate() + End Sub + Private Sub AddToken(CriteriaString As String) + Try + Clear_token() + TokenEdit1.Properties.BeginUpdate() + ''oRow.Item("AttrTitle") & " " & oRow.Item("Criteria") & " '" & oRow.Item("SearchTerm") & "'" + Dim oCount As Int16 = 1 + For Each oRow As DataRow In DTSearchTerms.Rows + Try + Dim oCriteriaString = oRow.Item("AttrTitle") & " " & oRow.Item("Criteria") & " '" & oRow.Item("SearchTerm") & "'" + TokenEdit1.Properties.Tokens.AddToken(CriteriaString, "criteria" + oCount.ToString) + Catch ex As Exception + + End Try + + oCount += 1 + Next + ' Dim oTokenCount = DTSearchTerms.Rows.Count + 'TokenEdit1.Properties.BeginUpdate() + 'TokenEdit1.Properties.Tokens.AddToken(CriteriaString, "criteria" + oCount.ToString) + Dim otokenEditString = "" + oCount = 1 + For Each oRow As DataRow In DTSearchTerms.Rows + If oCount = 1 Then + otokenEditString = "criteria1" + Else + otokenEditString &= $", criteria{oCount}" + End If + oCount += 1 + Next + TokenEdit1.EditValue = otokenEditString + ' ... add more tokens + TokenEdit1.Properties.EndUpdate() + Catch ex As Exception + MsgBox("Unexpected Error in AddToken: " & ex.Message, MsgBoxStyle.Critical) + Logger.Warn("Unexpected Error in AddToken: " & ex.Message) + End Try + + End Sub End Class \ No newline at end of file