diff --git a/GUIs.Common/FormHelper.vb b/GUIs.Common/FormHelper.vb index fd5deb5f..2dcbcdd7 100644 --- a/GUIs.Common/FormHelper.vb +++ b/GUIs.Common/FormHelper.vb @@ -51,6 +51,8 @@ Public Class FormHelper Private Function ShowMessage(pMessage As String, pTitle As String, pType As frmDialog.DialogType) As DialogResult Dim oForm As New frmDialog(pMessage, pTitle, pType) + oForm.BringToFront() + oForm.TopMost = True Return oForm.ShowDialog() End Function diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb index b62e76c4..3c1b8080 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb @@ -592,13 +592,9 @@ 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 frmDialog("The RegEx resulted in a proper match!", "Testing Regex", frmDialog.DialogType.Success) - oMsgBox.ShowDialog() - + Dim oResult = FormHelper.ShowInfoMessage("The RegEx resulted in a proper match!", "Testing Regex") Else - Dim oMsgBox As New frmDialog("No Match- There might be an error in the RegEx!", "Testing Regex", frmDialog.DialogType.Warning) - oMsgBox.ShowDialog() - + Dim oResult = FormHelper.ShowWarningMessage("No Match- There might be an error in the RegEx!", "Testing Regex") 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 30ce375d..77c68843 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -42,8 +42,8 @@ Public Class frmAdmin_Start Load_GridData(oDetailData) Else - Dim oMsgBox As New frmDialog($"Could not load data for Page [{oKey}] because it does not exist!", "Error", frmDialog.DialogType.Error) - oMsgBox.ShowDialog() + Dim oResult = FormHelper.ShowWarningMessage($"Could not load data for Page [{oKey}] because it does not exist!", "Error") + End If End If End Sub diff --git a/GUIs.ZooFlow/App.config b/GUIs.ZooFlow/App.config index 2827ad86..e0cf9dd4 100644 --- a/GUIs.ZooFlow/App.config +++ b/GUIs.ZooFlow/App.config @@ -20,7 +20,7 @@ True - PROD + DEV diff --git a/GUIs.ZooFlow/ClassDragDrop.vb b/GUIs.ZooFlow/ClassDragDrop.vb index 0e83ca2c..0f14cb4b 100644 --- a/GUIs.ZooFlow/ClassDragDrop.vb +++ b/GUIs.ZooFlow/ClassDragDrop.vb @@ -99,9 +99,7 @@ Public Class ClassDragDrop End If Catch ex As Exception Logger.Error(ex) - - Dim oMsgBox As New frmDialog(ex.Message, "View_MouseMove", frmDialog.DialogType.Error) - oMsgBox.ShowDialog() + MsgBox(ex.Message, MsgBoxStyle.Critical, "View_MouseMove") End Try End Sub diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 5a996360..1a862547 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -65,8 +65,7 @@ Public Class ClassInit Dim oMessage = $"{oMessageStart}{oMessage1}{oMessage2}{oMessageEnd}" - Dim oMsgBox As New frmDialog(oMessage, _MainForm.Text, frmDialog.DialogType.Error) - oMsgBox.ShowDialog() + MsgBox(oMessage, MsgBoxStyle.Critical, _MainForm.Text) Application.ExitThread() Else ' Copy back state from MyApplication Helper to My.Application diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb index a5335837..f2815a22 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb @@ -15,7 +15,6 @@ Public Class ClassFilehandle Private ReadOnly FileEx As File Private ReadOnly Email As Email2 Private ReadOnly UserFiles As ClassUserFiles - Private ReadOnly TempFiles As New List(Of String) Public Sub New(pLogConfig As LogConfig) @@ -126,15 +125,14 @@ Public Class ClassFilehandle Else oMSG = "Shortcuts cannot be droppped!" End If - Dim oMsgBox As New frmDialog(oMSG, "FileHandle", frmDialog.DialogType.Warning) - oMsgBox.ShowDialog() + MsgBox(oMSG, MsgBoxStyle.Information, "Index Load") + Return False End If Return UserFiles.Insert_GI_File(oTempFilePath, pHandletype) Catch ex As Exception - Dim oMsgBox As New frmDialog(ex.Message, "Decide_FileHandle", frmDialog.DialogType.Error) - oMsgBox.ShowDialog() + MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Decide_FileHandle") Return False End Try diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb index fe3ad581..701554f3 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb @@ -81,9 +81,8 @@ Public Class ClassFolderwatcher End If Catch ex As Exception Logger.Error(ex.Message) + MsgBox(ex.Message, MsgBoxStyle.Critical, "Folder Watch") - Dim oMsgBox As New frmDialog(ex.Message, "Folder Watch", frmDialog.DialogType.Error) - oMsgBox.ShowDialog() End Try End Function Public Function StartStop_FolderWatchSCAN() As Integer diff --git a/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb b/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb index 6d6291b1..e89e25b7 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb @@ -54,7 +54,7 @@ Public Class ClassUserFiles oSQL = $"SELECT A.* FROM TBIDB_FILE_OBJECT A INNER JOIN TBIDB_OBJECT B ON A.IDB_OBJ_ID = B.IDB_OBJ_ID WHERE A.FILE_HASH = '{oHash}' AND B.DELETED = 0 ORDER BY A.ADDED_WHEN" - Dim oResult As DataTable = My.DatabaseECM.GetDatatable(oSQL) + Dim oResult As DataTable = My.DatabaseIDB.GetDatatable(oSQL) If oResult.Rows.Count = 0 Then Return Nothing diff --git a/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb b/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb index b3317f86..85806b09 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb @@ -263,5 +263,6 @@ Public Class ClassValidator 'MsgBox(ClassConstants.TEXT_MISSING_INPUT, MsgBoxStyle.Exclamation, ClassConstants.TITLE_MISSING_INPUT) Dim oMsgBox As New frmDialog(ClassConstants.TEXT_MISSING_INPUT, ClassConstants.TITLE_MISSING_INPUT, frmDialog.DialogType.Warning) oMsgBox.ShowDialog() + End Sub End Class diff --git a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb index 6379aee4..804d4ccd 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb @@ -31,9 +31,14 @@ Partial Class frmFileflow_Duplicate Me.SimpleButton4 = New DevExpress.XtraEditors.SimpleButton() Me.SimpleButton3 = New DevExpress.XtraEditors.SimpleButton() Me.GroupControl1 = New DevExpress.XtraEditors.GroupControl() + Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() + Me.pnlHeader = New DevExpress.XtraEditors.PanelControl() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupControl1.SuspendLayout() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.PanelControl1.SuspendLayout() + CType(Me.pnlHeader, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SimpleButton2 @@ -46,9 +51,9 @@ Partial Class frmFileflow_Duplicate 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(228, 87) + Me.SimpleButton2.Location = New System.Drawing.Point(562, 2) Me.SimpleButton2.Name = "SimpleButton2" - Me.SimpleButton2.Size = New System.Drawing.Size(143, 40) + Me.SimpleButton2.Size = New System.Drawing.Size(100, 41) Me.SimpleButton2.TabIndex = 3 Me.SimpleButton2.Text = "Nein" ' @@ -62,7 +67,7 @@ Partial Class frmFileflow_Duplicate 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(118, 87) + Me.SimpleButton1.Location = New System.Drawing.Point(455, 2) Me.SimpleButton1.Name = "SimpleButton1" Me.SimpleButton1.Size = New System.Drawing.Size(101, 40) Me.SimpleButton1.TabIndex = 2 @@ -70,21 +75,21 @@ Partial Class frmFileflow_Duplicate ' 'LabelControlMessage ' - Me.LabelControlMessage.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelControlMessage.Appearance.ForeColor = System.Drawing.Color.Firebrick + Me.LabelControlMessage.Appearance.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelControlMessage.Appearance.ForeColor = System.Drawing.Color.Black Me.LabelControlMessage.Appearance.Options.UseFont = True Me.LabelControlMessage.Appearance.Options.UseForeColor = True Me.LabelControlMessage.LineVisible = True - Me.LabelControlMessage.Location = New System.Drawing.Point(118, 31) + Me.LabelControlMessage.Location = New System.Drawing.Point(118, 46) Me.LabelControlMessage.Name = "LabelControlMessage" - Me.LabelControlMessage.Size = New System.Drawing.Size(152, 21) + Me.LabelControlMessage.Size = New System.Drawing.Size(121, 17) Me.LabelControlMessage.TabIndex = 1 Me.LabelControlMessage.Text = "msgfrom_LoadForm" ' 'PictureEdit1 ' Me.PictureEdit1.EditValue = CType(resources.GetObject("PictureEdit1.EditValue"), Object) - Me.PictureEdit1.Location = New System.Drawing.Point(12, 31) + Me.PictureEdit1.Location = New System.Drawing.Point(12, 46) Me.PictureEdit1.Name = "PictureEdit1" Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.Transparent Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True @@ -104,7 +109,6 @@ Partial Class frmFileflow_Duplicate 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.Name = "SimpleButton5" - Me.SimpleButton5.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light Me.SimpleButton5.Size = New System.Drawing.Size(143, 42) Me.SimpleButton5.TabIndex = 6 Me.SimpleButton5.Text = "... nur von mir" @@ -120,7 +124,6 @@ Partial Class frmFileflow_Duplicate Me.SimpleButton4.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.bo_appointment1 Me.SimpleButton4.Location = New System.Drawing.Point(20, 85) Me.SimpleButton4.Name = "SimpleButton4" - Me.SimpleButton4.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light Me.SimpleButton4.Size = New System.Drawing.Size(223, 42) Me.SimpleButton4.TabIndex = 5 Me.SimpleButton4.Text = "Alle Dateien von heute" @@ -136,33 +139,54 @@ Partial Class frmFileflow_Duplicate 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.Name = "SimpleButton3" - Me.SimpleButton3.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light - Me.SimpleButton3.Size = New System.Drawing.Size(154, 42) + Me.SimpleButton3.Size = New System.Drawing.Size(372, 42) Me.SimpleButton3.TabIndex = 4 - Me.SimpleButton3.Text = "Datei anzeigen" + Me.SimpleButton3.Text = "Vorhandene Datei anzeigen" ' 'GroupControl1 ' 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, 151) + Me.GroupControl1.Location = New System.Drawing.Point(12, 185) Me.GroupControl1.Name = "GroupControl1" - Me.GroupControl1.Size = New System.Drawing.Size(401, 141) + Me.GroupControl1.Size = New System.Drawing.Size(669, 138) Me.GroupControl1.TabIndex = 7 Me.GroupControl1.Text = "Dateisuchen" ' + 'PanelControl1 + ' + Me.PanelControl1.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(230, Byte), Integer), CType(CType(230, Byte), Integer), CType(CType(230, Byte), Integer)) + Me.PanelControl1.Appearance.Options.UseBackColor = True + Me.PanelControl1.Controls.Add(Me.SimpleButton2) + Me.PanelControl1.Controls.Add(Me.SimpleButton1) + Me.PanelControl1.Location = New System.Drawing.Point(12, 133) + Me.PanelControl1.Name = "PanelControl1" + Me.PanelControl1.Size = New System.Drawing.Size(669, 46) + Me.PanelControl1.TabIndex = 8 + ' + 'pnlHeader + ' + Me.pnlHeader.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(19, Byte), Integer)) + Me.pnlHeader.Appearance.Options.UseBackColor = True + Me.pnlHeader.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder + 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.TabIndex = 9 + ' 'frmFileflow_Duplicate ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 21.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.Color.WhiteSmoke - Me.ClientSize = New System.Drawing.Size(686, 304) + Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + Me.ClientSize = New System.Drawing.Size(686, 335) + Me.Controls.Add(Me.pnlHeader) + Me.Controls.Add(Me.PanelControl1) Me.Controls.Add(Me.GroupControl1) - Me.Controls.Add(Me.SimpleButton2) Me.Controls.Add(Me.PictureEdit1) Me.Controls.Add(Me.LabelControlMessage) - Me.Controls.Add(Me.SimpleButton1) Me.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) @@ -172,6 +196,9 @@ Partial Class frmFileflow_Duplicate CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupControl1.ResumeLayout(False) + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.PanelControl1.ResumeLayout(False) + CType(Me.pnlHeader, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -184,4 +211,6 @@ Partial Class frmFileflow_Duplicate Friend WithEvents SimpleButton4 As DevExpress.XtraEditors.SimpleButton Friend WithEvents SimpleButton3 As DevExpress.XtraEditors.SimpleButton Friend WithEvents GroupControl1 As DevExpress.XtraEditors.GroupControl + Friend WithEvents PanelControl1 As DevExpress.XtraEditors.PanelControl + Friend WithEvents pnlHeader As DevExpress.XtraEditors.PanelControl End Class diff --git a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx index 856ab58e..27721dc1 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx +++ b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx @@ -137,30 +137,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALYDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - R3JlZW57ZmlsbDojMDM5QzIzO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTgsMTZWNkg1QzQuNCw2LDQs - Ni40LDQsN3YyMmMwLDAuNiwwLjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjE2SDh6IE04LDI2di02 - aDE2djZIOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHBhdGggZD0iTTE4LDZoLTh2OGg4VjZ6IE0xNCwx - MmgtMlY4aDJWMTJ6IiBjbGFzcz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0yNiwyYy0zLjMsMC02LDIu - Ny02LDZzMi43LDYsNiw2czYtMi43LDYtNlMyOS4zLDIsMjYsMnogTTI2LDExLjhjLTAuNCwwLTAuNy0w - LjMtMC43LTAuNyAgYzAtMC40LDAuMy0wLjcsMC43LTAuN3MwLjcsMC4zLDAuNywwLjdDMjYuNywxMS41 - LDI2LjQsMTEuOCwyNiwxMS44eiBNMjYuNyw5LjR2MC4zaC0xLjRWOS41YzAtMC4zLDAuMS0xLjEsMC42 - LTEuNSAgYzAuMi0wLjIsMS40LTAuNiwxLjYtMS43YzAtMC4zLTAuMS0wLjUtMC4zLTAuN3MtMC41LTAu - My0wLjktMC4zYy0wLjksMC0xLjQsMS0xLjQsMS40aC0xLjRjMC0wLjgsMC4zLTEuNCwwLjgtMS45czEu - Mi0wLjcsMi0wLjcgIHMxLjUsMC4yLDEuOSwwLjZjMC41LDAuNCwwLjcsMC45LDAuNywxLjZDMjguNiw4 - LjIsMjYuNyw4LjUsMjYuNyw5LjR6IiBjbGFzcz0iR3JlZW4iIC8+DQo8L3N2Zz4L - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKEDAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHICAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh @@ -168,14 +145,34 @@ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlVzZXIiPg0KICAgIDxwYXRoIGQ9Ik0xMCw5LjljLTAu - MSwwLjUsMC4yLDAuOSwwLjQsMS40YzAuMiwwLjUtMC4xLDEuNywwLjksMS42YzAsMCwwLDAuMSwwLDAu - MmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBjMi43LDAsNC4yLTIuNiw0LjctNC45YzAsMCwwLTAuMSww - LTAuMWMxLDAuMSwwLjYtMS4xLDAuOS0xLjZjMC4yLTAuNSwwLjQtMC45LDAuMy0xLjRjLTAuMS0wLjQt - MC40LTAuNC0wLjUtMC4zICAgYzEuOC00LjktMS4xLTQuNy0xLjEtNC43UzIwLDIsMTQuOCwyQzEwLDIs - OS40LDYsMTAuNSw5LjZDMTAuNCw5LjYsMTAuMSw5LjcsMTAsOS45eiIgY2xhc3M9IkJsYWNrIiAvPg0K - ICAgIDxwYXRoIGQ9Ik0yMCwxOGMtMC44LDEuNS0yLjEsNC00LDRjLTEuOSwwLTMuMi0yLjUtNC00Yy0y - LjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41QzI4LDE5LjEsMjIuMywyMS40LDIwLDE4eiIgY2xhc3M9 + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkNoZWNrQ2lyY2xlZCI+DQogICAgPHBhdGggZD0iTTE2 + LDRDOS40LDQsNCw5LjQsNCwxNmMwLDYuNiw1LjQsMTIsMTIsMTJzMTItNS40LDEyLTEyQzI4LDkuNCwy + Mi42LDQsMTYsNHogTTE0LDIybC02LTZsMi0ybDQsNGw4LThsMiwyICAgTDE0LDIyeiIgY2xhc3M9Ikdy + ZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABkEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBdHRlbnRpb24iPg0K + ICAgIDxwYXRoIGQ9Ik0xNS4xLDIuNUwyLjEsMjYuNUMxLjgsMjcuMiwyLjMsMjgsMy4xLDI4aDI1Ljlj + MC44LDAsMS4zLTAuOCwwLjktMS41TDE2LjksMi41ICAgQzE2LjUsMS44LDE1LjUsMS44LDE1LjEsMi41 + eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMjBjMS4xLDAsMiwwLjksMiwycy0w + LjksMi0yLDJzLTItMC45LTItMlMxNC45LDIwLDE2LDIweiBNMTQsMTBoNHY4aC00VjEweiIgY2xhc3M9 IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb index 20bb2775..13fa237d 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb @@ -52,8 +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 frmDialog("No Match- There might be an error in the RegEx!", Text, frmDialog.DialogType.Warning) - oMsgBox.ShowDialog() + MsgBox("No Match- There might be an error in the RegEx!", MsgBoxStyle.Exclamation) Exit Sub End Try diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb index 1794faca..c67ed9bc 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb @@ -17,7 +17,6 @@ Imports DigitalData.Modules.Patterns Imports DevExpress.XtraEditors Imports DevExpress.XtraSplashScreen Imports DigitalData.GUIs.Common - Public Class frmGlobix_Index #Region "+++++ Variablen ++++++" Private ReadOnly LogConfig As LogConfig @@ -52,6 +51,7 @@ Public Class frmGlobix_Index 'End Class #End Region + Public Sub New(pLogConfig As LogConfig) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -185,8 +185,9 @@ Public Class frmGlobix_Index Catch ex As Exception Logger.Warn("Unexpected error DTTBGI_REGEX_DOCTYPE - ErrorMessage: " & vbNewLine & ex.Message) - + Me.Visible = False FormHelper.ShowErrorMessage(ex, "Laden des Formulars") + Me.Visible = True Finally SplashScreenManager.CloseOverlayForm(OverlayHandle) FormLoaded = True @@ -275,7 +276,9 @@ Public Class frmGlobix_Index Try DocumentViewer1.LoadFile(My.Application.Globix.CurrentWorkfile.FilePath) Catch ex As Exception + Me.Visible = False FormHelper.ShowErrorMessage(ex, "Laden der Vorschau") + Me.Visible = True End Try End Sub @@ -329,7 +332,9 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I DocTypes = oDocTypes Catch ex As Exception + Me.Visible = False FormHelper.ShowErrorMessage(ex, "Laden des Profils") + Me.Visible = True End Try End Sub @@ -392,7 +397,9 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I Return oManualIndexes Catch ex As Exception Logger.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Refresh_IndexeMan:") + Me.Visible = False + FormHelper.ShowErrorMessage(ex, "Unexpected error in Refresh_IndexeMan:") + Me.Visible = True Return Nothing End Try @@ -472,8 +479,9 @@ 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 frmDialog(omsg, "Indexe Laden", frmDialog.DialogType.Warning) - oMsgBox.ShowDialog() + Me.Visible = False + Dim oResult = FormHelper.ShowWarningMessage(omsg, "Index Load") + Me.Visible = True Logger.Warn("DataType [{0}] not implemented!", oIndex.DataType) End Select @@ -498,7 +506,9 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I SendKeys.Send("{TAB}") Catch ex As Exception Logger.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in LoadIndexe_Man:") + Me.Visible = False + FormHelper.ShowErrorMessage(ex, "Unexpected error in LoadIndexe_Man:") + Me.Visible = True End Try End Sub Private Sub PrepareDependingControl(pControl As Control) @@ -652,31 +662,36 @@ 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 + Dim oMsg As String, oTitle As String Select Case CancelAttempts Case 0 If My.Application.User.Language = "de-DE" Then oMsg = "Bitte indexieren Sie die Datei vollständig!" & vbNewLine & "(Abbruch 1 des Indexierungsvorgangs)" + oTitle = "Fehlende Eingaben" Else oMsg = "Please Index file completely" & vbNewLine & "(Abort 1 of Indexdialog)" + oTitle = "Missung Input" End If - Dim oMsgBox As New frmDialog(oMsg, Text, frmDialog.DialogType.Warning) - oMsgBox.CancelButtonInvisible() - oMsgBox.ShowDialog() + Me.TopMost = False + Me.Visible = False + Dim oResult = FormHelper.ShowWarningMessage(oMsg, oTitle) + Me.Visible = True CancelAttempts += 1 e.Cancel = True Case 1 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?" + oTitle = "Fehlende Eingaben" Else oMsg = "You abort the indexdialog for the 2nd time!" & vbNewLine & "Do You want to abort indexing?" + oTitle = "Missung Input" End If - Dim oMsgBox As New frmDialog(oMsg, Text, frmDialog.DialogType.Question) - oMsgBox.CancelButtonVisible() - - If oMsgBox.DialogResult = DialogResult.Yes Then + Me.Visible = False + Dim oResult = FormHelper.ShowQuestionMessage(oMsg, oTitle) + Me.Visible = True + If oResult = DialogResult.Yes Then Dim containsfw_file As Boolean = False Try My.Application.Globix.ABORT_INDEXING = True @@ -702,19 +717,22 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I 'Zuerst die Daten des Ablaufs löschen If My.Database.ExecuteNonQueryECM($"DELETE FROM TBGI_FILES_USER WHERE USER@WORK = '{My.Application.User.UserName}'") = True Then If containsfw_file = True Then + Me.Visible = False If My.Application.User.Language = "de-DE" Then - MsgBox("Der Indexierungsprozess beinhaltete (auch) Dateien per Folderwatch!" & vbNewLine & "Diese Dateien wurden nicht gelöscht und verbleiben im Folderwatch-Verzeichnis!" & vbNewLine & "Bitte verschieben Sie die Dateien ggfls.", MsgBoxStyle.Information, "Achtung - Hinweis:") + FormHelper.ShowInfoMessage("Der Indexierungsprozess beinhaltete (auch) Dateien per Folderwatch!" & vbNewLine & "Diese Dateien wurden nicht gelöscht und verbleiben im Folderwatch-Verzeichnis!" & vbNewLine & "Bitte verschieben Sie die Dateien ggfls.", "Hinweis") Else - MsgBox("The Indexingprocess contained (also) files from folderwatch!" & vbNewLine & "These files weren't deleted and will stay in the folderwatch-folder!" & vbNewLine & "Please move these files manually.", MsgBoxStyle.Information, "Achtung - Hinweis:") + FormHelper.ShowInfoMessage("The Indexingprocess contained (also) files from folderwatch!" & vbNewLine & "These files weren't deleted and will stay in the folderwatch-folder!" & vbNewLine & "Please move these files manually.", "Attention") End If - + Me.Visible = True End If End If Catch ex As Exception Logger.Error(ex) - MsgBox("Unexpected Error in Abort Indexing: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + Me.Visible = False + FormHelper.ShowErrorMessage(ex, "Unexpected Error in Abort Indexing") + Me.Visible = True End Try Try @@ -727,7 +745,9 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I Catch ex As Exception Logger.Info(" - Unexpected error in Schliessen des Formulares - Fehler: " & vbNewLine & ex.Message) Logger.Error(ex.Message) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Schliessen des Formulares:") + Me.Visible = False + FormHelper.ShowErrorMessage(ex, "Unexpected error in FormClosing:") + Me.Visible = True End Try e.Cancel = False @@ -743,9 +763,11 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I WindowLocation.SaveFormLocationSize(Me) My.Settings.Save() Catch ex As Exception - Logger.Warn(" - Unexpected error in Schliessen des Formulares - Fehler: " & vbNewLine & ex.Message) + Logger.Warn(" - Unexpected error in Schliessen des Formulares2 - Fehler: " & vbNewLine & ex.Message) Logger.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Schliessen des Formulares:") + Me.Visible = False + FormHelper.ShowErrorMessage(ex, "Unexpected error in FormClosing2:") + Me.Visible = True End Try End Select Else @@ -798,13 +820,23 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I Return True Else Logger.Warn("Import failed with message: [{0}] and details [{1}]", oResult.ErrorMessage, oResult.ErrorDetails) - MsgBox($"Die Datei wurde nicht verarbeitet.{vbNewLine}{vbNewLine}Fehler: {oResult.ErrorMessage}", MsgBoxStyle.Critical, Text) + Dim oMsg As String, oTitle As String + If My.Application.User.Language = "de-DE" Then + oMsg = $"Die Datei wurde nicht verarbeitet.{vbNewLine}{vbNewLine}Fehler: {oResult.ErrorMessage}" + oTitle = "Achtung" + Else + oMsg = $"Unexpected Error in FileFlow{vbNewLine}{vbNewLine}Fehler: {oResult.ErrorMessage}" + oTitle = "Attention" + End If + FormHelper.ShowWarningMessage(oMsg, oTitle) + Return False End If Catch ex As Exception Logger.Error(ex) - MsgBox("Ablage fehlgeschlagen!", MsgBoxStyle.Critical, Text) + Me.TopMost = False + FormHelper.ShowErrorMessage(ex, Text) Return False Finally diff --git a/GUIs.ZooFlow/My Project/Settings.Designer.vb b/GUIs.ZooFlow/My Project/Settings.Designer.vb index 299cd27a..82aecbae 100644 --- a/GUIs.ZooFlow/My Project/Settings.Designer.vb +++ b/GUIs.ZooFlow/My Project/Settings.Designer.vb @@ -14,7 +14,7 @@ Option Explicit On _ Partial Friend NotInheritable Class Settings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -86,7 +86,7 @@ Partial Friend NotInheritable Class Settings _ + Global.System.Configuration.DefaultSettingValueAttribute("DEV")> _ Public ReadOnly Property UserConfig_Prefix() As String Get Return CType(Me("UserConfig_Prefix"),String) diff --git a/GUIs.ZooFlow/My Project/Settings.settings b/GUIs.ZooFlow/My Project/Settings.settings index e26b57b5..4564a6ed 100644 --- a/GUIs.ZooFlow/My Project/Settings.settings +++ b/GUIs.ZooFlow/My Project/Settings.settings @@ -22,7 +22,7 @@ Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd - PROD + DEV \ No newline at end of file diff --git a/Service.EDMIService/Methods/GlobalIndexer/Loader.vb b/Service.EDMIService/Methods/GlobalIndexer/Loader.vb index 20b7b18a..52b5ee0c 100644 --- a/Service.EDMIService/Methods/GlobalIndexer/Loader.vb +++ b/Service.EDMIService/Methods/GlobalIndexer/Loader.vb @@ -98,7 +98,7 @@ Namespace Methods.GlobalIndexer Return oIndexes Catch ex As Exception - LogAndThrow(ex, "Error while automatic loading indexes!") + LogAndThrow(ex, "Error while loading automatic indexes!") Return Nothing End Try End Function