diff --git a/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb b/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb index 9ebffca2..e328ac97 100644 --- a/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb +++ b/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb @@ -22,45 +22,59 @@ Partial Class frmWorkflow_Adhoc_start 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWorkflow_Adhoc_start)) - Dim ItemTemplateBase1 As DevExpress.XtraEditors.TableLayout.ItemTemplateBase = New DevExpress.XtraEditors.TableLayout.ItemTemplateBase() - 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 TemplatedItemElement1 As DevExpress.XtraEditors.TableLayout.TemplatedItemElement = New DevExpress.XtraEditors.TableLayout.TemplatedItemElement() - Dim TemplatedItemElement2 As DevExpress.XtraEditors.TableLayout.TemplatedItemElement = New DevExpress.XtraEditors.TableLayout.TemplatedItemElement() - 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 TableColumnDefinition3 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition4 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() 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 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() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() 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.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.ComboBox1 = New System.Windows.Forms.ComboBox() - Me.LabelControl3 = New DevExpress.XtraEditors.LabelControl() + Me.cmbWorkflowSelect = New System.Windows.Forms.ComboBox() Me.LookUpEdit1 = New DevExpress.XtraEditors.LookUpEdit() Me.GroupControl1 = New DevExpress.XtraEditors.GroupControl() Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() Me.GroupControl2 = New DevExpress.XtraEditors.GroupControl() - Me.ListBoxControl1 = New DevExpress.XtraEditors.ListBoxControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.GroupControl3 = New DevExpress.XtraEditors.GroupControl() + Me.GridPredefinedSearches = New DevExpress.XtraGrid.GridControl() + Me.TileView1 = New DevExpress.XtraGrid.Views.Tile.TileView() + Me.colName = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.colDescription = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.colCount = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.colImage = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupControl1.SuspendLayout() CType(Me.GroupControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupControl2.SuspendLayout() - CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GroupControl3, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupControl3.SuspendLayout() + CType(Me.GridPredefinedSearches, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TileView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' + Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green Me.RibbonControl1.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(35, 39, 35, 39) Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.RibbonControl1.MaxItemId = 1 + Me.RibbonControl1.MaxItemId = 2 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.OptionsMenuMinWidth = 385 Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) @@ -75,6 +89,7 @@ Partial Class frmWorkflow_Adhoc_start ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' @@ -96,24 +111,14 @@ Partial Class frmWorkflow_Adhoc_start Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'ComboBox1 + 'cmbWorkflowSelect ' - Me.ComboBox1.FormattingEnabled = True - Me.ComboBox1.Location = New System.Drawing.Point(5, 27) - Me.ComboBox1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.ComboBox1.Name = "ComboBox1" - Me.ComboBox1.Size = New System.Drawing.Size(337, 21) - Me.ComboBox1.TabIndex = 2 - ' - 'LabelControl3 - ' - Me.LabelControl3.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelControl3.Appearance.Options.UseFont = True - Me.LabelControl3.Location = New System.Drawing.Point(526, 649) - Me.LabelControl3.Name = "LabelControl3" - Me.LabelControl3.Size = New System.Drawing.Size(81, 17) - Me.LabelControl3.TabIndex = 7 - Me.LabelControl3.Text = "LabelControl3" + Me.cmbWorkflowSelect.FormattingEnabled = True + Me.cmbWorkflowSelect.Location = New System.Drawing.Point(5, 32) + Me.cmbWorkflowSelect.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmbWorkflowSelect.Name = "cmbWorkflowSelect" + Me.cmbWorkflowSelect.Size = New System.Drawing.Size(337, 21) + Me.cmbWorkflowSelect.TabIndex = 2 ' 'LookUpEdit1 ' @@ -130,6 +135,8 @@ Partial Class frmWorkflow_Adhoc_start ' Me.GroupControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GroupControl1.Appearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(19, Byte), Integer)) + Me.GroupControl1.Appearance.Options.UseBorderColor = True Me.GroupControl1.Controls.Add(Me.SimpleButton1) Me.GroupControl1.Controls.Add(Me.LookUpEdit1) Me.GroupControl1.Location = New System.Drawing.Point(12, 242) @@ -152,42 +159,127 @@ Partial Class frmWorkflow_Adhoc_start ' Me.GroupControl2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.GroupControl2.Controls.Add(Me.ComboBox1) + Me.GroupControl2.Appearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(19, Byte), Integer)) + Me.GroupControl2.Appearance.Options.UseBorderColor = True + Me.GroupControl2.Controls.Add(Me.cmbWorkflowSelect) Me.GroupControl2.Location = New System.Drawing.Point(12, 173) Me.GroupControl2.Name = "GroupControl2" Me.GroupControl2.Size = New System.Drawing.Size(909, 63) Me.GroupControl2.TabIndex = 11 - Me.GroupControl2.Text = "Workflow-Layout Auswahl" + Me.GroupControl2.Text = "Workflow Auswahl" ' - 'ListBoxControl1 + 'BarButtonItem1 ' - Me.ListBoxControl1.ItemHeight = 120 - Me.ListBoxControl1.Location = New System.Drawing.Point(17, 337) - Me.ListBoxControl1.Name = "ListBoxControl1" - Me.ListBoxControl1.Size = New System.Drawing.Size(561, 172) - Me.ListBoxControl1.TabIndex = 12 - ItemTemplateBase1.Columns.Add(TableColumnDefinition1) - ItemTemplateBase1.Columns.Add(TableColumnDefinition2) - TemplatedItemElement1.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - TemplatedItemElement1.Appearance.Normal.Options.UseFont = True - TemplatedItemElement1.FieldName = Nothing - TemplatedItemElement1.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TemplatedItemElement1.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TemplatedItemElement1.Text = "element1" - TemplatedItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TemplatedItemElement2.FieldName = Nothing - TemplatedItemElement2.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TemplatedItemElement2.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TemplatedItemElement2.RowIndex = 1 - TemplatedItemElement2.Text = "element2" - TemplatedItemElement2.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - ItemTemplateBase1.Elements.Add(TemplatedItemElement1) - ItemTemplateBase1.Elements.Add(TemplatedItemElement2) - ItemTemplateBase1.Name = "template1" - ItemTemplateBase1.Rows.Add(TableRowDefinition1) - ItemTemplateBase1.Rows.Add(TableRowDefinition2) - ItemTemplateBase1.Rows.Add(TableRowDefinition3) - Me.ListBoxControl1.Templates.Add(ItemTemplateBase1) + Me.BarButtonItem1.Caption = "Speichern und Schliessen" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'GroupControl3 + ' + Me.GroupControl3.Appearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(19, Byte), Integer)) + Me.GroupControl3.Appearance.Options.UseBorderColor = True + Me.GroupControl3.Controls.Add(Me.GridPredefinedSearches) + Me.GroupControl3.Location = New System.Drawing.Point(12, 318) + Me.GroupControl3.Name = "GroupControl3" + Me.GroupControl3.Size = New System.Drawing.Size(909, 295) + Me.GroupControl3.TabIndex = 15 + Me.GroupControl3.Text = "GroupControl3" + ' + 'GridPredefinedSearches + ' + Me.GridPredefinedSearches.Location = New System.Drawing.Point(25, 99) + Me.GridPredefinedSearches.MainView = Me.TileView1 + Me.GridPredefinedSearches.MenuManager = Me.RibbonControl1 + Me.GridPredefinedSearches.Name = "GridPredefinedSearches" + Me.GridPredefinedSearches.Size = New System.Drawing.Size(858, 96) + Me.GridPredefinedSearches.TabIndex = 2 + Me.GridPredefinedSearches.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView1, Me.GridView1}) + ' + 'TileView1 + ' + Me.TileView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colName, Me.colDescription, Me.colCount, Me.colImage}) + Me.TileView1.GridControl = Me.GridPredefinedSearches + Me.TileView1.Name = "TileView1" + Me.TileView1.OptionsTiles.AllowItemHover = True + Me.TileView1.OptionsTiles.ItemSize = New System.Drawing.Size(190, 80) + Me.TileView1.OptionsTiles.Orientation = System.Windows.Forms.Orientation.Vertical + Me.TileView1.OptionsTiles.RowCount = 2 + Me.TileView1.OptionsTiles.VerticalContentAlignment = DevExpress.Utils.VertAlignment.Center + TableColumnDefinition3.Length.Value = 35.0R + TableColumnDefinition3.PaddingRight = 5 + TableColumnDefinition4.Length.Value = 129.0R + Me.TileView1.TileColumns.Add(TableColumnDefinition3) + Me.TileView1.TileColumns.Add(TableColumnDefinition4) + TableRowDefinition3.Length.Value = 21.0R + TableRowDefinition4.Length.Value = 43.0R + Me.TileView1.TileRows.Add(TableRowDefinition3) + Me.TileView1.TileRows.Add(TableRowDefinition4) + TileViewItemElement4.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + TileViewItemElement4.Appearance.Normal.Options.UseFont = True + TileViewItemElement4.Column = Me.colName + TileViewItemElement4.ColumnIndex = 1 + TileViewItemElement4.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement4.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement4.Text = "colName" + TileViewItemElement4.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement5.Column = Me.colDescription + TileViewItemElement5.ColumnIndex = 1 + TileViewItemElement5.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement5.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement5.RowIndex = 1 + TileViewItemElement5.Text = "colDescription" + TileViewItemElement5.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement6.Column = Me.colImage + TileViewItemElement6.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement6.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement6.RowIndex = 1 + TileViewItemElement6.Text = "colImage" + TileViewItemElement6.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + Me.TileView1.TileTemplate.Add(TileViewItemElement4) + Me.TileView1.TileTemplate.Add(TileViewItemElement5) + Me.TileView1.TileTemplate.Add(TileViewItemElement6) + ' + 'colName + ' + Me.colName.Caption = "Name" + Me.colName.FieldName = "DisplayName" + Me.colName.Name = "colName" + Me.colName.Visible = True + Me.colName.VisibleIndex = 0 + ' + 'colDescription + ' + Me.colDescription.Caption = "Beschreibung" + Me.colDescription.FieldName = "Description" + Me.colDescription.Name = "colDescription" + Me.colDescription.Visible = True + Me.colDescription.VisibleIndex = 1 + ' + 'colCount + ' + Me.colCount.Caption = "Anzahl" + Me.colCount.FieldName = "Count" + Me.colCount.Name = "colCount" + Me.colCount.Visible = True + Me.colCount.VisibleIndex = 2 + ' + 'colImage + ' + Me.colImage.Caption = "Image" + Me.colImage.FieldName = "Image" + Me.colImage.Name = "colImage" + Me.colImage.Visible = True + Me.colImage.VisibleIndex = 3 + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridPredefinedSearches + Me.GridView1.Name = "GridView1" + ' + 'SvgImageCollection1 + ' + Me.SvgImageCollection1.Add("actions_user", "image://svgimages/icon builder/actions_user.svg") ' 'frmWorkflow_Adhoc_start ' @@ -195,10 +287,9 @@ Partial Class frmWorkflow_Adhoc_start Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(933, 730) - Me.Controls.Add(Me.ListBoxControl1) + Me.Controls.Add(Me.GroupControl3) Me.Controls.Add(Me.GroupControl2) Me.Controls.Add(Me.GroupControl1) - Me.Controls.Add(Me.LabelControl3) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -213,7 +304,12 @@ Partial Class frmWorkflow_Adhoc_start Me.GroupControl1.ResumeLayout(False) CType(Me.GroupControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupControl2.ResumeLayout(False) - CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GroupControl3, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupControl3.ResumeLayout(False) + CType(Me.GridPredefinedSearches, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TileView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -225,11 +321,19 @@ Partial Class frmWorkflow_Adhoc_start Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents ComboBox1 As Windows.Forms.ComboBox - Friend WithEvents LabelControl3 As DevExpress.XtraEditors.LabelControl + Friend WithEvents cmbWorkflowSelect As Windows.Forms.ComboBox Friend WithEvents LookUpEdit1 As DevExpress.XtraEditors.LookUpEdit Friend WithEvents GroupControl1 As DevExpress.XtraEditors.GroupControl Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton Friend WithEvents GroupControl2 As DevExpress.XtraEditors.GroupControl - Friend WithEvents ListBoxControl1 As DevExpress.XtraEditors.ListBoxControl + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents GroupControl3 As DevExpress.XtraEditors.GroupControl + Friend WithEvents GridPredefinedSearches As DevExpress.XtraGrid.GridControl + Friend WithEvents TileView1 As DevExpress.XtraGrid.Views.Tile.TileView + Friend WithEvents colName As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents colDescription As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents colCount As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents colImage As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection End Class diff --git a/GUIs.Common/frmWorkflow_Adhoc_start.resx b/GUIs.Common/frmWorkflow_Adhoc_start.resx index cf5ad933..497999f4 100644 --- a/GUIs.Common/frmWorkflow_Adhoc_start.resx +++ b/GUIs.Common/frmWorkflow_Adhoc_start.resx @@ -118,6 +118,32 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGkEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU2F2ZUFuZENsb3NlIj4NCiAgICA8 + cGF0aCBkPSJNNiwxNlY2SDNDMi40LDYsMiw2LjQsMiw3djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYs + MCwxLTAuNCwxLTFWMTZINnogTTYsMjZ2LTZoMTZ2Nkg2eiBNMTYsNkg4djhoOFY2eiAgICBNMTIsMTJo + LTJWOGgyVjEyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yOSwySDE5Yy0wLjUsMC0x + LDAuNS0xLDF2MTBjMCwwLjUsMC41LDEsMSwxaDEwYzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41 + LDIsMjksMnogTTI3LjcsMTAuNCAgIGMwLjQsMC40LDAuNCwxLDAsMS4zYy0wLjQsMC40LTEsMC40LTEu + MywwTDI0LDkuM2wtMi40LDIuNGMtMC40LDAuNC0xLDAuNC0xLjMsMGMtMC40LTAuNC0wLjQtMSwwLTEu + M0wyMi43LDhsLTIuNC0yLjQgICBjLTAuNC0wLjQtMC40LTEsMC0xLjNjMC40LTAuNCwxLTAuNCwxLjMs + MEwyNCw2LjdsMi40LTIuNGMwLjQtMC40LDEtMC40LDEuMywwYzAuNCwwLjQsMC40LDEsMCwxLjNMMjUu + Myw4TDI3LjcsMTAuNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -136,4 +162,7 @@ Cjwvc3ZnPgs= + + 17, 17 + \ No newline at end of file diff --git a/GUIs.Common/frmWorkflow_Adhoc_start.vb b/GUIs.Common/frmWorkflow_Adhoc_start.vb index 8bd31ce5..118845a0 100644 --- a/GUIs.Common/frmWorkflow_Adhoc_start.vb +++ b/GUIs.Common/frmWorkflow_Adhoc_start.vb @@ -6,6 +6,7 @@ Imports DigitalData.Modules.EDMI.API Imports DevExpress.XtraEditors Imports System.Drawing Imports DigitalData.Modules.EDMI.API.EDMIServiceReference +Imports DevExpress.Utils.Svg Public Class frmWorkflow_Adhoc_start Private ReadOnly Property LogConfig As LogConfig @@ -15,6 +16,7 @@ Public Class frmWorkflow_Adhoc_start Private ReadOnly AdHocWorkflow As AdHocWorkflow Private Client As Client Private IsLoading As Boolean = True + Private WFUserList As List(Of WFUSer) Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pAdhocWorkflow As AdHocWorkflow) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -34,31 +36,13 @@ Public Class frmWorkflow_Adhoc_start Return oOperationMode End Function - Private Function InitAppServer() As Boolean - Dim oServerAddress = Client.ParseServiceAddress(Environment.Service.Client.ServerAddress) - Dim oAddress As String = oServerAddress.Item1 - Dim oPort As Integer = oServerAddress.Item2 - Client = New Client(LogConfig, oAddress, oPort) - - If Not Client.Connect() Then - Logger.Warn("Client could not connect to Service at [{0}]", Environment.Service.Address) - Return False - End If - - Return True - End Function Private Sub frmWorkflow_Adhoc_start_Load(sender As Object, e As EventArgs) Handles Me.Load Try ' Operation mode is either guessed from service settings ' or explictly set from OperationModeOverride in Params OperationMode = GetOperationMode() - If OperationMode = OperationMode.WithAppServer Or OperationMode = OperationMode.ZooFlow Then - If InitAppServer() = False Then - Me.Close() - End If - - End If + Client = Environment.Service.Client ' Initialize Viewer with GDPicture.NET License @@ -75,7 +59,8 @@ Public Class frmWorkflow_Adhoc_start ' RibbonPageGroupFilesystem.Visible = False End If Dim oDatatableUserselect As DataTable - Dim oSQL = $"SELECT NAME + ', ' + PRENAME AS FULLNAME,EMAIL,USERNAME FROM TBDD_USER" + Dim oDatatableWFSelect As DataTable + Dim oSQL = AdHocWorkflow.AHWF_CMD_USR_SELECT Dim oResult As GetDatatableResponse = Nothing If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then oResult = Client.GetDatatableFromECM(oSQL) @@ -88,11 +73,35 @@ Public Class frmWorkflow_Adhoc_start Else oDatatableUserselect = Environment.Database.GetDatatable(oSQL) End If + If Not IsNothing(oDatatableUserselect) Then + LookUpEdit1.Properties.DataSource = oDatatableUserselect + LookUpEdit1.Properties.ValueMember = oDatatableUserselect.Columns(0).ColumnName + LookUpEdit1.Properties.DisplayMember = oDatatableUserselect.Columns(1).ColumnName + + End If + oSQL = AdHocWorkflow.AHWF_CMD_LAYOUT_SELECT + If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then + oResult = Client.GetDatatableFromECM(oSQL) + If oResult.OK = False Then + Throw New ApplicationException(oResult.ErrorMessage) + Else + oDatatableWFSelect = oResult.Table + End If + + Else + oDatatableWFSelect = Environment.Database.GetDatatable(oSQL) + End If + If Not IsNothing(oDatatableWFSelect) Then + cmbWorkflowSelect.DataSource = oDatatableWFSelect + cmbWorkflowSelect.ValueMember = oDatatableWFSelect.Columns(0).ColumnName + cmbWorkflowSelect.DisplayMember = oDatatableWFSelect.Columns(1).ColumnName + End If + If OperationMode = OperationMode.NoAppServer Then ' panelContainerStatus.Visibility = Docking.DockVisibility.Hidden End If - + WFUserList = New List(Of WFUSer) ' Hide the complete Navigation Ribbon Group if desired Catch ex As Exception @@ -107,18 +116,28 @@ Public Class frmWorkflow_Adhoc_start End Sub Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click - ListBoxControl1.Items.Add(New ListItem() With { - .Name = "Marlon Schreiber", - .email = "m.schreiber@digitaldata.works" - }) - ListBoxControl1.Items.Add(New ListItem() With { - .Name = "Jonathan Jenne", - .email = "j.jenner@digitaldata.works" - }) + Dim oUser As New WFUSer() With { + .Mail = "Heute", + .UserID = "Dokumente, die heute abgelegt wurden", + .Image = SvgImageCollection1.Item("actions_user") + } End Sub Private Class ListItem Public Name As String Public email As String End Class + Friend Class WFUSer + Public Property Mail As String + Public Property UserID As Integer + Public Property Image As SvgImage + Public Property Count As Integer = 0 + + Public ReadOnly Property DisplayName As String + Get + Return UserID + End Get + End Property + + End Class End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb index 8e3079af..3679e56b 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb @@ -589,9 +589,13 @@ Public Class frmAdmin_Globix Private Sub SimpleButton4_Click(sender As Object, e As EventArgs) Handles SimpleButton4.Click Try If Regex.IsMatch(REGEXTextBox.Text, txtDateinameTest.Text) Then - MsgBox("The RegEx resulted in a proper match!", MsgBoxStyle.Information, "Perfect:") + Dim oMsgBox As New Dialog1("The RegEx resulted in a proper match!", "", False) + oMsgBox.ShowDialog() + Else - MsgBox("No Match- There might be an error in the RegEx!", MsgBoxStyle.Information, "Something wrong:") + Dim oMsgBox As New Dialog1("No Match- There might be an error in the RegEx!", "", True) + oMsgBox.ShowDialog() + End If Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Testing Regex: ") diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 988fbd03..ff7fca6e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -45,7 +45,8 @@ Public Class frmAdmin_Start Load_GridData(oDetailData) Else - MsgBox($"Could not load data for Page [{oKey}] because it does not exist!", MsgBoxStyle.Critical, Text) + Dim oMsgBox As New Dialog1($"Could not load data for Page [{oKey}] because it does not exist!", "Error", True) + oMsgBox.ShowDialog() End If End If End Sub @@ -64,6 +65,7 @@ Public Class frmAdmin_Start Else MsgBox($"Tag [{Page}] not found! Exiting." & vbNewLine & $"Check the [ENTITY_TITLE] Column in Table [TBZF_ADMIN_SOURCE_SQL]. It must match with the Tag [{Page}] of the corresponding Tree List nodes!", MsgBoxStyle.Critical, Text) + Return False End If diff --git a/GUIs.ZooFlow/ClassDragDrop.vb b/GUIs.ZooFlow/ClassDragDrop.vb index adcb3908..3540ba5c 100644 --- a/GUIs.ZooFlow/ClassDragDrop.vb +++ b/GUIs.ZooFlow/ClassDragDrop.vb @@ -98,7 +98,9 @@ Public Class ClassDragDrop End If Catch ex As Exception Logger.Error(ex) - MsgBox("Error in view_MouseMove: " & ex.Message, MsgBoxStyle.Critical) + + Dim oMsgBox As New Dialog1("Error in view_MouseMove: " & ex.Message, "", True) + oMsgBox.ShowDialog() End Try End Sub diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 0d385c51..6d2b854c 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -207,14 +207,8 @@ Public Class ClassInit Dim oDatatable As DataTable = My.Database.GetDatatableIDB(oSql) For Each oRow As DataRow In oDatatable.Rows Dim oCAT_TITLE As String = oRow.Item("CAT_TITLE") + Logger.Debug($"IDB_CATALOG_STRING: {oRow.Item("CAT_STRING")}") - Select Case oCAT_TITLE - Case "AHWF_CMD_USR_SELECT" - AHWF_CMD_USR_SELECT = oRow.Item("CAT_STRING") - Case "AHWF_CMD_LAYOUT_SELECT" - AHWF_CMD_LAYOUT_SELECT = oRow.Item("CAT_STRING") - - End Select Next Catch ex As InitException @@ -377,7 +371,8 @@ Public Class ClassInit Dim oMessage = $"{oMessageStart}{oMessage1}{oMessage2}{oMessageEnd}" - MsgBox(oMessage, MsgBoxStyle.Critical, _MainForm.Text) + Dim oMsgBox As New Dialog1(oMessage, _MainForm.Text, True) + oMsgBox.ShowDialog() Application.ExitThread() Else ' Copy back state from MyApplication Helper to My.Application diff --git a/GUIs.ZooFlow/Dialog1.Designer.vb b/GUIs.ZooFlow/Dialog1.Designer.vb index 39b5c477..16b5335c 100644 --- a/GUIs.ZooFlow/Dialog1.Designer.vb +++ b/GUIs.ZooFlow/Dialog1.Designer.vb @@ -34,7 +34,7 @@ Partial Class Dialog1 Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None Me.OK_Button.DialogResult = System.Windows.Forms.DialogResult.Yes Me.OK_Button.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.OK_Button.Location = New System.Drawing.Point(235, 94) + Me.OK_Button.Location = New System.Drawing.Point(12, 94) Me.OK_Button.Name = "OK_Button" Me.OK_Button.Size = New System.Drawing.Size(87, 32) Me.OK_Button.TabIndex = 0 @@ -65,7 +65,7 @@ Partial Class Dialog1 ' 'Panel1 ' - Me.Panel1.BackColor = System.Drawing.Color.SteelBlue + Me.Panel1.BackColor = System.Drawing.Color.OrangeRed Me.Panel1.Controls.Add(Me.lblMeldung) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) @@ -89,7 +89,7 @@ Partial Class Dialog1 Me.MinimizeBox = False Me.Name = "Dialog1" Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Dialog1" Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() diff --git a/GUIs.ZooFlow/Dialog1.vb b/GUIs.ZooFlow/Dialog1.vb index 6bff2a38..f7a37427 100644 --- a/GUIs.ZooFlow/Dialog1.vb +++ b/GUIs.ZooFlow/Dialog1.vb @@ -1,7 +1,7 @@ Imports System.Windows.Forms Public Class Dialog1 - Public Sub New(pMessageText As String, pTitle As String) + Public Sub New(pMessageText As String, pTitle As String, IsError As Boolean) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -9,6 +9,13 @@ Public Class Dialog1 ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. Me.lblMeldung.Text = pMessageText Me.Text = pTitle + If IsError Then + Panel1.BackColor = Color.Red + Cancel_Button.Visible = False + Else + Panel1.BackColor = Color.OrangeRed + Cancel_Button.Visible = True + End If End Sub Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click @@ -21,4 +28,7 @@ Public Class Dialog1 Me.Close() End Sub + Private Sub Dialog1_Load(sender As Object, e As EventArgs) Handles Me.Load + + End Sub End Class diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb index 4c7363c7..f5b5a86f 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb @@ -54,11 +54,7 @@ Public Class ClassFilehandle 'Dim oBoxOptions = MsgBoxStyle.Question Or MsgBoxStyle.YesNo ofrmDuplicate.ShowDialog() - 'If My.Application.User.Language = "de-DE" Then - ' oResult = MsgBox($"Die Datei [{oFilename}] wurde bereits am [{oDate}] verarbeitet. Wollen Sie die gleiche Datei noch einmal verarbeiten?", oBoxOptions, oBoxTitle) - 'Else - ' oResult = MsgBox($"The file [{oFilename}] has already been processed at [{oDate}]. Do you want to process the same file again?", oBoxOptions, oBoxTitle) - 'End If + If ofrmDuplicate.DialogResult = DialogResult.Yes Then Return True @@ -124,11 +120,14 @@ Public Class ClassFilehandle End If If oTempFilePath.ToUpper.EndsWith(".LNK") Then + Dim oMSG As String If My.Application.User.Language = "de-DE" Then - MsgBox("Verknüpfungen können nicht abgelegt werden!", MsgBoxStyle.Critical, "Global Indexer") + oMSG = "Verknüpfungen können nicht abgelegt werden!" Else - MsgBox("Shortcuts cannot be droppped!", MsgBoxStyle.Critical, "Global Indexer") + oMSG = "Shortcuts cannot be droppped!" End If + Dim oMsgBox As New Dialog1(oMSG, "", True) + oMsgBox.ShowDialog() Return False End If diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb index 78839a27..d329fb87 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb @@ -80,7 +80,9 @@ Public Class ClassFolderwatcher End If Catch ex As Exception Logger.Error(ex.Message) - MsgBox("Error in StartStop_FolderWatch:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + + Dim oMsgBox As New Dialog1("Error in StartStop_FolderWatch:" & vbNewLine & ex.Message, "", True) + oMsgBox.ShowDialog() End Try End Function Public Function StartStop_FolderWatchSCAN() As Integer diff --git a/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb b/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb index 2339c1b6..bf1069d7 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb @@ -259,6 +259,8 @@ Public Class ClassValidator End Function Private Sub ShowValidationMessage() - MsgBox(ClassConstants.TEXT_MISSING_INPUT, MsgBoxStyle.Exclamation, ClassConstants.TITLE_MISSING_INPUT) + 'MsgBox(ClassConstants.TEXT_MISSING_INPUT, MsgBoxStyle.Exclamation, ClassConstants.TITLE_MISSING_INPUT) + Dim oMsgBox As New Dialog1(ClassConstants.TITLE_MISSING_INPUT & vbNewLine & ClassConstants.TEXT_MISSING_INPUT, "", True) + oMsgBox.ShowDialog() End Sub End Class diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb index bd693d31..96ba4bb0 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb @@ -44,12 +44,15 @@ Public Class frmGlobixBasicConfig Logger.Info(">> Unexpected error in CheckFolder: " & pMypath) Logger.Error(ex.Message) Logger.Info(" >> " & ex.Message) - If My.Application.User.Language = "de-DE" Then - MsgBox("Unexpected error in ECheckFolder: " & pMypath & vbNewLine & "Bitte überprüfen Sie die Rechte!" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - Else - MsgBox("Error in creating Hotfolder: " & pMypath & vbNewLine & "Please check the rights!" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End If + Dim otext As String + If My.Application.User.Language = "de-DE" Then + otext = "Unexpected error in ECheckFolder: " & pMypath & vbNewLine & "Bitte überprüfen Sie die Rechte!" & vbNewLine & ex.Message + Else + otext = "Error in creating Hotfolder: " & pMypath & vbNewLine & "Please check the rights!" & vbNewLine & ex.Message + End If + Dim oMsgBox As New Dialog1("No Match- There might be an error in the RegEx!", "", True) + oMsgBox.ShowDialog() Exit Sub End Try diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb index 990a5259..a55e26ac 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb @@ -463,12 +463,14 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I oControl = oControls.AddDateTimePicker(oControlName, oControlPosition, oDataType) Case Else + Dim omsg As String If My.Application.User.Language = "de-DE" Then - MsgBox("Bitte überprüfen Sie den Datentyp des hinterlegten Indexwertes!", MsgBoxStyle.Critical, "Achtung:") + omsg = "Bitte überprüfen Sie den Datentyp des hinterlegten Indexwertes!" Else - MsgBox("Please check Datatype of Indexvalue!", MsgBoxStyle.Critical, "Warning:") + omsg = "Please check Datatype of Indexvalue!" End If - + Dim oMsgBox As New Dialog1(omsg, "", True) + oMsgBox.ShowDialog() Logger.Warn("DataType [{0}] not implemented!", oIndex.DataType) End Select @@ -647,24 +649,30 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I Private Sub frmGlobix_Index_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing If File.Exists(My.Application.Globix.CurrentWorkfile.FilePath) Then + Dim oMsg As String Select Case CancelAttempts Case 0 + If My.Application.User.Language = "de-DE" Then - MsgBox("Bitte indexieren Sie die Datei vollständig!" & vbNewLine & "(Abbruch 1 des Indexierungsvorgangs)", MsgBoxStyle.Information) + oMsg = "Bitte indexieren Sie die Datei vollständig!" & vbNewLine & "(Abbruch 1 des Indexierungsvorgangs)" Else - MsgBox("Please Index file completely" & vbNewLine & "(Abort 1 of Indexdialog)", MsgBoxStyle.Information) + oMsg = "Please Index file completely" & vbNewLine & "(Abort 1 of Indexdialog)" End If + Dim oMsgBox As New Dialog1(oMsg, "", False) + oMsgBox.Cancel_Button.Visible = False + oMsgBox.ShowDialog() CancelAttempts += 1 e.Cancel = True Case 1 - Dim result As MsgBoxResult - If My.Application.User.Language = "de-DE" Then - result = MessageBox.Show("Sie brechen nun zum zweiten Mal den Indexierungsvorgang ab!" & vbNewLine & "Wollen Sie die Indexierung aller Dateien abbrechen?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - Else - result = MessageBox.Show("You abort the indexdialog for the 2nd time!" & vbNewLine & "Do You want to abort indexing?", "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - End If - If result = MsgBoxResult.Yes Then + If My.Application.User.Language = "de-DE" Then + oMsg = "Sie brechen nun zum zweiten Mal den Indexierungsvorgang ab!" & vbNewLine & "Wollen Sie die Indexierung aller Dateien abbrechen?" + Else + oMsg = "You abort the indexdialog for the 2nd time!" & vbNewLine & "Do You want to abort indexing?" + End If + Dim oMsgBox As New Dialog1(oMsg, "", False) + oMsgBox.Cancel_Button.Visible = True + If oMsgBox.DialogResult = DialogResult.Yes Then Dim containsfw_file As Boolean = False Try My.Application.Globix.ABORT_INDEXING = True diff --git a/GUIs.ZooFlow/MyApplication.vb b/GUIs.ZooFlow/MyApplication.vb index 109c97df..9ae3daf7 100644 --- a/GUIs.ZooFlow/MyApplication.vb +++ b/GUIs.ZooFlow/MyApplication.vb @@ -71,8 +71,8 @@ Namespace My End Function Public Function GetAdHocWorkflow(pObjectID As Long) As AdHocWorkflow Return New AdHocWorkflow With { - .AHWF_CMD_LAYOUT_SELECT = AHWF_CMD_LAYOUT_SELECT, - .AHWF_CMD_USR_SELECT = AHWF_CMD_USR_SELECT, + .AHWF_CMD_LAYOUT_SELECT = SQL_AHW_LAYOUT_SELECT, + .AHWF_CMD_USR_SELECT = SQL_AHW_USR_SELECT, .OBJECT_ID = pObjectID } End Function diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 64a3616f..5580c97f 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -309,12 +309,14 @@ Public Class frmFlowForm Dim oFileExclusions As New ClassExclusions() If oFileExclusions.Load() = False Then + Dim oMsg As String If My.Application.User.Language = "de-DE" Then - MsgBox("Die Ausschlusskriterien für Dateien in Folderwatch konnten nicht angelegt werden!", MsgBoxStyle.Information) + oMsg = "Die Ausschlusskriterien für Dateien in Folderwatch konnten nicht angelegt werden!" Else - MsgBox("File-Exclusions in Folderwatch could not be created!", MsgBoxStyle.Information) + oMsg = "File-Exclusions in Folderwatch could not be created!" End If - + Dim oMsgBox As New Dialog1(oMsg, "Error", True) + oMsgBox.ShowDialog() End If Init_Folderwatch() @@ -506,7 +508,7 @@ Public Class frmFlowForm If My.Application.User.Language <> "de-DE" Then oTitle = "Exit Zooflow" End If - Dim oMsgBox As New Dialog1(omessage, oTitle) + Dim oMsgBox As New Dialog1(omessage, oTitle, False) oMsgBox.ShowDialog() If oMsgBox.DialogResult = DialogResult.OK Then @@ -611,7 +613,8 @@ Public Class frmFlowForm End If If TheFormIsAlreadyLoaded("frmIndexFileList") Then Cursor = Cursors.Default - MsgBox("Please index the active file first!", MsgBoxStyle.Exclamation, "Drag 'n Drop not allowed!") + Dim oMsgBox As New Dialog1("Please index the active file first!", "Drag 'n Drop not allowed!", True) + oMsgBox.ShowDialog() Exit Function End If @@ -914,7 +917,8 @@ Public Class frmFlowForm If ex.Message.Contains("Sammlung wurde geändert") Or ex.Message.Contains("Enumeration") Then Else - MsgBox("Error in Work FolderWatch-File:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + Dim oMsgBox As New Dialog1("Error in Work FolderWatch-File:" & vbNewLine & ex.Message, "Drag 'n Drop not allowed!", True) + oMsgBox.ShowDialog() End If End Try diff --git a/GUIs.ZooFlow/frmtest.Designer.vb b/GUIs.ZooFlow/frmtest.Designer.vb index 3f0f49b2..736aad44 100644 --- a/GUIs.ZooFlow/frmtest.Designer.vb +++ b/GUIs.ZooFlow/frmtest.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmtest Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmtest 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.Label2 = New System.Windows.Forms.Label() Me.txtFile2Import = New System.Windows.Forms.TextBox() @@ -39,7 +39,7 @@ Partial Class frmtest Me.txtDoctypeID = New System.Windows.Forms.TextBox() Me.Label3 = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() - Me.txtObjectID = New System.Windows.Forms.TextBox() + Me.TextBox1 = New System.Windows.Forms.TextBox() Me.SuspendLayout() ' 'Label2 @@ -152,7 +152,6 @@ Partial Class frmtest ' 'txtIDB_OBJ_ID ' - Me.txtIDB_OBJ_ID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.DigitalData.GUIs.ZooFlow.Settings.Default, "IDBOBJID", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) Me.txtIDB_OBJ_ID.Location = New System.Drawing.Point(137, 38) Me.txtIDB_OBJ_ID.Name = "txtIDB_OBJ_ID" Me.txtIDB_OBJ_ID.Size = New System.Drawing.Size(100, 20) @@ -183,19 +182,19 @@ Partial Class frmtest Me.Button1.Text = "AdhocWorkflow" Me.Button1.UseVisualStyleBackColor = True ' - 'txtObjectID + 'TextBox1 ' - Me.txtObjectID.Location = New System.Drawing.Point(174, 193) - Me.txtObjectID.Name = "txtObjectID" - Me.txtObjectID.Size = New System.Drawing.Size(118, 20) - Me.txtObjectID.TabIndex = 25 + Me.TextBox1.Location = New System.Drawing.Point(172, 194) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(189, 20) + Me.TextBox1.TabIndex = 25 ' 'frmtest ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(865, 450) - Me.Controls.Add(Me.txtObjectID) + Me.Controls.Add(Me.TextBox1) Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.txtDoctypeID) @@ -235,5 +234,5 @@ Partial Class frmtest Friend WithEvents txtDoctypeID As TextBox Friend WithEvents Label3 As Label Friend WithEvents Button1 As Button - Friend WithEvents txtObjectID As TextBox + Friend WithEvents TextBox1 As TextBox End Class diff --git a/GUIs.ZooFlow/frmtest.vb b/GUIs.ZooFlow/frmtest.vb index 513db025..369b000e 100644 --- a/GUIs.ZooFlow/frmtest.vb +++ b/GUIs.ZooFlow/frmtest.vb @@ -75,7 +75,7 @@ Public Class frmtest End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - AdHoc_Workflow = My.Application.GetAdHocWorkflow(txtObjectID.Text) + AdHoc_Workflow = My.Application.GetAdHocWorkflow(TextBox1.Text) Dim oForm As New frmWorkflow_Adhoc_start(My.LogConfig, Environment, AdHoc_Workflow) oForm.Show() oForm.BringToFront() diff --git a/GUIs.ZooFlow/modCurrent.vb b/GUIs.ZooFlow/modCurrent.vb index 62d53995..58bb28aa 100644 --- a/GUIs.ZooFlow/modCurrent.vb +++ b/GUIs.ZooFlow/modCurrent.vb @@ -10,9 +10,6 @@ Module modCurrent Public Property NI_MESSAGE As String = "" Public Property NI_TYPE As String = "INFO" Public Property GLOBIX_JUMP_DOCTYPE_ID As Integer - - Public Property AHWF_CMD_USR_SELECT As String - Public Property AHWF_CMD_LAYOUT_SELECT As String Public Property SQL_FLOW_SEARCH_BASE As String Public Property SQL_AHW_LAYOUT_SELECT As String Public Property SQL_AHW_USR_SELECT As String