diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 8cf13068..db5f7877 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -61,6 +61,7 @@ Partial Class frmAdmin_Start Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem() Me.btnDatabaseConnection = New DevExpress.XtraBars.BarButtonItem() + Me.btnSecondServiceConnection = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -135,9 +136,9 @@ Partial Class frmAdmin_Start 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.btnAddRecord, Me.btnEditRecord, Me.BarButtonItem26, Me.BarButtonItem27, Me.btnDatabaseConnection}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.btnAddRecord, Me.btnEditRecord, Me.BarButtonItem26, Me.BarButtonItem27, Me.btnDatabaseConnection, Me.btnSecondServiceConnection}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 38 + Me.RibbonControl1.MaxItemId = 39 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -380,6 +381,13 @@ Partial Class frmAdmin_Start Me.btnDatabaseConnection.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.managedatasource3 Me.btnDatabaseConnection.Name = "btnDatabaseConnection" ' + 'btnSecondServiceConnection + ' + Me.btnSecondServiceConnection.Caption = "Dienstkonfiguration umschalten" + Me.btnSecondServiceConnection.Id = 38 + Me.btnSecondServiceConnection.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.switchrowcolumns + Me.btnSecondServiceConnection.Name = "btnSecondServiceConnection" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1}) @@ -392,6 +400,7 @@ Partial Class frmAdmin_Start Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem27) Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem9) Me.RibbonPageGroup2.ItemLinks.Add(Me.btnDatabaseConnection) + Me.RibbonPageGroup2.ItemLinks.Add(Me.btnSecondServiceConnection) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Daten" ' @@ -951,4 +960,5 @@ Partial Class frmAdmin_Start Friend WithEvents BarButtonItem26 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem27 As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnDatabaseConnection As DevExpress.XtraBars.BarButtonItem + Friend WithEvents btnSecondServiceConnection As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 179f7e85..0e36230d 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -311,4 +311,33 @@ Public Class frmAdmin_Start Return False End If End Function + + Private Sub btnSecondServiceConnection_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnSecondServiceConnection.ItemClick + If My.SystemConfig.AppServerConfigDevelopment = String.Empty Then + Dim oAnswer = MsgBox("Es ist keine zweite Dienstkonfiguration vorhanden. Wollen Sie nun eine hinterlegen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) + If oAnswer = MsgBoxResult.Yes Then + Dim oForm As New frmServiceConfig() With { + .ServiceAddress = "", + .ServiceOnline = False + } + + oForm.ShowDialog() + + My.SystemConfig.AppServerConfigDevelopment = oForm.ServiceAddress + My.SystemConfigManager.Save() + Else + ' Cancel + Exit Sub + End If + End If + + Dim oServiceAddress = My.SystemConfig.AppServerConfig + If My.Application.Service.Client.ServerAddress = My.SystemConfig.AppServerConfig Then + oServiceAddress = My.SystemConfig.AppServerConfigDevelopment + Else + oServiceAddress = My.SystemConfig.AppServerConfig + End If + + My.Application.Service.Client = New Modules.EDMI.API.Client(My.LogConfig, oServiceAddress) + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Config/ClassConfig.vb b/GUIs.ZooFlow/Config/ClassConfig.vb index 0b618431..d293d5d2 100644 --- a/GUIs.ZooFlow/Config/ClassConfig.vb +++ b/GUIs.ZooFlow/Config/ClassConfig.vb @@ -43,6 +43,9 @@ Public Class ClassConfig Public Property AppServerConfig As String = String.Empty + + Public Property AppServerConfigDevelopment As String = String.Empty + ' === Logging Configuration Public Property LogDebug As Boolean = False diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb index 1c85f4b4..0c6edc59 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb @@ -11,11 +11,11 @@ Imports Limilabs.Mail Public Class ClassFilehandle Inherits BaseClass - Private FileEx As File - Private Email As Email2 - Private UserFiles As ClassUserFiles + Private ReadOnly FileEx As File + Private ReadOnly Email As Email2 + Private ReadOnly UserFiles As ClassUserFiles - Private TempFiles As New List(Of String) + Private ReadOnly TempFiles As New List(Of String) Public Sub New(pLogConfig As LogConfig) MyBase.New(pLogConfig) diff --git a/GUIs.ZooFlow/Modules/Globix/State.vb b/GUIs.ZooFlow/Modules/Globix/State.vb index 4533043e..9d5e710f 100644 --- a/GUIs.ZooFlow/Modules/Globix/State.vb +++ b/GUIs.ZooFlow/Modules/Globix/State.vb @@ -8,9 +8,7 @@ Namespace Globix Public Property CurrMessageID As String Public Property CurrentFolderWatchPath As String Public Property CURRENT_SCAN_FOLDERWATCH As String - - Public Property CurrentWorkfile As Globix.Models.WorkFile - + Public Property CurrentWorkfile As Models.WorkFile Public Property INDEXING_ACTIVE As Boolean = False Public Property ABORT_INDEXING As Boolean = False Public Property CURRENT_ISATTACHMENT As Boolean = False diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixAdministration.resx b/GUIs.ZooFlow/Modules/Globix/frmGlobixAdministration.resx deleted file mode 100644 index f2e1256e..00000000 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixAdministration.resx +++ /dev/null @@ -1,376 +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 - 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 - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKcCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZCI+DQogICAgPHBhdGggZD0iTTI3LDE0aC05VjVj - MC0wLjUtMC41LTEtMS0xaC0yYy0wLjUsMC0xLDAuNS0xLDF2OUg1Yy0wLjUsMC0xLDAuNS0xLDF2MmMw - LDAuNSwwLjUsMSwxLDFoOXY5ICAgYzAsMC41LDAuNSwxLDEsMWgyYzAuNSwwLDEtMC41LDEtMXYtOWg5 - YzAuNSwwLDEtMC41LDEtMXYtMkMyOCwxNC41LDI3LjUsMTQsMjcsMTR6IiBjbGFzcz0iR3JlZW4iIC8+ - DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg - MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 - bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww - LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt - NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si - IC8+DQo8L3N2Zz4L - - - - 144, 17 - - - 17, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAxMyAxMyIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MTMgMTMiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs - YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy - Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQXBwb2ludG1l - bnRFbmRDb250aW51ZUFycm93XzFfIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIsNyA3LDIgNyw1IDEx - LDUgMTEsOSA3LDkgNywxMiAgIiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - 821, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcFAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku - QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC - MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iSXRlbVR5cGVD - aGVja2VkIj4NCiAgICA8Zz4NCiAgICAgIDxnPg0KICAgICAgICA8cmVjdCB4PSIyMCIgeT0iOCIgd2lk - dGg9IjEwIiBoZWlnaHQ9IjQiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsYWNrIiAvPg0KICAgICAgICA8 - cmVjdCB4PSIyMCIgeT0iMjIiIHdpZHRoPSIxMCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNz - PSJCbGFjayIgLz4NCiAgICAgICAgPHBhdGggZD0iTTE1LDE4SDNjLTAuNSwwLTEsMC41LTEsMXYxMmMw - LDAuNSwwLjUsMSwxLDFoMTJjMC41LDAsMS0wLjUsMS0xVjE5QzE2LDE4LjUsMTUuNSwxOCwxNSwxOHog - TTE0LDMwSDRWMjAgICAgIGgxMFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgICAgPHBhdGggZD0i - TTE0LDEwLjhWMTRINFY0aDguMmwyLTJIM0MyLjUsMiwyLDIuNSwyLDN2MTJjMCwwLjUsMC41LDEsMSwx - aDEyYzAuNSwwLDEtMC41LDEtMVY4LjhMMTQsMTAuOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgIDwv - Zz4NCiAgICAgIDxnPg0KICAgICAgICA8cmVjdCB4PSIyMCIgeT0iOCIgd2lkdGg9IjEwIiBoZWlnaHQ9 - IjQiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsYWNrIiAvPg0KICAgICAgICA8cmVjdCB4PSIyMCIgeT0i - MjIiIHdpZHRoPSIxMCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJCbGFjayIgLz4NCiAg - ICAgICAgPHBhdGggZD0iTTE1LDE4SDNjLTAuNSwwLTEsMC41LTEsMXYxMmMwLDAuNSwwLjUsMSwxLDFo - MTJjMC41LDAsMS0wLjUsMS0xVjE5QzE2LDE4LjUsMTUuNSwxOCwxNSwxOHogTTE0LDMwSDRWMjAgICAg - IGgxMFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgICAgPHBhdGggZD0iTTE0LDEwLjhWMTRINFY0 - aDguMmwyLTJIM0MyLjUsMiwyLDIuNSwyLDN2MTJjMCwwLjUsMC41LDEsMSwxaDEyYzAuNSwwLDEtMC41 - LDEtMVY4LjhMMTQsMTAuOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgIDwvZz4NCiAgICA8L2c+DQog - ICAgPHBvbHlnb24gcG9pbnRzPSI2LDUgNiw4IDEwLDEyIDE4LDQgMTgsMSAxMCw5ICAiIGNsYXNzPSJH - cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANYDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3 - RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm - aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iVXBkYXRlIj4NCiAgICA8ZyBj - bGFzcz0ic3QxIj4NCiAgICAgIDxwYXRoIGQ9Ik0xNiw2aC02VjJoNlY2eiBNMTYsOGgtNnY0aDZWOHog - TTI0LDJoLTZ2NGg2VjJ6IE0yNCwxMlY4aC02djRIMjR6IE0yLDZoNlYySDJWNnogTTIsMThoNnYtNEgy - VjE4eiBNMTYsMTQgICAgTDE2LDE0bC02LDB2NGgyLjhDMTMuNSwxNi40LDE0LjYsMTUsMTYsMTR6IE0y - LDEyaDZWOEgyVjEyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMjcu - NywyMGgySDMwdi02bC0yLjMsMi4zQzI2LjIsMTQuOSwyNC4yLDE0LDIyLDE0Yy00LjQsMC04LDMuNi04 - LDhjMCw0LjQsMy42LDgsOCw4czgtMy42LDgtOGgtMiAgIGMwLDMuMy0yLjcsNi02LDZzLTYtMi43LTYt - NnMyLjctNiw2LTZjMS43LDAsMy4yLDAuNyw0LjIsMS44TDI0LDIwSDI3Ljd6IiBjbGFzcz0iR3JlZW4i - IC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAxMyAxMyIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MTMgMTMiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs - YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy - Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQXBwb2ludG1l - bnRFbmRDb250aW51ZUFycm93XzFfIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIsNyA3LDIgNyw1IDEx - LDUgMTEsOSA3LDkgNywxMiAgIiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - 17, 56 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsFAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3 - RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm - aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iQXV0b21hdGljVXBkYXRlcyI+ - DQogICAgPHBhdGggZD0iTTE1LjYsMjUuMUwxNC42LDI1Yy0xLTAuMi0xLjYtMS0xLjYtMnYtMS4xYy0w - LjMsMC0wLjcsMC4xLTEsMC4xYy00LjQsMC04LTMuNi04LThjMC00LjQsMy42LTgsOC04ICAgYzIuMiww - LDQuMiwwLjksNS42LDIuNEwxNCwxMmg1LjdIMjJoMS44SDI0VjJsLTMuNSwzLjVDMTguMywzLjMsMTUu - MywyLDEyLDJDNS40LDIsMCw3LjQsMCwxNGMwLDYuNiw1LjQsMTIsMTIsMTIgICBjMS4xLDAsMi4yLTAu - MiwzLjMtMC41TDE1LjYsMjUuMXoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgICA8cGF0aCBkPSJNMzEsMjN2 - LTJsLTIuMi0wLjRjLTAuMi0wLjYtMC40LTEuMy0wLjgtMS44bDEuMy0xLjhsLTEuNC0xLjRsLTEuOCwx - LjNjLTAuNS0wLjMtMS4yLTAuNi0xLjgtMC43TDI0LDE0aC0yICAgbC0wLjQsMi4yYy0wLjYsMC4yLTEu - MywwLjQtMS44LDAuN0wxOCwxNS42TDE2LjYsMTdsMS4zLDEuOGMtMC4zLDAuNS0wLjYsMS4yLTAuOCwx - LjhMMTUsMjF2MmwyLjIsMC40YzAuMiwwLjYsMC40LDEuMywwLjgsMS44ICAgTDE2LjcsMjdsMS40LDEu - NGwxLjgtMS4zYzAuNSwwLjMsMS4yLDAuNiwxLjgsMC43TDIyLDMwaDJsMC40LTIuMmMwLjYtMC4yLDEu - My0wLjQsMS44LTAuN2wxLjgsMS4zbDEuNC0xLjRsLTEuMy0xLjggICBjMC4zLTAuNSwwLjYtMS4yLDAu - OC0xLjhMMzEsMjN6IE0yMywyNGMtMS4xLDAtMi0wLjktMi0yczAuOS0yLDItMnMyLDAuOSwyLDJTMjQu - MSwyNCwyMywyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALoDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs - YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy - Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iUGFnZVNldHVwIj4NCiAgICA8cGF0aCBkPSJNMTkuMiwyNkg4VjZoMTB2NWMwLDAu - NiwwLjQsMSwxLDFoNXY5LjJsMiwyVjExbC03LTdIN0M2LjQsNCw2LDQuNCw2LDV2MjJjMCwwLjYsMC40 - LDEsMSwxaDE0LjJMMTkuMiwyNnoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMjcuNiwy - Ny42bC02LjItNi4yYzAuNC0wLjcsMC42LTEuNSwwLjYtMi40YzAtMi44LTIuMi01LTUtNWMtMC44LDAt - MS41LDAuMi0yLjEsMC41bDIuNywyLjcgICBjMC42LDAuNiwwLjYsMS43LDAsMi40cy0xLjcsMC42LTIu - NCwwbC0yLjctMi43QzEyLjIsMTcuNSwxMiwxOC4yLDEyLDE5YzAsMi44LDIuMiw1LDUsNWMwLjksMCwx - LjctMC4yLDIuNC0wLjZsNi4yLDYuMiAgIGMwLjYsMC42LDEuNCwwLjYsMiwwbDAsMEMyOC4xLDI5LDI4 - LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - 399, 17 - - - 648, 17 - - - 1056, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg - MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 - bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww - LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt - NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si - IC8+DQo8L3N2Zz4L - - - - 267, 56 - - \ No newline at end of file diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb index 0018fdb5..dd71666f 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb @@ -22,7 +22,7 @@ Partial Class frmGlobixBasicConfig 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGlobixBasicConfig)) Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.DataGridView1 = New System.Windows.Forms.DataGridView() @@ -84,14 +84,14 @@ Partial Class frmGlobixBasicConfig ' 'DataGridView1 ' - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.DataGridView1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.DataGridView1.Location = New System.Drawing.Point(24, 143) + Me.DataGridView1.Location = New System.Drawing.Point(24, 171) Me.DataGridView1.Name = "DataGridView1" - Me.DataGridView1.Size = New System.Drawing.Size(312, 481) + Me.DataGridView1.Size = New System.Drawing.Size(312, 453) Me.DataGridView1.TabIndex = 7 ' 'LayoutControl1 @@ -119,16 +119,16 @@ Partial Class frmGlobixBasicConfig 'PictureEdit1 ' Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW_DROP3 - Me.PictureEdit1.Location = New System.Drawing.Point(364, 166) + Me.PictureEdit1.Location = New System.Drawing.Point(364, 194) Me.PictureEdit1.Name = "PictureEdit1" Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] - Me.PictureEdit1.Size = New System.Drawing.Size(642, 458) + Me.PictureEdit1.Size = New System.Drawing.Size(642, 430) Me.PictureEdit1.StyleController = Me.LayoutControl1 Me.PictureEdit1.TabIndex = 11 ' 'ToggleSwitchDropArea ' - Me.ToggleSwitchDropArea.Location = New System.Drawing.Point(364, 143) + Me.ToggleSwitchDropArea.Location = New System.Drawing.Point(364, 171) Me.ToggleSwitchDropArea.Name = "ToggleSwitchDropArea" Me.ToggleSwitchDropArea.Properties.OffText = "Progressiv" Me.ToggleSwitchDropArea.Properties.OnText = "Gemässigt" @@ -148,7 +148,7 @@ Partial Class frmGlobixBasicConfig ' 'ToggleSwitchHotfolder ' - Me.ToggleSwitchHotfolder.Location = New System.Drawing.Point(12, 38) + Me.ToggleSwitchHotfolder.Location = New System.Drawing.Point(12, 52) Me.ToggleSwitchHotfolder.Name = "ToggleSwitchHotfolder" Me.ToggleSwitchHotfolder.Properties.OffText = "Überwachung starten" Me.ToggleSwitchHotfolder.Properties.OnText = "Überwachung aktiv" @@ -158,7 +158,7 @@ Partial Class frmGlobixBasicConfig ' 'ToggleSwitchScanfolder ' - Me.ToggleSwitchScanfolder.Location = New System.Drawing.Point(12, 87) + Me.ToggleSwitchScanfolder.Location = New System.Drawing.Point(12, 115) Me.ToggleSwitchScanfolder.Name = "ToggleSwitchScanfolder" Me.ToggleSwitchScanfolder.Properties.OffText = "Scanfolder überwachen" Me.ToggleSwitchScanfolder.Properties.OnText = "Überwachung aktiv" @@ -168,7 +168,7 @@ Partial Class frmGlobixBasicConfig ' 'btnScanfolder ' - Me.btnScanfolder.Location = New System.Drawing.Point(963, 61) + Me.btnScanfolder.Location = New System.Drawing.Point(963, 75) Me.btnScanfolder.Name = "btnScanfolder" Me.btnScanfolder.Size = New System.Drawing.Size(55, 22) Me.btnScanfolder.StyleController = Me.LayoutControl1 @@ -177,9 +177,9 @@ Partial Class frmGlobixBasicConfig ' 'TextEditScanfolder ' - Me.TextEditScanfolder.Location = New System.Drawing.Point(96, 61) + Me.TextEditScanfolder.Location = New System.Drawing.Point(104, 83) Me.TextEditScanfolder.Name = "TextEditScanfolder" - Me.TextEditScanfolder.Size = New System.Drawing.Size(863, 20) + Me.TextEditScanfolder.Size = New System.Drawing.Size(847, 20) Me.TextEditScanfolder.StyleController = Me.LayoutControl1 Me.TextEditScanfolder.TabIndex = 4 ' @@ -194,9 +194,9 @@ Partial Class frmGlobixBasicConfig ' 'TextEditHotfolder ' - Me.TextEditHotfolder.Location = New System.Drawing.Point(96, 12) + Me.TextEditHotfolder.Location = New System.Drawing.Point(104, 20) Me.TextEditHotfolder.Name = "TextEditHotfolder" - Me.TextEditHotfolder.Size = New System.Drawing.Size(863, 20) + Me.TextEditHotfolder.Size = New System.Drawing.Size(847, 20) Me.TextEditHotfolder.StyleController = Me.LayoutControl1 Me.TextEditHotfolder.TabIndex = 0 ' @@ -214,7 +214,8 @@ Partial Class frmGlobixBasicConfig Me.LayoutControlItem1.Control = Me.TextEditHotfolder Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Size = New System.Drawing.Size(951, 26) + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem1.Size = New System.Drawing.Size(951, 40) Me.LayoutControlItem1.Text = "Ihr Hotfolder" Me.LayoutControlItem1.TextSize = New System.Drawing.Size(72, 13) ' @@ -231,25 +232,26 @@ Partial Class frmGlobixBasicConfig Me.LayoutControlItem2.Control = Me.btnHotfolder Me.LayoutControlItem2.Location = New System.Drawing.Point(951, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(59, 26) + Me.LayoutControlItem2.Size = New System.Drawing.Size(59, 40) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' 'LayoutControlItem4 ' Me.LayoutControlItem4.Control = Me.TextEditScanfolder - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 49) + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 63) Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(951, 26) + Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem4.Size = New System.Drawing.Size(951, 40) Me.LayoutControlItem4.Text = "Ihr Scanfolder" Me.LayoutControlItem4.TextSize = New System.Drawing.Size(72, 13) ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.btnScanfolder - Me.LayoutControlItem5.Location = New System.Drawing.Point(951, 49) + Me.LayoutControlItem5.Location = New System.Drawing.Point(951, 63) Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Size = New System.Drawing.Size(59, 26) + Me.LayoutControlItem5.Size = New System.Drawing.Size(59, 40) Me.LayoutControlItem5.Text = "..." Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem5.TextVisible = False @@ -257,7 +259,7 @@ Partial Class frmGlobixBasicConfig 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.ToggleSwitchScanfolder - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 75) + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 103) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Size = New System.Drawing.Size(1010, 23) Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) @@ -266,7 +268,7 @@ Partial Class frmGlobixBasicConfig 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.ToggleSwitchHotfolder - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 26) + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 40) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Size = New System.Drawing.Size(1010, 23) Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) @@ -284,9 +286,9 @@ Partial Class frmGlobixBasicConfig 'LayoutControlGroup1 ' Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem3}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 98) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 126) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(340, 530) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(340, 502) Me.LayoutControlGroup1.Text = "Blacklist Folderwatch-Files" ' 'LayoutControlItem3 @@ -296,7 +298,7 @@ Partial Class frmGlobixBasicConfig Me.LayoutControlItem3.Control = Me.DataGridView1 Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Size = New System.Drawing.Size(316, 485) + Me.LayoutControlItem3.Size = New System.Drawing.Size(316, 457) Me.LayoutControlItem3.Text = "Blacklist Folderwatchfiles" Me.LayoutControlItem3.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem3.TextVisible = False @@ -304,9 +306,9 @@ Partial Class frmGlobixBasicConfig 'LayoutControlGroup2 ' Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem11}) - Me.LayoutControlGroup2.Location = New System.Drawing.Point(340, 98) + Me.LayoutControlGroup2.Location = New System.Drawing.Point(340, 126) Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(670, 530) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(670, 502) Me.LayoutControlGroup2.Text = "Darstellung Drop-Area" ' 'LayoutControlItem10 @@ -325,7 +327,7 @@ Partial Class frmGlobixBasicConfig Me.LayoutControlItem11.Control = Me.PictureEdit1 Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 23) Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Size = New System.Drawing.Size(646, 462) + Me.LayoutControlItem11.Size = New System.Drawing.Size(646, 434) Me.LayoutControlItem11.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize Me.LayoutControlItem11.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem11.TextToControlDistance = 0 @@ -358,7 +360,7 @@ Partial Class frmGlobixBasicConfig Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmGlobixBasicConfig" - Me.Text = "Basiskonfiguration Globix" + Me.Text = "Basiskonfiguration File Flow" Me.TopMost = True CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixNameconvention.resx.bak b/GUIs.ZooFlow/Modules/Globix/frmGlobixNameconvention.resx.bak deleted file mode 100644 index 5b4457f6..00000000 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixNameconvention.resx.bak +++ /dev/null @@ -1,219 +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 - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs - YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy - Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4N - CiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xOC44LDE2bDYuOS02LjljMC40LTAuNCwwLjQtMSwwLTEu - NGwtMS40LTEuNGMtMC40LTAuNC0xLTAuNC0xLjQsMEwxNiwxMy4yTDkuMSw2LjNjLTAuNC0wLjQtMS0w - LjQtMS40LDAgICAgTDYuMyw3LjdjLTAuNCwwLjQtMC40LDEsMCwxLjRsNi45LDYuOWwtNi45LDYuOWMt - MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks - Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44 - LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs= - - - - - - 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 - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iRXhwb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxMnY2 - djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho - MTR2LTJIMjJ6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln - b24gcG9pbnRzPSIxNiwxMCAyNCwxMCAyNCwxNCAzMiw4IDI0LDIgMjQsNiAxNiw2ICAiIGNsYXNzPSJH - cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPoBAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJIZWFkZXJBbmRGb290ZXIiIHN0eWxlPSJlbmFibGUtYmFja2dy - b3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDoj - RDExQzFDO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDRINUM0LjUsNCw0LDQuNSw0LDV2MjJjMCww - LjUsMC41LDEsMSwxaDIyYzAuNSwwLDEtMC41LDEtMVY1QzI4LDQuNSwyNy41LDQsMjcsNHogTTIyLDIw - bC0yLDJsLTQtNGwtNCw0ICBsLTItMmw0LTRsLTQtNGwyLTJsNCw0bDQtNGwyLDJsLTQsNEwyMiwyMHoi - IGNsYXNzPSJSZWQiIC8+DQo8L3N2Zz4L - - - \ No newline at end of file diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.resx.bak b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.resx.bak deleted file mode 100644 index ca0e32ad..00000000 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.resx.bak +++ /dev/null @@ -1,525 +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 - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcFAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku - QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC - MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iSXRlbVR5cGVD - aGVja2VkIj4NCiAgICA8Zz4NCiAgICAgIDxnPg0KICAgICAgICA8cmVjdCB4PSIyMCIgeT0iOCIgd2lk - dGg9IjEwIiBoZWlnaHQ9IjQiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsYWNrIiAvPg0KICAgICAgICA8 - cmVjdCB4PSIyMCIgeT0iMjIiIHdpZHRoPSIxMCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNz - PSJCbGFjayIgLz4NCiAgICAgICAgPHBhdGggZD0iTTE1LDE4SDNjLTAuNSwwLTEsMC41LTEsMXYxMmMw - LDAuNSwwLjUsMSwxLDFoMTJjMC41LDAsMS0wLjUsMS0xVjE5QzE2LDE4LjUsMTUuNSwxOCwxNSwxOHog - TTE0LDMwSDRWMjAgICAgIGgxMFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgICAgPHBhdGggZD0i - TTE0LDEwLjhWMTRINFY0aDguMmwyLTJIM0MyLjUsMiwyLDIuNSwyLDN2MTJjMCwwLjUsMC41LDEsMSwx - aDEyYzAuNSwwLDEtMC41LDEtMVY4LjhMMTQsMTAuOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgIDwv - Zz4NCiAgICAgIDxnPg0KICAgICAgICA8cmVjdCB4PSIyMCIgeT0iOCIgd2lkdGg9IjEwIiBoZWlnaHQ9 - IjQiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsYWNrIiAvPg0KICAgICAgICA8cmVjdCB4PSIyMCIgeT0i - MjIiIHdpZHRoPSIxMCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJCbGFjayIgLz4NCiAg - ICAgICAgPHBhdGggZD0iTTE1LDE4SDNjLTAuNSwwLTEsMC41LTEsMXYxMmMwLDAuNSwwLjUsMSwxLDFo - MTJjMC41LDAsMS0wLjUsMS0xVjE5QzE2LDE4LjUsMTUuNSwxOCwxNSwxOHogTTE0LDMwSDRWMjAgICAg - IGgxMFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgICAgPHBhdGggZD0iTTE0LDEwLjhWMTRINFY0 - aDguMmwyLTJIM0MyLjUsMiwyLDIuNSwyLDN2MTJjMCwwLjUsMC41LDEsMSwxaDEyYzAuNSwwLDEtMC41 - LDEtMVY4LjhMMTQsMTAuOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgIDwvZz4NCiAgICA8L2c+DQog - ICAgPHBvbHlnb24gcG9pbnRzPSI2LDUgNiw4IDEwLDEyIDE4LDQgMTgsMSAxMCw5ICAiIGNsYXNzPSJH - cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIsDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9CgkuWWVsbG93e2ZpbGw6I0ZG - QjExNTt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iUHJldmlldyI+ - DQogICAgPHBhdGggZD0iTTIxLjQsMjhIMThsMCwwbDAsMEg2VjRoMTR2NWMwLDAuNiwwLjQsMSwxLDFo - NXYxMy40bDIsMlY5bC03LTdINUM0LjQsMiw0LDIuNCw0LDN2MjZjMCwwLjYsMC40LDEsMSwxaDE4LjQg - ICBMMjEuNCwyOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMTgsMTRjMy4zLDAsNiwy - LjcsNiw2YzAsMS4yLTAuNCwyLjMtMSwzLjNsNC42LDQuNmMwLjUsMC41LDAuNSwxLjMsMCwxLjdjLTAu - NSwwLjUtMS4zLDAuNS0xLjcsMEwyMS4zLDI1ICAgYy0wLjksMC42LTIuMSwxLTMuMywxYy0zLjMsMC02 - LTIuNy02LTZDMTIsMTYuNywxNC43LDE0LDE4LDE0eiBNMTgsMjRjMi4yLDAsNC0xLjgsNC00cy0xLjgt - NC00LTRzLTQsMS44LTQsNFMxNS44LDI0LDE4LDI0eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwv - c3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPYCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDI1 - IDI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl - ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiM2NDYzNjM7fS5jbHMtMntmaWxsOiNhNTI0MzE7fS5j - bHMtM3tmaWxsOm5vbmU7c3Ryb2tlOiM2NDYzNjM7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT4NCiAg - PC9kZWZzPg0KICA8cGF0aCBkPSJNMTguNjExNiwyMy41NDY0SDBWMy41OEgxOC42MTE2Wk0xLjk2Mzks - MjEuNTgyNkgxNi42NDc3VjUuNTQzM0gxLjk2MzlaIiBjbGFzcz0iY2xzLTEiIC8+DQogIDxwb2x5bGlu - ZSBwb2ludHM9IjIwLjIwNiAyMy41NDcgMjUgMTguNzUzIDIwLjIwNiAxMy45NTkiIGNsYXNzPSJjbHMt - MiIgLz4NCiAgPGxpbmUgeDE9IjQuMDQzOCIgeTE9IjEwLjE3MDkiIHgyPSIxNC41NjgiIHkyPSIxMC4x - NzA5IiBjbGFzcz0iY2xzLTMiIC8+DQogIDxsaW5lIHgxPSI0LjA0MzgiIHkxPSIxNC4wOTg2IiB4Mj0i - MTQuNTY4IiB5Mj0iMTQuMDk4NiIgY2xhc3M9ImNscy0zIiAvPg0KICA8bGluZSB4MT0iNC4wNDM4IiB5 - MT0iMTguMDI2MyIgeDI9IjE0LjU2OCIgeTI9IjE4LjAyNjMiIGNsYXNzPSJjbHMtMyIgLz4NCiAgPHJl - Y3QgeD0iMTAuNDA1NiIgeT0iMS40NTMzIiB3aWR0aD0iMTMuNzQ3IiBoZWlnaHQ9IjYuMjE2NiIgcng9 - IjAiIHJ5PSIwIiBjbGFzcz0iY2xzLTIiIC8+DQo8L3N2Zz4L - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEMEAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iV2luZG93cyI+DQogICAgPHBhdGggZD0iTTE4LDE4LjFWMTZoMnYwLjlDMTkuMywx - Ny4yLDE4LjYsMTcuNiwxOCwxOC4xeiBNMTQuNywyNkgyVjE2SDB2MTFjMCwwLjUsMC41LDEsMSwxaDE1 - LjEgICBDMTUuNSwyNy4zLDE1LjEsMjYuNiwxNC43LDI2eiBNMjQsMThjNS43LDAsOCw2LDgsNnMtMi4z - LDYtOCw2Yy01LjcsMC04LTYtOC02UzE4LjMsMTgsMjQsMTggTTI0LDIwYy0zLjMsMC01LjEsMi43LTUu - OCw0ICAgYzAuNywxLjMsMi41LDQsNS44LDRjMy4zLDAsNS4xLTIuNyw1LjgtNEMyOS4xLDIyLjcsMjcu - MywyMCwyNCwyMEwyNCwyMHogTTI0LDIyYy0xLjEsMC0yLDAuOS0yLDJzMC45LDIsMiwyYzEuMSwwLDIt - MC45LDItMiAgIFMyNS4xLDIyLDI0LDIyeiBNMjYsMTYuMlY4aDJ2OC45QzI3LjQsMTYuNiwyNi43LDE2 - LjQsMjYsMTYuMnogTTEwLDhIOHYyaDJWOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJN - MCwxNnYtNWMwLTAuNSwwLjUtMSwxLTFoMThjMC41LDAsMSwwLjUsMSwxdjVIMHogTTI4LDhWM2MwLTAu - NS0wLjUtMS0xLTFIOUM4LjUsMiw4LDIuNSw4LDN2NUgyOHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+ - DQo8L3N2Zz4L - - - - - 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 - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFkCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDI1 - IDI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl - ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiM2NDYzNjM7fS5jbHMtMntmaWxsOiNhNTI0MzE7fTwv - c3R5bGU+DQogIDwvZGVmcz4NCiAgPHBvbHlnb24gcG9pbnRzPSIxMi4wNjEgMjEuMjMgMy4zNTUgMjEu - MjMgMy4zNTUgMi43MyAxOS44NTUgMi43MyAxOS44NTUgMTMuMjk3IDIxLjg1NSAxMS4yNjIgMjEuODU1 - IDAuNzMgMS4zNTUgMC43MyAxLjM1NSAyMy4yMyAxMC4wOTYgMjMuMjMgMTIuMDYxIDIxLjIzIiBjbGFz - cz0iY2xzLTEiIC8+DQogIDxwb2x5Z29uIHBvaW50cz0iMjMuNjQ1IDE1LjExMSAyMi4yMzEgMTMuNjk3 - IDE4LjM1OCAxNy41NjkgMTQuNDg2IDEzLjY5NiAxMy4wNzEgMTUuMTEgMTYuOTQ0IDE4Ljk4MyAxMy4w - NzIgMjIuODU1IDE0LjQ4NiAyNC4yNjkgMTguMzU4IDIwLjM5NyAyMi4yMzEgMjQuMjcgMjMuNjQ1IDIy - Ljg1NiAxOS43NzIgMTguOTgzIDIzLjY0NSAxNS4xMTEiIGNsYXNzPSJjbHMtMiIgLz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDI1 - IDI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl - ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiM2NDYzNjM7fS5jbHMtMntmaWxsOiNhNTI0MzE7fTwv - c3R5bGU+DQogIDwvZGVmcz4NCiAgPHBhdGggZD0iTTIyLjc1LDIzLjIzSDIuMjVWLjczaDIwLjVabS0x - OC41LTJoMTYuNVYyLjczSDQuMjVaIiBjbGFzcz0iY2xzLTEiIC8+DQogIDxwYXRoIGQ9Ik0xNy44NTg2 - LDE4LjcxNjdoLTJhMy4zNTg5LDMuMzU4OSwwLDEsMC02LjcxNzgsMGgtMmE1LjM1ODksNS4zNTg5LDAs - MSwxLDEwLjcxNzgsMFoiIGNsYXNzPSJjbHMtMiIgLz4NCiAgPHBhdGggZD0iTTEyLjUsMTIuMzgyN2E0 - LjA3LDQuMDcsMCwxLDEsMi44NzY5LTEuMTkxOUE0LjA0MzksNC4wNDM5LDAsMCwxLDEyLjUsMTIuMzgy - N1ptMC02LjEzOTFhMi4wNywyLjA3LDAsMCwwLTEuNDYzOSwzLjUzMzIsMi4xMjA1LDIuMTIwNSwwLDAs - MCwyLjkyNjgsMGgwQTIuMDcsMi4wNywwLDAsMCwxMi41LDYuMjQzNloiIGNsYXNzPSJjbHMtMiIgLz4N - Cjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIUDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDI1 - IDI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl - ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiM2NDYzNjM7fS5jbHMtMntmaWxsOiNhNTI0MzE7fTwv - c3R5bGU+DQogIDwvZGVmcz4NCiAgPHBvbHlnb24gcG9pbnRzPSIyMC43MDcgMjMuMjMgMjAuNzA3IDIx - LjgzMSAxOS4wMDYgMjAuMTE5IDE5LjAwNiAyMS4yMyAxNy4yOTEgMjEuMjMgMTkuMjc4IDIzLjIzIDIw - LjcwNyAyMy4yMyIgY2xhc3M9ImNscy0xIiAvPg0KICA8cG9seWdvbiBwb2ludHM9IjE0LjQ3MyAyMS4y - MyA0Ljk3MyAyMS4yMyA0Ljk3MyAyLjczIDExLjk4OSAyLjczIDExLjk4OSA5LjQ0NyAxOS4wMDYgOS40 - NDcgMTkuMDA2IDE3LjI4IDIwLjcwNyAxOC45OTMgMjAuNzA3IDkuNDQ3IDExLjk4OSAwLjczIDMuMjcy - IDAuNzMgMy4yNzIgMjMuMjMgMTYuNDU5IDIzLjIzIDE0LjQ3MyAyMS4yMyIgY2xhc3M9ImNscy0xIiAv - Pg0KICA8cmVjdCB4PSIxNy40Mjg0IiB5PSIxNy4yNzk5IiB3aWR0aD0iMS45OTk4IiBoZWlnaHQ9Ijcu - MzUyOSIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iY2xzLTIiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC05LjQx - NDQsIDE5LjA3Mikgcm90YXRlKC00NC44MDA5LCAwLCAwKSIgLz4NCiAgPHBhdGggZD0iTTEyLjg0MTYs - MjAuMzgwOWE0Ljk5NzgsNC45OTc4LDAsMSwxLDMuNTM1Ni0xLjQ2MjRBNC45ODQ3LDQuOTg0NywwLDAs - MSwxMi44NDE2LDIwLjM4MDlabTAtNy45OTYxYTIuOTk4MywyLjk5ODMsMCwxLDAsMi4xMjE2Ljg3NjlB - Mi45OSwyLjk5LDAsMCwwLDEyLjg0MTYsMTIuMzg0OFoiIGNsYXNzPSJjbHMtMiIgLz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOMCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlNpbmdsZVBhZ2VWaWV3Ij4NCiAgICA8cGF0aCBk - PSJNMjcsMEgzQzIuNCwwLDIsMC40LDIsMXYyOGMwLDAuNiwwLjQsMSwxLDFoMjRjMC42LDAsMS0wLjQs - MS0xVjFDMjgsMC40LDI3LjYsMCwyNywweiBNMjYsMjhINFYyaDIyVjI4eiIgY2xhc3M9IkJsYWNrIiAv - Pg0KICAgIDxwYXRoIGQ9Ik0yMiw4SDhWNmgxNFY4eiBNMjIsMTBIOHYyaDE0VjEweiBNMjIsMTRIOHYy - aDE0VjE0eiBNMjIsMThIOHYyaDE0VjE4eiBNMjIsMjJIOHYyaDE0VjIyeiIgY2xhc3M9IkJsdWUiIC8+ - DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABIDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw - MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu - bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iSGlnaEltcG9ydGFuY2UiPg0KICAg - IDxwYXRoIGQ9Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMy - My43LDIsMTYsMnogTTE2LDI0Yy0xLjEsMC0yLTAuOS0yLTJzMC45LTIsMi0yczIsMC45LDIsMiAgIFMx - Ny4xLDI0LDE2LDI0eiBNMTgsMThoLTRWOGg0VjE4eiIgY2xhc3M9IlJlZCIgLz4NCiAgPC9nPg0KPC9z - dmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw - MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu - bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQWJvdXQiPg0KICAgIDxwYXRoIGQ9 - Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs - MnogTTE2LDZjMS4xLDAsMiwwLjksMiwycy0wLjksMi0yLDJzLTItMC45LTItMiAgIFMxNC45LDYsMTYs - NnogTTIwLDI0aC04di0yaDJ2LThoLTJ2LTJoMmg0djEwaDJWMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg - PC9nPg0KPC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcFAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku - QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC - MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iSXRlbVR5cGVD - aGVja2VkIj4NCiAgICA8Zz4NCiAgICAgIDxnPg0KICAgICAgICA8cmVjdCB4PSIyMCIgeT0iOCIgd2lk - dGg9IjEwIiBoZWlnaHQ9IjQiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsYWNrIiAvPg0KICAgICAgICA8 - cmVjdCB4PSIyMCIgeT0iMjIiIHdpZHRoPSIxMCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNz - PSJCbGFjayIgLz4NCiAgICAgICAgPHBhdGggZD0iTTE1LDE4SDNjLTAuNSwwLTEsMC41LTEsMXYxMmMw - LDAuNSwwLjUsMSwxLDFoMTJjMC41LDAsMS0wLjUsMS0xVjE5QzE2LDE4LjUsMTUuNSwxOCwxNSwxOHog - TTE0LDMwSDRWMjAgICAgIGgxMFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgICAgPHBhdGggZD0i - TTE0LDEwLjhWMTRINFY0aDguMmwyLTJIM0MyLjUsMiwyLDIuNSwyLDN2MTJjMCwwLjUsMC41LDEsMSwx - aDEyYzAuNSwwLDEtMC41LDEtMVY4LjhMMTQsMTAuOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgIDwv - Zz4NCiAgICAgIDxnPg0KICAgICAgICA8cmVjdCB4PSIyMCIgeT0iOCIgd2lkdGg9IjEwIiBoZWlnaHQ9 - IjQiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsYWNrIiAvPg0KICAgICAgICA8cmVjdCB4PSIyMCIgeT0i - MjIiIHdpZHRoPSIxMCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJCbGFjayIgLz4NCiAg - ICAgICAgPHBhdGggZD0iTTE1LDE4SDNjLTAuNSwwLTEsMC41LTEsMXYxMmMwLDAuNSwwLjUsMSwxLDFo - MTJjMC41LDAsMS0wLjUsMS0xVjE5QzE2LDE4LjUsMTUuNSwxOCwxNSwxOHogTTE0LDMwSDRWMjAgICAg - IGgxMFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgICAgPHBhdGggZD0iTTE0LDEwLjhWMTRINFY0 - aDguMmwyLTJIM0MyLjUsMiwyLDIuNSwyLDN2MTJjMCwwLjUsMC41LDEsMSwxaDEyYzAuNSwwLDEtMC41 - LDEtMVY4LjhMMTQsMTAuOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICAgIDwvZz4NCiAgICA8L2c+DQog - ICAgPHBvbHlnb24gcG9pbnRzPSI2LDUgNiw4IDEwLDEyIDE4LDQgMTgsMSAxMCw5ICAiIGNsYXNzPSJH - cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIgJAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDk0 - LjEzNzcgNDguOTI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8x - Ij4NCiAgPGRlZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiMxZDFkMWI7fS5jbHMtMntmaWxsOiNh - NTI0MzE7fS5jbHMtMywuY2xzLTR7ZmlsbDpub25lO3N0cm9rZTojMWQxZDFiO3N0cm9rZS13aWR0aDoy - cHg7fS5jbHMtM3tzdHJva2UtbWl0ZXJsaW1pdDoxMDt9PC9zdHlsZT4NCiAgPC9kZWZzPg0KICA8cGF0 - aCBkPSJNNDYuNjU0OCwyNy4yMDY5aC0yLjU1OWwtMS40NDksNC45OTVoLS4wMjVsLTEuMzI3LTQuOTk1 - aC0xLjcwNmwtMS4zMjgsNC45OTVoLS4wMjRsLTEuNDUtNC45OTVoLTIuNTU4bDIuODAyLDguNzcxaDIu - MzE0bDEuMDg1LTQuNjI5aC4wMjRsMS4wODQsNC42MjloMi4zMTVabS0xNC44NjIsNC4zODZhMi4yMDQ3 - LDIuMjA0NywwLDEsMS00LjM4NSwwLDIuMjA0OCwyLjIwNDgsMCwxLDEsNC4zODUsMG0yLjQzNiwwYTQu - NjI5LDQuNjI5LDAsMSwwLTQuNjI5LDQuNjI5LDQuNTUxMSw0LjU1MTEsMCwwLDAsNC42MjktNC42Mjlt - LTkuNjIzLDIuMTkzaC0yLjgwMnYtNi41NzloLTIuNDM2djguNzcxaDQuOTk0Wk0xOC4zOTI4LDI5LjRs - LS4yNDQtMi4xOTNoLTUuMjM4djguNzcxaDIuNDM2di0zLjQxMWgyLjY4MXYtMi4wNzFoLTIuNjgxVjI5 - LjRaIiBjbGFzcz0iY2xzLTEiIC8+DQogIDxwYXRoIGQ9Ik00Ni4wNDUsMjMuNjMzNUg0M3YtMS4yMTho - Mi42OHYtMi4wNzFINDN2LTEuMDk2aDMuMDQ1bC0uMjQ0LTIuMTkzSDQwLjU2M3Y4Ljc3MWg1LjIzOFpt - LTYuNjM5LDB2LTMuMTY3SDM1LjUwOGwtLjI0NCwxLjk0OUgzNi45N3YuNzMxYTIuMDc4LDIuMDc4LDAs - MCwxLTEuNzA2LjczMSwyLjIzMjcsMi4yMzI3LDAsMCwxLTIuMTkzLTIuNDM3LDIuMjUsMi4yNSwwLDAs - MSwyLjE5My0yLjQzNiwyLjU1LDIuNTUsMCwwLDEsMS45NDkuOTc1bDEuNDYyLTEuNzA2YTQuMDg4OCw0 - LjA4ODgsMCwwLDAtMy40MTEtMS40NjIsNC40ODI5LDQuNDgyOSwwLDAsMC00LjYyOSw0LjY0Miw0LjQy - MzgsNC40MjM4LDAsMCwwLDQuMzg2LDQuNjE3LDQuNjkzNCw0LjY5MzQsMCwwLDAsNC4zODUtMi40Mzdt - LTEyLjI1My0xLjA5NkgyNS43MTVsLjcwNy0yLjQzN2guMDI0Wm0zLjU0NSwzLjI4OS0zLjA0Ni04Ljc3 - MUgyNS4yMTZsLTMuMDQ1LDguNzcxaDIuNTU4bC40MTQtMS4zNGgyLjU4MmwuNDE1LDEuMzRabS04LjUy - Ny0yLjE5M0gxOS4zNjl2LTYuNTc4SDE2LjkzMnY4Ljc3MWg0Ljk5NVptLTguNzQ3LS43NjdhLjc4Njku - Nzg2OSwwLDAsMS0uNzY3Ljg3N2gtLjk2M1YyMS45OWguODUzYS44NzMuODczLDAsMCwxLC44NzcuODc3 - bS0uMjE5LTMuMDdhLjcyODEuNzI4MSwwLDAsMS0uNzY4Ljc2N2gtLjc0M3YtMS41MzVoLjc0M2EuNzQy - NS43NDI1LDAsMCwxLC43NjguNzY4bTIuNzUzLDMuMzVhMi4zNTE2LDIuMzUxNiwwLDAsMC0xLjQzOC0y - LjEzMnYtLjAyNGExLjY1NTQsMS42NTU0LDAsMCwwLC45NTEtMS43NDJjMC0xLjI0My0xLjA5Ny0yLjE5 - My0yLjY4LTIuMTkzSDkuMjU4djguNzcxaDMuODk4YTIuNjI1NSwyLjYyNTUsMCwwLDAsMi44MDItMi42 - OG0tMTAuOTc2LS42MDlIMy41NDVsLjcwNi0yLjQzN2guMDI1Wm0zLjU0NSwzLjI4OS0zLjA0Ni04Ljc3 - MUgzLjA0NUwwLDI1LjgyNjVIMi41NThsLjQxNC0xLjM0SDUuNTU1bC40MTQsMS4zNFoiIGNsYXNzPSJj - bHMtMiIgLz4NCiAgPHBvbHlnb24gcG9pbnRzPSI1Mi4zNzIgNDguOTI2IDk0LjEzOCAyNC40NjMgNTIu - MzcyIDAgNTIuMzcyIDQ4LjkyNiIgY2xhc3M9ImNscy0yIiAvPg0KICA8cGF0aCBkPSJNNTcuOTUxMSwy - MC45MzE4YTEzLjgxLDEzLjgxLDAsMCwwLDEuMzM3LDUuODMxLDExLjYyLDExLjYyLDAsMCwwLDYuMDE4 - LDUuNzU4Yy4xMTYuMDUxLjIyNy41NTQuMzA5LjY0OGExLjY3NjgsMS42NzY4LDAsMCwwLDIuNTA0LjAx - MmMuMDkyLS4xMDQuMjE5LS42MTMuMzQ5LS42NjlhMTEuNjEzNCwxMS42MTM0LDAsMCwwLDUuNDU1LTQu - NzU1LDEzLjU0ODMsMTMuNTQ4MywwLDAsMCwxLjg2OS02LjgyNVoiIGNsYXNzPSJjbHMtMyIgLz4NCiAg - PHBhdGggZD0iTTc3LjEwNDgsMTguMDE4Yy0uMDA0LS41MTMtLjAxLS40MjMuMDA2LS45MTlhNS42MzA5 - LDUuNjMwOSwwLDAsMC0uODc1LTMuMjg4LDYuNDExMiw2LjQxMTIsMCwwLDAtNS4xMTctMy4wMzljLS44 - Ni0uMDczLTcuNjAyLS4wNDMtOC4zMzUtLjA0MWE3LjU0ODEsNy41NDgxLDAsMCwwLTIuMjUxLjMzOCw2 - LjE4MjIsNi4xODIyLDAsMCwwLTQuNDEyLDUuNTc2Yy0uMDExLjY1Ni0uMDA4LjcxNy0uMDA2LDEuMzcz - WiIgY2xhc3M9ImNscy0zIiAvPg0KICA8cGF0aCBkPSJNNjcuMTEzNSw4Ljg2NzRzLS4xMTctNS4wOTgs - My4wMTEtNS41NjIiIGNsYXNzPSJjbHMtNCIgLz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIgJAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDk0 - LjEzNzcgNDguOTI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8x - Ij4NCiAgPGRlZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiMxZDFkMWI7fS5jbHMtMntmaWxsOiNh - NTI0MzE7fS5jbHMtMywuY2xzLTR7ZmlsbDpub25lO3N0cm9rZTojMWQxZDFiO3N0cm9rZS13aWR0aDoy - cHg7fS5jbHMtM3tzdHJva2UtbWl0ZXJsaW1pdDoxMDt9PC9zdHlsZT4NCiAgPC9kZWZzPg0KICA8cGF0 - aCBkPSJNNDYuNjU0OCwyNy4yMDY5aC0yLjU1OWwtMS40NDksNC45OTVoLS4wMjVsLTEuMzI3LTQuOTk1 - aC0xLjcwNmwtMS4zMjgsNC45OTVoLS4wMjRsLTEuNDUtNC45OTVoLTIuNTU4bDIuODAyLDguNzcxaDIu - MzE0bDEuMDg1LTQuNjI5aC4wMjRsMS4wODQsNC42MjloMi4zMTVabS0xNC44NjIsNC4zODZhMi4yMDQ3 - LDIuMjA0NywwLDEsMS00LjM4NSwwLDIuMjA0OCwyLjIwNDgsMCwxLDEsNC4zODUsMG0yLjQzNiwwYTQu - NjI5LDQuNjI5LDAsMSwwLTQuNjI5LDQuNjI5LDQuNTUxMSw0LjU1MTEsMCwwLDAsNC42MjktNC42Mjlt - LTkuNjIzLDIuMTkzaC0yLjgwMnYtNi41NzloLTIuNDM2djguNzcxaDQuOTk0Wk0xOC4zOTI4LDI5LjRs - LS4yNDQtMi4xOTNoLTUuMjM4djguNzcxaDIuNDM2di0zLjQxMWgyLjY4MXYtMi4wNzFoLTIuNjgxVjI5 - LjRaIiBjbGFzcz0iY2xzLTEiIC8+DQogIDxwYXRoIGQ9Ik00Ni4wNDUsMjMuNjMzNUg0M3YtMS4yMTho - Mi42OHYtMi4wNzFINDN2LTEuMDk2aDMuMDQ1bC0uMjQ0LTIuMTkzSDQwLjU2M3Y4Ljc3MWg1LjIzOFpt - LTYuNjM5LDB2LTMuMTY3SDM1LjUwOGwtLjI0NCwxLjk0OUgzNi45N3YuNzMxYTIuMDc4LDIuMDc4LDAs - MCwxLTEuNzA2LjczMSwyLjIzMjcsMi4yMzI3LDAsMCwxLTIuMTkzLTIuNDM3LDIuMjUsMi4yNSwwLDAs - MSwyLjE5My0yLjQzNiwyLjU1LDIuNTUsMCwwLDEsMS45NDkuOTc1bDEuNDYyLTEuNzA2YTQuMDg4OCw0 - LjA4ODgsMCwwLDAtMy40MTEtMS40NjIsNC40ODI5LDQuNDgyOSwwLDAsMC00LjYyOSw0LjY0Miw0LjQy - MzgsNC40MjM4LDAsMCwwLDQuMzg2LDQuNjE3LDQuNjkzNCw0LjY5MzQsMCwwLDAsNC4zODUtMi40Mzdt - LTEyLjI1My0xLjA5NkgyNS43MTVsLjcwNy0yLjQzN2guMDI0Wm0zLjU0NSwzLjI4OS0zLjA0Ni04Ljc3 - MUgyNS4yMTZsLTMuMDQ1LDguNzcxaDIuNTU4bC40MTQtMS4zNGgyLjU4MmwuNDE1LDEuMzRabS04LjUy - Ny0yLjE5M0gxOS4zNjl2LTYuNTc4SDE2LjkzMnY4Ljc3MWg0Ljk5NVptLTguNzQ3LS43NjdhLjc4Njku - Nzg2OSwwLDAsMS0uNzY3Ljg3N2gtLjk2M1YyMS45OWguODUzYS44NzMuODczLDAsMCwxLC44NzcuODc3 - bS0uMjE5LTMuMDdhLjcyODEuNzI4MSwwLDAsMS0uNzY4Ljc2N2gtLjc0M3YtMS41MzVoLjc0M2EuNzQy - NS43NDI1LDAsMCwxLC43NjguNzY4bTIuNzUzLDMuMzVhMi4zNTE2LDIuMzUxNiwwLDAsMC0xLjQzOC0y - LjEzMnYtLjAyNGExLjY1NTQsMS42NTU0LDAsMCwwLC45NTEtMS43NDJjMC0xLjI0My0xLjA5Ny0yLjE5 - My0yLjY4LTIuMTkzSDkuMjU4djguNzcxaDMuODk4YTIuNjI1NSwyLjYyNTUsMCwwLDAsMi44MDItMi42 - OG0tMTAuOTc2LS42MDlIMy41NDVsLjcwNi0yLjQzN2guMDI1Wm0zLjU0NSwzLjI4OS0zLjA0Ni04Ljc3 - MUgzLjA0NUwwLDI1LjgyNjVIMi41NThsLjQxNC0xLjM0SDUuNTU1bC40MTQsMS4zNFoiIGNsYXNzPSJj - bHMtMiIgLz4NCiAgPHBvbHlnb24gcG9pbnRzPSI1Mi4zNzIgNDguOTI2IDk0LjEzOCAyNC40NjMgNTIu - MzcyIDAgNTIuMzcyIDQ4LjkyNiIgY2xhc3M9ImNscy0yIiAvPg0KICA8cGF0aCBkPSJNNTcuOTUxMSwy - MC45MzE4YTEzLjgxLDEzLjgxLDAsMCwwLDEuMzM3LDUuODMxLDExLjYyLDExLjYyLDAsMCwwLDYuMDE4 - LDUuNzU4Yy4xMTYuMDUxLjIyNy41NTQuMzA5LjY0OGExLjY3NjgsMS42NzY4LDAsMCwwLDIuNTA0LjAx - MmMuMDkyLS4xMDQuMjE5LS42MTMuMzQ5LS42NjlhMTEuNjEzNCwxMS42MTM0LDAsMCwwLDUuNDU1LTQu - NzU1LDEzLjU0ODMsMTMuNTQ4MywwLDAsMCwxLjg2OS02LjgyNVoiIGNsYXNzPSJjbHMtMyIgLz4NCiAg - PHBhdGggZD0iTTc3LjEwNDgsMTguMDE4Yy0uMDA0LS41MTMtLjAxLS40MjMuMDA2LS45MTlhNS42MzA5 - LDUuNjMwOSwwLDAsMC0uODc1LTMuMjg4LDYuNDExMiw2LjQxMTIsMCwwLDAtNS4xMTctMy4wMzljLS44 - Ni0uMDczLTcuNjAyLS4wNDMtOC4zMzUtLjA0MWE3LjU0ODEsNy41NDgxLDAsMCwwLTIuMjUxLjMzOCw2 - LjE4MjIsNi4xODIyLDAsMCwwLTQuNDEyLDUuNTc2Yy0uMDExLjY1Ni0uMDA4LjcxNy0uMDA2LDEuMzcz - WiIgY2xhc3M9ImNscy0zIiAvPg0KICA8cGF0aCBkPSJNNjcuMTEzNSw4Ljg2NzRzLS4xMTctNS4wOTgs - My4wMTEtNS41NjIiIGNsYXNzPSJjbHMtNCIgLz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPECAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iRGVsZXRlTGlzdCI+DQogICAgPHBhdGggZD0iTTYsMjZWNGgxOHYxMy4ybDItMlYz - YzAtMC42LTAuNC0xLTEtMUg1QzQuNCwyLDQsMi40LDQsM3YyNGMwLDAuNiwwLjQsMSwxLDFoOC4ybDIt - Mkg2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iMjgsMjAgMjYsMTggMjIs - MjIgMTgsMTggMTYsMjAgMjAsMjQgMTYsMjggMTgsMzAgMjIsMjYgMjYsMzAgMjgsMjggMjQsMjQgICIg - Y2xhc3M9IlJlZCIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - 189, 17 - - \ No newline at end of file diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_IndexFileList.resx.bak b/GUIs.ZooFlow/Modules/Globix/frmGlobix_IndexFileList.resx.bak deleted file mode 100644 index cfdf51b2..00000000 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_IndexFileList.resx.bak +++ /dev/null @@ -1,251 +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 - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsEAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk - aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp - c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 - O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 - ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp - c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJTZWN1cml0eV94NUZf - UGVybWlzc2lvbl94NUZfT2JqZWN0Ij4NCiAgICA8cG9seWdvbiBwb2ludHM9IjAsNCAyNCw0IDI0LDgg - MTQsMTggMTQsMjYgMTAsMzAgMTAsMTggMCw4ICAiIGNsYXNzPSJZZWxsb3ciIC8+DQogICAgPHBhdGgg - ZD0iTTI0LDE0Yy00LjQsMC04LDMuNi04LDhzMy42LDgsOCw4czgtMy42LDgtOFMyOC40LDE0LDI0LDE0 - eiBNMjIuNSwyNkwxOSwyMi41bDEuNS0xLjVsMiwybDUtNWwxLjUsMS41ICAgTDIyLjUsMjZ6IiBjbGFz - cz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABcCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJfRmlsdGVyIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3 - IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuWWVsbG93e2ZpbGw6I0ZGQjEx - NTt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cjwvc3R5bGU+DQogIDxwb2x5Z29uIHBvaW50cz0iNCwyIDI4 - LDIgMjgsNiAxOCwxNiAxOCwyNiAxNCwzMCAxNCwxNiA0LDYgIiBjbGFzcz0iWWVsbG93IiAvPg0KICA8 - cG9seWdvbiBwb2ludHM9IjMyLDIwIDMwLDE4IDI2LDIyIDIyLDE4IDIwLDIwIDI0LDI0IDIwLDI4IDIy - LDMwIDI2LDI2IDMwLDMwIDMyLDI4IDI4LDI0ICIgY2xhc3M9IlJlZCIgLz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw - MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu - bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iR2V0dGluZ1N0YXJ0ZWQiPg0KICAg - IDxwYXRoIGQ9Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMy - My43LDIsMTYsMnogTTEyLDIyVjEwbDEwLDZMMTIsMjJ6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N - Cjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAM0DAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw - MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu - bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ2xvc2UiPg0KICAgIDxwYXRoIGQ9 - Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs - MnogTTIzLjcsMjEuN2MwLjQsMC40LDAuNCwxLDAsMS40bC0wLjYsMC42ICAgYy0wLjQsMC40LTEsMC40 - LTEuNCwwTDE2LDE4bC01LjcsNS43Yy0wLjQsMC40LTEsMC40LTEuNCwwbC0wLjYtMC42Yy0wLjQtMC40 - LTAuNC0xLDAtMS40TDE0LDE2bC01LjctNS43Yy0wLjQtMC40LTAuNC0xLDAtMS40ICAgbDAuNi0wLjZj - MC40LTAuNCwxLTAuNCwxLjQsMEwxNiwxNGw1LjctNS43YzAuNC0wLjQsMS0wLjQsMS40LDBsMC42LDAu - NmMwLjQsMC40LDAuNCwxLDAsMS40TDE4LDE2TDIzLjcsMjEuN3oiIGNsYXNzPSJSZWQiIC8+DQogIDwv - Zz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANYIAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGlzdE51bWJlcnMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg - MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDojRDExQzFDO30K - CS5CbGFja3tmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMzAsOEgxMlY2aDE4Vjh6 - IE0zMCwxOEgxMnYtMmgxOFYxOHogTTMwLDI4SDEydi0yaDE4VjI4eiIgY2xhc3M9IkJsYWNrIiAvPg0K - ICA8cGF0aCBkPSJNNiwydjhINFY1LjNsLTIsMFYzLjdsMC4yLDBjMC4yLDAsMC41LDAsMC43LTAuMWMw - LjMsMCwwLjUtMC4xLDAuNy0wLjNjMC4yLTAuMSwwLjQtMC4zLDAuNS0wLjUgIGMwLjEtMC4yLDAuMi0w - LjQsMC4zLTAuN2wwLTAuMUg2eiBNOCwyMHYtMS42SDQuNkM0LjcsMTguMiw0LjksMTguMSw1LDE4YzAu - Mi0wLjIsMC41LTAuNCwwLjctMC41YzAuMy0wLjIsMC41LTAuMywwLjgtMC41ICBjMC4zLTAuMiwwLjUt - MC40LDAuNy0wLjZjMC4yLTAuMiwwLjQtMC41LDAuNS0wLjhjMC4xLTAuMywwLjItMC42LDAuMi0xYzAt - MC40LTAuMS0wLjctMC4yLTEuMWMtMC4xLTAuMy0wLjQtMC42LTAuNi0wLjggIGMtMC4zLTAuMi0wLjUt - MC40LTAuOS0wLjVjLTAuMy0wLjEtMC43LTAuMi0xLTAuMmMtMC41LDAtMC45LDAuMS0xLjMsMC4yYy0w - LjQsMC4yLTAuNywwLjQtMC45LDAuN2MtMC4yLDAuMy0wLjQsMC42LTAuNSwxICBjLTAuMSwwLjQtMC4y - LDAuOC0wLjIsMS4zbDAsMC4xaDEuOHYtMC4xYzAtMC4yLDAtMC40LDAuMS0wLjZjMC0wLjIsMC4xLTAu - NCwwLjItMC41YzAuMS0wLjEsMC4yLTAuMywwLjMtMC40ICBjMC4xLTAuMSwwLjMtMC4xLDAuNS0wLjFj - MC4zLDAsMC41LDAuMSwwLjcsMC4zYzAuMiwwLjIsMC4zLDAuNCwwLjMsMC44YzAsMC4yLDAsMC40LTAu - MSwwLjVjLTAuMSwwLjItMC4yLDAuMy0wLjQsMC41ICBjLTAuMSwwLjEtMC4zLDAuMy0wLjUsMC40Yy0w - LjIsMC4xLTAuNCwwLjItMC41LDAuNEM0LjMsMTYuNiw0LDE2LjgsMy43LDE3Yy0wLjMsMC4yLTAuNiww - LjUtMC44LDAuN2MtMC4yLDAuMy0wLjQsMC42LTAuNSwwLjkgIGMtMC4xLDAuMy0wLjIsMC43LTAuMiwx - LjJWMjBIOHogTTYuMSwyOS44YzAuMy0wLjEsMC43LTAuMywwLjktMC41YzAuMy0wLjIsMC41LTAuNSww - LjYtMC44QzcuOSwyOC4yLDgsMjcuOCw4LDI3LjQgIGMwLTAuNS0wLjEtMC45LTAuNC0xLjJjLTAuMi0w - LjItMC40LTAuNC0wLjctMC41YzAuMi0wLjEsMC40LTAuMywwLjUtMC41YzAuMi0wLjMsMC4zLTAuNiww - LjMtMWMwLTAuNC0wLjEtMC43LTAuMi0xICBjLTAuMi0wLjMtMC40LTAuNS0wLjYtMC43Yy0wLjItMC4y - LTAuNS0wLjMtMC44LTAuNEM1LjcsMjIsNS40LDIyLDUuMSwyMmMtMC40LDAtMC44LDAuMS0xLjEsMC4y - Yy0wLjMsMC4xLTAuNiwwLjMtMC45LDAuNiAgYy0wLjIsMC4yLTAuNCwwLjUtMC42LDAuOWMtMC4xLDAu - My0wLjIsMC43LTAuMiwxLjFsMCwwLjFoMS43bDAtMC4xYzAtMC4zLDAuMS0wLjYsMC4zLTAuOWMwLjIt - MC4yLDAuNC0wLjMsMC44LTAuMyAgYzAuMiwwLDAuNSwwLjEsMC42LDAuMkM1LjksMjMuOSw2LDI0LjEs - NiwyNC40YzAsMC4yLDAsMC4zLTAuMSwwLjRDNS44LDI0LjksNS42LDI1LDUuNSwyNWMtMC4xLDAuMS0w - LjMsMC4xLTAuNSwwLjEgIGMtMC4xLDAtMC4yLDAtMC4zLDBjLTAuMSwwLTAuMiwwLTAuMiwwbC0wLjIs - MHYxLjRoMC4xYzAuMiwwLDAuNCwwLDAuNiwwYzAuMiwwLDAuNCwwLDAuNSwwLjFjMC4xLDAuMSwwLjMs - MC4xLDAuNCwwLjMgIGMwLjEsMC4xLDAuMSwwLjMsMC4xLDAuNmMwLDAuMy0wLjEsMC42LTAuMywwLjdj - LTAuMiwwLjItMC41LDAuMy0wLjgsMC4zYy0wLjIsMC0wLjQsMC0wLjUtMC4xYy0wLjEtMC4xLTAuMy0w - LjItMC40LTAuMyAgQzQuMSwyOCw0LDI3LjgsNCwyNy43Yy0wLjEtMC4yLTAuMS0wLjMtMC4xLTAuNWww - LTAuMUgyLjJsMCwwLjFjMCwwLjQsMC4xLDAuOSwwLjIsMS4yYzAuMSwwLjQsMC4zLDAuNywwLjYsMC45 - ICBjMC4zLDAuMiwwLjYsMC40LDAuOSwwLjZDNC4yLDI5LjksNC42LDMwLDUuMSwzMEM1LjQsMzAsNS44 - LDI5LjksNi4xLDI5Ljh6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw== - - - \ No newline at end of file diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 93ccee5a..9ff22962 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -1480,6 +1480,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property switchrowcolumns() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("switchrowcolumns", 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 96cabf2c..8539267f 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -193,8 +193,8 @@ ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ZOOFLOW_DRAG_NORMAL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -268,6 +268,9 @@ ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\FLOW_Sidebar_Search_aktiv1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -322,8 +325,8 @@ ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\FLOW_Sidebar_Task_inaktiv1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -346,6 +349,9 @@ ..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -364,6 +370,9 @@ ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ZooFlow_drop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -388,8 +397,8 @@ ..\Resources\managedatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ZOOFLOW_DRAG_NORMAL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -433,6 +442,9 @@ ..\Resources\del5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_edit1.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 @@ -448,9 +460,6 @@ ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ZooFlow_PM_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -496,15 +505,6 @@ ..\Resources\ZOOFLOW_DRAG_PROGRESSIVE.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\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\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -541,11 +541,11 @@ ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooFlow_PM_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_edit1.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\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -562,8 +562,11 @@ ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ZooFlow_drop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -598,7 +601,7 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\FLOW_Sidebar_Search_aktiv1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\switchrowcolumns.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/MyApplication.vb b/GUIs.ZooFlow/MyApplication.vb index da847c64..ac42be0e 100644 --- a/GUIs.ZooFlow/MyApplication.vb +++ b/GUIs.ZooFlow/MyApplication.vb @@ -26,8 +26,6 @@ Namespace My End Property Property LogConfig As LogConfig - Property MainForm As frmAdmin_Start - Property SearchForm As frmSearchStart #Region "Database" Property Database As DatabaseWithFallback @@ -55,7 +53,6 @@ Namespace My Public Property Modules As New Dictionary(Of String, State.ModuleState) Public Property ModulesActive As New List(Of String) Public Property ClipboardWatcher As New ClipboardWatcher.State - Public Property IDB_ConnectionString As String Public Property Globix As New Globix.State Public Property Search As New Search.State diff --git a/GUIs.ZooFlow/Resources/switchrowcolumns.svg b/GUIs.ZooFlow/Resources/switchrowcolumns.svg new file mode 100644 index 00000000..e1edea53 --- /dev/null +++ b/GUIs.ZooFlow/Resources/switchrowcolumns.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/SearchRunner.vb b/GUIs.ZooFlow/Search/SearchRunner.vb index b67d5cb6..86725133 100644 --- a/GUIs.ZooFlow/Search/SearchRunner.vb +++ b/GUIs.ZooFlow/Search/SearchRunner.vb @@ -30,6 +30,7 @@ Public Class SearchRunner End Enum Public Event NeedsRefresh As EventHandler(Of Integer) + Public Event Closed As EventHandler(Of Integer) Private Property _ActiveDateConstraint As String = String.Empty Public ReadOnly Property ActiveDateConstraint As String @@ -76,6 +77,7 @@ Public Class SearchRunner ' TODO: Implement, not needed right now 'AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh + AddHandler oForm.FormClosed, AddressOf Form_Closed oForm.Show() @@ -129,6 +131,7 @@ Public Class SearchRunner ' TODO: Implement, not needed right now 'AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh + AddHandler oForm.FormClosed, AddressOf Form_Closed oForm.Show() @@ -143,6 +146,10 @@ Public Class SearchRunner End If End Function + Private Sub Form_Closed(sender As Object, e As EventArgs) + RaiseEvent Closed(sender, 0) + End Sub + Private Function GetParams(pWindowTitle As String) As DocumentResultList.Params Dim oParams = New DocumentResultList.Params() With { .WindowGuid = SearchTitle, diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index a1254c04..6e70e140 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -1105,6 +1105,7 @@ + diff --git a/GUIs.ZooFlow/ZooFlow.vbproj.bak b/GUIs.ZooFlow/ZooFlow.vbproj.bak deleted file mode 100644 index 252293fa..00000000 --- a/GUIs.ZooFlow/ZooFlow.vbproj.bak +++ /dev/null @@ -1,976 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {D0FB36EB-783D-40E1-B71E-A0B84B2FE567} - WinExe - DigitalData.GUIs.ZooFlow - DigitalData.GUIs.ZooFlow - v4.6.1 - ZooFlow.Program - 512 - On - Binary - Off - On - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - AnyCPU - true - full - false - bin\Debug\ - true - true - prompt - - - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - - - AnyCPU - pdbonly - true - bin\Release\ - false - true - prompt - - - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - - - WindowsForms - - - DigitalData.GUIs.ZooFlow.My.MyApplication - - - - - - - - - - False - D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Images.v19.2.dll - - - - - - - - - - - - - - - - - - - - ..\Controls.SnapPanel\obj\Debug\DigitalData.Controls.SnapPanel.dll - - - P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll - - - False - True - C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll - - - ..\packages\NLog.4.7.10\lib\net45\NLog.dll - - - False - P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - frmAdmin_GlobixRelations.vb - - - Form - - - frmAdmin_ClipboardWatcher.vb - - - Form - - - frmAdmin_IDBAttribute.vb - - - Form - - - frmAdmin_IDBEntity.vb - - - Form - - - frmAdmin_IDBObjectStore.vb - - - Form - - - frmAdmin_IDBBERelations.vb - - - Form - - - frmSQLDesigner.vb - - - Form - - - - frmAdmin_Globix.vb - - - Form - - - frmAdmin_SourceSQL.vb - - - Form - - - - - - - - - - - - - True - True - DBCW_Stammdaten.xsd - - - DBCW_Stammdaten.xsd - - - True - True - DSDD_Stammdaten.xsd - - - DSIDB_Stammdaten.xsd - - - frmServiceConfig.vb - - - Form - - - frmTest.vb - - - Form - - - - - - frmGlobixNameconvention.vb - - - Form - - - - - - frmWaitForm.vb - - - Form - - - - True - True - MyDataset.xsd - - - - - frmGlobixBasicConfig.vb - - - Form - - - frmGlobixMissingInput.vb - - - Form - - - True - True - GlobixDataset.xsd - - - MyDataset.xsd - - - - frmFlowSearch.vb - - - Form - - - - - - - - - - True - True - DSIDB_Stammdaten.xsd - - - - - frmAdmin_Start.vb - - - Form - - - frmFlowForm.vb - - - Form - - - frmGlobix_IndexFileList.vb - - - Form - - - frmGlobix_Index.vb - - - Form - - - frmSearchNeu.vb - - - Form - - - frmSearchPredefined.vb - - - Form - - - frmSearchStart.vb - - - Form - - - - - - True - True - Resources.resx - - - - - - - - - - frmConfigDatabase.vb - - - Form - - - frmSettings.vb - - - Form - - - frmSplash.vb - - - Form - - - True - Application.myapp - True - - - - - - - - - - - frmAdmin_ClipboardWatcher.vb - - - frmAdmin_GlobixRelations.vb - - - frmAdmin_IDBAttribute.vb - - - frmAdmin_IDBEntity.vb - - - frmAdmin_Globix.vb - - - frmAdmin_IDBObjectStore.vb - - - frmAdmin_IDBBERelations.vb - - - frmAdmin_SourceSQL.vb - - - frmSQLDesigner.vb - - - frmServiceConfig.vb - - - frmTest.vb - - - frmGlobixBasicConfig.vb - - - frmGlobixMissingInput.vb - - - frmGlobixNameconvention.vb - - - frmWaitForm.vb - - - frmFlowSearch.vb - - - frmAdmin_Start.vb - - - frmConfigDatabase.vb - - - frmFlowForm.vb - - - frmGlobix_IndexFileList.vb - - - frmGlobix_Index.vb - - - frmSearchNeu.vb - - - frmSearchPredefined.vb - - - frmSearchStart.vb - - - frmSettings.vb - - - frmSplash.vb - - - - VbMyResourcesResXFileCodeGenerator - My.Resources - Designer - Resources.Designer.vb - - - - DBCW_Stammdaten.xsd - - - Designer - MSDataSetGenerator - DBCW_Stammdaten.Designer.vb - - - DBCW_Stammdaten.xsd - - - DSDD_Stammdaten.xsd - - - Designer - MSDataSetGenerator - DSDD_Stammdaten.Designer.vb - - - DSDD_Stammdaten.xsd - - - MyDataset.xsd - - - Designer - MSDataSetGenerator - MyDataset.Designer.vb - - - MyDataset.xsd - - - DSIDB_Stammdaten.xsd - - - Designer - MSDataSetGenerator - DSIDB_Stammdaten.Designer.vb - - - DSIDB_Stammdaten.xsd - - - GlobixDataset.xsd - - - Designer - MSDataSetGenerator - GlobixDataset.Designer.vb - - - GlobixDataset.xsd - - - SettingsSingleFileGenerator - Settings.Designer.vb - - - True - Settings.settings - True - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - - - {0958cddf-4a16-41f6-8837-8335f71d599c} - DocumentViewer - - - {3dcd6d1a-c830-4241-b7e4-27430e7ea483} - LookupControl - - - {bcc6942f-cd4b-4b67-8200-1c0d002e7cc2} - RegexEditor - - - {3e7bc8a9-91ef-49b8-8110-2c01f664c24a} - SQLEditor - - - {8a8f20fc-c46e-41ac-bee7-218366cfff99} - Encryption - - - {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E} - ClipboardWatcher - - - {d20a6bf2-c7c6-4a7a-b34d-fa27d775a049} - Common - - - {40384b94-1f94-4249-9a5a-d02e0b346738} - GlobalIndexer - - - {44982F9B-6116-44E2-85D0-F39650B1EF99} - Config - - - {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} - Database - - - {25017513-0d97-49d3-98d7-ba76d9b251b0} - EDMI.API - - - {991d0231-4623-496d-8bd0-9ca906029cbc} - Filesystem - - - {d3c8cfed-d6f6-43a8-9bdf-454145d0352f} - Language - - - {903B2D7D-3B80-4BE9-8713-7447B704E1B0} - Logging - - - {af664d85-0a4b-4bab-a2f8-83110c06553a} - Messaging - - - {7c3b0c7e-59fe-4e1a-a655-27ae119f9444} - Patterns - - - {81cac44f-3711-4c8f-ae98-e02a7448782a} - ZooFlow - - - {65efb268-c0e0-40c1-8981-9f70dee5c74a} - SQLConfig - - - {5efaef9b-90b9-4f05-9f70-f79ad77fff86} - Windows - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4.6.1 %28x86 und x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/GUIs.ZooFlow/frmConfigBasic.Designer.vb b/GUIs.ZooFlow/frmConfigBasic.Designer.vb index 43adfe93..b4ecd850 100644 --- a/GUIs.ZooFlow/frmConfigBasic.Designer.vb +++ b/GUIs.ZooFlow/frmConfigBasic.Designer.vb @@ -40,15 +40,14 @@ Partial Class frmConfigBasic Me.Quicksearch1CB_Pos = New DevExpress.XtraEditors.ComboBoxEdit() Me.Quicksearch1TitleTextBox = New DevExpress.XtraEditors.TextEdit() Me.ProcessManagerPathTextbox = New DevExpress.XtraEditors.TextEdit() + Me.ADRootPathTextBox = New DevExpress.XtraEditors.TextEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.ADRootPathTextBox = New DevExpress.XtraEditors.TextEdit() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -57,15 +56,14 @@ Partial Class frmConfigBasic CType(Me.Quicksearch1CB_Pos.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Quicksearch1TitleTextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ProcessManagerPathTextbox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ADRootPathTextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ADRootPathTextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -176,15 +174,16 @@ Partial Class frmConfigBasic Me.ToggleSwitchDebug.Location = New System.Drawing.Point(12, 12) Me.ToggleSwitchDebug.MenuManager = Me.RibbonControl1 Me.ToggleSwitchDebug.Name = "ToggleSwitchDebug" + Me.ToggleSwitchDebug.Properties.AutoHeight = False Me.ToggleSwitchDebug.Properties.OffText = "DEBUG not active" Me.ToggleSwitchDebug.Properties.OnText = "DEBUG is active" - Me.ToggleSwitchDebug.Size = New System.Drawing.Size(536, 19) + Me.ToggleSwitchDebug.Size = New System.Drawing.Size(776, 46) Me.ToggleSwitchDebug.StyleController = Me.LayoutControl1 Me.ToggleSwitchDebug.TabIndex = 8 ' 'Quicksearch1CB_Pos ' - Me.Quicksearch1CB_Pos.Location = New System.Drawing.Point(181, 101) + Me.Quicksearch1CB_Pos.Location = New System.Drawing.Point(181, 128) Me.Quicksearch1CB_Pos.MenuManager = Me.RibbonControl1 Me.Quicksearch1CB_Pos.Name = "Quicksearch1CB_Pos" Me.Quicksearch1CB_Pos.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -195,7 +194,7 @@ Partial Class frmConfigBasic ' 'Quicksearch1TitleTextBox ' - Me.Quicksearch1TitleTextBox.Location = New System.Drawing.Point(181, 71) + Me.Quicksearch1TitleTextBox.Location = New System.Drawing.Point(181, 98) Me.Quicksearch1TitleTextBox.MenuManager = Me.RibbonControl1 Me.Quicksearch1TitleTextBox.Name = "Quicksearch1TitleTextBox" Me.Quicksearch1TitleTextBox.Size = New System.Drawing.Size(592, 20) @@ -204,35 +203,36 @@ Partial Class frmConfigBasic ' 'ProcessManagerPathTextbox ' - Me.ProcessManagerPathTextbox.Location = New System.Drawing.Point(178, 173) + Me.ProcessManagerPathTextbox.Location = New System.Drawing.Point(178, 200) Me.ProcessManagerPathTextbox.MenuManager = Me.RibbonControl1 Me.ProcessManagerPathTextbox.Name = "ProcessManagerPathTextbox" Me.ProcessManagerPathTextbox.Size = New System.Drawing.Size(598, 20) Me.ProcessManagerPathTextbox.StyleController = Me.LayoutControl1 Me.ProcessManagerPathTextbox.TabIndex = 9 ' + 'ADRootPathTextBox + ' + Me.ADRootPathTextBox.Location = New System.Drawing.Point(178, 224) + Me.ADRootPathTextBox.MenuManager = Me.RibbonControl1 + Me.ADRootPathTextBox.Name = "ADRootPathTextBox" + Me.ADRootPathTextBox.Size = New System.Drawing.Size(598, 20) + Me.ADRootPathTextBox.StyleController = Me.LayoutControl1 + Me.ADRootPathTextBox.TabIndex = 10 + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.EmptySpaceItem1, Me.LayoutControlGroup1, Me.LayoutControlItem4, Me.LayoutControlGroup2}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.LayoutControlItem4, Me.LayoutControlGroup2}) Me.Root.Name = "Root" Me.Root.Size = New System.Drawing.Size(800, 268) Me.Root.TextVisible = False ' - 'EmptySpaceItem1 - ' - Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(540, 0) - Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(240, 23) - Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) - ' 'LayoutControlGroup1 ' Me.LayoutControlGroup1.CustomizationFormText = "Schnellsuche 1" Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem3}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 23) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 50) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" Me.LayoutControlGroup1.Size = New System.Drawing.Size(780, 105) Me.LayoutControlGroup1.Text = "Konfiguration Schnellsuche 1" @@ -264,16 +264,16 @@ Partial Class frmConfigBasic Me.LayoutControlItem4.Control = Me.ToggleSwitchDebug Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(540, 23) + Me.LayoutControlItem4.Size = New System.Drawing.Size(780, 50) Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem4.TextVisible = False ' 'LayoutControlGroup2 ' Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem5}) - Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 128) + Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 155) Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(780, 120) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(780, 93) Me.LayoutControlGroup2.Text = "Weitere Einstellungen" ' 'LayoutControlItem2 @@ -285,21 +285,12 @@ Partial Class frmConfigBasic Me.LayoutControlItem2.Text = "Pfad zum Process Manager" Me.LayoutControlItem2.TextSize = New System.Drawing.Size(142, 13) ' - 'ADRootPathTextBox - ' - Me.ADRootPathTextBox.Location = New System.Drawing.Point(178, 197) - Me.ADRootPathTextBox.MenuManager = Me.RibbonControl1 - Me.ADRootPathTextBox.Name = "ADRootPathTextBox" - Me.ADRootPathTextBox.Size = New System.Drawing.Size(598, 20) - Me.ADRootPathTextBox.StyleController = Me.LayoutControl1 - Me.ADRootPathTextBox.TabIndex = 10 - ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.ADRootPathTextBox Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Size = New System.Drawing.Size(756, 51) + Me.LayoutControlItem5.Size = New System.Drawing.Size(756, 24) Me.LayoutControlItem5.Text = "Active Directory Root Pfad" Me.LayoutControlItem5.TextSize = New System.Drawing.Size(142, 13) ' @@ -323,15 +314,14 @@ Partial Class frmConfigBasic CType(Me.Quicksearch1CB_Pos.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Quicksearch1TitleTextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ProcessManagerPathTextbox.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ADRootPathTextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ADRootPathTextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -354,7 +344,6 @@ Partial Class frmConfigBasic Friend WithEvents SkinPaletteRibbonGalleryBarItem1 As DevExpress.XtraBars.SkinPaletteRibbonGalleryBarItem Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents SkinRibbonGalleryBarItem1 As DevExpress.XtraBars.SkinRibbonGalleryBarItem - Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents ToggleSwitchDebug As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 3d53c170..a419c2e0 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -38,7 +38,6 @@ Partial Class frmFlowForm Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.TimerRefreshSidebarData = New System.Windows.Forms.Timer(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxSearch = New DevExpress.XtraEditors.SvgImageBox() @@ -156,10 +155,6 @@ Partial Class frmFlowForm Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' - 'TimerRefreshSidebarData - ' - Me.TimerRefreshSidebarData.Interval = 10000 - ' 'PictureBoxPM ' Me.PictureBoxPM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -557,7 +552,6 @@ Partial Class frmFlowForm Friend WithEvents ContextMenuSystray As ContextMenuStrip Friend WithEvents VerwaltungToolStripMenuItem As ToolStripMenuItem Friend WithEvents ZooFlowBeendenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents TimerRefreshSidebarData As Timer Friend WithEvents ToolTip1 As ToolTip Friend WithEvents ToolStripSeparator1 As ToolStripSeparator Friend WithEvents TimerFolderwatch As Timer diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index a6c59f48..1a234b61 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1956,17 +1956,14 @@ AMADAADwDwAA - + 468, 17 - - 658, 17 - - 757, 17 + 567, 17 - 906, 17 + 716, 17 @@ -2042,6 +2039,6 @@ - 1031, 17 + 841, 17 \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 169df38e..1e592c53 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -206,12 +206,12 @@ Public Class frmFlowForm ' === Initialization === Init = New ClassInit(My.LogConfig, Me) AddHandler Init.Completed, Async Sub() Await Init_Completed(sender, e) - Init.InitializeApplication() ' === Register Sidebar === RegisterBar(ABEdge.ABE_RIGHT) + ' Disable Form until init has completed Enabled = False End Sub @@ -231,8 +231,9 @@ Public Class frmFlowForm 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 + Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch") With { + .BaseSearchSQL = DocResultBaseSearch + } ' === Initialize Theming === If My.Application.Palette = "" Then @@ -242,14 +243,13 @@ Public Class frmFlowForm End If ' === Setup Timers === - AddHandler TimerRefreshSidebarData.Tick, AddressOf TimerRefreshData_Tick - TimerRefreshSidebarData.Enabled = True + ' No timers right now ' === Setup Event Handlers === AddHandler KeyDown, AddressOf frmFlowForm_KeyDown AddHandler KeyUp, AddressOf frmFlowForm_KeyDown AddHandler Watcher.ClipboardChanged, AddressOf Watcher_ClipboardChanged - + AddHandler Search.Closed, AddressOf SearchRunner_Closed PictureBoxSearch.Visible = False For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows @@ -259,12 +259,7 @@ Public Class frmFlowForm End If Next - 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) - - GridControl1.DataSource = AccessedFilesTable - colPrimary.FieldName = "DisplayFileName" - colSecondary.FieldName = "Changed when" + Await Load_Recent_Files() If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then Try @@ -354,6 +349,24 @@ Public Class frmFlowForm Enabled = True End Try End Function + + Private Async Sub SearchRunner_Closed(sender As Object, e As Integer) + Await Load_Recent_Files() + End Sub + + Private Async Function Load_Recent_Files() As Task + Try + 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) + + GridControl1.DataSource = AccessedFilesTable + colPrimary.FieldName = "DisplayFileName" + colSecondary.FieldName = "Changed when" + Catch ex As Exception + ShowErrorMessage(ex) + End Try + End Function + Async Function ConfigureQuicksearch1(Reload As Boolean) As Threading.Tasks.Task If Reload Then Dim oSQL = $"SELECT * FROM TBIDB_CATALOG_USER WHERE USR_ID = {My.Application.User.UserId}" @@ -1144,7 +1157,18 @@ Public Class frmFlowForm End Sub Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnServiceConfig.ItemClick - frmServiceConfig.ShowDialog() + Try + Dim oForm As New frmServiceConfig() With { + .ServiceAddress = My.Application.Service.Client.ServerAddress, + .ServiceOnline = My.Application.Service.Client.IsOnline + } + oForm.ShowDialog() + + My.SystemConfig.AppServerConfig = oForm.ServiceAddress + My.SystemConfigManager.Save() + Catch ex As Exception + ErrorHandler.ShowErrorMessage("Service Config") + End Try End Sub Private Async Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnBasicConfig.ItemClick @@ -1217,24 +1241,6 @@ Public Class frmFlowForm 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 diff --git a/GUIs.ZooFlow/frmServiceConfig.vb b/GUIs.ZooFlow/frmServiceConfig.vb index d33add26..ee2259df 100644 --- a/GUIs.ZooFlow/frmServiceConfig.vb +++ b/GUIs.ZooFlow/frmServiceConfig.vb @@ -11,21 +11,21 @@ Public Class frmServiceConfig Private ConnectionChanged As Boolean = False + Public Property ServiceAddress As String = "" + Public Property ServiceOnline As Boolean = False + Private Sub frmServiceConfig_Load(sender As Object, e As EventArgs) Handles Me.Load Logger = My.LogConfig.GetLogger() - If My.SystemConfig.AppServerConfig <> String.Empty Then - Dim oAddress = Client.ParseServiceAddress(My.SystemConfig.AppServerConfig) + If ServiceAddress <> String.Empty Then + Dim oAddress = Client.ParseServiceAddress(ServiceAddress) txtServiceAddress.Text = oAddress.Item1 txtServicePort.Text = oAddress.Item2 End If - If Not IsNothing(My.Application.Service.Client) Then - If My.Application.Service.Client.IsOnline Then - txtStatus.Text = STATUS_CONNECTED - End If + If ServiceOnline Then + txtStatus.Text = STATUS_CONNECTED End If - txtServiceAddress.Focus() End Sub @@ -41,11 +41,13 @@ Public Class frmServiceConfig Dim oResult = Client.Connect() If oResult = True Then - My.SystemConfig.AppServerConfig = $"{oIPAddress}:{oPort}" - My.SystemConfigManager.Save() + ServiceAddress = $"{oIPAddress}:{oPort}" + ServiceOnline = True txtStatus.Text = STATUS_CONNECTED Else + ServiceAddress = "" + ServiceOnline = True txtStatus.Text = STATUS_FAILED ' TODO: Make a connection test that is as elaborate as this one :D 'Select Case oResult