diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 055cc611..a519360f 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -124,6 +124,12 @@ Form + + frmDialog.vb + + + Form + @@ -210,6 +216,9 @@ frmDataResultList.vb + + frmDialog.vb + frmDocumentResultList.vb diff --git a/GUIs.ZooFlow/Dialog1.Designer.vb b/GUIs.Common/frmDialog.Designer.vb similarity index 59% rename from GUIs.ZooFlow/Dialog1.Designer.vb rename to GUIs.Common/frmDialog.Designer.vb index 16b5335c..8c6eddee 100644 --- a/GUIs.ZooFlow/Dialog1.Designer.vb +++ b/GUIs.Common/frmDialog.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class Dialog1 +Partial Class frmDialog Inherits DevExpress.XtraEditors.XtraForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -24,80 +24,90 @@ Partial Class Dialog1 Private Sub InitializeComponent() Me.OK_Button = New System.Windows.Forms.Button() Me.Cancel_Button = New System.Windows.Forms.Button() - Me.lblMeldung = New DevExpress.XtraEditors.LabelControl() Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblMeldung = New System.Windows.Forms.Label() + Me.Panel2 = New System.Windows.Forms.Panel() Me.Panel1.SuspendLayout() + Me.Panel2.SuspendLayout() Me.SuspendLayout() ' 'OK_Button ' - Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.OK_Button.DialogResult = System.Windows.Forms.DialogResult.Yes + Me.OK_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) 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(12, 94) + Me.OK_Button.Location = New System.Drawing.Point(3, 10) Me.OK_Button.Name = "OK_Button" - Me.OK_Button.Size = New System.Drawing.Size(87, 32) + Me.OK_Button.Size = New System.Drawing.Size(86, 32) Me.OK_Button.TabIndex = 0 Me.OK_Button.Text = "OK" ' 'Cancel_Button ' - Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.No + Me.Cancel_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel Me.Cancel_Button.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Cancel_Button.Location = New System.Drawing.Point(328, 94) + Me.Cancel_Button.Location = New System.Drawing.Point(358, 10) Me.Cancel_Button.Name = "Cancel_Button" - Me.Cancel_Button.Size = New System.Drawing.Size(95, 32) + Me.Cancel_Button.Size = New System.Drawing.Size(91, 32) Me.Cancel_Button.TabIndex = 1 Me.Cancel_Button.Text = "Abbrechen" ' - 'lblMeldung - ' - Me.lblMeldung.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMeldung.Appearance.ForeColor = System.Drawing.Color.Black - Me.lblMeldung.Appearance.Options.UseFont = True - Me.lblMeldung.Appearance.Options.UseForeColor = True - Me.lblMeldung.Location = New System.Drawing.Point(12, 12) - Me.lblMeldung.Name = "lblMeldung" - Me.lblMeldung.Size = New System.Drawing.Size(98, 21) - Me.lblMeldung.TabIndex = 1 - Me.lblMeldung.Text = "LabelControl1" - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.OrangeRed Me.Panel1.Controls.Add(Me.lblMeldung) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel1.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(435, 88) + Me.Panel1.Size = New System.Drawing.Size(452, 180) Me.Panel1.TabIndex = 2 ' - 'Dialog1 + 'lblMeldung + ' + Me.lblMeldung.AutoSize = True + Me.lblMeldung.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblMeldung.Location = New System.Drawing.Point(3, 9) + Me.lblMeldung.Name = "lblMeldung" + Me.lblMeldung.Size = New System.Drawing.Size(56, 21) + Me.lblMeldung.TabIndex = 0 + Me.lblMeldung.Text = "Label1" + ' + 'Panel2 + ' + Me.Panel2.Controls.Add(Me.OK_Button) + Me.Panel2.Controls.Add(Me.Cancel_Button) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel2.Location = New System.Drawing.Point(0, 180) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(452, 45) + Me.Panel2.TabIndex = 3 + ' + 'frmDialog ' Me.AcceptButton = Me.OK_Button Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(435, 134) - Me.Controls.Add(Me.Cancel_Button) - Me.Controls.Add(Me.OK_Button) + Me.ClientSize = New System.Drawing.Size(452, 225) + Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.Panel1) - Me.FormBorderEffect = DevExpress.XtraEditors.FormBorderEffect.None Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.MaximizeBox = False Me.MinimizeBox = False - Me.Name = "Dialog1" + Me.Name = "frmDialog" Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Dialog1" Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() + Me.Panel2.ResumeLayout(False) Me.ResumeLayout(False) End Sub Friend WithEvents OK_Button As System.Windows.Forms.Button Friend WithEvents Cancel_Button As System.Windows.Forms.Button - Friend WithEvents lblMeldung As DevExpress.XtraEditors.LabelControl - Friend WithEvents Panel1 As Panel + Friend WithEvents Panel1 As Windows.Forms.Panel + Friend WithEvents Panel2 As Windows.Forms.Panel + Friend WithEvents lblMeldung As Windows.Forms.Label End Class diff --git a/GUIs.ZooFlow/Dialog1.resx b/GUIs.Common/frmDialog.resx similarity index 100% rename from GUIs.ZooFlow/Dialog1.resx rename to GUIs.Common/frmDialog.resx diff --git a/GUIs.ZooFlow/Dialog1.vb b/GUIs.Common/frmDialog.vb similarity index 80% rename from GUIs.ZooFlow/Dialog1.vb rename to GUIs.Common/frmDialog.vb index f7a37427..775c7293 100644 --- a/GUIs.ZooFlow/Dialog1.vb +++ b/GUIs.Common/frmDialog.vb @@ -1,12 +1,14 @@ -Imports System.Windows.Forms +Imports System.Drawing +Imports System.Windows.Forms -Public Class Dialog1 +Public Class frmDialog Public Sub New(pMessageText As String, pTitle As String, IsError As Boolean) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Me.lblMeldung.Text = pMessageText Me.Text = pTitle If IsError Then @@ -27,8 +29,11 @@ Public Class Dialog1 Me.DialogResult = System.Windows.Forms.DialogResult.Cancel Me.Close() End Sub - - Private Sub Dialog1_Load(sender As Object, e As EventArgs) Handles Me.Load - + Public Sub CancelButtonInvisible() + Cancel_Button.Visible = False End Sub + Public Sub CancelButtonVisible() + Cancel_Button.Visible = True + End Sub + End Class diff --git a/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb b/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb index e328ac97..cfe122f5 100644 --- a/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb +++ b/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb @@ -24,6 +24,13 @@ Partial Class frmWorkflow_Adhoc_start Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWorkflow_Adhoc_start)) + 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 TableRowDefinition1 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition2 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + 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 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() @@ -31,25 +38,32 @@ Partial Class frmWorkflow_Adhoc_start 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.ColTitle = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.TileViewColumn2 = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.TileViewColumn4 = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.colEmail = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.colFullName = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.colImage = New DevExpress.XtraGrid.Columns.TileViewColumn() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = 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.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - 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.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.GridControlWorkflows = New DevExpress.XtraGrid.GridControl() + Me.TileViewWorkflows = New DevExpress.XtraGrid.Views.Tile.TileView() + Me.TileViewColumn3 = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() 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.GridSelectedUsers = New DevExpress.XtraGrid.GridControl() + Me.TileViewUser = New DevExpress.XtraGrid.Views.Tile.TileView() 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() @@ -58,45 +72,119 @@ Partial Class frmWorkflow_Adhoc_start Me.GroupControl1.SuspendLayout() CType(Me.GroupControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupControl2.SuspendLayout() + CType(Me.GridControlWorkflows, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TileViewWorkflows, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView2, 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.GridSelectedUsers, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TileViewUser, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' + 'ColTitle + ' + Me.ColTitle.Caption = "Title" + Me.ColTitle.FieldName = "Title" + Me.ColTitle.Name = "ColTitle" + Me.ColTitle.Visible = True + Me.ColTitle.VisibleIndex = 0 + ' + 'TileViewColumn2 + ' + Me.TileViewColumn2.Caption = "Description" + Me.TileViewColumn2.FieldName = "Description" + Me.TileViewColumn2.Name = "TileViewColumn2" + Me.TileViewColumn2.Visible = True + Me.TileViewColumn2.VisibleIndex = 1 + ' + 'TileViewColumn4 + ' + Me.TileViewColumn4.Caption = "Image" + Me.TileViewColumn4.FieldName = "Image" + Me.TileViewColumn4.Name = "TileViewColumn4" + Me.TileViewColumn4.Visible = True + Me.TileViewColumn4.VisibleIndex = 3 + ' + 'colEmail + ' + Me.colEmail.Caption = "ColEmail" + Me.colEmail.FieldName = "Email" + Me.colEmail.Name = "colEmail" + Me.colEmail.Visible = True + Me.colEmail.VisibleIndex = 0 + ' + 'colFullName + ' + Me.colFullName.Caption = "colFullName" + Me.colFullName.FieldName = "FullName" + Me.colFullName.Name = "colFullName" + Me.colFullName.Visible = True + Me.colFullName.VisibleIndex = 1 + ' + 'colImage + ' + Me.colImage.Caption = "Image" + Me.colImage.FieldName = "Image" + Me.colImage.Name = "colImage" + Me.colImage.Visible = True + Me.colImage.VisibleIndex = 3 + ' '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.BarButtonItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.RibbonControl1.MaxItemId = 2 + Me.RibbonControl1.MaxItemId = 4 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.OptionsMenuMinWidth = 385 Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.Size = New System.Drawing.Size(933, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(1061, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' + 'BarButtonItem1 + ' + 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" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Abbrechen und Schliessen" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Gewählten User entfernen" + Me.BarButtonItem3.Id = 3 + Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" + Me.RibbonPage1.Text = "Start" ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Funktionen" ' 'RibbonPageGroup2 ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "Aktionen Auswahl" ' 'RibbonStatusBar1 ' @@ -104,22 +192,13 @@ Partial Class frmWorkflow_Adhoc_start Me.RibbonStatusBar1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(933, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1061, 24) ' 'RibbonPage2 ' Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'cmbWorkflowSelect - ' - 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 ' Me.LookUpEdit1.Location = New System.Drawing.Point(5, 30) @@ -128,6 +207,7 @@ Partial Class frmWorkflow_Adhoc_start Me.LookUpEdit1.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LookUpEdit1.Properties.Appearance.Options.UseFont = True Me.LookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.LookUpEdit1.Properties.SearchMode = DevExpress.XtraEditors.Controls.SearchMode.AutoSuggest Me.LookUpEdit1.Size = New System.Drawing.Size(337, 24) Me.LookUpEdit1.TabIndex = 8 ' @@ -137,93 +217,142 @@ Partial Class frmWorkflow_Adhoc_start 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) + Me.GroupControl1.Location = New System.Drawing.Point(12, 321) Me.GroupControl1.Name = "GroupControl1" - Me.GroupControl1.Size = New System.Drawing.Size(909, 70) + Me.GroupControl1.Size = New System.Drawing.Size(1037, 70) Me.GroupControl1.TabIndex = 10 Me.GroupControl1.Text = "Benutzerauswahl" ' - 'SimpleButton1 - ' - Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleButton1.Location = New System.Drawing.Point(348, 23) - Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light - Me.SimpleButton1.Size = New System.Drawing.Size(108, 31) - Me.SimpleButton1.TabIndex = 9 - Me.SimpleButton1.Text = "Hinzufügen" - ' 'GroupControl2 ' 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.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.Controls.Add(Me.GridControlWorkflows) Me.GroupControl2.Location = New System.Drawing.Point(12, 173) Me.GroupControl2.Name = "GroupControl2" - Me.GroupControl2.Size = New System.Drawing.Size(909, 63) + Me.GroupControl2.Size = New System.Drawing.Size(1037, 142) Me.GroupControl2.TabIndex = 11 Me.GroupControl2.Text = "Workflow Auswahl" ' - 'BarButtonItem1 + 'GridControlWorkflows ' - 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" + Me.GridControlWorkflows.Location = New System.Drawing.Point(5, 26) + Me.GridControlWorkflows.MainView = Me.TileViewWorkflows + Me.GridControlWorkflows.MenuManager = Me.RibbonControl1 + Me.GridControlWorkflows.Name = "GridControlWorkflows" + Me.GridControlWorkflows.Size = New System.Drawing.Size(1027, 111) + Me.GridControlWorkflows.TabIndex = 3 + Me.GridControlWorkflows.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileViewWorkflows, Me.GridView2}) + ' + 'TileViewWorkflows + ' + Me.TileViewWorkflows.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColTitle, Me.TileViewColumn2, Me.TileViewColumn3, Me.TileViewColumn4}) + Me.TileViewWorkflows.GridControl = Me.GridControlWorkflows + Me.TileViewWorkflows.Name = "TileViewWorkflows" + Me.TileViewWorkflows.OptionsTiles.AllowItemHover = True + Me.TileViewWorkflows.OptionsTiles.ItemSize = New System.Drawing.Size(190, 80) + Me.TileViewWorkflows.OptionsTiles.Orientation = System.Windows.Forms.Orientation.Vertical + Me.TileViewWorkflows.OptionsTiles.RowCount = 2 + Me.TileViewWorkflows.OptionsTiles.VerticalContentAlignment = DevExpress.Utils.VertAlignment.Center + TableColumnDefinition1.Length.Value = 35.0R + TableColumnDefinition1.PaddingRight = 5 + TableColumnDefinition2.Length.Value = 129.0R + Me.TileViewWorkflows.TileColumns.Add(TableColumnDefinition1) + Me.TileViewWorkflows.TileColumns.Add(TableColumnDefinition2) + TableRowDefinition1.Length.Value = 21.0R + TableRowDefinition2.Length.Value = 43.0R + Me.TileViewWorkflows.TileRows.Add(TableRowDefinition1) + Me.TileViewWorkflows.TileRows.Add(TableRowDefinition2) + TileViewItemElement1.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + TileViewItemElement1.Appearance.Normal.Options.UseFont = True + TileViewItemElement1.Column = Me.ColTitle + TileViewItemElement1.ColumnIndex = 1 + TileViewItemElement1.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement1.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement1.Text = "colName" + TileViewItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement2.Column = Me.TileViewColumn2 + TileViewItemElement2.ColumnIndex = 1 + TileViewItemElement2.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement2.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement2.RowIndex = 1 + TileViewItemElement2.Text = "colDescription" + TileViewItemElement2.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement3.Column = Me.TileViewColumn4 + TileViewItemElement3.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement3.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement3.RowIndex = 1 + TileViewItemElement3.Text = "colImage" + TileViewItemElement3.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + Me.TileViewWorkflows.TileTemplate.Add(TileViewItemElement1) + Me.TileViewWorkflows.TileTemplate.Add(TileViewItemElement2) + Me.TileViewWorkflows.TileTemplate.Add(TileViewItemElement3) + ' + 'TileViewColumn3 + ' + Me.TileViewColumn3.Caption = "ID" + Me.TileViewColumn3.FieldName = "ID" + Me.TileViewColumn3.Name = "TileViewColumn3" + Me.TileViewColumn3.Visible = True + Me.TileViewColumn3.VisibleIndex = 2 + ' + 'GridView2 + ' + Me.GridView2.GridControl = Me.GridControlWorkflows + Me.GridView2.Name = "GridView2" ' '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.Controls.Add(Me.GridSelectedUsers) + Me.GroupControl3.Location = New System.Drawing.Point(12, 397) Me.GroupControl3.Name = "GroupControl3" - Me.GroupControl3.Size = New System.Drawing.Size(909, 295) + Me.GroupControl3.Size = New System.Drawing.Size(1037, 243) Me.GroupControl3.TabIndex = 15 - Me.GroupControl3.Text = "GroupControl3" + Me.GroupControl3.Text = "Aktuelle User" ' - 'GridPredefinedSearches + 'GridSelectedUsers ' - 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}) + Me.GridSelectedUsers.Location = New System.Drawing.Point(25, 41) + Me.GridSelectedUsers.MainView = Me.TileViewUser + Me.GridSelectedUsers.MenuManager = Me.RibbonControl1 + Me.GridSelectedUsers.Name = "GridSelectedUsers" + Me.GridSelectedUsers.Size = New System.Drawing.Size(1007, 185) + Me.GridSelectedUsers.TabIndex = 2 + Me.GridSelectedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileViewUser, Me.GridView1}) ' - 'TileView1 + 'TileViewUser ' - 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 + Me.TileViewUser.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEmail, Me.colFullName, Me.colCount, Me.colImage}) + Me.TileViewUser.GridControl = Me.GridSelectedUsers + Me.TileViewUser.Name = "TileViewUser" + Me.TileViewUser.OptionsTiles.AllowItemHover = True + Me.TileViewUser.OptionsTiles.ItemSize = New System.Drawing.Size(190, 80) + Me.TileViewUser.OptionsTiles.Orientation = System.Windows.Forms.Orientation.Vertical + Me.TileViewUser.OptionsTiles.RowCount = 2 + Me.TileViewUser.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) + Me.TileViewUser.TileColumns.Add(TableColumnDefinition3) + Me.TileViewUser.TileColumns.Add(TableColumnDefinition4) TableRowDefinition3.Length.Value = 21.0R TableRowDefinition4.Length.Value = 43.0R - Me.TileView1.TileRows.Add(TableRowDefinition3) - Me.TileView1.TileRows.Add(TableRowDefinition4) + Me.TileViewUser.TileRows.Add(TableRowDefinition3) + Me.TileViewUser.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.Column = Me.colEmail 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.Column = Me.colFullName TileViewItemElement5.ColumnIndex = 1 TileViewItemElement5.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter TileViewItemElement5.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze @@ -236,57 +365,34 @@ Partial Class frmWorkflow_Adhoc_start 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 + Me.TileViewUser.TileTemplate.Add(TileViewItemElement4) + Me.TileViewUser.TileTemplate.Add(TileViewItemElement5) + Me.TileViewUser.TileTemplate.Add(TileViewItemElement6) ' 'colCount ' - Me.colCount.Caption = "Anzahl" - Me.colCount.FieldName = "Count" + Me.colCount.Caption = "UserID" + Me.colCount.FieldName = "ID" 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.GridControl = Me.GridSelectedUsers Me.GridView1.Name = "GridView1" ' 'SvgImageCollection1 ' Me.SvgImageCollection1.Add("actions_user", "image://svgimages/icon builder/actions_user.svg") + Me.SvgImageCollection1.Add("Workflow", "image://svgimages/diagramicons/relayoutparts.svg") ' 'frmWorkflow_Adhoc_start ' Me.Appearance.Options.UseFont = True 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.ClientSize = New System.Drawing.Size(1061, 730) Me.Controls.Add(Me.GroupControl3) Me.Controls.Add(Me.GroupControl2) Me.Controls.Add(Me.GroupControl1) @@ -304,10 +410,13 @@ Partial Class frmWorkflow_Adhoc_start Me.GroupControl1.ResumeLayout(False) CType(Me.GroupControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupControl2.ResumeLayout(False) + CType(Me.GridControlWorkflows, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TileViewWorkflows, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView2, 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.GridSelectedUsers, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TileViewUser, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) @@ -321,19 +430,26 @@ 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 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 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 GridSelectedUsers As DevExpress.XtraGrid.GridControl + Friend WithEvents TileViewUser As DevExpress.XtraGrid.Views.Tile.TileView + Friend WithEvents colEmail As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents colFullName 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 + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents GridControlWorkflows As DevExpress.XtraGrid.GridControl + Friend WithEvents TileViewWorkflows As DevExpress.XtraGrid.Views.Tile.TileView + Friend WithEvents ColTitle As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents TileViewColumn2 As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents TileViewColumn3 As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents TileViewColumn4 As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView End Class diff --git a/GUIs.Common/frmWorkflow_Adhoc_start.resx b/GUIs.Common/frmWorkflow_Adhoc_start.resx index 497999f4..d5e69248 100644 --- a/GUIs.Common/frmWorkflow_Adhoc_start.resx +++ b/GUIs.Common/frmWorkflow_Adhoc_start.resx @@ -144,11 +144,27 @@ Myw4TDI3LjcsMTAuNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPoBAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJIZWFkZXJBbmRGb290ZXIiIHN0eWxlPSJlbmFibGUtYmFja2dy + b3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDoj + RDExQzFDO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDRINUM0LjUsNCw0LDQuNSw0LDV2MjJjMCww + LjUsMC41LDEsMSwxaDIyYzAuNSwwLDEtMC41LDEtMVY1QzI4LDQuNSwyNy41LDQsMjcsNHogTTIyLDIw + bC0yLDJsLTQtNGwtNCw0ICBsLTItMmw0LTRsLTQtNGwyLTJsNCw0bDQtNGwyLDJsLTQsNEwyMiwyMHoi + IGNsYXNzPSJSZWQiIC8+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFICAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh @@ -156,10 +172,9 @@ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0 - QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0 - LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N - Cjwvc3ZnPgs= + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJlbW92ZSI+DQogICAgPHBhdGggZD0iTTI3LDE4SDVj + LTAuNiwwLTEtMC41LTEtMXYtMmMwLTAuNiwwLjQtMSwxLTFoMjJjMC41LDAsMSwwLjQsMSwxdjJDMjgs + MTcuNSwyNy41LDE4LDI3LDE4eiIgY2xhc3M9IlJlZCIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== diff --git a/GUIs.Common/frmWorkflow_Adhoc_start.vb b/GUIs.Common/frmWorkflow_Adhoc_start.vb index 118845a0..7c56efac 100644 --- a/GUIs.Common/frmWorkflow_Adhoc_start.vb +++ b/GUIs.Common/frmWorkflow_Adhoc_start.vb @@ -7,6 +7,7 @@ Imports DevExpress.XtraEditors Imports System.Drawing Imports DigitalData.Modules.EDMI.API.EDMIServiceReference Imports DevExpress.Utils.Svg +Imports DevExpress.XtraGrid Public Class frmWorkflow_Adhoc_start Private ReadOnly Property LogConfig As LogConfig @@ -16,7 +17,8 @@ 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) + Private WFUserList As List(Of User2Workflow) + Private WorkflowList As List(Of Workflows) Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pAdhocWorkflow As AdHocWorkflow) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -44,7 +46,8 @@ Public Class frmWorkflow_Adhoc_start OperationMode = GetOperationMode() Client = Environment.Service.Client - + WFUserList = New List(Of User2Workflow) + WorkflowList = New List(Of Workflows) ' Initialize Viewer with GDPicture.NET License ' Hide options relating to a filepath for zooflow If OperationMode = OperationMode.ZooFlow Then @@ -92,16 +95,23 @@ Public Class frmWorkflow_Adhoc_start 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 + For Each oRow As DataRow In oDatatableWFSelect.Rows + WorkflowList.Add(New Workflows() With { + .ID = oRow.Item(0), + .Description = IIf(IsDBNull(oRow.Item(2)), "", oRow.Item(2)), + .Title = oRow.Item(1), + .Image = SvgImageCollection1.Item("Workflow") + }) + Next End If + GridControlWorkflows.DataSource = WorkflowList + TileViewWorkflows.FocusedRowHandle = GridControl.InvalidRowHandle If OperationMode = OperationMode.NoAppServer Then ' panelContainerStatus.Visibility = Docking.DockVisibility.Hidden End If - WFUserList = New List(Of WFUSer) + WFUserList = New List(Of User2Workflow) ' Hide the complete Navigation Ribbon Group if desired Catch ex As Exception @@ -115,21 +125,15 @@ Public Class frmWorkflow_Adhoc_start End Try End Sub - Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click - Dim oUser As New WFUSer() With { - .Mail = "Heute", - .UserID = "Dokumente, die heute abgelegt wurden", - .Image = SvgImageCollection1.Item("actions_user") - } + Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) + End Sub - Private Class ListItem - Public Name As String - Public email As String - End Class - Friend Class WFUSer - Public Property Mail As String + + Friend Class User2Workflow Public Property UserID As Integer + Public Property EMail As String + Public Property FullName As String Public Property Image As SvgImage Public Property Count As Integer = 0 @@ -140,4 +144,58 @@ Public Class frmWorkflow_Adhoc_start End Property End Class + Friend Class Workflows + Public Property Description As String + Public Property Title As String + Public Property ID As Integer + Public Property Image As SvgImage + Public Property Count As Integer = 0 + + Public ReadOnly Property DisplayName As String + Get + Return ID + End Get + End Property + + End Class + + Private Sub LookUpEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles LookUpEdit1.EditValueChanged + Dim editor As DevExpress.XtraEditors.LookUpEdit = CType(sender, DevExpress.XtraEditors.LookUpEdit) + Dim row As DataRowView = CType(editor.Properties.GetDataSourceRowByKeyValue(editor.EditValue), DataRowView) + Dim UsID As Object = row("ID") + Dim UsFname As Object = row("FullName") + Dim UsEmail As Object = row("Email") + WFUserList.Add(New User2Workflow() With { + .UserID = UsID, + .FullName = UsFname, + .EMail = UsEmail, + .Image = SvgImageCollection1.Item("actions_user") + }) + + GridSelectedUsers.DataSource = Nothing + GridSelectedUsers.DataSource = WFUserList + + TileViewUser.FocusedRowHandle = GridControl.InvalidRowHandle + 'Else + ' Dim omsg = "Bitte wählen Sie zuerst einen Workflow" + ' If Environment.User.Language <> "de-DE" Then + ' omsg = "Please choose a workflow first" + ' End If + ' Dim oMsgBox As New frmDialog(omsg, "Error", False) + ' oMsgBox.ShowDialog() + 'End If + + End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + Dim oUserRow = TileViewUser.GetRow(TileViewUser.FocusedRowHandle) + If oUserRow IsNot Nothing AndAlso TypeOf oUserRow Is User2Workflow Then + Dim oDateSearch As User2Workflow = oUserRow + + WFUserList.Remove(oDateSearch) + GridSelectedUsers.DataSource = Nothing + GridSelectedUsers.DataSource = WFUserList + End If + + End Sub 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 3679e56b..6b31475d 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb @@ -589,11 +589,11 @@ 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 - Dim oMsgBox As New Dialog1("The RegEx resulted in a proper match!", "", False) + Dim oMsgBox As New frmDialog("The RegEx resulted in a proper match!", "", False) oMsgBox.ShowDialog() Else - Dim oMsgBox As New Dialog1("No Match- There might be an error in the RegEx!", "", True) + Dim oMsgBox As New frmDialog("No Match- There might be an error in the RegEx!", "", True) oMsgBox.ShowDialog() End If diff --git a/GUIs.ZooFlow/frmIDBCommonSQL.Designer.vb b/GUIs.ZooFlow/Administration/IDB/frmIDBCommonSQL.Designer.vb similarity index 99% rename from GUIs.ZooFlow/frmIDBCommonSQL.Designer.vb rename to GUIs.ZooFlow/Administration/IDB/frmIDBCommonSQL.Designer.vb index 9242357a..0245d21f 100644 --- a/GUIs.ZooFlow/frmIDBCommonSQL.Designer.vb +++ b/GUIs.ZooFlow/Administration/IDB/frmIDBCommonSQL.Designer.vb @@ -54,9 +54,9 @@ Partial Class frmIDBCommonSQL Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() Me.TBIDB_COMMON_SQLTableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_COMMON_SQLTableAdapter() Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() - Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBIDB_COMMON_SQLBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() @@ -77,6 +77,7 @@ Partial Class frmIDBCommonSQL ' 'RibbonControl1 ' + Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem2, Me.BarButtonItem3, Me.bsiStatus}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) @@ -361,6 +362,14 @@ Partial Class frmIDBCommonSQL Me.LayoutControlItem9.Text = "Geändert wann:" Me.LayoutControlItem9.TextSize = New System.Drawing.Size(76, 13) ' + 'EmptySpaceItem2 + ' + Me.EmptySpaceItem2.AllowHotTrack = False + Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 21) + Me.EmptySpaceItem2.Name = "EmptySpaceItem2" + Me.EmptySpaceItem2.Size = New System.Drawing.Size(792, 32) + Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) + ' 'TBIDB_COMMON_SQLTableAdapter ' Me.TBIDB_COMMON_SQLTableAdapter.ClearBeforeFill = True @@ -382,14 +391,6 @@ Partial Class frmIDBCommonSQL Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete Me.TableAdapterManager.VWIDB_BE_ATTRIBUTETableAdapter = Nothing ' - 'EmptySpaceItem2 - ' - Me.EmptySpaceItem2.AllowHotTrack = False - Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 21) - Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(792, 32) - Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) - ' 'frmIDBCommonSQL ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/GUIs.ZooFlow/frmIDBCommonSQL.resx b/GUIs.ZooFlow/Administration/IDB/frmIDBCommonSQL.resx similarity index 88% rename from GUIs.ZooFlow/frmIDBCommonSQL.resx rename to GUIs.ZooFlow/Administration/IDB/frmIDBCommonSQL.resx index f59ceb88..fbf4bf5b 100644 --- a/GUIs.ZooFlow/frmIDBCommonSQL.resx +++ b/GUIs.ZooFlow/Administration/IDB/frmIDBCommonSQL.resx @@ -122,26 +122,16 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGkEAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPoBAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw - MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu - bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU2F2ZUFuZENsb3NlIj4NCiAgICA8 - cGF0aCBkPSJNNiwxNlY2SDNDMi40LDYsMiw2LjQsMiw3djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYs - MCwxLTAuNCwxLTFWMTZINnogTTYsMjZ2LTZoMTZ2Nkg2eiBNMTYsNkg4djhoOFY2eiAgICBNMTIsMTJo - LTJWOGgyVjEyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yOSwySDE5Yy0wLjUsMC0x - LDAuNS0xLDF2MTBjMCwwLjUsMC41LDEsMSwxaDEwYzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41 - LDIsMjksMnogTTI3LjcsMTAuNCAgIGMwLjQsMC40LDAuNCwxLDAsMS4zYy0wLjQsMC40LTEsMC40LTEu - MywwTDI0LDkuM2wtMi40LDIuNGMtMC40LDAuNC0xLDAuNC0xLjMsMGMtMC40LTAuNC0wLjQtMSwwLTEu - M0wyMi43LDhsLTIuNC0yLjQgICBjLTAuNC0wLjQtMC40LTEsMC0xLjNjMC40LTAuNCwxLTAuNCwxLjMs - MEwyNCw2LjdsMi40LTIuNGMwLjQtMC40LDEtMC40LDEuMywwYzAuNCwwLjQsMC40LDEsMCwxLjNMMjUu - Myw4TDI3LjcsMTAuNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJIZWFkZXJBbmRGb290ZXIiIHN0eWxlPSJlbmFibGUtYmFja2dy + b3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDoj + RDExQzFDO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDRINUM0LjUsNCw0LDQuNSw0LDV2MjJjMCww + LjUsMC41LDEsMSwxaDIyYzAuNSwwLDEtMC41LDEtMVY1QzI4LDQuNSwyNy41LDQsMjcsNHogTTIyLDIw + bC0yLDJsLTQtNGwtNCw0ICBsLTItMmw0LTRsLTQtNGwyLTJsNCw0bDQtNGwyLDJsLTQsNEwyMiwyMHoi + IGNsYXNzPSJSZWQiIC8+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/frmIDBCommonSQL.vb b/GUIs.ZooFlow/Administration/IDB/frmIDBCommonSQL.vb similarity index 100% rename from GUIs.ZooFlow/frmIDBCommonSQL.vb rename to GUIs.ZooFlow/Administration/IDB/frmIDBCommonSQL.vb diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index ff7fca6e..a392cd52 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -10,6 +10,7 @@ Imports DevExpress.XtraGrid Imports DevExpress.XtraBars Imports DigitalData.Modules.Language Imports DigitalData.Controls.SQLConfig +Imports DigitalData.GUIs.Common Public Class frmAdmin_Start Private CurrentModule As String @@ -45,7 +46,7 @@ Public Class frmAdmin_Start Load_GridData(oDetailData) Else - Dim oMsgBox As New Dialog1($"Could not load data for Page [{oKey}] because it does not exist!", "Error", True) + Dim oMsgBox As New frmDialog($"Could not load data for Page [{oKey}] because it does not exist!", "Error", True) oMsgBox.ShowDialog() End If End If diff --git a/GUIs.ZooFlow/ClassDragDrop.vb b/GUIs.ZooFlow/ClassDragDrop.vb index 3540ba5c..c2603d1d 100644 --- a/GUIs.ZooFlow/ClassDragDrop.vb +++ b/GUIs.ZooFlow/ClassDragDrop.vb @@ -3,6 +3,7 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid.ViewInfo Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Base +Imports DigitalData.GUIs.Common Public Class ClassDragDrop Inherits BaseClass @@ -99,7 +100,7 @@ Public Class ClassDragDrop Catch ex As Exception Logger.Error(ex) - Dim oMsgBox As New Dialog1("Error in view_MouseMove: " & ex.Message, "", True) + Dim oMsgBox As New frmDialog("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 6d2b854c..eb115c3c 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -13,6 +13,7 @@ Imports System.Data.SqlClient Imports DigitalData.Modules Imports DevExpress.LookAndFeel Imports DigitalData.Modules.Language +Imports DigitalData.GUIs.Common Public Class ClassInit Inherits Base.BaseClass @@ -371,7 +372,7 @@ Public Class ClassInit Dim oMessage = $"{oMessageStart}{oMessage1}{oMessage2}{oMessageEnd}" - Dim oMsgBox As New Dialog1(oMessage, _MainForm.Text, True) + Dim oMsgBox As New frmDialog(oMessage, _MainForm.Text, True) oMsgBox.ShowDialog() Application.ExitThread() Else diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb index f5b5a86f..b685a3c2 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb @@ -7,6 +7,7 @@ Imports DigitalData.Modules.Language Imports DigitalData.Modules.Filesystem Imports DigitalData.Modules.Messaging Imports Limilabs.Mail +Imports DigitalData.GUIs.Common Public Class ClassFilehandle Inherits BaseClass @@ -126,7 +127,7 @@ Public Class ClassFilehandle Else oMSG = "Shortcuts cannot be droppped!" End If - Dim oMsgBox As New Dialog1(oMSG, "", True) + Dim oMsgBox As New frmDialog(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 d329fb87..9dc2467c 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb @@ -1,4 +1,5 @@ Imports System.IO +Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging @@ -81,7 +82,7 @@ Public Class ClassFolderwatcher Catch ex As Exception Logger.Error(ex.Message) - Dim oMsgBox As New Dialog1("Error in StartStop_FolderWatch:" & vbNewLine & ex.Message, "", True) + Dim oMsgBox As New frmDialog("Error in StartStop_FolderWatch:" & vbNewLine & ex.Message, "", True) oMsgBox.ShowDialog() End Try End Function diff --git a/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb b/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb index bf1069d7..ab7cd50d 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb @@ -6,6 +6,7 @@ Imports DigitalData.Modules.EDMI.API Imports DigitalData.Modules.EDMI.API.EDMIServiceReference Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Base +Imports DigitalData.GUIs.Common Public Class ClassValidator Inherits BaseClass @@ -260,7 +261,7 @@ Public Class ClassValidator Private Sub ShowValidationMessage() '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) + Dim oMsgBox As New frmDialog(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 96ba4bb0..19215f45 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb @@ -1,4 +1,5 @@ Imports DevExpress.XtraEditors +Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Logging Public Class frmGlobixBasicConfig @@ -51,7 +52,7 @@ Public Class frmGlobixBasicConfig 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) + Dim oMsgBox As New frmDialog("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 a55e26ac..21a819b4 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb @@ -16,6 +16,7 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Patterns Imports DevExpress.XtraEditors Imports DevExpress.XtraSplashScreen +Imports DigitalData.GUIs.Common Public Class frmGlobix_Index #Region "+++++ Variablen ++++++" @@ -469,7 +470,7 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I Else omsg = "Please check Datatype of Indexvalue!" End If - Dim oMsgBox As New Dialog1(omsg, "", True) + Dim oMsgBox As New frmDialog(omsg, "", True) oMsgBox.ShowDialog() Logger.Warn("DataType [{0}] not implemented!", oIndex.DataType) End Select @@ -658,8 +659,8 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I Else oMsg = "Please Index file completely" & vbNewLine & "(Abort 1 of Indexdialog)" End If - Dim oMsgBox As New Dialog1(oMsg, "", False) - oMsgBox.Cancel_Button.Visible = False + Dim oMsgBox As New frmDialog(oMsg, "", False) + oMsgBox.CancelButtonInvisible() oMsgBox.ShowDialog() CancelAttempts += 1 e.Cancel = True @@ -670,8 +671,9 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I 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 + Dim oMsgBox As New frmDialog(oMsg, "", False) + oMsgBox.CancelButtonVisible() + If oMsgBox.DialogResult = DialogResult.Yes Then Dim containsfw_file As Boolean = False Try diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 6f656e73..86a23e76 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -246,16 +246,10 @@ Form - - Dialog1.vb - - - Form - - + frmIDBCommonSQL.vb - + Form @@ -511,10 +505,7 @@ frmAdmin_UserGroupRelations.vb - - Dialog1.vb - - + frmIDBCommonSQL.vb diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 5580c97f..b962fb70 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -315,7 +315,7 @@ Public Class frmFlowForm Else oMsg = "File-Exclusions in Folderwatch could not be created!" End If - Dim oMsgBox As New Dialog1(oMsg, "Error", True) + Dim oMsgBox As New frmDialog(oMsg, "Error", True) oMsgBox.ShowDialog() End If @@ -508,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, False) + Dim oMsgBox As New frmDialog(omessage, oTitle, False) oMsgBox.ShowDialog() If oMsgBox.DialogResult = DialogResult.OK Then @@ -613,7 +613,7 @@ Public Class frmFlowForm End If If TheFormIsAlreadyLoaded("frmIndexFileList") Then Cursor = Cursors.Default - Dim oMsgBox As New Dialog1("Please index the active file first!", "Drag 'n Drop not allowed!", True) + Dim oMsgBox As New frmDialog("Please index the active file first!", "Drag 'n Drop not allowed!", True) oMsgBox.ShowDialog() Exit Function End If @@ -917,7 +917,7 @@ Public Class frmFlowForm If ex.Message.Contains("Sammlung wurde geändert") Or ex.Message.Contains("Enumeration") Then Else - Dim oMsgBox As New Dialog1("Error in Work FolderWatch-File:" & vbNewLine & ex.Message, "Drag 'n Drop not allowed!", True) + Dim oMsgBox As New frmDialog("Error in Work FolderWatch-File:" & vbNewLine & ex.Message, "Drag 'n Drop not allowed!", True) oMsgBox.ShowDialog() End If