From 2c2329a7dbdea34d439ceb89c9cdd9ece4e59f13 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 20 May 2020 11:02:23 +0200 Subject: [PATCH] Icons: Tabs --- .../frmAdministration.Designer.vb | 85 +++++----- .../frmAdministration.resx | 150 +++++++++++++++--- 2 files changed, 174 insertions(+), 61 deletions(-) diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index 2d4b1f4..7ec8fde 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb @@ -465,9 +465,10 @@ Partial Class frmAdministration ' Me.TabPageGeneralSettings.AutoScroll = True Me.TabPageGeneralSettings.Controls.Add(Me.LayoutControl1) - Me.TabPageGeneralSettings.ImageOptions.Image = CType(resources.GetObject("TabPageGeneralSettings.ImageOptions.Image"), System.Drawing.Image) + Me.TabPageGeneralSettings.ImageOptions.SvgImage = CType(resources.GetObject("TabPageGeneralSettings.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.TabPageGeneralSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageGeneralSettings.Name = "TabPageGeneralSettings" - Me.TabPageGeneralSettings.Size = New System.Drawing.Size(1204, 572) + Me.TabPageGeneralSettings.Size = New System.Drawing.Size(1204, 568) Me.TabPageGeneralSettings.Text = "Allgemein" ' 'LayoutControl1 @@ -1044,8 +1045,10 @@ Partial Class frmAdministration Me.TabPageDocuments.Controls.Add(Me.LayoutControlDocs) Me.TabPageDocuments.Controls.Add(Me.GridControl1) Me.TabPageDocuments.ImageOptions.Image = CType(resources.GetObject("TabPageDocuments.ImageOptions.Image"), System.Drawing.Image) + Me.TabPageDocuments.ImageOptions.SvgImage = CType(resources.GetObject("TabPageDocuments.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.TabPageDocuments.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageDocuments.Name = "TabPageDocuments" - Me.TabPageDocuments.Size = New System.Drawing.Size(1204, 587) + Me.TabPageDocuments.Size = New System.Drawing.Size(1204, 568) Me.TabPageDocuments.Text = "Dokument-Suchen" ' 'LayoutControlDocs @@ -1066,7 +1069,7 @@ Partial Class frmAdministration Me.LayoutControlDocs.Name = "LayoutControlDocs" Me.LayoutControlDocs.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(-854, 328, 650, 400) Me.LayoutControlDocs.Root = Me.LayoutControlGroup2 - Me.LayoutControlDocs.Size = New System.Drawing.Size(1004, 587) + Me.LayoutControlDocs.Size = New System.Drawing.Size(1004, 568) Me.LayoutControlDocs.TabIndex = 24 Me.LayoutControlDocs.Text = "LayoutControl2" ' @@ -1159,18 +1162,18 @@ Partial Class frmAdministration Me.MemoEdit5.Name = "MemoEdit5" Me.MemoEdit5.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit5.Properties.Appearance.Options.UseFont = True - Me.MemoEdit5.Size = New System.Drawing.Size(644, 232) + Me.MemoEdit5.Size = New System.Drawing.Size(644, 224) Me.MemoEdit5.StyleController = Me.LayoutControlDocs Me.MemoEdit5.TabIndex = 12 ' 'MemoEdit6 ' Me.MemoEdit6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.MemoEdit6.Location = New System.Drawing.Point(348, 280) + Me.MemoEdit6.Location = New System.Drawing.Point(348, 272) Me.MemoEdit6.Name = "MemoEdit6" Me.MemoEdit6.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit6.Properties.Appearance.Options.UseFont = True - Me.MemoEdit6.Size = New System.Drawing.Size(644, 295) + Me.MemoEdit6.Size = New System.Drawing.Size(644, 284) Me.MemoEdit6.StyleController = Me.LayoutControlDocs Me.MemoEdit6.TabIndex = 13 ' @@ -1213,7 +1216,7 @@ Partial Class frmAdministration Me.LayoutControlGroup2.GroupBordersVisible = False Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem29, Me.LayoutControlItem30, Me.LayoutControlItem31, Me.LayoutControlItem25, Me.LayoutControlItem27, Me.LayoutControlItem26, Me.EmptySpaceItem2, Me.LayoutControlItem33, Me.LayoutControlItem32, Me.LayoutControlItem34, Me.LayoutControlItem24, Me.LayoutControlItem28}) Me.LayoutControlGroup2.Name = "Root" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(1004, 587) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(1004, 568) Me.LayoutControlGroup2.TextVisible = False ' 'LayoutControlItem29 @@ -1284,16 +1287,16 @@ Partial Class frmAdministration Me.EmptySpaceItem2.AllowHotTrack = False Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 200) Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(336, 367) + Me.EmptySpaceItem2.Size = New System.Drawing.Size(336, 348) Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem33 ' Me.LayoutControlItem33.Control = Me.MemoEdit6 Me.LayoutControlItem33.CustomizationFormText = "SQL für Ergebnis Zählung:" - Me.LayoutControlItem33.Location = New System.Drawing.Point(336, 252) + Me.LayoutControlItem33.Location = New System.Drawing.Point(336, 244) Me.LayoutControlItem33.Name = "LayoutControlItem33" - Me.LayoutControlItem33.Size = New System.Drawing.Size(648, 315) + Me.LayoutControlItem33.Size = New System.Drawing.Size(648, 304) Me.LayoutControlItem33.Text = "SQL für Ergebnis Zählung:" Me.LayoutControlItem33.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem33.TextSize = New System.Drawing.Size(125, 13) @@ -1304,7 +1307,7 @@ Partial Class frmAdministration Me.LayoutControlItem32.CustomizationFormText = "SQL für Suche:" Me.LayoutControlItem32.Location = New System.Drawing.Point(336, 0) Me.LayoutControlItem32.Name = "LayoutControlItem32" - Me.LayoutControlItem32.Size = New System.Drawing.Size(648, 252) + Me.LayoutControlItem32.Size = New System.Drawing.Size(648, 244) Me.LayoutControlItem32.Text = "SQL für Suche:" Me.LayoutControlItem32.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem32.TextSize = New System.Drawing.Size(125, 13) @@ -1349,7 +1352,7 @@ Partial Class frmAdministration Me.GridControl1.MainView = Me.GridView2 Me.GridControl1.MenuManager = Me.RibbonControl2 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(200, 587) + Me.GridControl1.Size = New System.Drawing.Size(200, 568) Me.GridControl1.TabIndex = 10 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' @@ -1379,8 +1382,10 @@ Partial Class frmAdministration Me.TabPageData.Controls.Add(Me.LayoutControlData) Me.TabPageData.Controls.Add(Me.GridControl2) Me.TabPageData.ImageOptions.Image = CType(resources.GetObject("TabPageData.ImageOptions.Image"), System.Drawing.Image) + Me.TabPageData.ImageOptions.SvgImage = CType(resources.GetObject("TabPageData.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.TabPageData.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageData.Name = "TabPageData" - Me.TabPageData.Size = New System.Drawing.Size(1204, 587) + Me.TabPageData.Size = New System.Drawing.Size(1204, 568) Me.TabPageData.Text = "Daten-Suchen" ' 'LayoutControlData @@ -1401,7 +1406,7 @@ Partial Class frmAdministration Me.LayoutControlData.Name = "LayoutControlData" Me.LayoutControlData.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(-714, 293, 650, 400) Me.LayoutControlData.Root = Me.LayoutControlGroup3 - Me.LayoutControlData.Size = New System.Drawing.Size(1004, 587) + Me.LayoutControlData.Size = New System.Drawing.Size(1004, 568) Me.LayoutControlData.TabIndex = 26 Me.LayoutControlData.Text = "LayoutControl3" ' @@ -1493,19 +1498,19 @@ Partial Class frmAdministration Me.MemoEdit3.Name = "MemoEdit3" Me.MemoEdit3.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit3.Properties.Appearance.Options.UseFont = True - Me.MemoEdit3.Size = New System.Drawing.Size(644, 233) + Me.MemoEdit3.Size = New System.Drawing.Size(644, 225) Me.MemoEdit3.StyleController = Me.LayoutControlData Me.MemoEdit3.TabIndex = 12 ' 'MemoEdit4 ' Me.MemoEdit4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.MemoEdit4.Location = New System.Drawing.Point(348, 281) + Me.MemoEdit4.Location = New System.Drawing.Point(348, 273) Me.MemoEdit4.MenuManager = Me.RibbonControl2 Me.MemoEdit4.Name = "MemoEdit4" Me.MemoEdit4.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit4.Properties.Appearance.Options.UseFont = True - Me.MemoEdit4.Size = New System.Drawing.Size(644, 294) + Me.MemoEdit4.Size = New System.Drawing.Size(644, 283) Me.MemoEdit4.StyleController = Me.LayoutControlData Me.MemoEdit4.TabIndex = 13 ' @@ -1545,7 +1550,7 @@ Partial Class frmAdministration Me.LayoutControlGroup3.GroupBordersVisible = False Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem17, Me.LayoutControlItem16, Me.LayoutControlItem11, Me.LayoutControlItem12, Me.LayoutControlItem13, Me.LayoutControlItem21, Me.LayoutControlItem22, Me.EmptySpaceItem1, Me.LayoutControlItem23}) Me.LayoutControlGroup3.Name = "Root" - Me.LayoutControlGroup3.Size = New System.Drawing.Size(1004, 587) + Me.LayoutControlGroup3.Size = New System.Drawing.Size(1004, 568) Me.LayoutControlGroup3.TextVisible = False ' 'LayoutControlItem10 @@ -1633,7 +1638,7 @@ Partial Class frmAdministration Me.LayoutControlItem21.Control = Me.MemoEdit3 Me.LayoutControlItem21.Location = New System.Drawing.Point(336, 0) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(648, 253) + Me.LayoutControlItem21.Size = New System.Drawing.Size(648, 245) Me.LayoutControlItem21.Text = "SQL für Suche:" Me.LayoutControlItem21.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem21.TextSize = New System.Drawing.Size(125, 13) @@ -1641,9 +1646,9 @@ Partial Class frmAdministration 'LayoutControlItem22 ' Me.LayoutControlItem22.Control = Me.MemoEdit4 - Me.LayoutControlItem22.Location = New System.Drawing.Point(336, 253) + Me.LayoutControlItem22.Location = New System.Drawing.Point(336, 245) Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(648, 314) + Me.LayoutControlItem22.Size = New System.Drawing.Size(648, 303) Me.LayoutControlItem22.Text = "SQL für Ergebnis Zählung:" Me.LayoutControlItem22.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem22.TextSize = New System.Drawing.Size(125, 13) @@ -1653,7 +1658,7 @@ Partial Class frmAdministration Me.EmptySpaceItem1.AllowHotTrack = False Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 200) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(336, 367) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(336, 348) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem23 @@ -1673,7 +1678,7 @@ Partial Class frmAdministration Me.GridControl2.MainView = Me.GridView3 Me.GridControl2.MenuManager = Me.RibbonControl2 Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(200, 587) + Me.GridControl2.Size = New System.Drawing.Size(200, 568) Me.GridControl2.TabIndex = 10 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -1702,8 +1707,10 @@ Partial Class frmAdministration ' Me.TabPageProcessAssignment.Controls.Add(Me.CtrlApplicationAssignment1) Me.TabPageProcessAssignment.ImageOptions.Image = CType(resources.GetObject("TabPageProcessAssignment.ImageOptions.Image"), System.Drawing.Image) + Me.TabPageProcessAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageProcessAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.TabPageProcessAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageProcessAssignment.Name = "TabPageProcessAssignment" - Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1204, 587) + Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1204, 568) Me.TabPageProcessAssignment.Text = "Anwendungs Zuordnung" ' 'CtrlApplicationAssignment1 @@ -1715,15 +1722,16 @@ Partial Class frmAdministration Me.CtrlApplicationAssignment1.SelectedProcessId = 0 Me.CtrlApplicationAssignment1.SelectedProfileId = 0 Me.CtrlApplicationAssignment1.SelectedWindowId = 0 - Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1204, 587) + Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1204, 568) Me.CtrlApplicationAssignment1.TabIndex = 2 ' 'TabPageUserAssignment ' Me.TabPageUserAssignment.Controls.Add(Me.SplitContainer1) - Me.TabPageUserAssignment.ImageOptions.Image = CType(resources.GetObject("TabPageUserAssignment.ImageOptions.Image"), System.Drawing.Image) + Me.TabPageUserAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageUserAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.TabPageUserAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageUserAssignment.Name = "TabPageUserAssignment" - Me.TabPageUserAssignment.Size = New System.Drawing.Size(1204, 587) + Me.TabPageUserAssignment.Size = New System.Drawing.Size(1204, 568) Me.TabPageUserAssignment.Text = "Benutzer Zuordnung" ' 'SplitContainer1 @@ -1742,8 +1750,8 @@ Partial Class frmAdministration ' Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlUserNotInProfile) Me.SplitContainer1.Panel2.Controls.Add(Me.Label2) - Me.SplitContainer1.Size = New System.Drawing.Size(1204, 587) - Me.SplitContainer1.SplitterDistance = 287 + Me.SplitContainer1.Size = New System.Drawing.Size(1204, 568) + Me.SplitContainer1.SplitterDistance = 277 Me.SplitContainer1.TabIndex = 98 ' 'GridControlUserInProfile @@ -1753,7 +1761,7 @@ Partial Class frmAdministration Me.GridControlUserInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlUserInProfile.MainView = Me.GridViewUserInProfile Me.GridControlUserInProfile.Name = "GridControlUserInProfile" - Me.GridControlUserInProfile.Size = New System.Drawing.Size(1204, 262) + Me.GridControlUserInProfile.Size = New System.Drawing.Size(1204, 252) Me.GridControlUserInProfile.TabIndex = 93 Me.GridControlUserInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserInProfile}) ' @@ -1835,7 +1843,7 @@ Partial Class frmAdministration Me.GridControlUserNotInProfile.MainView = Me.GridViewUserNotInProfile Me.GridControlUserNotInProfile.Name = "GridControlUserNotInProfile" Me.GridControlUserNotInProfile.ShowOnlyPredefinedDetails = True - Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1204, 271) + Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1204, 262) Me.GridControlUserNotInProfile.TabIndex = 96 Me.GridControlUserNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserNotInProfile}) ' @@ -1905,9 +1913,10 @@ Partial Class frmAdministration ' Me.TabPageGroupAssignment.AutoScroll = True Me.TabPageGroupAssignment.Controls.Add(Me.SplitContainer2) - Me.TabPageGroupAssignment.ImageOptions.Image = CType(resources.GetObject("TabPageGroupAssignment.ImageOptions.Image"), System.Drawing.Image) + Me.TabPageGroupAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageGroupAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.TabPageGroupAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageGroupAssignment.Name = "TabPageGroupAssignment" - Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1204, 587) + Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1204, 568) Me.TabPageGroupAssignment.Text = "Gruppen Zuordnung" ' 'SplitContainer2 @@ -1926,8 +1935,8 @@ Partial Class frmAdministration ' Me.SplitContainer2.Panel2.Controls.Add(Me.GridControlGroupNotInProfile) Me.SplitContainer2.Panel2.Controls.Add(Me.Label10) - Me.SplitContainer2.Size = New System.Drawing.Size(1204, 587) - Me.SplitContainer2.SplitterDistance = 284 + Me.SplitContainer2.Size = New System.Drawing.Size(1204, 568) + Me.SplitContainer2.SplitterDistance = 274 Me.SplitContainer2.TabIndex = 0 ' 'GridControlGroupInProfile @@ -1937,7 +1946,7 @@ Partial Class frmAdministration Me.GridControlGroupInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlGroupInProfile.MainView = Me.GridViewGroupInProfile Me.GridControlGroupInProfile.Name = "GridControlGroupInProfile" - Me.GridControlGroupInProfile.Size = New System.Drawing.Size(1204, 259) + Me.GridControlGroupInProfile.Size = New System.Drawing.Size(1204, 249) Me.GridControlGroupInProfile.TabIndex = 1 Me.GridControlGroupInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupInProfile}) ' @@ -1999,7 +2008,7 @@ Partial Class frmAdministration Me.GridControlGroupNotInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlGroupNotInProfile.MainView = Me.GridViewGroupNotInProfile Me.GridControlGroupNotInProfile.Name = "GridControlGroupNotInProfile" - Me.GridControlGroupNotInProfile.Size = New System.Drawing.Size(1204, 274) + Me.GridControlGroupNotInProfile.Size = New System.Drawing.Size(1204, 265) Me.GridControlGroupNotInProfile.TabIndex = 1 Me.GridControlGroupNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupNotInProfile}) ' diff --git a/app/DD_Clipboard_Searcher/frmAdministration.resx b/app/DD_Clipboard_Searcher/frmAdministration.resx index cd56e80..290c389 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.resx +++ b/app/DD_Clipboard_Searcher/frmAdministration.resx @@ -695,14 +695,21 @@ 1024, 95 - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAANRJREFUOE+d - kT0OgkAQhbG18WQmXsA7AI0dCWZbo7fRxMJGUC9j/MN2nDdhyC6wsLH4YHg770vIRsYYHxNmw+SazdcH - AvoNmqEFylsGy0AkoQK7fGTKes65nI0J2uUpM2McCb+bzlhZzyApVmYnEitvBENlRSSMI8EjpKx0JAhx - VQjAUFmBRPczBEtmXwe6pAtt7PMTs9AAv+EsVNeEHkUqfC5JnwAd5xachTeX7udUeJW9ApkjIhLsEPP3 - FtOzTIXqGncE2vMKPAQLxvAKgukI/oOiH3DIH9LquF+BAAAAAElFTkSuQmCC + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkhvbWUiPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iOCwy + OCA4LDE4IDIsMTggMTYsNCAzMCwxOCAyNCwxOCAyNCwyOCAxOCwyOCAxOCwxOCAxNCwxOCAxNCwyOCAg + IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -717,6 +724,32 @@ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAFRleHQ7UGFnZTtSZXBvcnR2YWEA AAAAVUlEQVQ4T2P4//8/RRjOaGlp+Y8H/4PSxsiaQRjFAHwAJN/X13cX3RCSDACCX+iGkGQAMgYC0gxA BngN8G3agReDwKgLaO0CYgDtDCAFYxhAHv7PAAC6Jy+iz67OxwAAAABJRU5ErkJggg== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGcEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJDb250cmFjdCI+DQog + ICAgPGcgY2xhc3M9InN0MSI+DQogICAgICA8cGF0aCBkPSJNMjIsMTRIMTB2LTJoMTJWMTR6IE0yMiw4 + SDEwdjJoMTJWOHogTTIyLDE2SDEwdjJoMTJWMTZ6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPC9nPg0K + ICAgIDxwYXRoIGQ9Ik0yNywySDVDNC41LDIsNCwyLjUsNCwzdjI2YzAsMC41LDAuNSwxLDEsMWgyMmMw + LjUsMCwxLTAuNSwxLTFWM0MyOCwyLjUsMjcuNSwyLDI3LDJ6IE0yNiwyOEg2VjRoMjBWMjh6IiBjbGFz + cz0iQmxhY2siIC8+DQogICAgPHJlY3QgeD0iMTYiIHk9IjIyIiB3aWR0aD0iNiIgaGVpZ2h0PSIyIiBy + eD0iMCIgcnk9IjAiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L @@ -726,6 +759,27 @@ dG9yrLHqcgAAAIhJREFUOE9j+P//P8O7I0UgLADEUUA8C4jPAfEnJAzig8RB8iB1YH0gDDPACIiXAvF/ IjBInRG6AXOQFBCD56Ab8A5NASH8juoGUOwFMyAmJRDN0A1IA2JPICYmGkHq0tANAIXBAyAGKYoDYl0g 5kHCID5IHCQPUjcaBrQIA4ozEwiTkZ3/MwAAShbqQY39CKgAAAAASUVORK5CYII= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADIDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRhdGFiYXNlIj4NCiAgICA8cGF0aCBkPSJNMTYsMjRj + LTUuNSwwLTEwLTEuOC0xMC00djRjMCwyLjIsNC41LDQsMTAsNHMxMC0xLjgsMTAtNHYtNEMyNiwyMi4y + LDIxLjUsMjQsMTYsMjR6IiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDxwYXRoIGQ9Ik0xNiwxOGMtNS41 + LDAtMTAtMS44LTEwLTR2NGMwLDIuMiw0LjUsNCwxMCw0czEwLTEuOCwxMC00di00QzI2LDE2LjIsMjEu + NSwxOCwxNiwxOHoiIGNsYXNzPSJZZWxsb3ciIC8+DQogICAgPHBhdGggZD0iTTE2LDRDMTAuNSw0LDYs + NS44LDYsOHY0YzAsMi4yLDQuNSw0LDEwLDRzMTAtMS44LDEwLTRWOEMyNiw1LjgsMjEuNSw0LDE2LDR6 + IiBjbGFzcz0iWWVsbG93IiAvPg0KICA8L2c+DQo8L3N2Zz4L @@ -738,26 +792,49 @@ m/b4i0HfEZygbYjOoP0aleh7SAr6nrIzaftMERLd+M55+AHESXAXw39ssQAAAABJRU5ErkJggg== - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAydEVYdFRpdGxlAEN1c3RvbWVyO0VtcGxveWVlO1Bl - cnNvbjtDb250YWN0O1VzZXI7Q2xpZW50fhE26AAAAM1JREFUOE+l0TEOQUEUBdBfiN4ySDQqKvTfGuxF - pbEIi5DoRcIa/gqovwKRca/MvMw8/zGhODKZd98NpnDO/eX1MVtstSHs4eIdYAxJzipowQmccoY2SNYq - 6IJeDnogWatgAk3LNAXJWgVLaFomziRrFYzgAXqZd/xzJWsV0A50Ae+S3KcCPtkNwjLP2c8YzOHo8fyW - sQo6sIL4zXnmHWeS1QUD2MAd+LXX0Pd45h1nzDCbFJRwhfCbv2G2jAuqaJirigtqNcxRS8HvXPEEp3w/ - tQHvKFEAAAAASUVORK5CYII= + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IldpbmRvdyI+DQogICAgPHBhdGggZD0iTTMwLDEwVjVj + MC0wLjUtMC41LTEtMS0xSDNDMi41LDQsMiw0LjUsMiw1djVIMzB6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg + ICA8cGF0aCBkPSJNMjgsMTB2MTZINFYxMEgydjE3YzAsMC41LDAuNSwxLDEsMWgyNmMwLjUsMCwxLTAu + NSwxLTFWMTBIMjh6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAYdEVYdFRpdGxlAFRlYW07UGVvcGxlO0dyb3VwO1w5 - 6BYAAADzSURBVDhPpdA9CsJAEAVglYBYeQYPoJ2tBxDEMq2FJ5BASsVrWNhqmc4rKHgJsbAXTKXre2En - TNZJESw+iPPzzKTlnPuLWWyifJhtT23YwdPbQwfMuhUwBhdgzaxbAbEauMISIm8BZ5B+bAWkvvmBunPe - wJnUCujDCy5Qdw57nOn/BPiQBA6gzxGssZfoHb3MW4cwADlHY429EURlAH50YQM3uMMU5BxZLl4b2OMM - Z7nTY8AR9D/RCniO/OYza3qGMgbkqvCANcg5E694bWCPMzKfl9/Af4fwnLlXeW29EwZY54QyvRMG6HPq - 5HqnEtCca30Bw6t+WSTe8moAAAAASUVORK5CYII= + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKgEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJDdXN0b21lcl8xXyI+ + DQogICAgPHBhdGggZD0iTTEwLDkuOWMtMC4xLDAuNSwwLjIsMC45LDAuNCwxLjRzLTAuMSwxLjcsMC45 + LDEuNmMwLDAsMCwwLjEsMCwwLjJjMC42LDIuMywyLDQuOSw0LjcsNC45czQuMi0yLjYsNC43LTQuOSAg + IFYxM2MxLDAuMSwwLjYtMS4xLDAuOS0xLjZjMC4yLTAuNSwwLjQtMC45LDAuMy0xLjRjLTAuMS0wLjQt + MC40LTAuNC0wLjUtMC4zQzIzLjIsNC44LDIwLjMsNSwyMC4zLDVTMjAsMiwxNC44LDIgICBDMTAsMiw5 + LjQsNiwxMC41LDkuNkMxMC40LDkuNiwxMC4xLDkuNywxMCw5Ljl6IE0yMCwxOGMtMC44LDEuNS0yLjEs + NC00LDRzLTMuMi0yLjUtNC00Yy0yLjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41ICAgQzI4LDE5LjEs + MjIuMywyMS40LDIwLDE4eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= @@ -766,6 +843,33 @@ 290, 95 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKQEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJQZXJzb24iPg0KICAg + IDxwYXRoIGQ9Ik0xMCw5LjljLTAuMSwwLjUsMC4yLDAuOSwwLjQsMS40cy0wLjEsMS43LDAuOSwxLjZj + MCwwLDAsMC4xLDAsMC4yYzAuNiwyLjMsMiw0LjksNC43LDQuOXM0LjItMi42LDQuNy00LjkgICBWMTNj + MSwwLjEsMC42LTEuMSwwLjktMS42YzAuMi0wLjUsMC40LTAuOSwwLjMtMS40Yy0wLjEtMC40LTAuNC0w + LjQtMC41LTAuM0MyMy4yLDQuOCwyMC4zLDUsMjAuMyw1UzIwLDIsMTQuOCwyICAgQzEwLDIsOS40LDYs + MTAuNSw5LjZDMTAuNCw5LjYsMTAuMSw5LjcsMTAsOS45eiBNMjAsMThjLTAuOCwxLjUtMi4xLDQtNCw0 + cy0zLjItMi41LTQtNGMtMi4zLDMuNS04LDEtOCw4LjVWMzBoMjR2LTMuNSAgIEMyOCwxOS4xLDIyLjMs + MjEuNCwyMCwxOHoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + 862, 56