diff --git a/ZooFlow/App.config b/ZooFlow/App.config index f909033..b80dcf2 100644 --- a/ZooFlow/App.config +++ b/ZooFlow/App.config @@ -56,32 +56,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108,6 +82,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb b/ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb index 5a1a283..1c378cb 100644 --- a/ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb +++ b/ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb @@ -30,25 +30,22 @@ Partial Class frmFileflow_Duplicate Me.SimpleButton5 = New DevExpress.XtraEditors.SimpleButton() Me.SimpleButton4 = New DevExpress.XtraEditors.SimpleButton() Me.SimpleButton3 = New DevExpress.XtraEditors.SimpleButton() - Me.GroupControl1 = New DevExpress.XtraEditors.GroupControl() Me.pnlHeader = New DevExpress.XtraEditors.PanelControl() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupControl1.SuspendLayout() CType(Me.pnlHeader, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox1.SuspendLayout() Me.SuspendLayout() ' 'SimpleButton2 ' - Me.SimpleButton2.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(47, Byte), Integer)) Me.SimpleButton2.Appearance.BorderColor = System.Drawing.Color.Black - Me.SimpleButton2.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.SimpleButton2.Appearance.Options.UseBackColor = True + Me.SimpleButton2.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.SimpleButton2.Appearance.Options.UseBorderColor = True Me.SimpleButton2.Appearance.Options.UseFont = True Me.SimpleButton2.DialogResult = System.Windows.Forms.DialogResult.No Me.SimpleButton2.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleButton2.Location = New System.Drawing.Point(581, 139) + Me.SimpleButton2.Location = New System.Drawing.Point(225, 102) Me.SimpleButton2.Name = "SimpleButton2" Me.SimpleButton2.Size = New System.Drawing.Size(100, 41) Me.SimpleButton2.TabIndex = 3 @@ -56,15 +53,13 @@ Partial Class frmFileflow_Duplicate ' 'SimpleButton1 ' - Me.SimpleButton1.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(47, Byte), Integer)) Me.SimpleButton1.Appearance.BorderColor = System.Drawing.Color.Black - Me.SimpleButton1.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.SimpleButton1.Appearance.Options.UseBackColor = True + Me.SimpleButton1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.SimpleButton1.Appearance.Options.UseBorderColor = True Me.SimpleButton1.Appearance.Options.UseFont = True Me.SimpleButton1.DialogResult = System.Windows.Forms.DialogResult.Yes Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleButton1.Location = New System.Drawing.Point(464, 139) + Me.SimpleButton1.Location = New System.Drawing.Point(118, 102) Me.SimpleButton1.Name = "SimpleButton1" Me.SimpleButton1.Size = New System.Drawing.Size(101, 40) Me.SimpleButton1.TabIndex = 2 @@ -97,14 +92,12 @@ Partial Class frmFileflow_Duplicate ' 'SimpleButton5 ' - Me.SimpleButton5.Appearance.BackColor = System.Drawing.Color.WhiteSmoke - Me.SimpleButton5.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.SimpleButton5.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.SimpleButton5.Appearance.ForeColor = System.Drawing.Color.Black - Me.SimpleButton5.Appearance.Options.UseBackColor = True Me.SimpleButton5.Appearance.Options.UseFont = True Me.SimpleButton5.Appearance.Options.UseForeColor = True Me.SimpleButton5.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleButton5.Location = New System.Drawing.Point(249, 85) + Me.SimpleButton5.Location = New System.Drawing.Point(247, 72) Me.SimpleButton5.Name = "SimpleButton5" Me.SimpleButton5.Size = New System.Drawing.Size(143, 42) Me.SimpleButton5.TabIndex = 6 @@ -112,14 +105,12 @@ Partial Class frmFileflow_Duplicate ' 'SimpleButton4 ' - Me.SimpleButton4.Appearance.BackColor = System.Drawing.Color.Wheat - Me.SimpleButton4.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.SimpleButton4.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.SimpleButton4.Appearance.ForeColor = System.Drawing.Color.Black - Me.SimpleButton4.Appearance.Options.UseBackColor = True Me.SimpleButton4.Appearance.Options.UseFont = True Me.SimpleButton4.Appearance.Options.UseForeColor = True Me.SimpleButton4.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.bo_appointment1 - Me.SimpleButton4.Location = New System.Drawing.Point(20, 85) + Me.SimpleButton4.Location = New System.Drawing.Point(18, 72) Me.SimpleButton4.Name = "SimpleButton4" Me.SimpleButton4.Size = New System.Drawing.Size(223, 42) Me.SimpleButton4.TabIndex = 5 @@ -127,35 +118,17 @@ Partial Class frmFileflow_Duplicate ' 'SimpleButton3 ' - Me.SimpleButton3.Appearance.BackColor = System.Drawing.Color.WhiteSmoke - Me.SimpleButton3.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.SimpleButton3.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.SimpleButton3.Appearance.ForeColor = System.Drawing.Color.Black - Me.SimpleButton3.Appearance.Options.UseBackColor = True Me.SimpleButton3.Appearance.Options.UseFont = True Me.SimpleButton3.Appearance.Options.UseForeColor = True Me.SimpleButton3.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleButton3.Location = New System.Drawing.Point(20, 37) + Me.SimpleButton3.Location = New System.Drawing.Point(18, 24) Me.SimpleButton3.Name = "SimpleButton3" Me.SimpleButton3.Size = New System.Drawing.Size(372, 42) Me.SimpleButton3.TabIndex = 4 Me.SimpleButton3.Text = "Vorhandene Datei anzeigen" ' - 'GroupControl1 - ' - Me.GroupControl1.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(47, Byte), Integer)) - Me.GroupControl1.Appearance.Options.UseBackColor = True - Me.GroupControl1.AppearanceCaption.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(47, Byte), Integer)) - Me.GroupControl1.AppearanceCaption.Options.UseBackColor = True - Me.GroupControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder - Me.GroupControl1.Controls.Add(Me.SimpleButton3) - Me.GroupControl1.Controls.Add(Me.SimpleButton5) - Me.GroupControl1.Controls.Add(Me.SimpleButton4) - Me.GroupControl1.Location = New System.Drawing.Point(12, 185) - Me.GroupControl1.Name = "GroupControl1" - Me.GroupControl1.Size = New System.Drawing.Size(669, 138) - Me.GroupControl1.TabIndex = 7 - Me.GroupControl1.Text = "Dateisuchen" - ' 'pnlHeader ' Me.pnlHeader.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) @@ -164,19 +137,31 @@ Partial Class frmFileflow_Duplicate Me.pnlHeader.Dock = System.Windows.Forms.DockStyle.Top Me.pnlHeader.Location = New System.Drawing.Point(0, 0) Me.pnlHeader.Name = "pnlHeader" - Me.pnlHeader.Size = New System.Drawing.Size(686, 40) + Me.pnlHeader.Size = New System.Drawing.Size(609, 40) Me.pnlHeader.TabIndex = 9 ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.SimpleButton3) + Me.GroupBox1.Controls.Add(Me.SimpleButton4) + Me.GroupBox1.Controls.Add(Me.SimpleButton5) + Me.GroupBox1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GroupBox1.Location = New System.Drawing.Point(12, 149) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(429, 126) + Me.GroupBox1.TabIndex = 10 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Dateisuchen" + ' 'frmFileflow_Duplicate ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 21.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(47, Byte), Integer)) - Me.ClientSize = New System.Drawing.Size(686, 335) + Me.ClientSize = New System.Drawing.Size(609, 286) + Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.SimpleButton2) Me.Controls.Add(Me.pnlHeader) Me.Controls.Add(Me.SimpleButton1) - Me.Controls.Add(Me.GroupControl1) Me.Controls.Add(Me.PictureEdit1) Me.Controls.Add(Me.LabelControlMessage) Me.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -186,9 +171,8 @@ Partial Class frmFileflow_Duplicate Me.Text = "frmGlobix_Duplicate" Me.TopMost = True CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupControl1.ResumeLayout(False) CType(Me.pnlHeader, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupBox1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -200,6 +184,6 @@ Partial Class frmFileflow_Duplicate Friend WithEvents SimpleButton5 As DevExpress.XtraEditors.SimpleButton Friend WithEvents SimpleButton4 As DevExpress.XtraEditors.SimpleButton Friend WithEvents SimpleButton3 As DevExpress.XtraEditors.SimpleButton - Friend WithEvents GroupControl1 As DevExpress.XtraEditors.GroupControl Friend WithEvents pnlHeader As DevExpress.XtraEditors.PanelControl + Friend WithEvents GroupBox1 As GroupBox End Class diff --git a/ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx b/ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx index 27721dc..688af47 100644 --- a/ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx +++ b/ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx @@ -155,25 +155,18 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABkEAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHECAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk - aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp - c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 - O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 - ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp - c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBdHRlbnRpb24iPg0K - ICAgIDxwYXRoIGQ9Ik0xNS4xLDIuNUwyLjEsMjYuNUMxLjgsMjcuMiwyLjMsMjgsMy4xLDI4aDI1Ljlj - MC44LDAsMS4zLTAuOCwwLjktMS41TDE2LjksMi41ICAgQzE2LjUsMS44LDE1LjUsMS44LDE1LjEsMi41 - eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMjBjMS4xLDAsMiwwLjksMiwycy0w - LjksMi0yLDJzLTItMC45LTItMlMxNC45LDIwLDE2LDIweiBNMTQsMTBoNHY4aC00VjEweiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + Y2U9InByZXNlcnZlIiBpZD0iTXVsdGlwbGVfRG9jdW1lbnRzIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91 + bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDoj + NzI3MjcyO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTMxLDhoLTVWNWMwLTAuNS0wLjUtMS0xLTFoLTVW + MWMwLTAuNS0wLjUtMS0xLTFIMUMwLjUsMCwwLDAuNSwwLDF2MjJjMCwwLjUsMC41LDEsMSwxaDV2M2Mw + LDAuNSwwLjUsMSwxLDEgIGg1djNjMCwwLjUsMC41LDEsMSwxaDE4YzAuNSwwLDEtMC41LDEtMVY5QzMy + LDguNSwzMS41LDgsMzEsOHogTTYsNXYxN0gyVjJoMTZ2Mkg3QzYuNSw0LDYsNC41LDYsNXogTTEyLDl2 + MTdIOFY2aDE2djJIMTMgIEMxMi41LDgsMTIsOC41LDEyLDl6IE0zMCwzMEgxNFYxMGgxNlYzMHoiIGNs + YXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs= diff --git a/ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb b/ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb index 650f83b..f42d7f7 100644 --- a/ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb +++ b/ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb @@ -12,7 +12,7 @@ Public Class frmFileflow_Duplicate ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. If My.Application.User.Language = "de-DE" Then - omessagetext = $"Die Datei [{pFilename}] wurde bereits" & vbNewLine & "am [{pDate}] verarbeitet." & vbNewLine & "Wollen Sie die gleiche Datei noch einmal verarbeiten?" + omessagetext = $"Die Datei [{pFilename}] wurde bereits am [{pDate}] verarbeitet." & vbNewLine & "Wollen Sie die gleiche Datei noch einmal verarbeiten?" Else omessagetext = $"The file [{pFilename}] has already been processed at [{pDate}]. Do you want to process the same file again?" End If diff --git a/ZooFlow/Modules/Globix/frmGlobix_Result.Designer.vb b/ZooFlow/Modules/Globix/frmGlobix_Result.Designer.vb index ac1d953..b2bbbf4 100644 --- a/ZooFlow/Modules/Globix/frmGlobix_Result.Designer.vb +++ b/ZooFlow/Modules/Globix/frmGlobix_Result.Designer.vb @@ -200,7 +200,6 @@ Partial Class frmGlobix_Result Me.Name = "frmGlobix_Result" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "frmGlobix_Result" - Me.TopMost = True CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/ZooFlow/Modules/Globix/frmGlobix_Result.vb b/ZooFlow/Modules/Globix/frmGlobix_Result.vb index 13f949e..105b45e 100644 --- a/ZooFlow/Modules/Globix/frmGlobix_Result.vb +++ b/ZooFlow/Modules/Globix/frmGlobix_Result.vb @@ -14,9 +14,6 @@ Public Class frmGlobix_Result } End Sub - Private Sub PictureEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEdit1.EditValueChanged - Close() - End Sub Private Async Function GetResult(oVariant As String) As Task Dim oSql As String Try @@ -43,4 +40,8 @@ Public Class frmGlobix_Result Private Async Sub SimpleButton3_Click(sender As Object, e As EventArgs) Handles SimpleButton3.Click Await GetResult("DOCID") End Sub + + Private Sub PictureEdit1_Click(sender As Object, e As EventArgs) Handles PictureEdit1.Click + Close() + End Sub End Class \ No newline at end of file diff --git a/ZooFlow/frmFlowForm.Designer.vb b/ZooFlow/frmFlowForm.Designer.vb index 2fedcb8..0cf0de1 100644 --- a/ZooFlow/frmFlowForm.Designer.vb +++ b/ZooFlow/frmFlowForm.Designer.vb @@ -38,6 +38,7 @@ Partial Class frmFlowForm Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.TreeViewToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.PictureBoxSearch = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox() @@ -77,7 +78,6 @@ Partial Class frmFlowForm Me.PMTaskBadgeGroup = New DevExpress.Utils.VisualEffects.Badge() Me.PMTaskBadgeIndividual = New DevExpress.Utils.VisualEffects.Badge() Me.TimerDisplay = New System.Windows.Forms.Timer(Me.components) - Me.TreeViewToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuSystray.SuspendLayout() CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit() @@ -108,63 +108,69 @@ Partial Class frmFlowForm ' Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EinblendenToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.SucheEntwurfToolStripMenuItem, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem, Me.TreeViewToolStripMenuItem}) Me.ContextMenuSystray.Name = "ContextMenuSystray" - Me.ContextMenuSystray.Size = New System.Drawing.Size(181, 176) + Me.ContextMenuSystray.Size = New System.Drawing.Size(170, 154) ' 'EinblendenToolStripMenuItem ' Me.EinblendenToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.action_add_16xMD Me.EinblendenToolStripMenuItem.Name = "EinblendenToolStripMenuItem" - Me.EinblendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.EinblendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.EinblendenToolStripMenuItem.Text = "Einblenden" Me.EinblendenToolStripMenuItem.Visible = False ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(166, 6) ' 'VerwaltungToolStripMenuItem ' Me.VerwaltungToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.gear_32xLG Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem" - Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.VerwaltungToolStripMenuItem.Text = "Verwaltung" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(166, 6) ' 'SucheEntwurfToolStripMenuItem ' Me.SucheEntwurfToolStripMenuItem.Name = "SucheEntwurfToolStripMenuItem" - Me.SucheEntwurfToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SucheEntwurfToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.SucheEntwurfToolStripMenuItem.Text = "Suche Entwurf" ' 'TestToolStripMenuItem ' Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem" - Me.TestToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.TestToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.TestToolStripMenuItem.Text = "Test" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(166, 6) ' 'ZooFlowBeendenToolStripMenuItem ' Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem" - Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' + 'TreeViewToolStripMenuItem + ' + Me.TreeViewToolStripMenuItem.Name = "TreeViewToolStripMenuItem" + Me.TreeViewToolStripMenuItem.Size = New System.Drawing.Size(169, 22) + Me.TreeViewToolStripMenuItem.Text = "treeView" + ' 'PictureBoxSearch ' Me.PictureBoxSearch.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureBoxSearch.Cursor = System.Windows.Forms.Cursors.Hand Me.PictureBoxSearch.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxSearch.Location = New System.Drawing.Point(21, 442) + Me.PictureBoxSearch.Location = New System.Drawing.Point(21, 443) Me.PictureBoxSearch.Name = "PictureBoxSearch" Me.PictureBoxSearch.Size = New System.Drawing.Size(158, 50) Me.PictureBoxSearch.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom @@ -198,7 +204,7 @@ Partial Class frmFlowForm Me.pnlQuicksearch1.Controls.Add(Me.PictureEditQuicksearch1) Me.pnlQuicksearch1.Controls.Add(Me.lblQuicksearch1) Me.pnlQuicksearch1.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 497) + Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 498) Me.pnlQuicksearch1.Name = "pnlQuicksearch1" Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 75) Me.pnlQuicksearch1.TabIndex = 16 @@ -323,9 +329,9 @@ Partial Class frmFlowForm Me.barDockControlBottom.Appearance.Options.UseBackColor = True Me.barDockControlBottom.CausesValidation = False Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.barDockControlBottom.Location = New System.Drawing.Point(0, 774) + Me.barDockControlBottom.Location = New System.Drawing.Point(0, 775) Me.barDockControlBottom.Manager = Me.BarManager1 - Me.barDockControlBottom.Size = New System.Drawing.Size(202, 26) + Me.barDockControlBottom.Size = New System.Drawing.Size(202, 25) ' 'barDockControlLeft ' @@ -333,7 +339,7 @@ Partial Class frmFlowForm Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0) Me.barDockControlLeft.Manager = Me.BarManager1 - Me.barDockControlLeft.Size = New System.Drawing.Size(0, 774) + Me.barDockControlLeft.Size = New System.Drawing.Size(0, 775) ' 'barDockControlRight ' @@ -341,7 +347,7 @@ Partial Class frmFlowForm Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right Me.barDockControlRight.Location = New System.Drawing.Point(202, 0) Me.barDockControlRight.Manager = Me.BarManager1 - Me.barDockControlRight.Size = New System.Drawing.Size(0, 774) + Me.barDockControlRight.Size = New System.Drawing.Size(0, 775) ' 'BarButtonItem2 ' @@ -385,7 +391,7 @@ Partial Class frmFlowForm Me.Panel3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) - Me.Panel3.Location = New System.Drawing.Point(21, 434) + Me.Panel3.Location = New System.Drawing.Point(21, 435) Me.Panel3.Name = "Panel3" Me.Panel3.Size = New System.Drawing.Size(158, 2) Me.Panel3.TabIndex = 17 @@ -423,13 +429,13 @@ Partial Class frmFlowForm Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 202) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(202, 572) + Me.Panel2.Size = New System.Drawing.Size(202, 573) Me.Panel2.TabIndex = 17 ' 'GridControlRecentFiles ' Me.GridControlRecentFiles.Anchor = System.Windows.Forms.AnchorStyles.Bottom - Me.GridControlRecentFiles.Location = New System.Drawing.Point(21, 246) + Me.GridControlRecentFiles.Location = New System.Drawing.Point(21, 247) Me.GridControlRecentFiles.MainView = Me.RecentFilesView Me.GridControlRecentFiles.MenuManager = Me.BarManager1 Me.GridControlRecentFiles.Name = "GridControlRecentFiles" @@ -489,7 +495,7 @@ Partial Class frmFlowForm Me.LabelControl1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl1.Appearance.Options.UseFont = True Me.LabelControl1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None - Me.LabelControl1.Location = New System.Drawing.Point(21, 222) + Me.LabelControl1.Location = New System.Drawing.Point(21, 223) Me.LabelControl1.Name = "LabelControl1" Me.LabelControl1.Size = New System.Drawing.Size(158, 18) Me.LabelControl1.TabIndex = 0 @@ -528,12 +534,6 @@ Partial Class frmFlowForm ' Me.TimerDisplay.Interval = 60000 ' - 'TreeViewToolStripMenuItem - ' - Me.TreeViewToolStripMenuItem.Name = "TreeViewToolStripMenuItem" - Me.TreeViewToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.TreeViewToolStripMenuItem.Text = "treeView" - ' 'frmFlowForm ' Me.AllowDrop = True diff --git a/ZooFlow/frmFlowForm.vb b/ZooFlow/frmFlowForm.vb index 49e2b57..f6c6be6 100644 --- a/ZooFlow/frmFlowForm.vb +++ b/ZooFlow/frmFlowForm.vb @@ -181,7 +181,6 @@ Public Class frmFlowForm ' Runtime Variables Private ESCHitCount As Integer = 0 Private IndexForm As frmGlobix_Index - Private ResultForm As frmGlobix_Result Private AdminForm As frmAdmin_Start Private InitialOverlayHandle As IOverlaySplashScreenHandle @@ -626,6 +625,7 @@ Public Class frmFlowForm Dim oDroppedFiles = FileDropNew.GetFiles(e) If oDroppedFiles.Count > 0 Then Await Globix_CheckDroppedFiles(oDroppedFiles) + End If Await Load_Recent_Files() @@ -675,7 +675,9 @@ Public Class frmFlowForm Logger.Info(" CURRENT_WORKFILE: {0}", My.Application.Globix.CurrentWorkfile) If IO.File.Exists(My.Application.Globix.CurrentWorkfile.FilePath) = True And My.Application.Globix.DTACTUAL_FILES.Rows.Count > 0 Then - Globix_Open_IndexDialog() + If Globix_Open_IndexDialog() = True Then + frmGlobix_Result.ShowDialog() + End If End If Next Catch ex As Exception @@ -703,7 +705,7 @@ Public Class frmFlowForm FileDropNew.RemoveTempDirectory() End Sub - Sub Globix_Open_IndexDialog() + Private Function Globix_Open_IndexDialog() As Boolean Try IndexForm = New frmGlobix_Index(My.LogConfig) NotifyIconReset() @@ -715,14 +717,15 @@ Public Class frmFlowForm oMessage = "File successfully imported!" End If NotifyIcon.ShowBalloonTip(15000, "FileFlow", oMessage, ToolTipIcon.Info) - ResultForm = New frmGlobix_Result() - ResultForm.ShowDialog() + Cursor = Cursors.Default + Return True End If Cursor = Cursors.Default Catch ex As Exception FormHelper.ShowErrorMessage(ex, "Globix_Open_IndexDialog") + Return False End Try - End Sub + End Function Sub NotifyIconReset() NI_TYPE = "INFO" NI_MESSAGE = String.Empty diff --git a/ZooFlow/frmtest.vb b/ZooFlow/frmtest.vb index 0033f76..ec14ba0 100644 --- a/ZooFlow/frmtest.vb +++ b/ZooFlow/frmtest.vb @@ -2,6 +2,7 @@ Imports DigitalData.Modules.Base.IDB.FileStore Imports DigitalData.GUIs.Common Imports DigitalData.Modules.ZooFlow +Imports DevExpress.LookAndFeel Public Class frmtest Private Property Environment As Environment @@ -10,7 +11,7 @@ Public Class frmtest Private Sub frmtest_Load(sender As Object, e As EventArgs) Handles MyBase.Load cmbObjectStoreType.SelectedIndex = 0 Environment = My.Application.GetEnvironment() - + DevExpress.Skins.SkinManager.EnableFormSkins() End Sub Private Sub btnOpenFile_Click(sender As Object, e As EventArgs) Handles btnOpenFile.Click