diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb
index 1a84f5bd..1925b2a4 100644
--- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb
+++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb
@@ -600,7 +600,7 @@ Partial Class frmAdmin_Globix
'GridLookUpEdit1
'
Me.GridLookUpEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "IDB_DOCTYPE_ID", True))
- Me.GridLookUpEdit1.Location = New System.Drawing.Point(156, 76)
+ Me.GridLookUpEdit1.Location = New System.Drawing.Point(166, 76)
Me.GridLookUpEdit1.MenuManager = Me.RibbonControl1
Me.GridLookUpEdit1.Name = "GridLookUpEdit1"
Me.GridLookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
@@ -608,7 +608,7 @@ Partial Class frmAdmin_Globix
Me.GridLookUpEdit1.Properties.DisplayMember = "Doctype"
Me.GridLookUpEdit1.Properties.PopupView = Me.GridLookUpEdit1View
Me.GridLookUpEdit1.Properties.ValueMember = "Doctype_ID"
- Me.GridLookUpEdit1.Size = New System.Drawing.Size(931, 20)
+ Me.GridLookUpEdit1.Size = New System.Drawing.Size(921, 20)
Me.GridLookUpEdit1.StyleController = Me.LayoutControlProfile
Me.GridLookUpEdit1.TabIndex = 61
'
@@ -630,19 +630,19 @@ Partial Class frmAdmin_Globix
Me.IDB_DOCTYPE_IDComboBox.DataSource = Me.VWIDB_DOCTYPE_LANGUAGEBindingSource
Me.IDB_DOCTYPE_IDComboBox.DisplayMember = "Doctype"
Me.IDB_DOCTYPE_IDComboBox.FormattingEnabled = True
- Me.IDB_DOCTYPE_IDComboBox.Location = New System.Drawing.Point(156, 45)
+ Me.IDB_DOCTYPE_IDComboBox.Location = New System.Drawing.Point(166, 45)
Me.IDB_DOCTYPE_IDComboBox.Name = "IDB_DOCTYPE_IDComboBox"
- Me.IDB_DOCTYPE_IDComboBox.Size = New System.Drawing.Size(389, 21)
+ Me.IDB_DOCTYPE_IDComboBox.Size = New System.Drawing.Size(379, 21)
Me.IDB_DOCTYPE_IDComboBox.TabIndex = 60
Me.IDB_DOCTYPE_IDComboBox.ValueMember = "Doctype_ID"
'
'TextEdit1
'
Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWANN", True))
- Me.TextEdit1.Location = New System.Drawing.Point(156, 257)
+ Me.TextEdit1.Location = New System.Drawing.Point(166, 257)
Me.TextEdit1.MenuManager = Me.RibbonControl1
Me.TextEdit1.Name = "TextEdit1"
- Me.TextEdit1.Size = New System.Drawing.Size(389, 20)
+ Me.TextEdit1.Size = New System.Drawing.Size(379, 20)
Me.TextEdit1.StyleController = Me.LayoutControlProfile
Me.TextEdit1.TabIndex = 59
'
@@ -653,9 +653,9 @@ Partial Class frmAdmin_Globix
Me.IDB_OBJECT_STORE_IDComboBox.DataSource = Me.VWIDB_OBJECT_STOREBindingSource
Me.IDB_OBJECT_STORE_IDComboBox.DisplayMember = "Objectstore"
Me.IDB_OBJECT_STORE_IDComboBox.FormattingEnabled = True
- Me.IDB_OBJECT_STORE_IDComboBox.Location = New System.Drawing.Point(156, 166)
+ Me.IDB_OBJECT_STORE_IDComboBox.Location = New System.Drawing.Point(166, 166)
Me.IDB_OBJECT_STORE_IDComboBox.Name = "IDB_OBJECT_STORE_IDComboBox"
- Me.IDB_OBJECT_STORE_IDComboBox.Size = New System.Drawing.Size(389, 21)
+ Me.IDB_OBJECT_STORE_IDComboBox.Size = New System.Drawing.Size(379, 21)
Me.IDB_OBJECT_STORE_IDComboBox.TabIndex = 57
Me.IDB_OBJECT_STORE_IDComboBox.ValueMember = "GUID"
'
@@ -667,10 +667,10 @@ Partial Class frmAdmin_Globix
'SEQUENCENumericUpDown
'
Me.SEQUENCENumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_INDEX_MANBindingSource, "SEQUENCE", True))
- Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(385, 15)
+ Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(395, 15)
Me.SEQUENCENumericUpDown.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
Me.SEQUENCENumericUpDown.Name = "SEQUENCENumericUpDown"
- Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(44, 21)
+ Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(34, 22)
Me.SEQUENCENumericUpDown.TabIndex = 56
Me.SEQUENCENumericUpDown.Value = New Decimal(New Integer() {1, 0, 0, 0})
'
@@ -692,81 +692,81 @@ Partial Class frmAdmin_Globix
'GEAENDERTWANNTextBox
'
Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GEAENDERTWANN", True))
- Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(696, 257)
+ Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(706, 257)
Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox"
Me.GEAENDERTWANNTextBox.ReadOnly = True
- Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(391, 20)
+ Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(381, 20)
Me.GEAENDERTWANNTextBox.TabIndex = 39
'
'TextEditErstelltWer
'
Me.TextEditErstelltWer.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWER", True))
- Me.TextEditErstelltWer.Location = New System.Drawing.Point(156, 227)
+ Me.TextEditErstelltWer.Location = New System.Drawing.Point(166, 227)
Me.TextEditErstelltWer.MenuManager = Me.RibbonControl1
Me.TextEditErstelltWer.Name = "TextEditErstelltWer"
- Me.TextEditErstelltWer.Size = New System.Drawing.Size(389, 20)
+ Me.TextEditErstelltWer.Size = New System.Drawing.Size(379, 20)
Me.TextEditErstelltWer.StyleController = Me.LayoutControlProfile
Me.TextEditErstelltWer.TabIndex = 44
'
'TextEditGeandertWer
'
Me.TextEditGeandertWer.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GEANDERTWER", True))
- Me.TextEditGeandertWer.Location = New System.Drawing.Point(696, 227)
+ Me.TextEditGeandertWer.Location = New System.Drawing.Point(706, 227)
Me.TextEditGeandertWer.MenuManager = Me.RibbonControl1
Me.TextEditGeandertWer.Name = "TextEditGeandertWer"
- Me.TextEditGeandertWer.Size = New System.Drawing.Size(391, 20)
+ Me.TextEditGeandertWer.Size = New System.Drawing.Size(381, 20)
Me.TextEditGeandertWer.StyleController = Me.LayoutControlProfile
Me.TextEditGeandertWer.TabIndex = 45
'
'TextEditNamenkonvention
'
Me.TextEditNamenkonvention.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "NAMENKONVENTION", True))
- Me.TextEditNamenkonvention.Location = New System.Drawing.Point(156, 136)
+ Me.TextEditNamenkonvention.Location = New System.Drawing.Point(166, 136)
Me.TextEditNamenkonvention.MenuManager = Me.RibbonControl1
Me.TextEditNamenkonvention.Name = "TextEditNamenkonvention"
- Me.TextEditNamenkonvention.Size = New System.Drawing.Size(672, 20)
+ Me.TextEditNamenkonvention.Size = New System.Drawing.Size(662, 20)
Me.TextEditNamenkonvention.StyleController = Me.LayoutControlProfile
Me.TextEditNamenkonvention.TabIndex = 46
'
'TextEditBeschreibung
'
Me.TextEditBeschreibung.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "BESCHREIBUNG", True))
- Me.TextEditBeschreibung.Location = New System.Drawing.Point(156, 197)
+ Me.TextEditBeschreibung.Location = New System.Drawing.Point(166, 197)
Me.TextEditBeschreibung.MenuManager = Me.RibbonControl1
Me.TextEditBeschreibung.Name = "TextEditBeschreibung"
- Me.TextEditBeschreibung.Size = New System.Drawing.Size(931, 20)
+ Me.TextEditBeschreibung.Size = New System.Drawing.Size(921, 20)
Me.TextEditBeschreibung.StyleController = Me.LayoutControlProfile
Me.TextEditBeschreibung.TabIndex = 48
'
'TextEditBezeichnung
'
Me.TextEditBezeichnung.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "BEZEICHNUNG", True))
- Me.TextEditBezeichnung.Location = New System.Drawing.Point(696, 45)
+ Me.TextEditBezeichnung.Location = New System.Drawing.Point(706, 45)
Me.TextEditBezeichnung.MenuManager = Me.RibbonControl1
Me.TextEditBezeichnung.Name = "TextEditBezeichnung"
- Me.TextEditBezeichnung.Size = New System.Drawing.Size(391, 20)
+ Me.TextEditBezeichnung.Size = New System.Drawing.Size(381, 20)
Me.TextEditBezeichnung.StyleController = Me.LayoutControlProfile
Me.TextEditBezeichnung.TabIndex = 51
'
'TextEditDoctypeID
'
Me.TextEditDoctypeID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GUID", True))
- Me.TextEditDoctypeID.Location = New System.Drawing.Point(156, 15)
+ Me.TextEditDoctypeID.Location = New System.Drawing.Point(166, 15)
Me.TextEditDoctypeID.MenuManager = Me.RibbonControl1
Me.TextEditDoctypeID.Name = "TextEditDoctypeID"
- Me.TextEditDoctypeID.Size = New System.Drawing.Size(78, 20)
+ Me.TextEditDoctypeID.Size = New System.Drawing.Size(68, 20)
Me.TextEditDoctypeID.StyleController = Me.LayoutControlProfile
Me.TextEditDoctypeID.TabIndex = 52
'
'ComboBoxEditDupl_handling
'
Me.ComboBoxEditDupl_handling.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "DUPLICATE_HANDLING", True))
- Me.ComboBoxEditDupl_handling.Location = New System.Drawing.Point(156, 106)
+ Me.ComboBoxEditDupl_handling.Location = New System.Drawing.Point(166, 106)
Me.ComboBoxEditDupl_handling.MenuManager = Me.RibbonControl1
Me.ComboBoxEditDupl_handling.Name = "ComboBoxEditDupl_handling"
Me.ComboBoxEditDupl_handling.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.ComboBoxEditDupl_handling.Properties.Items.AddRange(New Object() {"New version", "Default", "Question"})
- Me.ComboBoxEditDupl_handling.Size = New System.Drawing.Size(931, 20)
+ Me.ComboBoxEditDupl_handling.Size = New System.Drawing.Size(921, 20)
Me.ComboBoxEditDupl_handling.StyleController = Me.LayoutControlProfile
Me.ComboBoxEditDupl_handling.TabIndex = 54
'
@@ -798,7 +798,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem10.Size = New System.Drawing.Size(542, 31)
Me.LayoutControlItem10.Text = "Bezeichnung"
- Me.LayoutControlItem10.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem10.TextSize = New System.Drawing.Size(139, 13)
'
'LayoutControlItem3
'
@@ -811,7 +811,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem3.Size = New System.Drawing.Size(540, 30)
Me.LayoutControlItem3.Text = "Erstellt wer"
- Me.LayoutControlItem3.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem3.TextSize = New System.Drawing.Size(139, 13)
'
'LayoutControlItem30
'
@@ -821,7 +821,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem30.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem30.Size = New System.Drawing.Size(823, 30)
Me.LayoutControlItem30.Text = "Namenkonvention"
- Me.LayoutControlItem30.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem30.TextSize = New System.Drawing.Size(139, 13)
'
'LayoutControlItem20
'
@@ -832,7 +832,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem20.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem20.Size = New System.Drawing.Size(195, 30)
Me.LayoutControlItem20.Text = "Reihenfolge"
- Me.LayoutControlItem20.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem20.TextSize = New System.Drawing.Size(139, 13)
'
'LayoutControlItem4
'
@@ -844,7 +844,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem4.Size = New System.Drawing.Size(229, 30)
Me.LayoutControlItem4.Text = "ID"
- Me.LayoutControlItem4.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem4.TextSize = New System.Drawing.Size(139, 13)
'
'EmptySpaceItem1
'
@@ -873,7 +873,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem25.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem25.Size = New System.Drawing.Size(540, 31)
Me.LayoutControlItem25.Text = "File-Store:"
- Me.LayoutControlItem25.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem25.TextSize = New System.Drawing.Size(139, 13)
'
'EmptySpaceItem3
'
@@ -891,7 +891,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem26.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem26.Size = New System.Drawing.Size(1082, 30)
Me.LayoutControlItem26.Text = "Verhalten Datei vorhanden"
- Me.LayoutControlItem26.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem26.TextSize = New System.Drawing.Size(139, 13)
'
'LayoutControlItem1
'
@@ -913,7 +913,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem32.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem32.Size = New System.Drawing.Size(540, 30)
Me.LayoutControlItem32.Text = "Erstellt wann"
- Me.LayoutControlItem32.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem32.TextSize = New System.Drawing.Size(139, 13)
'
'LayoutControlItem5
'
@@ -926,7 +926,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem5.Size = New System.Drawing.Size(542, 30)
Me.LayoutControlItem5.Text = "Geändert wer"
- Me.LayoutControlItem5.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem5.TextSize = New System.Drawing.Size(139, 13)
'
'LayoutControlItem36
'
@@ -939,7 +939,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem36.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem36.Size = New System.Drawing.Size(542, 30)
Me.LayoutControlItem36.Text = "Geändert wann:"
- Me.LayoutControlItem36.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem36.TextSize = New System.Drawing.Size(139, 13)
'
'LayoutControlItem28
'
@@ -949,7 +949,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem28.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem28.Size = New System.Drawing.Size(1082, 30)
Me.LayoutControlItem28.Text = "Beschreibung"
- Me.LayoutControlItem28.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem28.TextSize = New System.Drawing.Size(139, 13)
'
'EmptySpaceItem12
'
@@ -967,7 +967,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem61.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem61.Size = New System.Drawing.Size(540, 31)
Me.LayoutControlItem61.Text = "Dokumentart"
- Me.LayoutControlItem61.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem61.TextSize = New System.Drawing.Size(139, 13)
'
'LayoutControlItem12
'
@@ -976,7 +976,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem12.Name = "LayoutControlItem12"
Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem12.Size = New System.Drawing.Size(1082, 30)
- Me.LayoutControlItem12.TextSize = New System.Drawing.Size(129, 13)
+ Me.LayoutControlItem12.TextSize = New System.Drawing.Size(139, 13)
'
'XtraTabControl2
'
@@ -1531,9 +1531,9 @@ Partial Class frmAdmin_Globix
Me.CONNECTION_IDTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "CONNECTION_ID", True))
Me.CONNECTION_IDTextBox1.Enabled = False
Me.CONNECTION_IDTextBox1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.CONNECTION_IDTextBox1.Location = New System.Drawing.Point(350, 142)
+ Me.CONNECTION_IDTextBox1.Location = New System.Drawing.Point(352, 142)
Me.CONNECTION_IDTextBox1.Name = "CONNECTION_IDTextBox1"
- Me.CONNECTION_IDTextBox1.Size = New System.Drawing.Size(26, 20)
+ Me.CONNECTION_IDTextBox1.Size = New System.Drawing.Size(24, 20)
Me.CONNECTION_IDTextBox1.TabIndex = 23
'
'SQL_RESULTTextBox1
@@ -1559,9 +1559,9 @@ Partial Class frmAdmin_Globix
'VALUETextBox
'
Me.VALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "VALUE", True))
- Me.VALUETextBox.Location = New System.Drawing.Point(361, 76)
+ Me.VALUETextBox.Location = New System.Drawing.Point(369, 76)
Me.VALUETextBox.Name = "VALUETextBox"
- Me.VALUETextBox.Size = New System.Drawing.Size(185, 20)
+ Me.VALUETextBox.Size = New System.Drawing.Size(177, 20)
Me.VALUETextBox.TabIndex = 9
'
'INDEXNAMEComboBox
@@ -1570,9 +1570,9 @@ Partial Class frmAdmin_Globix
Me.INDEXNAMEComboBox.DataSource = Me.VWIDB_BE_ATTRIBUTEBindingSource
Me.INDEXNAMEComboBox.DisplayMember = "ATTR_TITLE"
Me.INDEXNAMEComboBox.FormattingEnabled = True
- Me.INDEXNAMEComboBox.Location = New System.Drawing.Point(361, 45)
+ Me.INDEXNAMEComboBox.Location = New System.Drawing.Point(369, 45)
Me.INDEXNAMEComboBox.Name = "INDEXNAMEComboBox"
- Me.INDEXNAMEComboBox.Size = New System.Drawing.Size(384, 21)
+ Me.INDEXNAMEComboBox.Size = New System.Drawing.Size(376, 21)
Me.INDEXNAMEComboBox.TabIndex = 8
'
'ACTIVECheckBox1
@@ -1588,19 +1588,19 @@ Partial Class frmAdmin_Globix
'SEQUENCENumericUpDown1
'
Me.SEQUENCENumericUpDown1.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_INDEX_AUTOMBindingSource, "SEQUENCE", True))
- Me.SEQUENCENumericUpDown1.Location = New System.Drawing.Point(463, 15)
+ Me.SEQUENCENumericUpDown1.Location = New System.Drawing.Point(469, 15)
Me.SEQUENCENumericUpDown1.Name = "SEQUENCENumericUpDown1"
- Me.SEQUENCENumericUpDown1.Size = New System.Drawing.Size(52, 21)
+ Me.SEQUENCENumericUpDown1.Size = New System.Drawing.Size(46, 22)
Me.SEQUENCENumericUpDown1.TabIndex = 6
'
'GUIDTextBoxAutoAttribute
'
Me.GUIDTextBoxAutoAttribute.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "GUID", True))
Me.GUIDTextBoxAutoAttribute.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.GUIDTextBoxAutoAttribute.Location = New System.Drawing.Point(361, 15)
+ Me.GUIDTextBoxAutoAttribute.Location = New System.Drawing.Point(369, 15)
Me.GUIDTextBoxAutoAttribute.Name = "GUIDTextBoxAutoAttribute"
Me.GUIDTextBoxAutoAttribute.ReadOnly = True
- Me.GUIDTextBoxAutoAttribute.Size = New System.Drawing.Size(30, 20)
+ Me.GUIDTextBoxAutoAttribute.Size = New System.Drawing.Size(22, 20)
Me.GUIDTextBoxAutoAttribute.TabIndex = 5
'
'SimpleButton1
@@ -1617,12 +1617,12 @@ Partial Class frmAdmin_Globix
'
'ComboBoxEditAAttrFileParam
'
- Me.ComboBoxEditAAttrFileParam.Location = New System.Drawing.Point(836, 76)
+ Me.ComboBoxEditAAttrFileParam.Location = New System.Drawing.Point(844, 76)
Me.ComboBoxEditAAttrFileParam.MenuManager = Me.RibbonControl1
Me.ComboBoxEditAAttrFileParam.Name = "ComboBoxEditAAttrFileParam"
Me.ComboBoxEditAAttrFileParam.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.ComboBoxEditAAttrFileParam.Properties.Items.AddRange(New Object() {"FILENAME_EXT", "FILENAME", "EXTENSION", "DATE_CREATED", "DATE_MODIFIED"})
- Me.ComboBoxEditAAttrFileParam.Size = New System.Drawing.Size(260, 20)
+ Me.ComboBoxEditAAttrFileParam.Size = New System.Drawing.Size(252, 20)
Me.ComboBoxEditAAttrFileParam.StyleController = Me.LayoutControlAutoIndexe
Me.ComboBoxEditAAttrFileParam.TabIndex = 11
'
@@ -1641,12 +1641,12 @@ Partial Class frmAdmin_Globix
'
Me.ADDED_WHOTextBoxAutoAttribut.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "ADDED_WHO", True))
Me.ADDED_WHOTextBoxAutoAttribut.Enabled = False
- Me.ADDED_WHOTextBoxAutoAttribut.Location = New System.Drawing.Point(361, 202)
+ Me.ADDED_WHOTextBoxAutoAttribut.Location = New System.Drawing.Point(369, 202)
Me.ADDED_WHOTextBoxAutoAttribut.MenuManager = Me.RibbonControl1
Me.ADDED_WHOTextBoxAutoAttribut.Name = "ADDED_WHOTextBoxAutoAttribut"
Me.ADDED_WHOTextBoxAutoAttribut.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.ADDED_WHOTextBoxAutoAttribut.Properties.Appearance.Options.UseFont = True
- Me.ADDED_WHOTextBoxAutoAttribut.Size = New System.Drawing.Size(279, 20)
+ Me.ADDED_WHOTextBoxAutoAttribut.Size = New System.Drawing.Size(271, 20)
Me.ADDED_WHOTextBoxAutoAttribut.StyleController = Me.LayoutControlAutoIndexe
Me.ADDED_WHOTextBoxAutoAttribut.TabIndex = 19
'
@@ -1654,12 +1654,12 @@ Partial Class frmAdmin_Globix
'
Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "ADDED_WHEN", True))
Me.TextEdit3.Enabled = False
- Me.TextEdit3.Location = New System.Drawing.Point(361, 232)
+ Me.TextEdit3.Location = New System.Drawing.Point(369, 232)
Me.TextEdit3.MenuManager = Me.RibbonControl1
Me.TextEdit3.Name = "TextEdit3"
Me.TextEdit3.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TextEdit3.Properties.Appearance.Options.UseFont = True
- Me.TextEdit3.Size = New System.Drawing.Size(279, 20)
+ Me.TextEdit3.Size = New System.Drawing.Size(271, 20)
Me.TextEdit3.StyleController = Me.LayoutControlAutoIndexe
Me.TextEdit3.TabIndex = 20
'
@@ -1667,24 +1667,24 @@ Partial Class frmAdmin_Globix
'
Me.CHANGED_WHOTextEditAutoAttribut.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "CHANGED_WHO", True))
Me.CHANGED_WHOTextEditAutoAttribut.EditValue = ""
- Me.CHANGED_WHOTextEditAutoAttribut.Location = New System.Drawing.Point(817, 202)
+ Me.CHANGED_WHOTextEditAutoAttribut.Location = New System.Drawing.Point(825, 202)
Me.CHANGED_WHOTextEditAutoAttribut.MenuManager = Me.RibbonControl1
Me.CHANGED_WHOTextEditAutoAttribut.Name = "CHANGED_WHOTextEditAutoAttribut"
Me.CHANGED_WHOTextEditAutoAttribut.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CHANGED_WHOTextEditAutoAttribut.Properties.Appearance.Options.UseFont = True
- Me.CHANGED_WHOTextEditAutoAttribut.Size = New System.Drawing.Size(279, 20)
+ Me.CHANGED_WHOTextEditAutoAttribut.Size = New System.Drawing.Size(271, 20)
Me.CHANGED_WHOTextEditAutoAttribut.StyleController = Me.LayoutControlAutoIndexe
Me.CHANGED_WHOTextEditAutoAttribut.TabIndex = 21
'
'TextEdit5
'
Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "CHANGED_WHEN", True))
- Me.TextEdit5.Location = New System.Drawing.Point(817, 232)
+ Me.TextEdit5.Location = New System.Drawing.Point(825, 232)
Me.TextEdit5.MenuManager = Me.RibbonControl1
Me.TextEdit5.Name = "TextEdit5"
Me.TextEdit5.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TextEdit5.Properties.Appearance.Options.UseFont = True
- Me.TextEdit5.Size = New System.Drawing.Size(279, 20)
+ Me.TextEdit5.Size = New System.Drawing.Size(271, 20)
Me.TextEdit5.StyleController = Me.LayoutControlAutoIndexe
Me.TextEdit5.TabIndex = 22
'
@@ -1705,7 +1705,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem15.Size = New System.Drawing.Size(207, 30)
Me.LayoutControlItem15.Text = "ID"
- Me.LayoutControlItem15.TextSize = New System.Drawing.Size(155, 13)
+ Me.LayoutControlItem15.TextSize = New System.Drawing.Size(163, 13)
'
'LayoutControlItem23
'
@@ -1716,7 +1716,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem23.Size = New System.Drawing.Size(124, 30)
Me.LayoutControlItem23.Text = "Reihenfolge"
Me.LayoutControlItem23.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize
- Me.LayoutControlItem23.TextSize = New System.Drawing.Size(57, 13)
+ Me.LayoutControlItem23.TextSize = New System.Drawing.Size(63, 13)
Me.LayoutControlItem23.TextToControlDistance = 5
'
'LayoutControlItem33
@@ -1737,7 +1737,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem34.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem34.Size = New System.Drawing.Size(561, 31)
Me.LayoutControlItem34.Text = "Attribut"
- Me.LayoutControlItem34.TextSize = New System.Drawing.Size(155, 13)
+ Me.LayoutControlItem34.TextSize = New System.Drawing.Size(163, 13)
'
'LayoutControlItem35
'
@@ -1749,7 +1749,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem35.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem35.Size = New System.Drawing.Size(362, 40)
Me.LayoutControlItem35.Text = "Fester oder Automatischer Wert"
- Me.LayoutControlItem35.TextSize = New System.Drawing.Size(155, 13)
+ Me.LayoutControlItem35.TextSize = New System.Drawing.Size(163, 13)
'
'LayoutControlItem14
'
@@ -1781,7 +1781,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem37.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem37.Size = New System.Drawing.Size(437, 40)
Me.LayoutControlItem37.Text = "FILE-Parameter"
- Me.LayoutControlItem37.TextSize = New System.Drawing.Size(155, 13)
+ Me.LayoutControlItem37.TextSize = New System.Drawing.Size(163, 13)
'
'LayoutControlItem39
'
@@ -1820,7 +1820,7 @@ Partial Class frmAdmin_Globix
Me.ADDED_WHOAutoAttribut.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.ADDED_WHOAutoAttribut.Size = New System.Drawing.Size(456, 30)
Me.ADDED_WHOAutoAttribut.Text = "Erstellt wer"
- Me.ADDED_WHOAutoAttribut.TextSize = New System.Drawing.Size(155, 13)
+ Me.ADDED_WHOAutoAttribut.TextSize = New System.Drawing.Size(163, 13)
'
'LayoutControlItem41
'
@@ -1830,7 +1830,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem41.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem41.Size = New System.Drawing.Size(456, 30)
Me.LayoutControlItem41.Text = "Erstellt wann"
- Me.LayoutControlItem41.TextSize = New System.Drawing.Size(155, 13)
+ Me.LayoutControlItem41.TextSize = New System.Drawing.Size(163, 13)
'
'CHANGED_WHOItemAutoAttribut
'
@@ -1840,7 +1840,7 @@ Partial Class frmAdmin_Globix
Me.CHANGED_WHOItemAutoAttribut.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.CHANGED_WHOItemAutoAttribut.Size = New System.Drawing.Size(456, 30)
Me.CHANGED_WHOItemAutoAttribut.Text = "Geändert wer"
- Me.CHANGED_WHOItemAutoAttribut.TextSize = New System.Drawing.Size(155, 13)
+ Me.CHANGED_WHOItemAutoAttribut.TextSize = New System.Drawing.Size(163, 13)
'
'LayoutControlItem43
'
@@ -1850,7 +1850,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem43.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem43.Size = New System.Drawing.Size(456, 30)
Me.LayoutControlItem43.Text = "Geändert wann"
- Me.LayoutControlItem43.TextSize = New System.Drawing.Size(155, 13)
+ Me.LayoutControlItem43.TextSize = New System.Drawing.Size(163, 13)
'
'LayoutControlItem45
'
@@ -1861,7 +1861,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem45.Size = New System.Drawing.Size(84, 30)
Me.LayoutControlItem45.Text = "Conn ID:"
Me.LayoutControlItem45.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize
- Me.LayoutControlItem45.TextSize = New System.Drawing.Size(43, 13)
+ Me.LayoutControlItem45.TextSize = New System.Drawing.Size(45, 13)
Me.LayoutControlItem45.TextToControlDistance = 5
'
'LayoutControlItem44
@@ -2087,10 +2087,10 @@ Partial Class frmAdmin_Globix
'
Me.ChangedWhenAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "CHANGED_WHEN", True))
Me.ChangedWhenAutoSelect.Enabled = False
- Me.ChangedWhenAutoSelect.Location = New System.Drawing.Point(505, 117)
+ Me.ChangedWhenAutoSelect.Location = New System.Drawing.Point(511, 117)
Me.ChangedWhenAutoSelect.MenuManager = Me.RibbonControl1
Me.ChangedWhenAutoSelect.Name = "ChangedWhenAutoSelect"
- Me.ChangedWhenAutoSelect.Size = New System.Drawing.Size(272, 20)
+ Me.ChangedWhenAutoSelect.Size = New System.Drawing.Size(266, 20)
Me.ChangedWhenAutoSelect.StyleController = Me.LayoutControl2
Me.ChangedWhenAutoSelect.TabIndex = 16
'
@@ -2103,10 +2103,10 @@ Partial Class frmAdmin_Globix
'
Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "ADDED_WHEN", True))
Me.TextEdit8.Enabled = False
- Me.TextEdit8.Location = New System.Drawing.Point(119, 117)
+ Me.TextEdit8.Location = New System.Drawing.Point(125, 117)
Me.TextEdit8.MenuManager = Me.RibbonControl1
Me.TextEdit8.Name = "TextEdit8"
- Me.TextEdit8.Size = New System.Drawing.Size(272, 20)
+ Me.TextEdit8.Size = New System.Drawing.Size(266, 20)
Me.TextEdit8.StyleController = Me.LayoutControl2
Me.TextEdit8.TabIndex = 15
'
@@ -2114,10 +2114,10 @@ Partial Class frmAdmin_Globix
'
Me.AddedWhoAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "ADDED_WHO", True))
Me.AddedWhoAutoSelect.Enabled = False
- Me.AddedWhoAutoSelect.Location = New System.Drawing.Point(119, 87)
+ Me.AddedWhoAutoSelect.Location = New System.Drawing.Point(125, 87)
Me.AddedWhoAutoSelect.MenuManager = Me.RibbonControl1
Me.AddedWhoAutoSelect.Name = "AddedWhoAutoSelect"
- Me.AddedWhoAutoSelect.Size = New System.Drawing.Size(272, 20)
+ Me.AddedWhoAutoSelect.Size = New System.Drawing.Size(266, 20)
Me.AddedWhoAutoSelect.StyleController = Me.LayoutControl2
Me.AddedWhoAutoSelect.TabIndex = 14
'
@@ -2125,18 +2125,18 @@ Partial Class frmAdmin_Globix
'
Me.ChangedWhoAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "CHANGED_WHO", True))
Me.ChangedWhoAutoSelect.Enabled = False
- Me.ChangedWhoAutoSelect.Location = New System.Drawing.Point(505, 87)
+ Me.ChangedWhoAutoSelect.Location = New System.Drawing.Point(511, 87)
Me.ChangedWhoAutoSelect.MenuManager = Me.RibbonControl1
Me.ChangedWhoAutoSelect.Name = "ChangedWhoAutoSelect"
- Me.ChangedWhoAutoSelect.Size = New System.Drawing.Size(272, 20)
+ Me.ChangedWhoAutoSelect.Size = New System.Drawing.Size(266, 20)
Me.ChangedWhoAutoSelect.StyleController = Me.LayoutControl2
Me.ChangedWhoAutoSelect.TabIndex = 13
'
'txtDateinameTest
'
- Me.txtDateinameTest.Location = New System.Drawing.Point(116, 60)
+ Me.txtDateinameTest.Location = New System.Drawing.Point(122, 60)
Me.txtDateinameTest.Name = "txtDateinameTest"
- Me.txtDateinameTest.Size = New System.Drawing.Size(664, 20)
+ Me.txtDateinameTest.Size = New System.Drawing.Size(658, 20)
Me.txtDateinameTest.TabIndex = 12
Me.txtDateinameTest.Text = "Example.pdf"
'
@@ -2153,18 +2153,18 @@ Partial Class frmAdmin_Globix
'REGEXTextBox
'
Me.REGEXTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "REGEX", True))
- Me.REGEXTextBox.Location = New System.Drawing.Point(116, 36)
+ Me.REGEXTextBox.Location = New System.Drawing.Point(122, 36)
Me.REGEXTextBox.Name = "REGEXTextBox"
- Me.REGEXTextBox.Size = New System.Drawing.Size(664, 20)
+ Me.REGEXTextBox.Size = New System.Drawing.Size(658, 20)
Me.REGEXTextBox.TabIndex = 6
'
'GUIDTextBoxAutoSelect
'
Me.GUIDTextBoxAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "GUID", True))
- Me.GUIDTextBoxAutoSelect.Location = New System.Drawing.Point(116, 12)
+ Me.GUIDTextBoxAutoSelect.Location = New System.Drawing.Point(122, 12)
Me.GUIDTextBoxAutoSelect.Name = "GUIDTextBoxAutoSelect"
Me.GUIDTextBoxAutoSelect.ReadOnly = True
- Me.GUIDTextBoxAutoSelect.Size = New System.Drawing.Size(48, 20)
+ Me.GUIDTextBoxAutoSelect.Size = New System.Drawing.Size(42, 20)
Me.GUIDTextBoxAutoSelect.TabIndex = 5
'
'LayoutControlGroup5
@@ -2183,7 +2183,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem55.Name = "LayoutControlItem55"
Me.LayoutControlItem55.Size = New System.Drawing.Size(772, 24)
Me.LayoutControlItem55.Text = "Regular Expression"
- Me.LayoutControlItem55.TextSize = New System.Drawing.Size(92, 13)
+ Me.LayoutControlItem55.TextSize = New System.Drawing.Size(98, 13)
'
'EmptySpaceItem9
'
@@ -2211,7 +2211,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem54.Name = "LayoutControlItem54"
Me.LayoutControlItem54.Size = New System.Drawing.Size(156, 24)
Me.LayoutControlItem54.Text = "ID"
- Me.LayoutControlItem54.TextSize = New System.Drawing.Size(92, 13)
+ Me.LayoutControlItem54.TextSize = New System.Drawing.Size(98, 13)
'
'LayoutControlItem53
'
@@ -2240,7 +2240,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem57.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem57.Size = New System.Drawing.Size(386, 30)
Me.LayoutControlItem57.Text = "Erstellt wer"
- Me.LayoutControlItem57.TextSize = New System.Drawing.Size(92, 13)
+ Me.LayoutControlItem57.TextSize = New System.Drawing.Size(98, 13)
'
'LayoutControlItem59
'
@@ -2252,7 +2252,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem59.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem59.Size = New System.Drawing.Size(386, 145)
Me.LayoutControlItem59.Text = "Geändert wann"
- Me.LayoutControlItem59.TextSize = New System.Drawing.Size(92, 13)
+ Me.LayoutControlItem59.TextSize = New System.Drawing.Size(98, 13)
'
'LayoutControlItem58
'
@@ -2264,7 +2264,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem58.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem58.Size = New System.Drawing.Size(386, 145)
Me.LayoutControlItem58.Text = "Erstellt wann"
- Me.LayoutControlItem58.TextSize = New System.Drawing.Size(92, 13)
+ Me.LayoutControlItem58.TextSize = New System.Drawing.Size(98, 13)
'
'LayoutControlItem56
'
@@ -2276,7 +2276,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem56.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
Me.LayoutControlItem56.Size = New System.Drawing.Size(386, 30)
Me.LayoutControlItem56.Text = "Geändert wer"
- Me.LayoutControlItem56.TextSize = New System.Drawing.Size(92, 13)
+ Me.LayoutControlItem56.TextSize = New System.Drawing.Size(98, 13)
'
'LayoutControlItem60
'
@@ -2285,7 +2285,7 @@ Partial Class frmAdmin_Globix
Me.LayoutControlItem60.Name = "LayoutControlItem60"
Me.LayoutControlItem60.Size = New System.Drawing.Size(772, 24)
Me.LayoutControlItem60.Text = "Dateiname für Test"
- Me.LayoutControlItem60.TextSize = New System.Drawing.Size(92, 13)
+ Me.LayoutControlItem60.TextSize = New System.Drawing.Size(98, 13)
'
'ListBox2
'
@@ -2715,7 +2715,7 @@ Partial Class frmAdmin_Globix
Me.Name = "frmAdmin_Globix"
Me.Ribbon = Me.RibbonControl1
Me.StatusBar = Me.RibbonStatusBar1
- Me.Text = "Global Indexer - Profil"
+ Me.Text = "File FLOW - Profil"
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GlobixDataset, System.ComponentModel.ISupportInitialize).EndInit()
diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx
index a117f6a2..c3704ee2 100644
--- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx
+++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx
@@ -159,9 +159,6 @@
350, 17
-
- 350, 17
-
17, 17
@@ -212,9 +209,6 @@
NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-
- 1161, 17
-
752, 56
@@ -304,9 +298,6 @@
IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-
- 17, 95
-
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@@ -510,12 +501,6 @@
MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-
- 246, 56
-
-
- 752, 56
-
17, 56
diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb
index a159dca3..6d9d8173 100644
--- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb
+++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb
@@ -25,9 +25,9 @@ Public Class frmAdmin_Globix
Try
VWIDB_DOCTYPE_LANGUAGETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString
TBDD_DOKUMENTARTTableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString
- Me.TBGI_REGEX_DOCTYPETableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString
- Me.VWIDB_OBJECT_STORETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString
- Me.VWIDB_BE_ATTRIBUTETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString
+ TBGI_REGEX_DOCTYPETableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString
+ VWIDB_OBJECT_STORETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString
+ VWIDB_BE_ATTRIBUTETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString
TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString
Me.VWIDB_DOCTYPE_LANGUAGETableAdapter.FillByLanguage(Me.DSIDB_Stammdaten.VWIDB_DOCTYPE_LANGUAGE, My.Application.User.Language)
diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_GlobixRelations.Designer.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_GlobixRelations.Designer.vb
index 888f8bd8..32606f5a 100644
--- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_GlobixRelations.Designer.vb
+++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_GlobixRelations.Designer.vb
@@ -81,7 +81,7 @@ Partial Class frmAdmin_GlobixRelations
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
- Me.RibbonControl1.Size = New System.Drawing.Size(1087, 160)
+ Me.RibbonControl1.Size = New System.Drawing.Size(1087, 158)
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
'
'RibbonPage1
@@ -97,10 +97,10 @@ Partial Class frmAdmin_GlobixRelations
'
'RibbonStatusBar1
'
- Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 739)
+ Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 737)
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
- Me.RibbonStatusBar1.Size = New System.Drawing.Size(1087, 22)
+ Me.RibbonStatusBar1.Size = New System.Drawing.Size(1087, 24)
'
'RibbonPage2
'
@@ -110,7 +110,7 @@ Partial Class frmAdmin_GlobixRelations
'XtraTabControl1
'
Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.XtraTabControl1.Location = New System.Drawing.Point(0, 160)
+ Me.XtraTabControl1.Location = New System.Drawing.Point(0, 158)
Me.XtraTabControl1.Name = "XtraTabControl1"
Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
Me.XtraTabControl1.Size = New System.Drawing.Size(1087, 579)
@@ -124,7 +124,7 @@ Partial Class frmAdmin_GlobixRelations
Me.XtraTabPage1.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.XtraTabPage1.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.XtraTabPage1.Name = "XtraTabPage1"
- Me.XtraTabPage1.Size = New System.Drawing.Size(1085, 553)
+ Me.XtraTabPage1.Size = New System.Drawing.Size(1085, 551)
Me.XtraTabPage1.Text = "User-Relations"
'
'LayoutControlUser
@@ -138,7 +138,7 @@ Partial Class frmAdmin_GlobixRelations
Me.LayoutControlUser.Location = New System.Drawing.Point(0, 0)
Me.LayoutControlUser.Name = "LayoutControlUser"
Me.LayoutControlUser.Root = Me.Root
- Me.LayoutControlUser.Size = New System.Drawing.Size(1085, 553)
+ Me.LayoutControlUser.Size = New System.Drawing.Size(1085, 551)
Me.LayoutControlUser.TabIndex = 0
Me.LayoutControlUser.Text = "LayoutControl1"
'
@@ -148,7 +148,7 @@ Partial Class frmAdmin_GlobixRelations
Me.SimpleButton2.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
Me.SimpleButton2.ImageOptions.Location = DevExpress.XtraEditors.ImageLocation.MiddleRight
Me.SimpleButton2.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
- Me.SimpleButton2.Location = New System.Drawing.Point(420, 505)
+ Me.SimpleButton2.Location = New System.Drawing.Point(420, 503)
Me.SimpleButton2.Name = "SimpleButton2"
Me.SimpleButton2.RightToLeft = System.Windows.Forms.RightToLeft.No
Me.SimpleButton2.Size = New System.Drawing.Size(275, 36)
@@ -161,7 +161,7 @@ Partial Class frmAdmin_GlobixRelations
Me.SimpleButton1.Appearance.Options.UseTextOptions = True
Me.SimpleButton1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far
Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
- Me.SimpleButton1.Location = New System.Drawing.Point(420, 465)
+ Me.SimpleButton1.Location = New System.Drawing.Point(420, 463)
Me.SimpleButton1.Name = "SimpleButton1"
Me.SimpleButton1.Size = New System.Drawing.Size(275, 36)
Me.SimpleButton1.StyleController = Me.LayoutControlUser
@@ -176,7 +176,7 @@ Partial Class frmAdmin_GlobixRelations
Me.GridControlUsersRelated.MainView = Me.GridViewUsersRelated
Me.GridControlUsersRelated.MenuManager = Me.RibbonControl1
Me.GridControlUsersRelated.Name = "GridControlUsersRelated"
- Me.GridControlUsersRelated.Size = New System.Drawing.Size(374, 506)
+ Me.GridControlUsersRelated.Size = New System.Drawing.Size(374, 504)
Me.GridControlUsersRelated.TabIndex = 8
Me.GridControlUsersRelated.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUsersRelated})
'
@@ -195,7 +195,7 @@ Partial Class frmAdmin_GlobixRelations
Me.GridControlDoctypesUsers.MainView = Me.GridViewDoctypesUser
Me.GridControlDoctypesUsers.MenuManager = Me.RibbonControl1
Me.GridControlDoctypesUsers.Name = "GridControlDoctypesUsers"
- Me.GridControlDoctypesUsers.Size = New System.Drawing.Size(275, 426)
+ Me.GridControlDoctypesUsers.Size = New System.Drawing.Size(275, 424)
Me.GridControlDoctypesUsers.TabIndex = 7
Me.GridControlDoctypesUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoctypesUser})
'
@@ -218,7 +218,7 @@ Partial Class frmAdmin_GlobixRelations
Me.GridControlFreeUsers.MainView = Me.GridViewFreeUsers
Me.GridControlFreeUsers.MenuManager = Me.RibbonControl1
Me.GridControlFreeUsers.Name = "GridControlFreeUsers"
- Me.GridControlFreeUsers.Size = New System.Drawing.Size(404, 506)
+ Me.GridControlFreeUsers.Size = New System.Drawing.Size(404, 504)
Me.GridControlFreeUsers.TabIndex = 6
Me.GridControlFreeUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFreeUsers})
'
@@ -239,7 +239,7 @@ Partial Class frmAdmin_GlobixRelations
Me.Root.GroupBordersVisible = False
Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.SimpleLabelItem1, Me.SimpleLabelItem2, Me.LayoutControlItem1, Me.LayoutControlItem2, Me.SimpleLabelItem3, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5})
Me.Root.Name = "Root"
- Me.Root.Size = New System.Drawing.Size(1085, 553)
+ Me.Root.Size = New System.Drawing.Size(1085, 551)
Me.Root.TextVisible = False
'
'SimpleLabelItem1
@@ -271,7 +271,7 @@ Partial Class frmAdmin_GlobixRelations
Me.LayoutControlItem1.Control = Me.GridControlFreeUsers
Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 23)
Me.LayoutControlItem1.Name = "LayoutControlItem1"
- Me.LayoutControlItem1.Size = New System.Drawing.Size(408, 510)
+ Me.LayoutControlItem1.Size = New System.Drawing.Size(408, 508)
Me.LayoutControlItem1.TextSize = New System.Drawing.Size(0, 0)
Me.LayoutControlItem1.TextVisible = False
'
@@ -280,7 +280,7 @@ Partial Class frmAdmin_GlobixRelations
Me.LayoutControlItem2.Control = Me.GridControlDoctypesUsers
Me.LayoutControlItem2.Location = New System.Drawing.Point(408, 23)
Me.LayoutControlItem2.Name = "LayoutControlItem2"
- Me.LayoutControlItem2.Size = New System.Drawing.Size(279, 430)
+ Me.LayoutControlItem2.Size = New System.Drawing.Size(279, 428)
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0)
Me.LayoutControlItem2.TextVisible = False
'
@@ -301,14 +301,14 @@ Partial Class frmAdmin_GlobixRelations
Me.LayoutControlItem3.Control = Me.GridControlUsersRelated
Me.LayoutControlItem3.Location = New System.Drawing.Point(687, 23)
Me.LayoutControlItem3.Name = "LayoutControlItem3"
- Me.LayoutControlItem3.Size = New System.Drawing.Size(378, 510)
+ Me.LayoutControlItem3.Size = New System.Drawing.Size(378, 508)
Me.LayoutControlItem3.TextSize = New System.Drawing.Size(0, 0)
Me.LayoutControlItem3.TextVisible = False
'
'LayoutControlItem4
'
Me.LayoutControlItem4.Control = Me.SimpleButton1
- Me.LayoutControlItem4.Location = New System.Drawing.Point(408, 453)
+ Me.LayoutControlItem4.Location = New System.Drawing.Point(408, 451)
Me.LayoutControlItem4.Name = "LayoutControlItem4"
Me.LayoutControlItem4.Size = New System.Drawing.Size(279, 40)
Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0)
@@ -317,7 +317,7 @@ Partial Class frmAdmin_GlobixRelations
'LayoutControlItem5
'
Me.LayoutControlItem5.Control = Me.SimpleButton2
- Me.LayoutControlItem5.Location = New System.Drawing.Point(408, 493)
+ Me.LayoutControlItem5.Location = New System.Drawing.Point(408, 491)
Me.LayoutControlItem5.Name = "LayoutControlItem5"
Me.LayoutControlItem5.Size = New System.Drawing.Size(279, 40)
Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
@@ -328,7 +328,7 @@ Partial Class frmAdmin_GlobixRelations
Me.XtraTabPage2.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.XtraTabPage2.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.XtraTabPage2.Name = "XtraTabPage2"
- Me.XtraTabPage2.Size = New System.Drawing.Size(1085, 553)
+ Me.XtraTabPage2.Size = New System.Drawing.Size(1085, 551)
Me.XtraTabPage2.Text = "Group-Relations"
'
'frmAdmin_GlobixRelations
@@ -343,7 +343,7 @@ Partial Class frmAdmin_GlobixRelations
Me.Name = "frmAdmin_GlobixRelations"
Me.Ribbon = Me.RibbonControl1
Me.StatusBar = Me.RibbonStatusBar1
- Me.Text = "Globix-Profiles - relations"
+ Me.Text = "File FLOW - Profil-Zuordnungen"
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl1.ResumeLayout(False)
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx.bak b/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx.bak
deleted file mode 100644
index 05ee9257..00000000
--- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx.bak
+++ /dev/null
@@ -1,516 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- False
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKcCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZCI+DQogICAgPHBhdGggZD0iTTI3LDE0aC05VjVj
- MC0wLjUtMC41LTEtMS0xaC0yYy0wLjUsMC0xLDAuNS0xLDF2OUg1Yy0wLjUsMC0xLDAuNS0xLDF2MmMw
- LDAuNSwwLjUsMSwxLDFoOXY5ICAgYzAsMC41LDAuNSwxLDEsMWgyYzAuNSwwLDEtMC41LDEtMXYtOWg5
- YzAuNSwwLDEtMC41LDEtMXYtMkMyOCwxNC41LDI3LjUsMTQsMjcsMTR6IiBjbGFzcz0iR3JlZW4iIC8+
- DQogIDwvZz4NCjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGQBAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBlbmFibGUt
- YmFja2dyb3VuZD0ibmV3IDAgMCAzMiAzMiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgaWQ9IkxheWVyXzEi
- Pg0KICA8cG9seWdvbiBwb2ludHM9IjI1LDQgMTYsMTMgNyw0IDQsNyAxMywxNiA0LDI1IDcsMjggMTYs
- MTkgMjUsMjggMjgsMjUgMTksMTYgMjgsNyAiIGZpbGw9IiNEMjRDMkYiIC8+DQo8L3N2Zz4L
-
-
-
- 477, 17
-
-
- 350, 17
-
-
- 17, 17
-
-
- 177, 17
-
-
- 732, 17
-
-
- 981, 17
-
-
- 246, 56
-
-
- 1161, 17
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABwFAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
- RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
- Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
- aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iUmVuYW1lXzFfIj4NCiAgICA8
- cGF0aCBkPSJNMi4xLDE2aDIuMmwwLjYtMi4zaDMuMkw4LjgsMTZIMTFMNy44LDZINS40TDIuMSwxNnog
- TTYuNCw4LjdjMC4xLTAuMywwLjEtMC42LDAuMS0wLjloMC4xICAgYzAsMC4zLDAuMSwwLjYsMC4xLDAu
- OWwxLDMuM0g1LjRMNi40LDguN3ogTTE3LjUsMTAuNmMwLjYtMC4yLDEuMS0wLjUsMS41LTAuOWMwLjQt
- MC40LDAuNi0wLjksMC42LTEuNGMwLTAuNy0wLjMtMS4zLTAuOS0xLjcgICBDMTguMSw2LjIsMTcuMSw2
- LDE1LjksNkgxMnY5LjlWMTZoNGMxLjIsMCwyLjItMC4yLDIuOS0wLjhDMTkuNywxNC42LDIwLDE0LDIw
- LDEzYzAtMC42LTAuMi0xLjItMC43LTEuNiAgIEMxOC45LDExLDE4LjMsMTAuNywxNy41LDEwLjZ6IE0x
- NC40LDcuN2gwLjljMS4xLDAsMS43LDAuNCwxLjcsMS4xYzAsMC40LTAuMSwwLjctMC40LDAuOUMxNi40
- LDkuOSwxNiwxMCwxNS41LDEwaC0xLjFWNy43eiAgICBNMTcsMTMuOGMtMC4zLDAuMi0wLjgsMC40LTEu
- MywwLjRoLTEuM3YtMi42aDEuM2MwLjUsMCwwLjksMC4xLDEuMywwLjNjMC4zLDAuMiwwLjUsMC42LDAu
- NSwwLjlDMTcuNSwxMy4zLDE3LjQsMTMuNiwxNywxMy44eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxw
- YXRoIGQ9Ik0yNywxOWwtOCw4bC00LTRsOC04TDI3LDE5eiBNMjgsMThsMS43LTEuN2MwLjQtMC40LDAu
- NC0xLDAtMS4zTDI3LDEyLjNjLTAuNC0wLjQtMS0wLjQtMS4zLDBMMjQsMTRMMjgsMTh6ICAgIE0xNCwy
- NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-
-
-
- 752, 56
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKEDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlVzZXIiPg0KICAgIDxwYXRoIGQ9Ik0xMCw5LjljLTAu
- MSwwLjUsMC4yLDAuOSwwLjQsMS40YzAuMiwwLjUtMC4xLDEuNywwLjksMS42YzAsMCwwLDAuMSwwLDAu
- MmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBjMi43LDAsNC4yLTIuNiw0LjctNC45YzAsMCwwLTAuMSww
- LTAuMWMxLDAuMSwwLjYtMS4xLDAuOS0xLjZjMC4yLTAuNSwwLjQtMC45LDAuMy0xLjRjLTAuMS0wLjQt
- MC40LTAuNC0wLjUtMC4zICAgYzEuOC00LjktMS4xLTQuNy0xLjEtNC43UzIwLDIsMTQuOCwyQzEwLDIs
- OS40LDYsMTAuNSw5LjZDMTAuNCw5LjYsMTAuMSw5LjcsMTAsOS45eiIgY2xhc3M9IkJsYWNrIiAvPg0K
- ICAgIDxwYXRoIGQ9Ik0yMCwxOGMtMC44LDEuNS0yLjEsNC00LDRjLTEuOSwwLTMuMi0yLjUtNC00Yy0y
- LjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41QzI4LDE5LjEsMjIuMywyMS40LDIwLDE4eiIgY2xhc3M9
- IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEoIAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iRGVmaW5lZE5hbWVVc2VJbkZvcm11bGEiIHN0eWxlPSJlbmFibGUtYmFj
- a2dyb3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbHVle2Zp
- bGw6IzExNzdENzt9CgkuQmxhY2t7ZmlsbDojNzI3MjcyO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTcs
- MjBsLTctN1Y5bDctN2gyMmMwLjYsMCwxLDAuNCwxLDF2MTZjMCwwLjYtMC40LDEtMSwxaC04LjRsMC41
- LTJoMi4zSDI4VjRINy44TDIsOS44djIuM0w3LjgsMThoMy44aDEuNiAgbC0wLjQsMkg3eiBNNiwxMWMw
- LDEuMSwwLjksMiwyLDJzMi0wLjksMi0yYzAtMS4xLTAuOS0yLTItMlM2LDkuOSw2LDExeiIgY2xhc3M9
- IkJsYWNrIiAvPg0KICA8cGF0aCBkPSJNMTkuOSwxNGgyLjNsLTAuNSwyaC0yLjNsLTIuMSw4LjdjLTAu
- MywxLjItMC43LDIuMi0xLjIsM2MtMC42LDAuOC0xLjIsMS40LTIsMS44Yy0wLjcsMC40LTEuNiwwLjYt
- Mi42LDAuNiAgYy0xLDAtMS44LTAuMi0yLjMtMC42Yy0wLjctMC41LTEtMS0xLTEuNmMwLTAuNSwwLjIt
- MC45LDAuNS0xLjJjMC4zLTAuMywwLjctMC41LDEuMi0wLjVjMC4yLDAsMC40LDAsMC42LDAuMSAgYzAu
- MiwwLjEsMC40LDAuMiwwLjYsMC4zYzAuMSwwLjEsMC4zLDAuMywwLjYsMC43YzAuMSwwLjIsMC4zLDAu
- MywwLjQsMC4zYzAuMSwwLjEsMC4yLDAuMSwwLjQsMC4xYzAuNSwwLDAuOS0wLjYsMS4xLTEuN2wyLjIt
- OS45ICBoLTEuN2wwLjQtMmgxLjdsMC40LTEuN2MwLjMtMS40LDEtMi40LDItMy4yYzEtMC44LDIuMy0x
- LjEsNC0xLjFjMC44LDAsMS41LDAuMSwxLjksMC4zYzAuNSwwLjIsMC44LDAuNSwxLjEsMC44ICBjMC4z
- LDAuNCwwLjQsMC43LDAuNCwxLjFjMCwwLjMtMC4xLDAuNi0wLjIsMC45Yy0wLjIsMC4zLTAuNCwwLjUt
- MC42LDAuNmMtMC4zLDAuMS0wLjYsMC4yLTAuOSwwLjJjLTAuMywwLTAuNi0wLjEtMC45LTAuMiAgYy0w
- LjMtMC4xLTAuNS0wLjMtMC44LTAuNmMtMC4zLTAuMy0wLjUtMC41LTAuNi0wLjZjLTAuMS0wLjEtMC4z
- LTAuMS0wLjQtMC4xYy0wLjMsMC0wLjYsMC4xLTAuOCwwLjRjLTAuMSwwLjItMC4zLDAuNi0wLjQsMS4z
- ICBMMTkuOSwxNHogTTIyLjUsMjIuM2wxLjIsMi40YzAuNy0wLjksMS4xLTEuNSwxLjMtMS43YzAuMy0w
- LjMsMC42LTAuNSwxLTAuN3MwLjYtMC4yLDAuOS0wLjJjMC4zLDAsMC42LDAuMSwwLjgsMC4zICBzMC4z
- LDAuNCwwLjMsMC43YzAsMC4yLDAsMC40LTAuMSwwLjVzLTAuMiwwLjMtMC4zLDAuNHMtMC4zLDAuMi0w
- LjQsMC4yYy0wLjEsMC0wLjIsMC0wLjUsMC4xYy0wLjMsMC0wLjUsMC0wLjYsMC4xICBjLTAuMSwwLTAu
- MiwwLjEtMC40LDAuMmMtMC4yLDAuMS0wLjMsMC4zLTAuNSwwLjRjLTAuMSwwLjEtMC4zLDAuNC0wLjgs
- MS4xbDAuNCwwLjhjMC4zLDAuNiwwLjYsMS4xLDAuOCwxLjIgIGMwLjIsMC4yLDAuNCwwLjMsMC42LDAu
- M2MwLjMsMCwwLjctMC4yLDEuMS0wLjZsMC44LDFjLTAuOSwwLjgtMS44LDEuMi0yLjcsMS4yYy0wLjQs
- MC0wLjctMC4xLTEtMC4yYy0wLjMtMC4xLTAuNi0wLjMtMC44LTAuNiAgYy0wLjItMC4yLTAuNS0wLjYt
- MC43LTEuMWwtMC40LTAuOWMtMC40LDAuNy0wLjgsMS4yLTEuMiwxLjZjLTAuNCwwLjQtMC44LDAuNy0x
- LjEsMC45Yy0wLjMsMC4yLTAuNiwwLjItMC45LDAuMiAgYy0wLjIsMC0wLjQsMC0wLjYtMC4xYy0wLjEt
- MC4xLTAuMy0wLjItMC40LTAuNEMxOCwyOS4zLDE4LDI5LjIsMTgsMjljMC0wLjIsMC4xLTAuNCwwLjIt
- MC42YzAuMS0wLjIsMC4zLTAuMywwLjQtMC40ICBjMC4yLTAuMSwwLjUtMC4xLDAuOS0wLjFjMC4zLDAs
- MC41LTAuMSwwLjctMC4yYzAuMi0wLjEsMC40LTAuMiwwLjYtMC41YzAuMi0wLjIsMC41LTAuNywxLTEu
- NEwyMSwyNC4zaC0xLjFsMC4zLTEuNCAgYzAuNi0wLjEsMS4yLTAuMywxLjctMC42SDIyLjV6IiBjbGFz
- cz0iQmx1ZSIgLz4NCjwvc3ZnPgs=
-
-
-
- 17, 95
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFycm93MUxlZnQiPg0KICAgIDxwb2x5Z29uIHBvaW50
- cz0iMjgsMTQgMTQsMTQgMTQsMTMuMyAxNCw2IDQsMTYgMTQsMjYgMTQsMTguNyAxNCwxOCAyOCwxOCAg
- IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iQ2hhbmdlX0RhdGFfU291cmNlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91
- bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMx
- MTc3RDc7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9Cgkuc3Qw
- e29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTAsOFY0YzAtMi4yLDQuNS00LDEwLTRz
- MTAsMS44LDEwLDR2NEg4djMuOUMzLjQsMTEuNSwwLDkuOSwwLDh6IE04LDE5LjljLTQuNi0wLjQtOC0y
- LTgtMy45djQgIGMwLDEuOSwzLjQsMy41LDgsMy45VjE5Ljl6IE04LDE3Ljl2LTRjLTQuNi0wLjQtOC0y
- LTgtMy45djRDMCwxNS45LDMuNCwxNy41LDgsMTcuOXoiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDxwYXRo
- IGQ9Ik0zMSw2SDdDNi41LDYsNiw2LjUsNiw3djI0YzAsMC41LDAuNSwxLDEsMWgyNGMwLjUsMCwxLTAu
- NSwxLTFWN0MzMiw2LjUsMzEuNSw2LDMxLDZ6IE0zMCwzMEg4VjhoMjJWMzB6IiBjbGFzcz0iQmxhY2si
- IC8+DQogIDxnIGNsYXNzPSJzdDAiPg0KICAgIDxwYXRoIGQ9Ik0xNiwxNHYtNGgxMnY0SDE2eiBNMTQs
- MTBoLTR2NGg0VjEweiBNMTQsMTZoLTR2MTJoNFYxNnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQog
- IDxwYXRoIGQ9Ik0yNSwxNmwtNCw0aDNjMCwyLjItMS44LDQtNCw0di0zbC00LDRsNCw0di0zYzMuMyww
- LDYtMi43LDYtNmgzTDI1LDE2eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
- WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD
- MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls
- bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl
- Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w
- LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs
- YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw
- IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH
- cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJQCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iT3BlbiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
- MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJLnN0
- MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8cGF0aCBkPSJN
- Mi4yLDI1LjJsNS41LTEyYzAuMy0wLjcsMS0xLjIsMS44LTEuMkgyNlY5YzAtMC42LTAuNC0xLTEtMUgx
- MlY1YzAtMC42LTAuNC0xLTEtMUgzQzIuNCw0LDIsNC40LDIsNXYyMCAgIGMwLDAuMiwwLDAuMywwLjEs
- MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K
- ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx
- NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw==
-
-
-
- 511, 95
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj
- aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r
- K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml
- rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz
- xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR
- 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh
- zQ3o4jAe74EDiAAAAABJRU5ErkJggg==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
- QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
- MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
- cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
- LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
- NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
- MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
- MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
- MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
- IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
- NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
- ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
- LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
- QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJYEAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
- RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
- Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
- aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iUGFyYW1ldGVycyI+DQogICAgPHBhdGggZD0i
- TTE0LDI2SDZWNGgxOHYxMmMwLjcsMC4yLDEuNCwwLjUsMiwwLjhWM2MwLTAuNi0wLjQtMS0xLTFINUM0
- LjQsMiw0LDIuNCw0LDN2MjRjMCwwLjYsMC40LDEsMSwxaDkuOCAgIEMxNC41LDI3LjQsMTQuMiwyNi43
- LDE0LDI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0zMCwyNXYtMmwtMi4yLTAuNGMt
- MC4yLTAuNi0wLjQtMS4zLTAuOC0xLjhsMS4zLTEuOGwtMS40LTEuNGwtMS44LDEuM2MtMC41LTAuMy0x
- LjItMC42LTEuOC0wLjdMMjMsMTZoLTIgICBsLTAuNCwyLjJjLTAuNiwwLjItMS4zLDAuNC0xLjgsMC43
- TDE3LDE3LjZMMTUuNiwxOWwxLjMsMS44Yy0wLjMsMC41LTAuNiwxLjItMC44LDEuOEwxNCwyM3YybDIu
- MiwwLjRjMC4yLDAuNiwwLjQsMS4zLDAuOCwxLjggICBMMTUuNywyOWwxLjQsMS40bDEuOC0xLjNjMC41
- LDAuMywxLjIsMC42LDEuOCwwLjdMMjEsMzJoMmwwLjQtMi4yYzAuNi0wLjIsMS4zLTAuNCwxLjgtMC43
- bDEuOCwxLjNsMS40LTEuNGwtMS4zLTEuOCAgIGMwLjMtMC41LDAuNi0xLjIsMC44LTEuOEwzMCwyNXog
- TTIyLDI2Yy0xLjEsMC0yLTAuOS0yLTJzMC45LTIsMi0yczIsMC45LDIsMlMyMy4xLDI2LDIyLDI2eiIg
- Y2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKEDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlVzZXIiPg0KICAgIDxwYXRoIGQ9Ik0xMCw5LjljLTAu
- MSwwLjUsMC4yLDAuOSwwLjQsMS40YzAuMiwwLjUtMC4xLDEuNywwLjksMS42YzAsMCwwLDAuMSwwLDAu
- MmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBjMi43LDAsNC4yLTIuNiw0LjctNC45YzAsMCwwLTAuMSww
- LTAuMWMxLDAuMSwwLjYtMS4xLDAuOS0xLjZjMC4yLTAuNSwwLjQtMC45LDAuMy0xLjRjLTAuMS0wLjQt
- MC40LTAuNC0wLjUtMC4zICAgYzEuOC00LjktMS4xLTQuNy0xLjEtNC43UzIwLDIsMTQuOCwyQzEwLDIs
- OS40LDYsMTAuNSw5LjZDMTAuNCw5LjYsMTAuMSw5LjcsMTAsOS45eiIgY2xhc3M9IkJsYWNrIiAvPg0K
- ICAgIDxwYXRoIGQ9Ik0yMCwxOGMtMC44LDEuNS0yLjEsNC00LDRjLTEuOSwwLTMuMi0yLjUtNC00Yy0y
- LjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41QzI4LDE5LjEsMjIuMywyMS40LDIwLDE4eiIgY2xhc3M9
- IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALkEAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
- YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
- Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iR3JvdXBCeVJl
- c291cmNlXzFfIj4NCiAgICA8cGF0aCBkPSJNNi41LDcuNkM1LjQsNCw2LDAsMTAuOCwwYzUuMiwwLDUu
- NSwyLjksNS41LDIuOXMyLjktMC4yLDEuMSw0LjdjMC4xLDAsMC41LTAuMSwwLjUsMC4zICAgYzAuMSww
- LjUsMCwwLjktMC4zLDEuNGMtMC4xLDAuMi0wLjEsMC40LTAuMSwwLjdIMTNjLTAuNSwwLTEsMC41LTEs
- MXY1Yy0yLjYsMC00LjEtMi42LTQuNy00LjljMC0wLjEsMC0wLjEsMC0wLjIgICBjLTEsMC4xLTAuNi0x
- LjEtMC45LTEuNkM2LjIsOC44LDUuOSw4LjQsNiw3LjlDNi4xLDcuNyw2LjQsNy42LDYuNSw3LjZ6IE0x
- MiwyMGMtMS45LDAtMy4yLTIuNS00LTRjLTIuMywzLjUtOCwxLTgsOC41VjI2aDEyVjIweiIgY2xhc3M9
- IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTE0LDEzdjE4YzAsMC42LDAuNCwxLDEsMWgxNmMwLjYsMCwx
- LTAuNCwxLTFWMTNjMC0wLjYtMC40LTEtMS0xSDE1QzE0LjQsMTIsMTQsMTIuNCwxNCwxM3ogTTMwLDMw
- SDE2VjE2ICAgaDE0VjMweiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxnIGNsYXNzPSJzdDAiPg0KICAg
- ICAgPHBhdGggZD0iTTI4LDE4aC00djRoNFYxOHogTTIyLDI0aC00djRoNFYyNHogTTI4LDI0aC00djRo
- NFYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8L2c+DQogICAgPHJlY3QgeD0iMTgiIHk9IjE4IiB3
- aWR0aD0iNCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0K
- PC9zdmc+Cw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
- Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN
- YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz
- MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4
- QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs
- MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9
- IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x
- VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx
- LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x
- LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM
- MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-
-
-
- 17, 56
-
-
- 502, 56
-
-
- 1004, 56
-
-
- 267, 95
-
-
- 765, 95
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_GlobixRelations.resx.bak b/GUIs.ZooFlow/Administration/frmAdmin_GlobixRelations.resx.bak
deleted file mode 100644
index 1b038ac4..00000000
--- a/GUIs.ZooFlow/Administration/frmAdmin_GlobixRelations.resx.bak
+++ /dev/null
@@ -1,227 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAF4CAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlByZXZpb3VzVmlldyI+DQogICAgPHBhdGggZD0i
- TTE2LDJDOC4zLDIsMiw4LjMsMiwxNnM2LjMsMTQsMTQsMTRzMTQtNi4zLDE0LTE0UzIzLjcsMiwxNiwy
- eiBNMjQsMThoLTh2NmwtOC04bDgtOHY2aDhWMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9z
- dmc+Cw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFsCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ik5leHRWaWV3Ij4NCiAgICA8cGF0aCBkPSJNMTYs
- MkM4LjMsMiwyLDguMywyLDE2czYuMywxNCwxNCwxNHMxNC02LjMsMTQtMTRTMjMuNywyLDE2LDJ6IE0x
- NiwyNHYtNkg4di00aDhWOGw4LDhMMTYsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+
- Cw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKEDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlVzZXIiPg0KICAgIDxwYXRoIGQ9Ik0xMCw5LjljLTAu
- MSwwLjUsMC4yLDAuOSwwLjQsMS40YzAuMiwwLjUtMC4xLDEuNywwLjksMS42YzAsMCwwLDAuMSwwLDAu
- MmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBjMi43LDAsNC4yLTIuNiw0LjctNC45YzAsMCwwLTAuMSww
- LTAuMWMxLDAuMSwwLjYtMS4xLDAuOS0xLjZjMC4yLTAuNSwwLjQtMC45LDAuMy0xLjRjLTAuMS0wLjQt
- MC40LTAuNC0wLjUtMC4zICAgYzEuOC00LjktMS4xLTQuNy0xLjEtNC43UzIwLDIsMTQuOCwyQzEwLDIs
- OS40LDYsMTAuNSw5LjZDMTAuNCw5LjYsMTAuMSw5LjcsMTAsOS45eiIgY2xhc3M9IkJsYWNrIiAvPg0K
- ICAgIDxwYXRoIGQ9Ik0yMCwxOGMtMC44LDEuNS0yLjEsNC00LDRjLTEuOSwwLTMuMi0yLjUtNC00Yy0y
- LjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41QzI4LDE5LjEsMjIuMywyMS40LDIwLDE4eiIgY2xhc3M9
- IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACEEAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iQWxsb3dfVXNlcnNfdG9fRWRpdF9SYW5nZXMiIHN0eWxlPSJlbmFibGUt
- YmFja2dyb3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbGFj
- a3tmaWxsOiM3MjcyNzI7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5zdDB7b3BhY2l0eTowLjU7fQo8
- L3N0eWxlPg0KICA8cGF0aCBkPSJNMTgsNHY2aC04VjRIMTh6IE04LDEwVjRIMHY2SDh6IE04LDE4di02
- SDB2Nkg4eiBNMTgsMTh2LTZoLTh2NkgxOHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8ZyBjbGFzcz0ic3Qw
- Ij4NCiAgICA8cGF0aCBkPSJNMjAsNGg4djZoLThWNHogTTgsMjZ2LTZIMHY2SDh6IE0xOCwyMi45VjIw
- aC04djZoNC41QzE1LjMsMjQuMSwxNi44LDIzLjQsMTgsMjIuOXoiIGNsYXNzPSJCbGFjayIgLz4NCiAg
- PC9nPg0KICA8cGF0aCBkPSJNMjAuMywxOC40Yy0wLjItMC4zLTAuMy0wLjYtMC4zLTFjMC0wLjIsMC4y
- LTAuMiwwLjMtMC4yYy0wLjctMi41LDAtNSwyLjktNS4yYzMtMC4yLDMuNywyLDMuNywyICBzMS42LTAu
- MSwwLjcsMy4yYzAuMSwwLDAuMy0wLjEsMC40LDAuMmMwLjEsMC40LDAsMC42LTAuMiwxYy0wLjIsMC4z
- LDAuMSwxLjEtMC42LDEuMWMwLDAsMCwwLjEsMCwwLjFDMjYuOCwyMS4yLDI1LjgsMjMsMjQsMjMgIGMt
- MS44LDAtMi44LTEuNy0zLjItMy40YzAsMCwwLTAuMSwwLTAuMUMyMC4yLDE5LjYsMjAuNCwxOC44LDIw
- LjMsMTguNHogTTI2LjcsMjMuMmMtMC41LDEtMS40LDIuOC0yLjcsMi44Yy0xLjMsMC0yLjEtMS44LTIu
- Ni0yLjkgIEMxOS45LDI1LjYsMTYsMjMuOCwxNiwyOXYxaDE2di0xQzMyLDIzLjksMjguMiwyNS41LDI2
- LjcsMjMuMnoiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
- Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN
- YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz
- MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4
- QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs
- MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9
- IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x
- VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx
- LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x
- LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM
- MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx.bak b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx.bak
deleted file mode 100644
index 8e679d2e..00000000
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx.bak
+++ /dev/null
@@ -1,165 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGkEAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
- MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
- bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU2F2ZUFuZENsb3NlIj4NCiAgICA8
- cGF0aCBkPSJNNiwxNlY2SDNDMi40LDYsMiw2LjQsMiw3djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYs
- MCwxLTAuNCwxLTFWMTZINnogTTYsMjZ2LTZoMTZ2Nkg2eiBNMTYsNkg4djhoOFY2eiAgICBNMTIsMTJo
- LTJWOGgyVjEyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yOSwySDE5Yy0wLjUsMC0x
- LDAuNS0xLDF2MTBjMCwwLjUsMC41LDEsMSwxaDEwYzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41
- LDIsMjksMnogTTI3LjcsMTAuNCAgIGMwLjQsMC40LDAuNCwxLDAsMS4zYy0wLjQsMC40LTEsMC40LTEu
- MywwTDI0LDkuM2wtMi40LDIuNGMtMC40LDAuNC0xLDAuNC0xLjMsMGMtMC40LTAuNC0wLjQtMSwwLTEu
- M0wyMi43LDhsLTIuNC0yLjQgICBjLTAuNC0wLjQtMC40LTEsMC0xLjNjMC40LTAuNCwxLTAuNCwxLjMs
- MEwyNCw2LjdsMi40LTIuNGMwLjQtMC40LDEtMC40LDEuMywwYzAuNCwwLjQsMC40LDEsMCwxLjNMMjUu
- Myw4TDI3LjcsMTAuNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-
-
-
- 350, 17
-
-
- 17, 17
-
-
- 17, 56
-
-
- 177, 17
-
-
- 602, 17
-
-
- 278, 56
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.resx.bak b/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.resx.bak
deleted file mode 100644
index b42266c6..00000000
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.resx.bak
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAF4CAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlByZXZpb3VzVmlldyI+DQogICAgPHBhdGggZD0i
- TTE2LDJDOC4zLDIsMiw4LjMsMiwxNnM2LjMsMTQsMTQsMTRzMTQtNi4zLDE0LTE0UzIzLjcsMiwxNiwy
- eiBNMjQsMThoLTh2NmwtOC04bDgtOHY2aDhWMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9z
- dmc+Cw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFsCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ik5leHRWaWV3Ij4NCiAgICA8cGF0aCBkPSJNMTYs
- MkM4LjMsMiwyLDguMywyLDE2czYuMywxNCwxNCwxNHMxNC02LjMsMTQtMTRTMjMuNywyLDE2LDJ6IE0x
- NiwyNHYtNkg4di00aDhWOGw4LDhMMTYsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+
- Cw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
- Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN
- YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz
- MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4
- QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs
- MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9
- IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x
- VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx
- LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x
- LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM
- MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx.bak b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx.bak
deleted file mode 100644
index 48512134..00000000
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx.bak
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGkEAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
- MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
- bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU2F2ZUFuZENsb3NlIj4NCiAgICA8
- cGF0aCBkPSJNNiwxNlY2SDNDMi40LDYsMiw2LjQsMiw3djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYs
- MCwxLTAuNCwxLTFWMTZINnogTTYsMjZ2LTZoMTZ2Nkg2eiBNMTYsNkg4djhoOFY2eiAgICBNMTIsMTJo
- LTJWOGgyVjEyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yOSwySDE5Yy0wLjUsMC0x
- LDAuNS0xLDF2MTBjMCwwLjUsMC41LDEsMSwxaDEwYzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41
- LDIsMjksMnogTTI3LjcsMTAuNCAgIGMwLjQsMC40LDAuNCwxLDAsMS4zYy0wLjQsMC40LTEsMC40LTEu
- MywwTDI0LDkuM2wtMi40LDIuNGMtMC40LDAuNC0xLDAuNC0xLjMsMGMtMC40LTAuNC0wLjQtMSwwLTEu
- M0wyMi43LDhsLTIuNC0yLjQgICBjLTAuNC0wLjQtMC40LTEsMC0xLjNjMC40LTAuNCwxLTAuNCwxLjMs
- MEwyNCw2LjdsMi40LTIuNGMwLjQtMC40LDEtMC40LDEuMywwYzAuNCwwLjQsMC40LDEsMCwxLjNMMjUu
- Myw4TDI3LjcsMTAuNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-
-
-
- 177, 17
-
-
- 17, 17
-
-
- 443, 17
-
-
- 17, 56
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.resx.bak b/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.resx.bak
deleted file mode 100644
index b4aad41f..00000000
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.resx.bak
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACQCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkNoZWNrIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjI3
- LDUgMTEsMjEgNSwxNSAyLDE4IDExLDI3IDMwLDggICIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8
- L3N2Zz4L
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
- MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5
- bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww
- LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt
- NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si
- IC8+DQo8L3N2Zz4L
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
- YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
- Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4N
- CiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xOC44LDE2bDYuOS02LjljMC40LTAuNCwwLjQtMSwwLTEu
- NGwtMS40LTEuNGMtMC40LTAuNC0xLTAuNC0xLjQsMEwxNiwxMy4yTDkuMSw2LjNjLTAuNC0wLjQtMS0w
- LjQtMS40LDAgICAgTDYuMyw3LjdjLTAuNCwwLjQtMC40LDEsMCwxLjRsNi45LDYuOWwtNi45LDYuOWMt
- MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks
- Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44
- LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
- MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
- bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQWJvdXQiPg0KICAgIDxwYXRoIGQ9
- Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs
- MnogTTE2LDZjMS4xLDAsMiwwLjksMiwycy0wLjksMi0yLDJzLTItMC45LTItMiAgIFMxNC45LDYsMTYs
- NnogTTIwLDI0aC04di0yaDJ2LThoLTJ2LTJoMmg0djEwaDJWMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg
- PC9nPg0KPC9zdmc+Cw==
-
-
-
- 845, 17
-
-
- 177, 17
-
-
- 177, 17
-
-
- 17, 17
-
-
- 427, 17
-
-
- 672, 17
-
-
- 845, 17
-
-
- 17, 17
-
-
- 1067, 17
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
index 6dbe6085..8cf13068 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
@@ -437,10 +437,10 @@ Partial Class frmAdmin_Start
Me.TreeListMenu.AppendNode(New Object() {"Configurations"}, 4, 10, 10, -1, "IDB_DOCTYPE_CONFIG")
Me.TreeListMenu.AppendNode(New Object() {"Relation Business Entity"}, 4, 9, 9, -1, "DOCTYPE_BE")
Me.TreeListMenu.AppendNode(New Object() {"Object Stores"}, 0, "IDB_OBJECT_STORES")
- Me.TreeListMenu.AppendNode(New Object() {"Global Indexer"}, -1, 6, 6, -1, "")
+ Me.TreeListMenu.AppendNode(New Object() {"File FLOW"}, -1, 6, 6, -1, "")
Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 8, 4, 4, -1, "GI_PROFILES")
Me.TreeListMenu.AppendNode(New Object() {"Profile Relations"}, 9, 9, 9, -1, "GI_RELATIONS")
- Me.TreeListMenu.AppendNode(New Object() {"Clipboard Watcher"}, -1, 7, 7, -1, "")
+ Me.TreeListMenu.AppendNode(New Object() {"Search FLOW"}, -1, 7, 7, -1, "")
Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 11, 4, 4, -1, "CW_PROFILES")
Me.TreeListMenu.AppendNode(New Object() {"Administration"}, -1)
Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 13, 3, 3, -1, "META_SOURCE_SQL")
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx.bak b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx.bak
deleted file mode 100644
index 2e063e9b..00000000
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx.bak
+++ /dev/null
@@ -1,325 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0
- QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0
- LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N
- Cjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJlZnJlc2hfMV8iPg0KICAgIDxwYXRoIGQ9Ik0yNC41
- LDcuNUMyMi4zLDUuMywxOS4zLDQsMTYsNEMxMC4xLDQsNS4xLDguMyw0LjIsMTRoNC4xYzAuOS0zLjQs
- NC02LDcuNy02YzIuMiwwLDQuMiwwLjksNS42LDIuNEwxOCwxNCAgIGg1LjdoNC4xSDI4VjRMMjQuNSw3
- LjV6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTE2LjIsMjRjLTIuMiwwLTQuMi0wLjkt
- NS42LTIuNGwzLjYtMy42SDguNEg0LjRINC4ydjEwbDMuNS0zLjVjMi4yLDIuMiw1LjIsMy41LDguNSwz
- LjUgICBDMjIuMSwyOCwyNywyMy43LDI4LDE4aC00LjFDMjMsMjEuNCwxOS45LDI0LDE2LjIsMjR6IiBj
- bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRlbGV0ZUNpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0x
- Niw0QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHog
- TTIzLjEsMjAuMmwtMi44LDIuOEwxNiwxOC44bC00LjIsNC4yICAgbC0yLjgtMi44bDQuMi00LjJsLTQu
- Mi00LjJsMi44LTIuOGw0LjIsNC4ybDQuMi00LjJsMi44LDIuOEwxOC44LDE2TDIzLjEsMjAuMnoiIGNs
- YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACcCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iRHVwbGljYXRlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAg
- MCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDojNzI3MjcyO30K
- PC9zdHlsZT4NCiAgPHBhdGggZD0iTTIxLDJIMTFjLTAuNSwwLTEsMC41LTEsMXY1SDVDNC41LDgsNCw4
- LjUsNCw5djIwYzAsMC41LDAuNSwxLDEsMWgxNmMwLjUsMCwxLTAuNSwxLTF2LTVoNWMwLjUsMCwxLTAu
- NSwxLTEgIFY5TDIxLDJ6IE0yMCwyOEg2VjEwaDh2NWMwLDAuNSwwLjUsMSwxLDFoNVYyOHogTTI2LDIy
- aC00di03bC03LTdoLTNWNGg4djVjMCwwLjUsMC41LDEsMSwxaDVWMjJ6IiBjbGFzcz0iQmxhY2siIC8+
- DQo8L3N2Zz4L
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKMCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkluZm8iPg0KICAgIDxwYXRoIGQ9Ik0xNiwyQzguMywy
- LDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYsMnogTTE2LDZjMS4x
- LDAsMiwwLjksMiwyYzAsMS4xLTAuOSwyLTIsMiAgIHMtMi0wLjktMi0yQzE0LDYuOSwxNC45LDYsMTYs
- NnogTTIwLDI0aC04di0yaDJ2LThoLTJ2LTJoMmg0djEwaDJWMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg
- PC9nPg0KPC9zdmc+Cw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAF8CAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
- UmVke2ZpbGw6I0QxMUMxQzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuR3JlZW57ZmlsbDojMDM5
- QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9Ildhcm5pbmdDaXJjbGVkMSI+DQogICAgPHBhdGggZD0iTTE2
- LDJDOC4zLDIsMiw4LjMsMiwxNnM2LjMsMTQsMTQsMTRzMTQtNi4zLDE0LTE0UzIzLjcsMiwxNiwyeiBN
- MTYsMjRjLTEuMSwwLTItMC45LTItMmMwLTEuMSwwLjktMiwyLTIgICBzMiwwLjksMiwyQzE4LDIzLjEs
- MTcuMSwyNCwxNiwyNHogTTE4LDE4aC00VjhoNFYxOHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwv
- c3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJlZnJlc2hfMV8iPg0KICAgIDxwYXRoIGQ9Ik0yNC41
- LDcuNUMyMi4zLDUuMywxOS4zLDQsMTYsNEMxMC4xLDQsNS4xLDguMyw0LjIsMTRoNC4xYzAuOS0zLjQs
- NC02LDcuNy02YzIuMiwwLDQuMiwwLjksNS42LDIuNEwxOCwxNCAgIGg1LjdoNC4xSDI4VjRMMjQuNSw3
- LjV6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTE2LjIsMjRjLTIuMiwwLTQuMi0wLjkt
- NS42LTIuNGwzLjYtMy42SDguNEg0LjRINC4ydjEwbDMuNS0zLjVjMi4yLDIuMiw1LjIsMy41LDguNSwz
- LjUgICBDMjIuMSwyOCwyNywyMy43LDI4LDE4aC00LjFDMjMsMjEuNCwxOS45LDI0LDE2LjIsMjR6IiBj
- bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
- Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN
- YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz
- MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4
- QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs
- MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9
- IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x
- VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx
- LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x
- LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM
- MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-
-
-
- 122, 17
-
-
- 396, 17
-
-
- 691, 17
-
-
- 531, 17
-
-
- 1043, 17
-
-
- 17, 56
-
-
- 1216, 17
-
-
- 264, 17
-
-
- 17, 17
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
- MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5
- bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww
- LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt
- NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si
- IC8+DQo8L3N2Zz4L
-
-
-
- 919, 17
-
-
- 277, 56
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
index dad8903a..179f7e85 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
@@ -30,12 +30,12 @@ Public Class frmAdmin_Start
DetailForm = New ClassDetailForm(My.LogConfig)
AddHandler DetailForm.DetailFormClosed, AddressOf DetailForm_Closed
- If My.SystemConfig.ConnectionString = String.Empty Then
- If ShowDatabaseSettings() = False Then
- MsgBox("Die Datenbank verbindung wurde nicht konfiguriert. Die Administration kann nicht verwendet werden.", MsgBoxStyle.Critical, Text)
- Exit Sub
- End If
- End If
+ 'If My.SystemConfig.ConnectionString = String.Empty Then
+ ' If ShowDatabaseSettings() = False Then
+ ' MsgBox("Die Datenbank verbindung wurde nicht konfiguriert. Die Administration kann nicht verwendet werden.", MsgBoxStyle.Critical, Text)
+ ' Exit Sub
+ ' End If
+ 'End If
DetailForm.LoadData()
TreeListMenu.ExpandAll()
diff --git a/GUIs.ZooFlow/Administration/frmSQLDesigner.resx.bak b/GUIs.ZooFlow/Administration/frmSQLDesigner.resx.bak
deleted file mode 100644
index 17a47334..00000000
--- a/GUIs.ZooFlow/Administration/frmSQLDesigner.resx.bak
+++ /dev/null
@@ -1,315 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
- yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
- TkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
- yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
- TkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
- yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
- TkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAKhJREFUOE+dkb0RAiEQhSnFIgyMyckNLMI6zB0zS0FruBKugdMACFdWecoBw49v
- 5ku43W8eh7DWkmcxxhzFP2HB4bqnaZ7IS27OuU341BcW7E7bN5f7ebxNLGCG26QCENo0qQq01qSUIill
- kaIAV+Dz0lJMJkhr89BjeRZZCeIfh8UamcDzfbphQRoIMITKYFhQoykogUUQ1n7pFYTxPBDUaAp6+EwL
- 8QKzYQ6as7QBdAAAAABJRU5ErkJggg==
-
-
-
- True
-
-
- True
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
- WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
- Pg0KICA8ZyBpZD0iRXhwb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxMnY2
- djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho
- MTR2LTJIMjJ6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln
- b24gcG9pbnRzPSIxNiwxMCAyNCwxMCAyNCwxNCAzMiw4IDI0LDIgMjQsNiAxNiw2ICAiIGNsYXNzPSJH
- cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
- yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
- TkSuQmCC
-
-
-
-
- AAABAAMAICAQAAEABADoAgAANgAAACAgAAABAAgAqAgAAB4DAAAgIAAAAQAgAKgQAADGCwAAKAAAACAA
- AABAAAAAAQAEAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA
- AACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAP///////wAAAAAAAAAAD///
- ////////8AAAAAAAD//4d3d3d3d3j//wAAAAD/+Hd3d3d3d3d3d4//AAAA/3d3d3d3d3d3d3d3/wAAD/
- d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3d3d3d/8AAP93d3d3d3d3d3d3d3f/AAD/d3d3d3d3d3d3d3d3
- /wAA/3d3d3d3d3d3d3d3d/8AAP93d3d3d3d3d3d3d3f/AAD/d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3
- d3d3d/8AAP93d3d3d3d3d3d3d3f/AAD/d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3d3d3d/8AAP93d3d3
- d3d3d3d3d3f/AAD/d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3d3d3d/8AAP93d3d3d3d3d3d3d3f/AAD/
- d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3d3d3d/8AAP93d3eI/////4h3d3f/AAD/d3f//////////3d3
- /wAA/3eP///////////4d/8AAP93j///////////+Hf/AAD/d3f//////////3d3/wAAD/d3d4j/////
- iHd3f/AAAA//h3d3d3d3d3d3eP/wAAAAD//4d3d3d3d3j//wAAAAAAAP///////////wAAAAAAAAAAD/
- //////8AAAAAAP/AA//+AAB/+AAAH+AAAAfgAAAHwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
- AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA+AA
- AAfgAAAH+AAAH/4AAH//wAP/KAAAACAAAABAAAAAAQAIAAAAAAAABAAAAAAAAAAAAAAAAQAAAAEAAAAA
- AABCQkIATU1NAG9vbwB5eXkAhoaGAJGRkQCamZkApKOkALOzswDFxMUAycnJANDPzwDm5OUA6+vrAPHv
- 8AD29vYA+Pj4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
- /wAAAAAAAAAAAAAAEREQEBAQEBAQEBERAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAQEBAQEBAQEBAQEBAA
- AAAAAAAAAAAAAAAQEBAOCQYDAQEBAQEBAQIDBgkOEBAQAAAAAAAAAAAREBALBAEBAQEBAQEBAQEBAQEB
- AQEECxAQEQAAAAAAABAQBQEBAQEBAQEBAQEBAQEBAQEBAQEBBRAQAAAAAAAQEAUBAQEBAQEBAQEBAQEB
- AQEBAQEBAQEBBRAQAAAAABAQAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBEBAAAAAAEBABAQEBAQEBAQEB
- AQEBAQEBAQEBAQEBAQEQEAAAAAAQEAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBARAQAAAAABAQAQEBAQEB
- AQEBAQEBAQEBAQEBAQEBAQEBEBAAAAAAEBABAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEQEAAAAAAQEAEB
- AQEBAQEBAQEBAQEBAQEBAQEBAQEBARAQAAAAABAQAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBEBAAAAAA
- EBABAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEQEAAAAAAQEAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBARAQ
- AAAAABAQAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBEBAAAAAAEBABAQEBAQEBAQEBAQEBAQEBAQEBAQEB
- AQEQEAAAAAAQEAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBARAQAAAAABAQAQEBAQEBAQEBAQEBAQEBAQEB
- AQEBAQEBEBAAAAAAEBABAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEQEAAAAAAQEAEBAQEBAQEBAQEBAQEB
- AQEBAQEBAQEBARAQAAAAABAQAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBEBAAAAAAEBABAQEBAQQICg0P
- Dw8PDw8NCggEAQEBAQEQEAAAAAAQEAEBAgcNDw8PDw8PDw8PDw8PDw8NBwIBARAQAAAAABAOAQEMDw8P
- Dw8PDw8PDw8PDw8PDw8PDAEBEBAAAAAAEA4BAQwPDw8PDw8PDw8PDw8PDw8PDw8MAQEQEAAAAAAQEAUB
- AgcNDw8PDw8PDw8PDw8PDw8NBwIBBRAQAAAAAAAQDgUBAQEECAoNDw8PDw8PDQoIBAEBAQUOEAAAAAAA
- ABEQEAsEAQEBAQEBAQEBAQEBAQEBAQQLEBARAAAAAAAAAAAQEBAOCQYDAQEBAQEBAQEDBgkOEBAQAAAA
- AAAAAAAAAAAAEBAQEBAQEBAQEBAQEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAARERAQEBAQEBAQEREAAAAA
- AAAAAAAA/8AD//4AAH/4AAAf4AAAB+AAAAfAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
- AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAAD4AAAB+AA
- AAf4AAAf/gAAf//AA/8oAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vYg9vb2cPb29p/29va/9vb2//b29v/29vb/9vb2//b2
- 9v/29vb/9vb2//b29v/29va/9vb2n/b29nD29vYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29hD29vZw9vb23/b29v/29vb/9vb2//b29v/29vb/9vb2//b2
- 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vbf9vb2cPb29hAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vZQ9vb27/b29v/29vb/6+vr/7Ozs/+RkZH/b29v/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9NTU3/b29v/5GRkf+zs7P/6+vr//b29v/29vb/9vb27/b2
- 9lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2n/b29v/29vb/ycnJ/3p6ev9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/enp6/8nJ
- yf/29vb/9vb2//b29p8AAAAAAAAAAAAAAAAAAAAAAAAAAPb29nD29vb/9vb2/4aGhv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/4aGhv/29vb/9vb2//b29nAAAAAAAAAAAAAAAAAAAAAA9vb23/b29v+Ghob/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/4aGhv/29vb/9vb23wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb2
- 9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
- AAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAA
- AAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
- 9v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b2
- 9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAA
- AAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAA
- AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
- 9v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb2
- 9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv95eHj/pKOk/8XExf/m5OX/8e/w//Hv8P/x7/D/8e/w//Hv
- 8P/x7/D/5uTl/8XExf+ko6T/eXh4/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
- AAAAAAAA9vb2//b29v9CQkL/QkJC/01NTf+amZn/5uTl//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
- 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/5uTl/5qZmf9NTU3/QkJC/0JCQv/29vb/9vb2/wAA
- AAAAAAAAAAAAAAAAAAD29vb/6+vr/0JCQv9CQkL/0M/P//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
- 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/9DPz/9CQkL/QkJC//b2
- 9v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/r6+v/QkJC/0JCQv/Qz8//8e/w//Hv8P/x7/D/8e/w//Hv
- 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/0M/P/0JC
- Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb23/b29v+Ghob/QkJC/01NTf+amZn/5uTl//Hv
- 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/5uTl/5qZ
- mf9NTU3/QkJC/4aGhv/29vb/9vb23wAAAAAAAAAAAAAAAAAAAAD29vZw9vb2/+vr6/+Ghob/QkJC/0JC
- Qv9CQkL/eXh4/6SjpP/FxMX/5uTl//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/+bk5f/FxMX/pKOk/3l4
- eP9CQkL/QkJC/0JCQv+Ghob/6+vr//b29v/29vZwAAAAAAAAAAAAAAAAAAAAAAAAAAD29vaf9vb2//b2
- 9v/Jycn/enp6/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/QkJC/0JCQv96enr/ycnJ//b29v/29vb/9vb2nwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAD29vZQ9vb27/b29v/29vb/6+vr/7Ozs/+RkZH/b29v/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
- Qv9CQkL/b29v/5GRkf+zs7P/6+vr//b29v/29vb/9vb27/b29lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAD29vYQ9vb2cPb29t/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
- 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb23/b29nD29vYQAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29iD29vZw9vb2n/b29r/29vb/9vb2//b2
- 9v/29vb/9vb2//b29v/29vb/9vb2//b29r/29vaf9vb2cPb29iAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAP8AAP/4AAAf8AAAD+AAAAfAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
- AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
- AAPgAAAH8AAAD/gAAB//AAD/
-
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Search/ClassControlCreator.vb b/GUIs.ZooFlow/ClassControlCreator.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/ClassControlCreator.vb
rename to GUIs.ZooFlow/ClassControlCreator.vb
diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb
index add35a2d..7c577ed8 100644
--- a/GUIs.ZooFlow/ClassInit.vb
+++ b/GUIs.ZooFlow/ClassInit.vb
@@ -324,7 +324,7 @@ Public Class ClassInit
If TypeOf e.Error Is InitException Then
Dim oException As InitException = DirectCast(e.Error, InitException)
- oMessage2 = $"{vbNewLine}{vbNewLine}Details: {oException.InnerException.Message}"
+ oMessage2 = $"{vbNewLine}{vbNewLine}Details: {oException?.InnerException?.Message}"
End If
Dim oMessage = $"{oMessageStart}{oMessage1}{oMessage2}{oMessageEnd}"
diff --git a/GUIs.ZooFlow/ClassModules.vb b/GUIs.ZooFlow/ClassModules.vb
index a5e94225..79a96141 100644
--- a/GUIs.ZooFlow/ClassModules.vb
+++ b/GUIs.ZooFlow/ClassModules.vb
@@ -35,13 +35,13 @@ Public Class ClassModules
Select Case pProduct
Case Product.GlobalIndexer
- oApplicationName = PM_EXENAME
+ oApplicationName = GLOBIX_EXENAME
Case Product.ClipboardWatcher
oApplicationName = CW_EXENAME
Case Product.ProcessManager
- oApplicationName = GLOBIX_EXENAME
+ oApplicationName = PM_EXENAME
End Select
diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb
index a6947243..64753c9e 100644
--- a/GUIs.ZooFlow/My Project/Resources.Designer.vb
+++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb
@@ -180,6 +180,16 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+ '''
+ Friend ReadOnly Property _new() As DevExpress.Utils.Svg.SvgImage
+ Get
+ Dim obj As Object = ResourceManager.GetObject("new", resourceCulture)
+ Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''
@@ -1150,6 +1160,36 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+ '''
+ Friend ReadOnly Property new1() As DevExpress.Utils.Svg.SvgImage
+ Get
+ Dim obj As Object = ResourceManager.GetObject("new1", resourceCulture)
+ Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+ End Get
+ End Property
+
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+ '''
+ Friend ReadOnly Property new2() As DevExpress.Utils.Svg.SvgImage
+ Get
+ Dim obj As Object = ResourceManager.GetObject("new2", resourceCulture)
+ Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+ End Get
+ End Property
+
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+ '''
+ Friend ReadOnly Property new3() As DevExpress.Utils.Svg.SvgImage
+ Get
+ Dim obj As Object = ResourceManager.GetObject("new3", resourceCulture)
+ Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''
diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx
index 6b33dc08..b0cafd65 100644
--- a/GUIs.ZooFlow/My Project/Resources.resx
+++ b/GUIs.ZooFlow/My Project/Resources.resx
@@ -304,8 +304,8 @@
..\Resources\actions_options.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
- ..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\new.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
@@ -391,9 +391,6 @@
..\Resources\ZooFlow_drop_drag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\ZooFlow_Sidebar_TOP.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
@@ -424,6 +421,9 @@
..\Resources\del5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ ..\Resources\new1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
..\Resources\ZooFlow_Sidebar_TOP_Drop.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
@@ -481,6 +481,9 @@
..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
@@ -499,8 +502,8 @@
..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ZooFlow_Sidebar_TOP.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
@@ -511,6 +514,9 @@
..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ ..\Resources\new2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -526,6 +532,12 @@
..\Resources\gear_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\managedatasource3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ ..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
@@ -565,7 +577,7 @@
..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
- ..\Resources\managedatasource3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ ..\Resources\new3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Resources/new.svg b/GUIs.ZooFlow/Resources/new.svg
new file mode 100644
index 00000000..4a85a96a
--- /dev/null
+++ b/GUIs.ZooFlow/Resources/new.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Resources/new1.svg b/GUIs.ZooFlow/Resources/new1.svg
new file mode 100644
index 00000000..4a85a96a
--- /dev/null
+++ b/GUIs.ZooFlow/Resources/new1.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Resources/new2.svg b/GUIs.ZooFlow/Resources/new2.svg
new file mode 100644
index 00000000..4a85a96a
--- /dev/null
+++ b/GUIs.ZooFlow/Resources/new2.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Resources/new3.svg b/GUIs.ZooFlow/Resources/new3.svg
new file mode 100644
index 00000000..4a85a96a
--- /dev/null
+++ b/GUIs.ZooFlow/Resources/new3.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb b/GUIs.ZooFlow/Search/Old/frmFlowSearch.Designer.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb
rename to GUIs.ZooFlow/Search/Old/frmFlowSearch.Designer.vb
diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.resx b/GUIs.ZooFlow/Search/Old/frmFlowSearch.resx
similarity index 100%
rename from GUIs.ZooFlow/Search/frmFlowSearch.resx
rename to GUIs.ZooFlow/Search/Old/frmFlowSearch.resx
diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.vb b/GUIs.ZooFlow/Search/Old/frmFlowSearch.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/frmFlowSearch.vb
rename to GUIs.ZooFlow/Search/Old/frmFlowSearch.vb
diff --git a/GUIs.ZooFlow/Search/frmSearchPredefined.Designer.vb b/GUIs.ZooFlow/Search/Old/frmSearchPredefined.Designer.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/frmSearchPredefined.Designer.vb
rename to GUIs.ZooFlow/Search/Old/frmSearchPredefined.Designer.vb
diff --git a/GUIs.ZooFlow/Search/frmSearchPredefined.resx b/GUIs.ZooFlow/Search/Old/frmSearchPredefined.resx
similarity index 100%
rename from GUIs.ZooFlow/Search/frmSearchPredefined.resx
rename to GUIs.ZooFlow/Search/Old/frmSearchPredefined.resx
diff --git a/GUIs.ZooFlow/Search/frmSearchPredefined.vb b/GUIs.ZooFlow/Search/Old/frmSearchPredefined.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/frmSearchPredefined.vb
rename to GUIs.ZooFlow/Search/Old/frmSearchPredefined.vb
diff --git a/GUIs.ZooFlow/Search/frmSearchStart.Designer.vb b/GUIs.ZooFlow/Search/Old/frmSearchStart.Designer.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/frmSearchStart.Designer.vb
rename to GUIs.ZooFlow/Search/Old/frmSearchStart.Designer.vb
diff --git a/GUIs.ZooFlow/Search/frmSearchStart.resx b/GUIs.ZooFlow/Search/Old/frmSearchStart.resx
similarity index 100%
rename from GUIs.ZooFlow/Search/frmSearchStart.resx
rename to GUIs.ZooFlow/Search/Old/frmSearchStart.resx
diff --git a/GUIs.ZooFlow/Search/frmSearchStart.vb b/GUIs.ZooFlow/Search/Old/frmSearchStart.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/frmSearchStart.vb
rename to GUIs.ZooFlow/Search/Old/frmSearchStart.vb
diff --git a/GUIs.ZooFlow/Search/SearchRunner.vb b/GUIs.ZooFlow/Search/SearchRunner.vb
index 19981073..b67d5cb6 100644
--- a/GUIs.ZooFlow/Search/SearchRunner.vb
+++ b/GUIs.ZooFlow/Search/SearchRunner.vb
@@ -2,6 +2,7 @@
Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.ZooFlow
+Imports System.Threading.Tasks
Public Class SearchRunner
Inherits BaseClass
@@ -30,7 +31,7 @@ Public Class SearchRunner
Public Event NeedsRefresh As EventHandler(Of Integer)
- Private _ActiveDateConstraint As String = String.Empty
+ Private Property _ActiveDateConstraint As String = String.Empty
Public ReadOnly Property ActiveDateConstraint As String
Get
Return _ActiveDateConstraint
@@ -47,8 +48,8 @@ Public Class SearchRunner
Public Property BaseSearchSQL As String
Public Property ExplicitDate As Boolean = False
- Private Environment As Environment
- Private SearchTitle As String
+ Private ReadOnly Environment As Environment
+ Private ReadOnly SearchTitle As String
Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pSearchTitle As String)
MyBase.New(pLogConfig)
@@ -56,28 +57,46 @@ Public Class SearchRunner
SearchTitle = pSearchTitle
End Sub
- Public Async Function Run(pSearchTerm As String) As Threading.Tasks.Task(Of SearchResult)
+ Public Function Run(pDatatable As DataTable) As SearchResult
+ Return Run(pDatatable, "Suche")
+ End Function
+
+ Public Function Run(pDatatable As DataTable, pTitle As String) As SearchResult
+ Dim oParams = GetParams(pTitle)
+ oParams.Results.Add(New DocumentResultList.DocumentResult() With {
+ .Title = pTitle,
+ .Datatable = pDatatable
+ })
+
+ If pDatatable.Rows.Count = 1 Then
+ oParams.ShowFileList = False
+ End If
+
+ Dim oForm As New frmDocumentResultList(My.LogConfig, Environment, oParams)
+
+ ' TODO: Implement, not needed right now
+ 'AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh
+
+ oForm.Show()
+
+ Return New SearchResult()
+ End Function
+
+ Public Async Function Run(pSearchTerm As String) As Task(Of SearchResult)
+ Dim oWindowTitle = GetResultWindowString(pSearchTerm)
Return Await Run(pSearchTerm, Nothing, Nothing)
End Function
+
Public Async Function Run(pSearchTerm As String, pDateFrom As Date, pDateTo As Date) As Threading.Tasks.Task(Of SearchResult)
If pDateFrom.Equals(Date.MinValue) = False Then
ExplicitDate = True
End If
Dim oSearchTerm = pSearchTerm
- Dim oParams = New DocumentResultList.Params() With {
- .WindowGuid = SearchTitle,
- .WindowTitle = GetResultWindowString(oSearchTerm),
- .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow,
- .ProfileGuid = 35452,
- .ColumnNames = New DocumentResultList.ColumnNames With {
- .ObjectIdColumn = "DocID"
- },
- .ShowBackNavigation = False
- }
-
- Dim oP3 = $"{_ActiveDateAttribute}~{_ActiveDateConstraint}"
+ Dim oWindowTitle = GetResultWindowString(pSearchTerm)
+ Dim oParams = GetParams(oWindowTitle)
+ Dim oDateConstraint = $"{_ActiveDateAttribute}~{_ActiveDateConstraint}"
If ExplicitDate Then
Dim oDate2 As Date
@@ -88,11 +107,11 @@ Public Class SearchRunner
End If
Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{pDateFrom}','{oDate2}'"
If Await My.Database.ExecuteNonQueryIDBAsync(oProc) = True Then
- oP3 = $"{_ActiveDateAttribute}~DATEPART"
+ oDateConstraint = $"{_ActiveDateAttribute}~DATEPART"
End If
End If
- Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'"
+ Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oDateConstraint}'"
If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then
Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(BaseSearchSQL)
@@ -113,26 +132,30 @@ Public Class SearchRunner
oForm.Show()
- Return New SearchResult With {
- .OK = True
- }
+ Return New SearchResult()
Else
- 'bsiStatus.Caption = "No Results"
- Return New SearchResult With {
- .OK = False,
- .ErrorMessage = "No Results"
- }
+ Return New SearchResult("No Results")
+
End If
Else
- 'bsiStatus.Caption = "Error in FlowSearch - Check Your log"
- Return New SearchResult With {
- .OK = False,
- .ErrorMessage = "Error in FlowSearch - Check Your log"
- }
+ Return New SearchResult("Error in FlowSearch - Check Your log")
+
End If
End Function
-
+ Private Function GetParams(pWindowTitle As String) As DocumentResultList.Params
+ Dim oParams = New DocumentResultList.Params() With {
+ .WindowGuid = SearchTitle,
+ .WindowTitle = pWindowTitle,
+ .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow,
+ .ProfileGuid = 35452,
+ .ColumnNames = New DocumentResultList.ColumnNames With {
+ .ObjectIdColumn = "DocID"
+ },
+ .ShowBackNavigation = False
+ }
+ Return oParams
+ End Function
Private Function GetResultWindowString(SearchContent As String) As String
If SearchContent <> String.Empty Then
@@ -201,6 +224,22 @@ Public Class SearchRunner
Public Class SearchResult
Public OK As Boolean
- Public ErrorMessage As String
+ Public ErrorMessage As String = String.Empty
+
+ '''
+ ''' Returns a positive Search Result
+ '''
+ Public Sub New()
+ OK = True
+ End Sub
+
+ '''
+ ''' Returns a failed search result with an error message
+ '''
+ '''
+ Public Sub New(pMessage As String)
+ OK = False
+ ErrorMessage = pMessage
+ End Sub
End Class
End Class
diff --git a/GUIs.ZooFlow/Search/Search.vb b/GUIs.ZooFlow/Search/Test/Search.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/Search.vb
rename to GUIs.ZooFlow/Search/Test/Search.vb
diff --git a/GUIs.ZooFlow/Search/SearchCriteria.vb b/GUIs.ZooFlow/Search/Test/SearchCriteria.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/SearchCriteria.vb
rename to GUIs.ZooFlow/Search/Test/SearchCriteria.vb
diff --git a/GUIs.ZooFlow/Search/SearchFilter.vb b/GUIs.ZooFlow/Search/Test/SearchFilter.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/SearchFilter.vb
rename to GUIs.ZooFlow/Search/Test/SearchFilter.vb
diff --git a/GUIs.ZooFlow/Search/SearchToken.vb b/GUIs.ZooFlow/Search/Test/SearchToken.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/SearchToken.vb
rename to GUIs.ZooFlow/Search/Test/SearchToken.vb
diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb b/GUIs.ZooFlow/Search/Test/frmFlowSearch2.Designer.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb
rename to GUIs.ZooFlow/Search/Test/frmFlowSearch2.Designer.vb
diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.resx b/GUIs.ZooFlow/Search/Test/frmFlowSearch2.resx
similarity index 100%
rename from GUIs.ZooFlow/Search/frmFlowSearch2.resx
rename to GUIs.ZooFlow/Search/Test/frmFlowSearch2.resx
diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.vb b/GUIs.ZooFlow/Search/Test/frmFlowSearch2.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/frmFlowSearch2.vb
rename to GUIs.ZooFlow/Search/Test/frmFlowSearch2.vb
diff --git a/GUIs.ZooFlow/Search/frmSearchNeu.Designer.vb b/GUIs.ZooFlow/Search/Test/frmSearchNeu.Designer.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/frmSearchNeu.Designer.vb
rename to GUIs.ZooFlow/Search/Test/frmSearchNeu.Designer.vb
diff --git a/GUIs.ZooFlow/Search/frmSearchNeu.resx b/GUIs.ZooFlow/Search/Test/frmSearchNeu.resx
similarity index 100%
rename from GUIs.ZooFlow/Search/frmSearchNeu.resx
rename to GUIs.ZooFlow/Search/Test/frmSearchNeu.resx
diff --git a/GUIs.ZooFlow/Search/frmSearchNeu.vb b/GUIs.ZooFlow/Search/Test/frmSearchNeu.vb
similarity index 100%
rename from GUIs.ZooFlow/Search/frmSearchNeu.vb
rename to GUIs.ZooFlow/Search/Test/frmSearchNeu.vb
diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.resx.bak b/GUIs.ZooFlow/Search/frmFlowSearch.resx.bak
deleted file mode 100644
index 06b8dec2..00000000
--- a/GUIs.ZooFlow/Search/frmFlowSearch.resx.bak
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPoCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
- WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
- Pg0KICA8ZyBpZD0iQmFyY29kZSI+DQogICAgPHBhdGggZD0iTTI5LDRIMUMwLjUsNCwwLDQuNSwwLDV2
- MjJjMCwwLjUsMC41LDEsMSwxaDI4YzAuNSwwLDEtMC41LDEtMVY1QzMwLDQuNSwyOS41LDQsMjksNHog
- TTI4LDI2SDJWNmgyNlYyNnogICAgTTYsMjRINFY4aDJWMjR6IE0xMCwyMEg4VjhoMlYyMHogTTE0LDI0
- aC0yVjhoMlYyNHogTTE4LDIwaC0yVjhoMlYyMHogTTIyLDIwaC0yVjhoMlYyMHogTTI2LDI0aC0yVjho
- MlYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-
-
-
- 17, 17
-
-
- 170, 17
-
-
- True
-
-
- True
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFsEAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
- aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
- c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
- O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
- ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
- c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJTdGF0ZU1hY2hpbmUi
- Pg0KICAgIDxwYXRoIGQ9Ik0xNiw2aC0yTDQsMjJsMiwyaDE4bDItMkwxNiw2eiBNMjMuMiwyMkg2Ljhs
- LTAuMy0wLjNMMTUsOC4ybDguNSwxMy41TDIzLjIsMjJ6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBh
- dGggZD0iTTUsMjhjLTIuOCwwLTUtMi4yLTUtNXMyLjItNSw1LTVzNSwyLjIsNSw1UzcuOCwyOCw1LDI4
- eiBNMzAsMjNjMC0yLjgtMi4yLTUtNS01cy01LDIuMi01LDVzMi4yLDUsNSw1ICAgUzMwLDI1LjgsMzAs
- MjN6IE0yMCw3YzAtMi44LTIuMi01LTUtNXMtNSwyLjItNSw1czIuMiw1LDUsNVMyMCw5LjgsMjAsN3oi
- IGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Search/frmSearchPredefined.resx.bak b/GUIs.ZooFlow/Search/frmSearchPredefined.resx.bak
deleted file mode 100644
index 6ff9aefd..00000000
--- a/GUIs.ZooFlow/Search/frmSearchPredefined.resx.bak
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
- QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
- MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
- cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
- LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
- NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
- MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
- MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
- MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
- IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
- NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
- ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
- LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
- QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-
-
-
- 17, 17
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iRmluZCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
- MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5
- bGU+DQogIDxwYXRoIGQ9Ik0yOS41LDE5LjdMMjkuNSwxOS43TDI5LjUsMTkuN0MyOS41LDE5LjcsMjku
- NSwxOS43LDI5LjUsMTkuN0wyMy44LDZsMCwwYy0wLjQtMS4yLTEuNS0yLTIuOC0yICBjLTEuNywwLTMs
- MS4zLTMsM3YzaC00VjdjMC0xLjctMS4zLTMtMy0zQzkuNyw0LDguNiw0LjksOC4yLDZsMCwwTDIuNSwx
- OS43YzAsMCwwLDAsMCwwbDAsMGgwQzIuMiwyMC40LDIsMjEuMiwyLDIyICBjMCwzLjMsMi43LDYsNiw2
- czYtMi43LDYtNnYtNGg0djRjMCwzLjMsMi43LDYsNiw2czYtMi43LDYtNkMzMCwyMS4yLDI5LjgsMjAu
- NCwyOS41LDE5Ljd6IE04LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00ICBzNCwxLjgsNCw0UzEw
- LjIsMjYsOCwyNnogTTI0LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNi4y
- LDI2LDI0LDI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw==
-
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Search/frmSearchStart.resx.bak b/GUIs.ZooFlow/Search/frmSearchStart.resx.bak
deleted file mode 100644
index 2464eb15..00000000
--- a/GUIs.ZooFlow/Search/frmSearchStart.resx.bak
+++ /dev/null
@@ -1,294 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACECAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iRmlsbF9Eb3duIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAg
- MCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJ
- LkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgkuc3Qwe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPGcgY2xh
- c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTI4LDEwdjIwSDJWMTBoMTB2Nkg3LjNMMTUsMjcuNkwyMi43
- LDE2SDE4di02SDI4eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQogIDxwYXRoIGQ9Ik0yOCw4SDJW
- MmgyNlY4eiBNMTQsMTB2OGgtM2w0LDZsNC02aC0zdi04SDE0eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2
- Zz4L
-
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAEFkZDtQbHVzO0JhcnM7UmliYm9u
- O5UGMy8AAABgSURBVDhP3YxRCoAwDEN3QS/lqbxdtNKUTDJEHAh+vNGl6WsAXmFDsqwbkphtx4bkR4Kc
- bceGRAUjzofFp0wVFPEnWrzk1e0CJfMS6I7ME4w4Sp1Ad8SGhII4/kZwD9oOmV+r+RzWkL4AAAAASUVO
- RK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAEFkZDtQbHVzO0JhcnM7UmliYm9u
- O5UGMy8AAACPSURBVFhH7c5RCoQwDEVRN+imXJW7i82HIOlFHhKiSD4Owp1p+xYzexXGShgrYayEsRJG
- xbrtdhV/V2FU9IAe0AP+PSBeniW+46bg6HCG+I6bgqPDGeI7bgqODmeI77gpqJTLFRgVNGB8b13PnzAq
- xoXfG/AERkUPoAHji/+9g1HRA7JgrISxEsZKGOvYcgB55Y6E3tOuXgAAAABJRU5ErkJggg==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIYBAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDI1
- IDI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
- ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiM3MDZmNmY7fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAg
- PHBhdGggZD0iTTE5LjgzMzMsMS41VjkuOTM4Mkg1LjE2NjdWMS41SDEuNXYyMmgyMlYxLjVabTAsMTgu
- NTMyOEg1LjE2Njd2LTYuNTVIMTkuODMzM1oiIGNsYXNzPSJjbHMtMSIgLz4NCiAgPHBhdGggZD0iTTYu
- NzgzNywxLjVWOC4wNWg4LjQzODJWMS41Wk05LjUyMjYsNi44MTA1SDguMDA1OVYyLjczOTJIOS41MjI2
- WiIgY2xhc3M9ImNscy0xIiAvPg0KPC9zdmc+Cw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOgBAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDI1
- IDI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
- ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fS5jbHMtMntmaWxsOiM2NDYzNjM7fTwv
- c3R5bGU+DQogIDwvZGVmcz4NCiAgPHBhdGggZD0iTTEzLjk5MywxOC41ODE5bDguODQxLTguODQxYTIu
- Mjc0MiwyLjI3NDIsMCwwLDAsMC0zLjIxNmwtNC4zNTktNC4zNTlhMi4yNzQyLDIuMjc0MiwwLDAsMC0z
- LjIxNiwwbC04Ljg0MSw4Ljg0MVoiIGNsYXNzPSJjbHMtMSIgLz4NCiAgPHBhdGggZD0iTTUuNjQyLDEx
- Ljc4MzFsLTMuNDc2LDMuNDc2YTIuMjc0MiwyLjI3NDIsMCwwLDAsMCwzLjIxNmw0LjM1OSw0LjM1OWEy
- LjI3NDIsMi4yNzQyLDAsMCwwLDMuMjE2LDBsMy40NzYtMy40NzZaIiBjbGFzcz0iY2xzLTIiIC8+DQo8
- L3N2Zz4L
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALcBAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTmV4dCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
- MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9zdHls
- ZT4NCiAgPHBhdGggZD0iTTguOSw0LjFDOC40LDMuOCw4LDQuMSw4LDQuNnYyMC43YzAsMC42LDAuNCww
- LjgsMC45LDAuNWwxNi44LTEwLjNjMC41LTAuMywwLjUtMC44LDAtMS4xTDguOSw0LjF6IiBjbGFzcz0i
- Qmx1ZSIgLz4NCjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iRmluZCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
- MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5
- bGU+DQogIDxwYXRoIGQ9Ik0yOS41LDE5LjdMMjkuNSwxOS43TDI5LjUsMTkuN0MyOS41LDE5LjcsMjku
- NSwxOS43LDI5LjUsMTkuN0wyMy44LDZsMCwwYy0wLjQtMS4yLTEuNS0yLTIuOC0yICBjLTEuNywwLTMs
- MS4zLTMsM3YzaC00VjdjMC0xLjctMS4zLTMtMy0zQzkuNyw0LDguNiw0LjksOC4yLDZsMCwwTDIuNSwx
- OS43YzAsMCwwLDAsMCwwbDAsMGgwQzIuMiwyMC40LDIsMjEuMiwyLDIyICBjMCwzLjMsMi43LDYsNiw2
- czYtMi43LDYtNnYtNGg0djRjMCwzLjMsMi43LDYsNiw2czYtMi43LDYtNkMzMCwyMS4yLDI5LjgsMjAu
- NCwyOS41LDE5Ljd6IE04LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00ICBzNCwxLjgsNCw0UzEw
- LjIsMjYsOCwyNnogTTI0LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNi4y
- LDI2LDI0LDI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGgFAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDI1
- IDI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
- ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiM2NDYzNjM7fS5jbHMtMntmaWxsOiNhNTI0MzE7fTwv
- c3R5bGU+DQogIDwvZGVmcz4NCiAgPHBhdGggZD0iTTE5LjQ0LDEzLjA4SDUuMzU1M1YxLjUyM0gxOS40
- NFpNNy4xOTc3LDExLjE0ODJoMTAuNFYzLjQ1NDZINy4xOTc3WiIgY2xhc3M9ImNscy0xIiAvPg0KICA8
- cGF0aCBkPSJNMTcuMDY4MiwyMy40NzdjLTQuMTE2NiwwLTcuMzI1NS00LjIxNTEtNy40Ni00LjM5NDhs
- LS40NzE0LS42Mjg3LjQ3MTQtLjYyODhjLjEzNDktLjE4LDMuMzQzOC00LjM5NDMsNy40Ni00LjM5NDNz
- Ny4zMjU1LDQuMjE0Niw3LjQ2LDQuMzk0M0wyNSwxOC40NTM1bC0uNDcxNC42Mjg3QzI0LjM5MzcsMTku
- MjYxOSwyMS4xODQ4LDIzLjQ3NywxNy4wNjgyLDIzLjQ3N1ptLTUuNDkyMS01LjAyMzVjLjk2MjYsMS4w
- NDY2LDMuMTAwOSwzLjAyODcsNS40OTIxLDMuMDI4N1MyMS41OTc3LDE5LjUsMjIuNTYsMTguNDUzNWMt
- Ljk2MjYtMS4wNDYxLTMuMTAxLTMuMDI4My01LjQ5MjEtMy4wMjgzUzEyLjUzODcsMTcuNDA3NCwxMS41
- NzYxLDE4LjQ1MzVaIiBjbGFzcz0iY2xzLTEiIC8+DQogIDxwYXRoIGQ9Ik0xOS42NTMsMTguNDUzNWEy
- LjY5ODgsMi42OTg4LDAsMCwwLTIuNTg1My0yLjc5OTIsMi40MjUxLDIuNDI1MSwwLDAsMC0xLjM1OTUu
- NDIyNSwxLjM1OSwxLjM1OSwwLDAsMSwuMjYzOS44MDYsMS4yNjEsMS4yNjEsMCwwLDEtMS4yMDczLDEu
- MzA4MSwxLjEwMTcsMS4xMDE3LDAsMCwxLS4yNjctLjAzNDhjLS4wMDkyLjA5NzctLjAxNDYuMTk3MS0u
- MDE0Ni4yOTc0YTIuNjk4MSwyLjY5ODEsMCwwLDAsMi41ODQ1LDIuNzk5MSwyLjY5ODcsMi42OTg3LDAs
- MCwwLDIuNTg1My0yLjc5OTEiIGNsYXNzPSJjbHMtMSIgLz4NCiAgPHBhdGggZD0iTTkuNjA3OCwxOS4w
- ODIybC0uNDcxNC0uNjI4Ny4yMjA5LS4yOTQ3SDEuODQyNHYtNy45NDZIMTIuMjQxOHY1LjA0MzRhMTAu
- NjIyNywxMC42MjI3LDAsMCwxLDEuODQyNC0xLjExNDJWOC4yMThIMFYyMC4xNTM2SDEwLjU0MjhBMTIu
- Mzc4MywxMi4zNzgzLDAsMCwxLDkuNjA3OCwxOS4wODIyWiIgY2xhc3M9ImNscy0xIiAvPg0KICA8cmVj
- dCB4PSI1LjM1NTMiIHk9IjEuNTIzIiB3aWR0aD0iMTQuMDg0MiIgaGVpZ2h0PSI1Ljk2MjciIHJ4PSIw
- IiByeT0iMCIgY2xhc3M9ImNscy0yIiAvPg0KICA8cmVjdCB4PSIwIiB5PSI4LjIxOCIgd2lkdGg9IjE0
- LjA5OTQiIGhlaWdodD0iNS45NjI3IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJjbHMtMiIgLz4NCjwvc3Zn
- Pgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACECAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iRmlsbF9Eb3duIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAg
- MCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJ
- LkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgkuc3Qwe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPGcgY2xh
- c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTI4LDEwdjIwSDJWMTBoMTB2Nkg3LjNMMTUsMjcuNkwyMi43
- LDE2SDE4di02SDI4eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQogIDxwYXRoIGQ9Ik0yOCw4SDJW
- MmgyNlY4eiBNMTQsMTB2OGgtM2w0LDZsNC02aC0zdi04SDE0eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2
- Zz4L
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIcCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
- YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
- Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
- Pg0KICA8ZyBpZD0iRm9yd2FyZF8xXyI+DQogICAgPHBhdGggZD0iTTE2LDJDOC4zLDIsMiw4LjMsMiwx
- NnM2LjMsMTQsMTQsMTRzMTQtNi4zLDE0LTE0UzIzLjcsMiwxNiwyeiBNMTYsMjR2LTZIOHYtNGg4Vjhs
- OCw4TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-
-
-
- 189, 17
-
-
- 73
-
-
\ No newline at end of file
diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj
index aa866084..e509c311 100644
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -339,13 +339,13 @@
MyDataset.xsd
-
+
frmFlowSearch.vb
-
+
Form
-
+
@@ -387,28 +387,28 @@
Form
-
+
frmFlowSearch2.vb
-
+
Form
-
+
frmSearchNeu.vb
-
+
Form
-
+
frmSearchPredefined.vb
-
+
Form
-
+
frmSearchStart.vb
-
+
Form
@@ -443,11 +443,11 @@
-
-
-
+
+
+
-
+
frmAdmin_ClipboardWatcher.vb
@@ -521,7 +521,7 @@
frmGlobixNameconvention.vb
-
+
frmFlowSearch.vb
@@ -540,16 +540,16 @@
frmFlowSearch1.vb
-
+
frmFlowSearch2.vb
-
+
frmSearchNeu.vb
-
+
frmSearchPredefined.vb
-
+
frmSearchStart.vb
@@ -1100,6 +1100,10 @@
+
+
+
+
diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb
index 1a5224f2..1d969d59 100644
--- a/GUIs.ZooFlow/frmFlowForm.Designer.vb
+++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb
@@ -68,8 +68,14 @@ Partial Class frmFlowForm
Me.Panel1 = New System.Windows.Forms.Panel()
Me.PictureEdit2 = New DevExpress.XtraEditors.PictureEdit()
Me.Panel2 = New System.Windows.Forms.Panel()
+ Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
+ Me.RecentFilesView = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView()
+ Me.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
+ Me.colPrimary = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
+ Me.colSecondary = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
Me.AdornerUIManager1 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components)
Me.TaskBadge = New DevExpress.Utils.VisualEffects.Badge()
+ Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl()
Me.ContextMenuSystray.SuspendLayout()
CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -80,6 +86,8 @@ Partial Class frmFlowForm
Me.Panel1.SuspendLayout()
CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel2.SuspendLayout()
+ CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.RecentFilesView, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.AdornerUIManager1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
@@ -168,13 +176,13 @@ Partial Class frmFlowForm
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, 280)
+ Me.PictureBoxSearch.Location = New System.Drawing.Point(21, 442)
Me.PictureBoxSearch.Name = "PictureBoxSearch"
Me.PictureBoxSearch.Size = New System.Drawing.Size(158, 50)
Me.PictureBoxSearch.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom
Me.PictureBoxSearch.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.FLOW_Sidebar_Search_inaktiv
Me.PictureBoxSearch.TabIndex = 13
- Me.PictureBoxSearch.Text = "SvgImageBox1"
+ Me.PictureBoxSearch.Text = "X"
Me.ToolTip1.SetToolTip(Me.PictureBoxSearch, "FlowSearch öffnen")
'
'TimerFolderwatch
@@ -188,7 +196,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, 335)
+ Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 497)
Me.pnlQuicksearch1.Name = "pnlQuicksearch1"
Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 75)
Me.pnlQuicksearch1.TabIndex = 16
@@ -266,7 +274,7 @@ Partial Class frmFlowForm
'
'btnGlobixConfig
'
- Me.btnGlobixConfig.Caption = "Grundeinstellungen Globix"
+ Me.btnGlobixConfig.Caption = "Grundeinstellungen FileFlow"
Me.btnGlobixConfig.Id = 10
Me.btnGlobixConfig.ImageOptions.SvgImage = CType(resources.GetObject("btnGlobixConfig.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.btnGlobixConfig.Name = "btnGlobixConfig"
@@ -313,7 +321,7 @@ 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, 612)
+ Me.barDockControlBottom.Location = New System.Drawing.Point(0, 774)
Me.barDockControlBottom.Manager = Me.BarManager1
Me.barDockControlBottom.Size = New System.Drawing.Size(202, 26)
'
@@ -323,7 +331,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, 612)
+ Me.barDockControlLeft.Size = New System.Drawing.Size(0, 774)
'
'barDockControlRight
'
@@ -331,7 +339,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, 612)
+ Me.barDockControlRight.Size = New System.Drawing.Size(0, 774)
'
'BarButtonItem2
'
@@ -364,7 +372,7 @@ Partial Class frmFlowForm
Me.lblQuicksearch1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblQuicksearch1.Appearance.Options.UseFont = True
Me.lblQuicksearch1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
- Me.lblQuicksearch1.Location = New System.Drawing.Point(21, 3)
+ Me.lblQuicksearch1.Location = New System.Drawing.Point(21, 5)
Me.lblQuicksearch1.Name = "lblQuicksearch1"
Me.lblQuicksearch1.Size = New System.Drawing.Size(158, 18)
Me.lblQuicksearch1.TabIndex = 0
@@ -375,7 +383,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, 272)
+ Me.Panel3.Location = New System.Drawing.Point(21, 434)
Me.Panel3.Name = "Panel3"
Me.Panel3.Size = New System.Drawing.Size(158, 2)
Me.Panel3.TabIndex = 17
@@ -404,16 +412,75 @@ Partial Class frmFlowForm
'
'Panel2
'
+ Me.Panel2.Controls.Add(Me.GridControl1)
Me.Panel2.Controls.Add(Me.PictureBoxPM)
+ Me.Panel2.Controls.Add(Me.LabelControl1)
Me.Panel2.Controls.Add(Me.Panel3)
Me.Panel2.Controls.Add(Me.pnlQuicksearch1)
Me.Panel2.Controls.Add(Me.PictureBoxSearch)
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, 410)
+ Me.Panel2.Size = New System.Drawing.Size(202, 572)
Me.Panel2.TabIndex = 17
'
+ 'GridControl1
+ '
+ Me.GridControl1.Anchor = System.Windows.Forms.AnchorStyles.Bottom
+ Me.GridControl1.Location = New System.Drawing.Point(21, 246)
+ Me.GridControl1.MainView = Me.RecentFilesView
+ Me.GridControl1.MenuManager = Me.BarManager1
+ Me.GridControl1.Name = "GridControl1"
+ Me.GridControl1.Size = New System.Drawing.Size(158, 182)
+ Me.GridControl1.TabIndex = 18
+ Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.RecentFilesView})
+ '
+ 'RecentFilesView
+ '
+ Me.RecentFilesView.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1})
+ Me.RecentFilesView.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Simple
+ Me.RecentFilesView.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colPrimary, Me.colSecondary})
+ Me.RecentFilesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.None
+ Me.RecentFilesView.GridControl = Me.GridControl1
+ Me.RecentFilesView.Name = "RecentFilesView"
+ Me.RecentFilesView.OptionsBehavior.Editable = False
+ Me.RecentFilesView.OptionsBehavior.ReadOnly = True
+ Me.RecentFilesView.OptionsSelection.EnableAppearanceFocusedCell = False
+ Me.RecentFilesView.OptionsSelection.EnableAppearanceHideSelection = False
+ Me.RecentFilesView.OptionsView.ColumnAutoWidth = True
+ Me.RecentFilesView.OptionsView.ShowBands = False
+ Me.RecentFilesView.OptionsView.ShowColumnHeaders = False
+ Me.RecentFilesView.OptionsView.ShowGroupPanel = False
+ Me.RecentFilesView.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False]
+ Me.RecentFilesView.OptionsView.ShowIndicator = False
+ Me.RecentFilesView.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.[False]
+ '
+ 'GridBand1
+ '
+ Me.GridBand1.Caption = "GridBand1"
+ Me.GridBand1.Columns.Add(Me.colPrimary)
+ Me.GridBand1.Columns.Add(Me.colSecondary)
+ Me.GridBand1.Name = "GridBand1"
+ Me.GridBand1.VisibleIndex = 0
+ Me.GridBand1.Width = 75
+ '
+ 'colPrimary
+ '
+ Me.colPrimary.Caption = "Primary"
+ Me.colPrimary.FieldName = "Primary"
+ Me.colPrimary.Name = "colPrimary"
+ Me.colPrimary.Visible = True
+ '
+ 'colSecondary
+ '
+ Me.colSecondary.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
+ Me.colSecondary.AppearanceCell.Options.UseForeColor = True
+ Me.colSecondary.Caption = "Secondary"
+ Me.colSecondary.FieldName = "Secondary"
+ Me.colSecondary.Name = "colSecondary"
+ Me.colSecondary.RowIndex = 1
+ Me.colSecondary.Visible = True
+ '
'AdornerUIManager1
'
Me.AdornerUIManager1.Elements.Add(Me.TaskBadge)
@@ -430,6 +497,18 @@ Partial Class frmFlowForm
Me.TaskBadge.TargetElement = Me.PictureBoxPM
Me.TaskBadge.TargetElementRegion = DevExpress.Utils.VisualEffects.TargetElementRegion.Control
'
+ 'LabelControl1
+ '
+ Me.LabelControl1.Anchor = System.Windows.Forms.AnchorStyles.Bottom
+ 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.Name = "LabelControl1"
+ Me.LabelControl1.Size = New System.Drawing.Size(158, 18)
+ Me.LabelControl1.TabIndex = 0
+ Me.LabelControl1.Text = "Zuletzt bearbeitet"
+ '
'frmFlowForm
'
Me.AllowDrop = True
@@ -440,7 +519,7 @@ Partial Class frmFlowForm
Me.Appearance.Options.UseForeColor = True
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(202, 638)
+ Me.ClientSize = New System.Drawing.Size(202, 800)
Me.Controls.Add(Me.Panel2)
Me.Controls.Add(Me.Panel1)
Me.Controls.Add(Me.barDockControlLeft)
@@ -463,6 +542,8 @@ Partial Class frmFlowForm
Me.Panel1.ResumeLayout(False)
CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel2.ResumeLayout(False)
+ CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.RecentFilesView, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.AdornerUIManager1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -510,4 +591,10 @@ Partial Class frmFlowForm
Friend WithEvents bbtnitmAusblenden As DevExpress.XtraBars.BarButtonItem
Friend WithEvents EinblendenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents SucheEntwurfToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
+ Friend WithEvents RecentFilesView As DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView
+ Friend WithEvents colSecondary As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn
+ Friend WithEvents colPrimary As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn
+ Friend WithEvents GridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
+ Friend WithEvents LabelControl1 As LabelControl
End Class
diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb
index 72c025b2..19aa1698 100644
--- a/GUIs.ZooFlow/frmFlowForm.vb
+++ b/GUIs.ZooFlow/frmFlowForm.vb
@@ -9,12 +9,10 @@ Imports DigitalData.GUIs.ZooFlow.ClipboardWatcher
Imports DigitalData.Modules
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Language.Utils
-Imports DigitalData.Modules.Messaging
Imports DigitalData.Modules.Windows
Imports DigitalData.Modules.ZooFlow
Imports DigitalData.GUIs.Common.Base
Imports DigitalData.GUIs.Common
-Imports DigitalData.Controls.SQLConfig
Imports DigitalData.Modules.Language
Imports DevExpress.LookAndFeel
Imports System.Threading.Tasks
@@ -86,9 +84,7 @@ Public Class frmFlowForm
End If
MyBase.WndProc(m)
Catch ex As Exception
-
End Try
-
End Sub
Protected Overrides ReadOnly Property CreateParams() As System.Windows.Forms.CreateParams
Get
@@ -166,6 +162,7 @@ Public Class frmFlowForm
Private FileEx As Filesystem.File
Private ErrorHandler As BaseErrorHandler
Private Modules As ClassModules
+ Private Search As SearchRunner
' Globix Helper Classes
Private FileDropNew As FileDrop
@@ -196,6 +193,7 @@ Public Class frmFlowForm
Public Event ClipboardChanged As EventHandler(Of IDataObject)
Private WithEvents HotkeyClass As Hotkey
Private WithEvents Watcher As Watcher = Watcher.Singleton
+
#End Region
Private Sub frmFlowForm_Load(sender As Object, e As EventArgs) Handles Me.Load
@@ -232,8 +230,10 @@ Public Class frmFlowForm
Environment = My.Application.GetEnvironment()
ErrorHandler = New BaseErrorHandler(My.LogConfig, Logger, Me)
Modules = New ClassModules(My.LogConfig, My.SystemConfig)
-
FileEx = New Filesystem.File(My.LogConfig)
+ Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch")
+ Search.BaseSearchSQL = DocResultBaseSearch
+
' === Initialize Theming ===
If My.Application.Palette = "" Then
UserLookAndFeel.Default.SetSkinStyle(My.Application.Skin)
@@ -250,8 +250,6 @@ Public Class frmFlowForm
AddHandler KeyUp, AddressOf frmFlowForm_KeyDown
AddHandler Watcher.ClipboardChanged, AddressOf Watcher_ClipboardChanged
- 'Dim oSQL = My.Queries.Common.FNIDB_GET_SEARCH_PROFILES(My.Application.User.UserId, My.Application.User.Language)
- 'Dim oDatatable As DataTable = My.Database.GetDatatableIDB(oSQL)
PictureBoxSearch.Visible = False
For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows
@@ -261,14 +259,12 @@ Public Class frmFlowForm
End If
Next
- 'If Not IsNothing(oDatatable) Then
- ' If oDatatable.Rows.Count > 0 Then
- ' IDBSearchActive = True
- ' DTIDB_SEARCHES = oDatatable
- ' PictureBoxSearch1.Visible = True
- ' End If
+ Dim oSql = $"SELECT TOP 10 * FROM VWIDB_DOCRESULT_DE WHERE [Changed who] = '{My.Application.User.UserName}' ORDER BY [Changed when] DESC"
+ Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(oSql)
- 'End If
+ GridControl1.DataSource = AccessedFilesTable
+ colPrimary.FieldName = "DisplayFileName"
+ colSecondary.FieldName = "Changed when"
If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then
Try
@@ -304,7 +300,7 @@ Public Class frmFlowForm
ProfileLoader = New ClassProfileLoader(My.LogConfig, My.Database)
ProfileLoader.LoadProfiles()
Catch ex As Exception
- ShowErrorMessage(ex)
+ ErrorHandler.ShowErrorMessage(ex, "Init Search FLOW")
End Try
Else
My.Application.ClipboardWatcher.MonitoringActive = False
@@ -345,8 +341,6 @@ Public Class frmFlowForm
End If
-
-
If IsNothing(My.Tables.DTIDB_CATALOG_USER) Then
Exit Function
End If
@@ -590,15 +584,6 @@ Public Class frmFlowForm
Next
End Function
- Private Function FormLoaded_Visible() As Boolean
- For Each frm As Form In Application.OpenForms
- If frm.Name.Equals("frmSearchStart") Or frm.Name.Equals("frmGlobix_Index") Or frm.Name.Equals("frmAdmin_Start") Then
- Return False
- End If
- Next
-
- Return True
- End Function
Private Sub NotifyIcon_DoubleClick(sender As Object, e As EventArgs) Handles NotifyIcon.DoubleClick
If Visible = False Then
@@ -608,10 +593,6 @@ Public Class frmFlowForm
End If
End Sub
- Private Sub PictureBox1_DragEnter(sender As Object, e As DragEventArgs)
- Drag_Enter(sender, e)
- End Sub
-
Sub Drag_Enter(sender As Object, e As DragEventArgs)
If e.Data.GetDataPresent(DataFormats.FileDrop) Then
e.Effect = DragDropEffects.All
@@ -649,11 +630,7 @@ Public Class frmFlowForm
End If
End Function
- Private Async Sub PictureBox1_DragDrop(sender As Object, e As DragEventArgs)
- Await DragDropForm(e)
- End Sub
-
- Private Async Function Globix_CheckDroppedFiles(pDroppedFiles As List(Of FileDrop.DroppedFile)) As Threading.Tasks.Task
+ Private Async Function Globix_CheckDroppedFiles(pDroppedFiles As List(Of FileDrop.DroppedFile)) As Task
Try
Await My.Database.ExecuteNonQueryECMAsync($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND USER@WORK = '{My.Application.User.UserName}'")
@@ -856,7 +833,7 @@ Public Class frmFlowForm
My.UIConfigManager.Save()
End Sub
- Private Sub TimerFolderwatch_Tick_1(sender As Object, e As EventArgs) Handles TimerFolderwatch.Tick
+ Private Sub TimerFolderwatch_Tick(sender As Object, e As EventArgs) Handles TimerFolderwatch.Tick
Try
' JenneJ, 11.02.2019:
@@ -1120,7 +1097,6 @@ Public Class frmFlowForm
Private Function GetResultWindowString(SearchContent As String) As String
If SearchContent <> String.Empty Then
If My.Application.User.Language = DigitalData.Modules.ZooFlow.State.UserState.LANG_DE_DE Then
-
Return $"Suche Nach '{SearchContent}'"
Else
Return $"Search For '{SearchContent}'"
@@ -1130,72 +1106,13 @@ Public Class frmFlowForm
End If
End Function
- Async Function GetSearchResults(pSearchText As String) As Task
- Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{pSearchText}',''"
- Await My.Database.GetDatatableIDBAsync(DocResultBaseSearch)
- End Function
-
- Async Function RunQuickSearch1(pSearchText As String) As Threading.Tasks.Task
- Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
-
- Try
- Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{pSearchText}',''"
- Dim oParams = New DocumentResultList.Params() With {
- .WindowGuid = "QuickFlowSearch1",
- .WindowTitle = GetResultWindowString(pSearchText),
- .OperationModeOverride = DigitalData.Modules.ZooFlow.Constants.OperationMode.ZooFlow,
- .ProfileGuid = 354521,
- .ShowBackNavigation = False
- }
-
- If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then
- Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(DocResultBaseSearch)
-
- If oDTDocResult.Rows.Count > 0 Then
- Logger.Debug($"Quicksearch1 got {oDTDocResult.Rows.Count} results")
- oParams.Results.Add(New DocumentResultList.DocumentResult() With {
- .Title = GetResultWindowString(pSearchText),
- .Datatable = oDTDocResult
- })
-
- ' disable file list if we have only one document
- If oDTDocResult.Rows.Count = 1 Then
- oParams.ShowFileList = False
- End If
-
- Dim oForm As New frmDocumentResultList(My.LogConfig, Environment, oParams)
- oForm.Show()
- oForm.BringToFront()
- oForm.Focus()
-
- Else
- Dim oMessage As String
- If My.Application.User.Language = "de-DE" Then
- oMessage = "Kein Ergebnis"
- Else
- oMessage = "No results"
- End If
- NotifyIcon.ShowBalloonTip(20000, $"Info", oMessage, ToolTipIcon.Info)
-
- End If
- End If
-
- Catch ex As Exception
- Logger.Error(ex)
- MsgBox("Unhandled exception in RunQuickSearch1: " & ex.Message, MsgBoxStyle.Critical)
- Finally
- SplashScreenManager.CloseOverlayForm(oHandle)
- End Try
- End Function
-
Private Async Sub TextEdit1_KeyUp(sender As Object, e As KeyEventArgs) Handles txtQuicksearch1.KeyUp
If e.KeyCode = Keys.Return Then
- Await CheckRunSearch1()
+ Await CheckQuickSearch1()
End If
End Sub
-
- Async Function CheckRunSearch1() As Threading.Tasks.Task
+ Private Async Function CheckQuickSearch1() As Threading.Tasks.Task
Dim oSearchText = txtQuicksearch1.Text
If oSearchText <> String.Empty Then
@@ -1203,7 +1120,10 @@ Public Class frmFlowForm
Dim oToken = RunningTaskTokenSource.Token
Try
- Await RunQuickSearch1(oSearchText)
+ Dim oResult = Await Search.Run(oSearchText)
+ If oResult.OK = False Then
+ NotifyIcon.ShowBalloonTip(20_000, "Info", oResult.ErrorMessage, ToolTipIcon.Info)
+ End If
Catch ex As Exception
ShowErrorMessage(ex)
@@ -1246,7 +1166,7 @@ Public Class frmFlowForm
Private Sub PictureBoxPM_Click(sender As Object, e As EventArgs) Handles PictureBoxPM.Click
Try
- Dim oProcessManagerPath = Modules.GetProductPath(DigitalData.Modules.Base.ECM.Product.ProcessManager)
+ Dim oProcessManagerPath = Modules.GetProductProgramPath(DigitalData.Modules.Base.ECM.Product.ProcessManager)
If oProcessManagerPath IsNot Nothing AndAlso IO.File.Exists(oProcessManagerPath) Then
Process.Start(oProcessManagerPath)
End If
@@ -1264,7 +1184,7 @@ Public Class frmFlowForm
End Sub
Private Async Sub PictureEditQuicksearch1_Click(sender As Object, e As EventArgs) Handles PictureEditQuicksearch1.Click
- Await CheckRunSearch1()
+ Await CheckQuickSearch1()
End Sub
Private Sub bbtnitmAusblenden_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmAusblenden.ItemClick
@@ -1283,8 +1203,44 @@ Public Class frmFlowForm
oForm.Show()
End Sub
- Private Sub PictureEditQuicksearch1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEditQuicksearch1.EditValueChanged
+ Private Sub AdvBandedGridView1_DoubleClick(sender As Object, e As EventArgs) Handles RecentFilesView.DoubleClick
+ If RecentFilesView.FocusedRowHandle >= 0 Then
+ Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
+ Try
+ Dim oFile As DataRowView = RecentFilesView.GetRow(RecentFilesView.FocusedRowHandle)
+ Dim oRow As DataRow = oFile.Row
+ Dim oObjectId As Long = oRow.Item("DocId")
+ Dim oDataSource As DataTable = GridControl1.DataSource
+ Dim oResult = oDataSource.AsEnumerable().
+ Where(Function(row) row.Item("DocId") = oObjectId).
+ CopyToDataTable()
+
+ Search.Run(oResult, "Suche")
+
+ 'Dim oParams = New DocumentResultList.Params() With {
+ ' .WindowGuid = "SingleDocument",
+ ' .WindowTitle = "Einzelnes Dokument",
+ ' .OperationModeOverride = DigitalData.Modules.ZooFlow.Constants.OperationMode.ZooFlow,
+ ' .ProfileGuid = 354521,
+ ' .ShowBackNavigation = False,
+ ' .ShowFileList = False,
+ ' .Results = New List(Of DocumentResultList.DocumentResult) From {
+ ' New DocumentResultList.DocumentResult() With {
+ ' .Title = "Einzelnes Dokument",
+ ' .Datatable = oResult
+ ' }
+ ' }
+ '}
+
+ 'Dim oForm As New frmDocumentResultList(My.LogConfig, Environment, oParams)
+ 'oForm.Show()
+ Catch ex As Exception
+ ErrorHandler.ShowErrorMessage(ex, "Laden eines Dokuments")
+ Finally
+ SplashScreenManager.CloseOverlayForm(oHandle)
+ End Try
+ End If
End Sub
End Class
diff --git a/Modules.Filesystem/File.vb b/Modules.Filesystem/File.vb
index 3caca1d5..30cd5203 100644
--- a/Modules.Filesystem/File.vb
+++ b/Modules.Filesystem/File.vb
@@ -120,7 +120,6 @@ Public Class File
Dim oExtension = Path.GetExtension(oFileName)
Dim oVersionSeparator As Char = "~"c
- Dim oFileVersion As Integer = Nothing
' Split Filename without extension at version separator to:
' - Check if file is already versioned
@@ -130,25 +129,31 @@ Public Class File
' test1.pdf --> test1 --> ['test1'] --> no fileversion
' test1~2.pdf --> test1~2 --> ['test1', '2'] --> version 2
' test1~12345~2.pdf --> test1~12345~2 --> ['test1', '12345', '2'] --> still version 2
- Dim oFileNameWithoutExtension = Path.GetFileNameWithoutExtension(oFileName)
- Dim oSplitFilename = oFileNameWithoutExtension.Split(oVersionSeparator).ToList()
+ 'Dim oFileNameWithoutExtension = Path.GetFileNameWithoutExtension(oFileName)
+ 'Dim oSplitFilename = oFileNameWithoutExtension.Split(oVersionSeparator).ToList()
' if file is already versioned, extract file version
' else just use the filename and set version to 1
- If oSplitFilename.Count > 1 Then
- Dim oVersion As Integer = 1
- Try
- oVersion = Integer.Parse(oSplitFilename.Last())
- oFileNameWithoutExtension = String.Join("", oSplitFilename.Take(oSplitFilename.Count - 1))
- Catch ex As Exception
- ' oFilenameWithoutExtension does NOT change
- oFileNameWithoutExtension = oFileNameWithoutExtension
- Finally
- oFileVersion = oVersion
- End Try
- Else
- oFileVersion = 1
- End If
+ 'If oSplitFilename.Count > 1 Then
+ ' Dim oVersion As Integer = 1
+ ' Try
+ ' oVersion = Integer.Parse(oSplitFilename.Last())
+ ' oFileNameWithoutExtension = String.Join("", oSplitFilename.Take(oSplitFilename.Count - 1))
+ ' Catch ex As Exception
+ ' ' oFilenameWithoutExtension does NOT change
+ ' oFileNameWithoutExtension = oFileNameWithoutExtension
+ ' Finally
+ ' oFileVersion = oVersion
+ ' End Try
+ 'Else
+ ' oFileVersion = 1
+ 'End If
+
+ Dim oFileNameWithoutExtension = Path.GetFileNameWithoutExtension(oFileName)
+ Dim oSplitResult = GetVersionedString(oFileNameWithoutExtension, oVersionSeparator)
+
+ oFileNameWithoutExtension = oSplitResult.Item1
+ Dim oFileVersion = oSplitResult.Item2
' Shorten the filename (only filename, without extension or version)
' by cutting the length in half. This should work no matter how long the path and/or filename are.
@@ -180,6 +185,45 @@ Public Class File
End Try
End Function
+ '''
+ ''' Split String at version separator to:
+ ''' check if string is already versioned,
+ ''' get the string version of an already versioned string
+ '''
+ '''
+ ''' Examples:
+ ''' test1.pdf --> test1 --> ['test1'] --> no fileversion
+ ''' test1~2.pdf --> test1~2 --> ['test1', '2'] --> version 2
+ ''' test1~12345~2.pdf --> test1~12345~2 --> ['test1', '12345', '2'] --> still version 2
+ ''' somestring~3 --> somestring~3 --> ['somestring', '3'] --> version 3
+ '''
+ ''' The string to versioned
+ ''' The character to split at
+ ''' Tuple of string and version
+ Public Function GetVersionedString(pString As String, pSeparator As Char) As Tuple(Of String, Integer)
+ Dim oSplitString = pString.Split(pSeparator).ToList()
+ Dim oStringVersion As Integer
+
+ ' if string is already versioned, extract string version
+ ' else just use the string and set version to 1
+ If oSplitString.Count > 1 Then
+ Dim oVersion As Integer = 1
+ Try
+ oVersion = Integer.Parse(oSplitString.Last())
+ pString = String.Join("", oSplitString.Take(oSplitString.Count - 1))
+ Catch ex As Exception
+ ' pString does NOT change
+ pString = pString
+ Finally
+ oStringVersion = oVersion
+ End Try
+ Else
+ oStringVersion = 1
+ End If
+
+ Return New Tuple(Of String, Integer)(pString, oStringVersion)
+ End Function
+
Public Function GetAppDataPath(CompanyName As String, ProductName As String)
Dim oLocalAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
Return Path.Combine(oLocalAppData, CompanyName, ProductName)
diff --git a/Modules.Filesystem/My Project/AssemblyInfo.vb b/Modules.Filesystem/My Project/AssemblyInfo.vb
index 2ae924dd..15366762 100644
--- a/Modules.Filesystem/My Project/AssemblyInfo.vb
+++ b/Modules.Filesystem/My Project/AssemblyInfo.vb
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
-
+
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
-
+
+
diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb
index 7bd310af..8a969115 100644
--- a/Services.ZUGFeRDService/ThreadRunner.vb
+++ b/Services.ZUGFeRDService/ThreadRunner.vb
@@ -14,18 +14,12 @@ Public Class ThreadRunner
Private WithEvents _workerThread As BackgroundWorker
Private WithEvents _workerTimer As Timer
- Private _config As ConfigManager(Of Config)
- Private _logConfig As LogConfig
- Private _logger As Logger
- Private _firebird As Firebird
- Private _watchDirectories As List(Of String)
- Private _successDirectory As String
- Private _errorDirectory As String
- Private _originalEmailDirectory As String
- Private _attachmentDirectory As String
- Private _zugferd As ZUGFeRDInterface
- Private _jobArguments As WorkerArgs
- Private _mssql As MSSQLServer
+ Private ReadOnly _config As ConfigManager(Of Config)
+ Private ReadOnly _logConfig As LogConfig
+ Private ReadOnly _logger As Logger
+ Private ReadOnly _firebird As Firebird
+ Private ReadOnly _jobArguments As WorkerArgs
+ Private ReadOnly _mssql As MSSQLServer
Public Sub New(LogConfig As LogConfig, ConfigManager As ConfigManager(Of Config), Firebird As Firebird, Optional MSSQL As MSSQLServer = Nothing)
_logConfig = LogConfig