From 3e84c7bdcbbf0256fbc0e836fe9e872e79b29c5e Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 12 Nov 2020 16:27:01 +0100 Subject: [PATCH] ZooFlow: Easier Filter --- .../DocumentViewer.Designer.vb | 285 ++++++++++++- Controls.DocumentViewer/DocumentViewer.resx | 388 +++++++++++++++--- Controls.DocumentViewer/DocumentViewer.vb | 36 +- .../My Project/licenses.licx | 2 + GUIs.ZooFlow/frmSearchStart.Designer.vb | 30 +- GUIs.ZooFlow/frmSearchStart.vb | 27 +- 6 files changed, 648 insertions(+), 120 deletions(-) diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index 5a098dc6..05ed4e97 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -22,6 +22,7 @@ Partial Class DocumentViewer 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DocumentViewer)) Me.GdViewer = New GdPicture14.GdViewer() Me.mainToolStrip = New System.Windows.Forms.ToolStrip() @@ -38,7 +39,7 @@ Partial Class DocumentViewer Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() Me.btnFirstPage = New System.Windows.Forms.ToolStripButton() Me.btnPreviousPage = New System.Windows.Forms.ToolStripButton() - Me.txtCurrentPage = New System.Windows.Forms.ToolStripTextBox() + Me.txtCurrentPageold = New System.Windows.Forms.ToolStripTextBox() Me.lblPageCount = New System.Windows.Forms.ToolStripLabel() Me.btnNextPage = New System.Windows.Forms.ToolStripButton() Me.btnLastPage = New System.Windows.Forms.ToolStripButton() @@ -55,9 +56,36 @@ Partial Class DocumentViewer Me.btnSettings = New System.Windows.Forms.ToolStripButton() Me.OpenFileDialog = New System.Windows.Forms.OpenFileDialog() Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl() + Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) + Me.Bar2 = New DevExpress.XtraBars.Bar() + Me.buttonPrint = New DevExpress.XtraBars.BarButtonItem() + Me.buttonFitWidth = New DevExpress.XtraBars.BarButtonItem() + Me.buttonFitPage = New DevExpress.XtraBars.BarButtonItem() + Me.buttonZoomIn = New DevExpress.XtraBars.BarButtonItem() + Me.buttonZoomOut = New DevExpress.XtraBars.BarButtonItem() + Me.buttonRotateLeft = New DevExpress.XtraBars.BarButtonItem() + Me.buttonRotateRight = New DevExpress.XtraBars.BarButtonItem() + Me.buttonFlipX = New DevExpress.XtraBars.BarButtonItem() + Me.buttonFlipY = New DevExpress.XtraBars.BarButtonItem() + Me.buttonFirstPage = New DevExpress.XtraBars.BarButtonItem() + Me.buttonPrevPage = New DevExpress.XtraBars.BarButtonItem() + Me.txtCurrentPage = New DevExpress.XtraBars.BarEditItem() + Me.RepositoryItemTextEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() + Me.buttonNextPage = New DevExpress.XtraBars.BarButtonItem() + Me.buttonLastPage = New DevExpress.XtraBars.BarButtonItem() + Me.buttonSettings = New DevExpress.XtraBars.BarButtonItem() + Me.Bar3 = New DevExpress.XtraBars.Bar() + Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() + Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl() Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument() Me.mainToolStrip.SuspendLayout() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GdViewer @@ -93,7 +121,7 @@ Partial Class DocumentViewer Me.GdViewer.HQAnnotationRendering = True Me.GdViewer.IgnoreDocumentResolution = False Me.GdViewer.KeepDocumentPosition = False - Me.GdViewer.Location = New System.Drawing.Point(0, 31) + Me.GdViewer.Location = New System.Drawing.Point(0, 67) Me.GdViewer.LockViewer = False Me.GdViewer.MagnifierHeight = 90 Me.GdViewer.MagnifierWidth = 160 @@ -123,7 +151,7 @@ Partial Class DocumentViewer Me.GdViewer.ScrollLargeChange = CType(50, Short) Me.GdViewer.ScrollSmallChange = CType(1, Short) Me.GdViewer.SilentMode = True - Me.GdViewer.Size = New System.Drawing.Size(1015, 559) + Me.GdViewer.Size = New System.Drawing.Size(1015, 504) Me.GdViewer.TabIndex = 0 Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone Me.GdViewer.Zoom = 1.0R @@ -136,8 +164,8 @@ Partial Class DocumentViewer Me.mainToolStrip.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.mainToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.mainToolStrip.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.mainToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btnPrint, Me.btnFitWidth, Me.btnFitPage, Me.ToolStripSeparator2, Me.btnMouseMode, Me.ToolStripSeparator6, Me.btnFirstPage, Me.btnPreviousPage, Me.txtCurrentPage, Me.lblPageCount, Me.btnNextPage, Me.btnLastPage, Me.ToolStripSeparator1, Me.btnZoomOut, Me.cbZoom, Me.btnZoomIn, Me.ToolStripSeparator5, Me.btnRotateLeft, Me.btnRotateRight, Me.btnFlipX, Me.btnFlipY, Me.ToolStripSeparator4, Me.btnSettings}) - Me.mainToolStrip.Location = New System.Drawing.Point(0, 0) + Me.mainToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btnPrint, Me.btnFitWidth, Me.btnFitPage, Me.ToolStripSeparator2, Me.btnMouseMode, Me.ToolStripSeparator6, Me.btnFirstPage, Me.btnPreviousPage, Me.txtCurrentPageold, Me.lblPageCount, Me.btnNextPage, Me.btnLastPage, Me.ToolStripSeparator1, Me.btnZoomOut, Me.cbZoom, Me.btnZoomIn, Me.ToolStripSeparator5, Me.btnRotateLeft, Me.btnRotateRight, Me.btnFlipX, Me.btnFlipY, Me.ToolStripSeparator4, Me.btnSettings}) + Me.mainToolStrip.Location = New System.Drawing.Point(0, 36) Me.mainToolStrip.Name = "mainToolStrip" Me.mainToolStrip.Size = New System.Drawing.Size(1015, 31) Me.mainToolStrip.TabIndex = 6 @@ -252,12 +280,12 @@ Partial Class DocumentViewer Me.btnPreviousPage.Size = New System.Drawing.Size(28, 28) Me.btnPreviousPage.Text = "Go to previous page" ' - 'tbCurrentPage + 'txtCurrentPageold ' - Me.txtCurrentPage.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCurrentPage.Name = "tbCurrentPage" - Me.txtCurrentPage.Size = New System.Drawing.Size(40, 31) - Me.txtCurrentPage.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.txtCurrentPageold.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtCurrentPageold.Name = "txtCurrentPageold" + Me.txtCurrentPageold.Size = New System.Drawing.Size(40, 31) + Me.txtCurrentPageold.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'lblPageCount ' @@ -387,6 +415,7 @@ Partial Class DocumentViewer 'RichEditControl1 ' Me.RichEditControl1.Location = New System.Drawing.Point(735, 377) + Me.RichEditControl1.MenuManager = Me.BarManager1 Me.RichEditControl1.Name = "RichEditControl1" Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden @@ -396,9 +425,212 @@ Partial Class DocumentViewer Me.RichEditControl1.Text = "RichEditControl1" Me.RichEditControl1.Visible = False ' + 'BarManager1 + ' + Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.Bar2, Me.Bar3}) + Me.BarManager1.DockControls.Add(Me.barDockControlTop) + Me.BarManager1.DockControls.Add(Me.barDockControlBottom) + Me.BarManager1.DockControls.Add(Me.barDockControlLeft) + Me.BarManager1.DockControls.Add(Me.barDockControlRight) + Me.BarManager1.Form = Me + Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.buttonPrint, Me.buttonFitPage, Me.buttonFitWidth, Me.buttonZoomIn, Me.buttonZoomOut, Me.buttonRotateRight, Me.buttonRotateLeft, Me.buttonFlipX, Me.buttonFlipY, Me.buttonSettings, Me.buttonPrevPage, Me.buttonNextPage, Me.buttonFirstPage, Me.buttonLastPage, Me.txtCurrentPage}) + Me.BarManager1.MainMenu = Me.Bar2 + Me.BarManager1.MaxItemId = 17 + Me.BarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2}) + Me.BarManager1.StatusBar = Me.Bar3 + ' + 'Bar2 + ' + Me.Bar2.BarName = "Hauptmenü" + Me.Bar2.DockCol = 0 + Me.Bar2.DockRow = 0 + Me.Bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top + Me.Bar2.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.buttonPrint), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFitWidth), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFitPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonZoomIn), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonZoomOut), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonRotateLeft), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonRotateRight), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFlipX), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFlipY), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFirstPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonPrevPage), New DevExpress.XtraBars.LinkPersistInfo(Me.txtCurrentPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonNextPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonLastPage), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.buttonSettings, DevExpress.XtraBars.BarItemPaintStyle.Standard)}) + Me.Bar2.OptionsBar.AllowCollapse = True + Me.Bar2.OptionsBar.AllowQuickCustomization = False + Me.Bar2.OptionsBar.DrawDragBorder = False + Me.Bar2.OptionsBar.UseWholeRow = True + Me.Bar2.Text = "Hauptmenü" + ' + 'buttonPrint + ' + Me.buttonPrint.Caption = "Drucken" + Me.buttonPrint.Id = 0 + Me.buttonPrint.ImageOptions.SvgImage = CType(resources.GetObject("buttonPrint.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonPrint.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonPrint.Name = "buttonPrint" + ' + 'buttonFitWidth + ' + Me.buttonFitWidth.Caption = "An Breite anpassen" + Me.buttonFitWidth.Id = 2 + Me.buttonFitWidth.ImageOptions.SvgImage = CType(resources.GetObject("buttonFitWidth.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonFitWidth.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonFitWidth.Name = "buttonFitWidth" + ' + 'buttonFitPage + ' + Me.buttonFitPage.Caption = "An Seite Anpassen" + Me.buttonFitPage.Id = 1 + Me.buttonFitPage.ImageOptions.SvgImage = CType(resources.GetObject("buttonFitPage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonFitPage.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonFitPage.Name = "buttonFitPage" + ' + 'buttonZoomIn + ' + Me.buttonZoomIn.Caption = "Zoom +" + Me.buttonZoomIn.Id = 3 + Me.buttonZoomIn.ImageOptions.SvgImage = CType(resources.GetObject("buttonZoomIn.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonZoomIn.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonZoomIn.Name = "buttonZoomIn" + ' + 'buttonZoomOut + ' + Me.buttonZoomOut.Caption = "Zoom -" + Me.buttonZoomOut.Id = 4 + Me.buttonZoomOut.ImageOptions.SvgImage = CType(resources.GetObject("buttonZoomOut.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonZoomOut.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonZoomOut.Name = "buttonZoomOut" + ' + 'buttonRotateLeft + ' + Me.buttonRotateLeft.Caption = "Drehen -90 Grad" + Me.buttonRotateLeft.Id = 6 + Me.buttonRotateLeft.ImageOptions.SvgImage = CType(resources.GetObject("buttonRotateLeft.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonRotateLeft.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonRotateLeft.Name = "buttonRotateLeft" + ' + 'buttonRotateRight + ' + Me.buttonRotateRight.Caption = "Drehen 90 Grad" + Me.buttonRotateRight.Id = 5 + Me.buttonRotateRight.ImageOptions.SvgImage = CType(resources.GetObject("buttonRotateRight.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonRotateRight.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonRotateRight.Name = "buttonRotateRight" + ' + 'buttonFlipX + ' + Me.buttonFlipX.Caption = "Spiegeln Horizontal" + Me.buttonFlipX.Id = 7 + Me.buttonFlipX.ImageOptions.SvgImage = CType(resources.GetObject("buttonFlipX.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonFlipX.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonFlipX.Name = "buttonFlipX" + ' + 'buttonFlipY + ' + Me.buttonFlipY.Caption = "Spiegeln Vertikal" + Me.buttonFlipY.Id = 8 + Me.buttonFlipY.ImageOptions.SvgImage = CType(resources.GetObject("buttonFlipY.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonFlipY.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonFlipY.Name = "buttonFlipY" + ' + 'buttonFirstPage + ' + Me.buttonFirstPage.Caption = "Erste Seite" + Me.buttonFirstPage.Id = 13 + Me.buttonFirstPage.ImageOptions.SvgImage = CType(resources.GetObject("buttonFirstPage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonFirstPage.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonFirstPage.Name = "buttonFirstPage" + ' + 'buttonPrevPage + ' + Me.buttonPrevPage.Caption = "Zurück" + Me.buttonPrevPage.Id = 11 + Me.buttonPrevPage.ImageOptions.SvgImage = CType(resources.GetObject("buttonPrevPage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonPrevPage.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonPrevPage.Name = "buttonPrevPage" + ' + 'txtCurrentPage + ' + Me.txtCurrentPage.Caption = "BarEditItem1" + Me.txtCurrentPage.Edit = Me.RepositoryItemTextEdit2 + Me.txtCurrentPage.Id = 16 + Me.txtCurrentPage.Name = "txtCurrentPage" + ' + 'RepositoryItemTextEdit2 + ' + Me.RepositoryItemTextEdit2.AutoHeight = False + Me.RepositoryItemTextEdit2.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric + Me.RepositoryItemTextEdit2.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric + Me.RepositoryItemTextEdit2.Name = "RepositoryItemTextEdit2" + ' + 'buttonNextPage + ' + Me.buttonNextPage.Caption = "Vor" + Me.buttonNextPage.Id = 12 + Me.buttonNextPage.ImageOptions.SvgImage = CType(resources.GetObject("buttonNextPage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonNextPage.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonNextPage.Name = "buttonNextPage" + ' + 'buttonLastPage + ' + Me.buttonLastPage.Caption = "Letzte Seite" + Me.buttonLastPage.Id = 14 + Me.buttonLastPage.ImageOptions.SvgImage = CType(resources.GetObject("buttonLastPage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonLastPage.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonLastPage.Name = "buttonLastPage" + ' + 'buttonSettings + ' + Me.buttonSettings.Caption = "Einstellungen" + Me.buttonSettings.Id = 9 + Me.buttonSettings.ImageOptions.SvgImage = CType(resources.GetObject("buttonSettings.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.buttonSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) + Me.buttonSettings.Name = "buttonSettings" + ' + 'Bar3 + ' + Me.Bar3.BarName = "Statusleiste" + Me.Bar3.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Bottom + Me.Bar3.DockCol = 0 + Me.Bar3.DockRow = 0 + Me.Bar3.DockStyle = DevExpress.XtraBars.BarDockStyle.Bottom + Me.Bar3.OptionsBar.AllowQuickCustomization = False + Me.Bar3.OptionsBar.DrawDragBorder = False + Me.Bar3.OptionsBar.UseWholeRow = True + Me.Bar3.Text = "Statusleiste" + ' + 'barDockControlTop + ' + Me.barDockControlTop.CausesValidation = False + Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top + Me.barDockControlTop.Location = New System.Drawing.Point(0, 0) + Me.barDockControlTop.Manager = Me.BarManager1 + Me.barDockControlTop.Size = New System.Drawing.Size(1015, 36) + ' + 'barDockControlBottom + ' + Me.barDockControlBottom.CausesValidation = False + Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom + Me.barDockControlBottom.Location = New System.Drawing.Point(0, 571) + Me.barDockControlBottom.Manager = Me.BarManager1 + Me.barDockControlBottom.Size = New System.Drawing.Size(1015, 19) + ' + 'barDockControlLeft + ' + Me.barDockControlLeft.CausesValidation = False + Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left + Me.barDockControlLeft.Location = New System.Drawing.Point(0, 36) + Me.barDockControlLeft.Manager = Me.BarManager1 + Me.barDockControlLeft.Size = New System.Drawing.Size(0, 535) + ' + 'barDockControlRight + ' + Me.barDockControlRight.CausesValidation = False + Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right + Me.barDockControlRight.Location = New System.Drawing.Point(1015, 36) + Me.barDockControlRight.Manager = Me.BarManager1 + Me.barDockControlRight.Size = New System.Drawing.Size(0, 535) + ' + 'RepositoryItemTextEdit1 + ' + Me.RepositoryItemTextEdit1.AutoHeight = False + Me.RepositoryItemTextEdit1.Name = "RepositoryItemTextEdit1" + ' 'SpreadsheetControl1 ' Me.SpreadsheetControl1.Location = New System.Drawing.Point(461, 377) + Me.SpreadsheetControl1.MenuManager = Me.BarManager1 Me.SpreadsheetControl1.Name = "SpreadsheetControl1" Me.SpreadsheetControl1.ReadOnly = True Me.SpreadsheetControl1.Size = New System.Drawing.Size(268, 161) @@ -414,10 +646,17 @@ Partial Class DocumentViewer Me.Controls.Add(Me.RichEditControl1) Me.Controls.Add(Me.GdViewer) Me.Controls.Add(Me.mainToolStrip) + Me.Controls.Add(Me.barDockControlLeft) + Me.Controls.Add(Me.barDockControlRight) + Me.Controls.Add(Me.barDockControlBottom) + Me.Controls.Add(Me.barDockControlTop) Me.Name = "DocumentViewer" Me.Size = New System.Drawing.Size(1015, 590) Me.mainToolStrip.ResumeLayout(False) Me.mainToolStrip.PerformLayout() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -438,7 +677,7 @@ Partial Class DocumentViewer Friend WithEvents ToolStripSeparator6 As ToolStripSeparator Friend WithEvents btnFirstPage As ToolStripButton Friend WithEvents btnPreviousPage As ToolStripButton - Friend WithEvents txtCurrentPage As ToolStripTextBox + Friend WithEvents txtCurrentPageold As ToolStripTextBox Friend WithEvents lblPageCount As ToolStripLabel Friend WithEvents btnNextPage As ToolStripButton Friend WithEvents btnLastPage As ToolStripButton @@ -457,4 +696,28 @@ Partial Class DocumentViewer Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl Friend WithEvents PrintDocument1 As Printing.PrintDocument + Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager + Friend WithEvents Bar2 As DevExpress.XtraBars.Bar + Friend WithEvents buttonPrint As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonFitWidth As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonFitPage As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonZoomIn As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonZoomOut As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonRotateRight As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonRotateLeft As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonFlipX As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonFlipY As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonSettings As DevExpress.XtraBars.BarButtonItem + Friend WithEvents Bar3 As DevExpress.XtraBars.Bar + Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl + Friend WithEvents buttonFirstPage As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonPrevPage As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonNextPage As DevExpress.XtraBars.BarButtonItem + Friend WithEvents buttonLastPage As DevExpress.XtraBars.BarButtonItem + Friend WithEvents txtCurrentPage As DevExpress.XtraBars.BarEditItem + Friend WithEvents RepositoryItemTextEdit2 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit + Friend WithEvents RepositoryItemTextEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit End Class diff --git a/Controls.DocumentViewer/DocumentViewer.resx b/Controls.DocumentViewer/DocumentViewer.resx index c2fd94b3..db9f24aa 100644 --- a/Controls.DocumentViewer/DocumentViewer.resx +++ b/Controls.DocumentViewer/DocumentViewer.resx @@ -124,13 +124,13 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFhSURBVEhLvVWxToRAEEWNjf+kf0FBRccHkBBozH6CjSHa - aGVvuNL4IRIKvuFyFwpx13l7O96ySNi7E1/ysm8mM/N27iAEU8jzXBIVzqIoBicTMdO0+UEIcU4DlC8O - NkiS5HJZAyGuFt7gUW8gpdQD7JPJMXCQwU2xUqfQjNmD3N+jKPrCU9H3vbrOK+K9RDFOW9s5N4YG27bV - T1ccx59Zlr3A4OfR+0sDM7PXBkwYcOGx5P+EufQGcmDQdZ0Sd6/UUOnindle2zk3hkZv0zTTBlVVqbqu - JW6BVXHa2s65MTR6y7IcGyzJwQZz2s658ZT+nw20MICeupGdc+MpjYE6YZOLfOEOZY23GR+WFSVGJqAv - fusl9sQH88OMgSLG89uHenKIHAO3xUfKtPrBNpjDyQZzG6A2DMML0+oHdwP3zeUYOHaDtemfRZqmW2o5 - 23V6gm5FHsUam8xwQ7w1bQ6C4BuAm93DSGjZ/gAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFiSURBVEhLvVUxTsNAEDQgGv5EnuDOtTs/wJJlN+gaGuQP + QANVPuCUiDdYLlzwjSjIBeaOncstOZ+xfEkwI41udrW7c5vYcjCFPM8lUeEsimJwMhEzTZsfhBCXNED5 + 4miDJEmulzUQ4mbhDZ70BlJKPcA+mRwDRxmsio06h2bMAeT+FobhF56Kvu/VbV4RHySKcdrazrkxNNi2 + rX664jj+zLJsDYOfR+8vDczMXhswYcCFp5L/E+bSG8iBQdd1StyvqaHSxXuzg7ZzbgyN3qZppg2qqlJ1 + XUvcAqvitLWdc2No9JZlOTZYkoMN5rSdc+Mp/T8baGEAPXUjO+fGUxoDdcImF/nCHcoabzM+LBtKjExA + X/zWS+yJj+aHGQNFjJfXd/XsEDkGbouPlGn1g20wh7MN5jZAbRRFV6bVD+4G7pvLMXDqBlvTP4s0TT+o + 5WLf6Qm6FXkUW2wywx3xzrQ5CIJv4BbZuctiXasAAAAASUVORK5CYII= @@ -154,28 +154,28 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZM9LwRRGIU38VVp/AFqjUKDzIxQ+QE0IqHS - iAhhZ0ShIDQSEVFTsiSYuxEfBQ0JkaVQS1DSERLCdc94N5m4Z82sJ3lyM/e958zu7E6mFD09uQrHz/e5 - gQq9rLpv6F/98AKl53JXGmt0bfYxxzmcl2gyLaP7dU5WnaHot1unt9YexHnkpOJvzKfaYyXd80d6dqMQ - rWyOnFSUxptULgvD57d3DbCyeaTJSxXH88NlGjTGYfNIk5cqjjOhLmjQGIfNIfJSxXHG1BMLwjhsDpGX - Ko7Xqz5ZEMZh80iTlyqb9unjShoydk7l9fXtk34xPzBWXLNzUOpsmgcvq1ggbnb1nO4XbTdKnU3xBgeF - h3+Zv7iLbiJ1Nuwb4FH0L55of+1cz6wX9PzmVbTiGvvsUUmdTZpHlEaps2mczlWzQLlKnU3X8F4NC5Sr - 1Nn8/E1XvlgovStfUsf5601OY+Kb7ATqkAXTirxUcVw/HGLBtCIvVZy2iZ3a1kA9snCSyCEvVaVx/d0B - VpAkclKRjOurJVZSSpyXaHrcIBxvGtl+Y4VFMcc5iZRPx1S+3gnCBVN2Y3yNeYN9zOUoIZP5Bl9auHhV - DRJiAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZM9LwRRGIU38VVp/AG9RqFBZkaodBo6CZVG + RAg7IwoFIRGJiB9AyZJg7mbjo6AhIbIUaglKOkJCuO4Z7yYT96yZ9SRPbua+95zZnd3JlKOvL1fl+Pl+ + N1Chl1X3jQNrH16g9HzuSmONrs0+5jiH8xJNpnVsv8HJqjMU/Xb79NbagziPnFT8jflUBVbSu3Ck5zaL + 0crmyElFebwp5bIwfH571wArm0eavFRxPD9cpUFjHDaPNHmp4jiT6oIGjXHYHCIvVRxnXD2xIIzD5hB5 + qeJ4PeqTBWEcNo80eamy6Zg5rqYhY9d0Xl/fPukX8wNjxTU7B6XOpmXosoYF4mbXzul+yQ6j1NmUbnBQ + fPiX+Yu76CZSZ8O+AR7FwPKJ9tfP9exGUS9sXUUrrrHPHpXU2aR5RGmUOpummVwtC1Sq1Nl0jxTqWKBS + pc7m52+6+MVC6V38kjrOX29yGhPfZCdQhyyYVuSliuP64TALphV5qeK0T+7WtwXqkYWTRA55qSqP6+8N + soIkkZOKZFxfrbCScuK8RNPjBuFE8+jOGyssiTnOSaRyOqfzjU4QLpmyG+NrzBvsYy5HCZnMN31vuEob + G6vIAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVEhLxVRLS8NAEF7UnkVRPHr32oNCsgmof0CkKIp4 - 69lXs1tEgiCiP8GTd1FsdksRPPgHREFR/4Pg8+oz005w2KY1Ka1+MGQyj+/bGZJlncB4MRhCt70AYi7U - LveOXjDEmCP1F7Xhxf03TCWGu6IGuFQ7llTPEQ+mGOPC/wSDIDzTCNjFyqAt1HbY+2ryYElrAkDMhd4a - FeqJ9lIfS9OtyJblPiB2lg4fzT7TsCXZBGPLJ/3cCzYtUdsxrW/kY2tzgeqJpd7gIngw6xILQIBaJOBI - te6slu7NfFKrkgPqTjGhPmDHdXHjncbjfKSPEWji0/ff6pH+DwQg0AlD+n+YYETq9/BOuTLjaQ3p4/+D - SXHaawk9ZRXUhSN/Tk/romcjH+njBTDFcrmD7vD6nQ5/tEuzLrEABKjFXRWuf9bjynIuzeqwtfkEdfD9 - rvDen7HWQKjWR3upjx0pBRAwke3pWdsrXdNe6mNpshU1QjZ/nnE8NWfJ4NbkwZLWJjBR/RgKep576iZa - Habai2x+L+NKtWAXju8w1BnA6moeY9/IuSrpVj3aVAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVEhLxVRLS8NAEF7UnkVRPHr32oNCsgmIf0CkKIp4 + 69lXsltEgiCiP8GTd1FsdosIHvwDoqCo/0HwefWZaSc4bNOalFY/GDKZx/ftDMmyTmC8FA6h214AMRdq + h/uHLxhizJH6i9rwwt4bplLDXVYDXKptS6rnmAdTjHERfIJBEJ5ZBOzS8aAt1FbU+2ryYElrAkDMhd4c + FeqJ9lIfS7OtyJaVPiB2Fg8ezT7TsCXdBGNLJ/3cDzcsUdsxrW/kY2tzgeqJpV7nInww61ILQIBaLOBI + teaslO/NfFqrkgPqTuGqD9hxXdx4p/EkH+kTBJr49P23eqT/AwEIdMKQ/h8mGJH6PbpTrsx4VkP65P9g + Qpz2WkJPWp66cOTP6Wld/GzkI32yAKZYobDfHV2/U9GPdmnWpRaAALWkq8INznpcWSlkWR22Np+gDkHQ + Fd3709YqCNX6aC/1sSOjAAImsn09Y/vla9pLfSxNt6JGyBfPc46vZi0Z3po8WNLaBCaqH4On57ivbuLV + Yaq9yBd3c65U87Z3dIehzgBWV/MY+wayRSrlbBFxbgAAAABJRU5ErkJggg== @@ -183,13 +183,13 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHKSURBVEhLY6AZqK9ngrKoC4zTzrDalG0OsS3bdAIqRB1g X7+fw7Z8U4pdxeYbQPwfhKFSlAH7/PUCduWbyy1KNz2zLa//BzIYRIMwVAl5wKlqszTQxZ02RZveIBtK - sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yxdd70 - F9kAiiwIDV3FbFuxKdymdPMpO5fNf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp + sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yxtd/0 + F9kAiiwIDV3FbFuxKdymdPMpO/vNf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp ohSIn+LTgMzHpQaZDTbctnxjg23BmnfEaEDmE6MebIFdxZY064rN9+0qIJLUxGALQMAjdxu7fcWmWJuy DZfxuQiZj0sNMhtqPAIAyxMWm8pNAcCMdASkkFIMNRY7sCvd4GhdvnGHfPz83zAXIbsQRuNjQ43CD+zK NxjalG1cYZu16SeyAVSzAAaARYW6bfnmqfr567+DDCEGQ7WSBmyrtkuCSlG7io1vsbkamQ3VQh6wqdgi aFu2sRJUD9DEAhgAFS+gvGRXsuEuyHBkDFVCHQBK4ralm6OBtdtZqvoAAwCLeKDrvaxLNx2EitAK/Gdk - YGBgAABSZ4fXERBsXgAAAABJRU5ErkJggg== + YGBgAAAbpYfOsB0S1AAAAABJRU5ErkJggg== @@ -197,13 +197,13 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHCSURBVEhLYwCD+nomCINGwLZs0wmbss0hxmlnWKFC1AV2 FZv/Q/EN2/JNKfb1+zmgUtQBtuX1/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG - KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMedNf23L - N+yxr9jiQlQSB2kkC7ts/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp + KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMftNf23L + N+yxr9jiQlQSB2kkC9tv/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXH9P+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+ YlOsR+42drDhIACSpBiXbT5iU7kpAFiOsUCNRQB8LkJmI4uBsHz8/N/W5Rt32JVucIQahR3ANBBtQdam nzZlG1fYlW8whBqBH4A0EoP189d/ty3fPBVYVKhDtRIH0F2Kyd74FlSq2lZtl4RqIQ1gN3Tzf1C9YFu2 - sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEA5X2H - 142IlcMAAAAASUVORK5CYII= + sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEAr3eH + zjV331AAAAAASUVORK5CYII= @@ -212,29 +212,29 @@ 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 @@ -307,24 +307,292 @@ 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 233, 25 + + 508, 25 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOcCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku + QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC + MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iUHJpbnRfMV8i + Pg0KICAgIDxwYXRoIGQ9Ik0xMCw0aDEydjhoMlYySDh2MTBoMlY0eiBNMjgsMTBoLTJ2M2MwLDAuNi0w + LjQsMS0xLDFIN2MtMC42LDAtMS0wLjQtMS0xdi0zSDRjLTEuMSwwLTIsMC45LTIsMiAgIHYxMmMwLDEu + MSwwLjksMiwyLDJoNHY0aDE2di00aDRjMS4xLDAsMi0wLjksMi0yVjEyQzMwLDEwLjksMjkuMSwxMCwy + OCwxMHogTTIyLDI0djJ2MkgxMHYtMnYtMnYtNGgxMlYyNHoiIGlkPSJQcmludCIgY2xhc3M9IkJsYWNr + IiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4CAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBlbmFibGUt + YmFja2dyb3VuZD0ibmV3IDAgMCAzMiAzMiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgaWQ9IkxheWVyXzEi + Pg0KICA8ZyBpZD0iTGF5ZXJfMV8yXyI+DQogICAgPHBvbHlnb24gcG9pbnRzPSI0LDIgNCw0IDYsNCA2 + LDIyIDQsMjIgNCwyNCA4LDI0IDgsMiAgIiBmaWxsPSIjMzc3QUI1IiAvPg0KICAgIDxwb2x5Z29uIHBv + aW50cz0iMTAsMzAgMTIsMzAgMTIsMjggMjYsMjggMjYsMzAgMjgsMzAgMjgsMjYgMTAsMjYgICIgZmls + bD0iIzM3N0FCNSIgLz4NCiAgICA8ZyBpZD0iTGF5ZXJfMV8xXyI+DQogICAgICA8cG9seWdvbiBwb2lu + dHM9IjEwLDIgMTAsMjQgMjgsMjQgMjgsOCAyMiwyICAgIiBvcGFjaXR5PSIwLjYiIC8+DQogICAgICA8 + cG9seWdvbiBwb2ludHM9IjEyLDQgMTIsMjIgMjYsMjIgMjYsMTAgMjAsMTAgMjAsNCAgICIgZmlsbD0i + I0ZGRkZGRiIgLz4NCiAgICAgIDxwb2x5Z29uIHBvaW50cz0iMjIsNCAyMiw4IDI2LDggICAiIGZpbGw9 + IiNGRkZGRkYiIC8+DQogICAgPC9nPg0KICAgIDxnIGlkPSJMYXllcl8yXzFfIiAvPg0KICA8L2c+DQog + IDxnIGlkPSJMYXllcl8yIiAvPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACMDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBlbmFibGUt + YmFja2dyb3VuZD0ibmV3IDAgMCAzMiAzMiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgaWQ9IkxheWVyXzEi + Pg0KICA8ZyBpZD0iTGF5ZXJfMV8xXyI+DQogICAgPHBvbHlnb24gcG9pbnRzPSI0LDAgNCwzMCAyOCwz + MCAyOCw3IDIxLDAgICIgb3BhY2l0eT0iMC42IiAvPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iNiwyIDYs + MjggMjYsMjggMjYsMTAgMTgsMTAgMTgsMiAgIiBmaWxsPSIjRkZGRkZGIiAvPg0KICAgIDxwb2x5Z29u + IHBvaW50cz0iMjAsMiAyMCw4IDI2LDggICIgZmlsbD0iI0ZGRkZGRiIgLz4NCiAgPC9nPg0KICA8ZyBp + ZD0iTGF5ZXJfMiIgLz4NCiAgPHJlY3QgeD0iOCIgeT0iOCIgd2lkdGg9IjgiIGhlaWdodD0iMiIgcng9 + IjAiIHJ5PSIwIiBvcGFjaXR5PSIwLjMiIC8+DQogIDxyZWN0IHg9IjgiIHk9IjEyIiB3aWR0aD0iMTYi + IGhlaWdodD0iMiIgcng9IjAiIHJ5PSIwIiBvcGFjaXR5PSIwLjMiIC8+DQogIDxyZWN0IHg9IjgiIHk9 + IjE2IiB3aWR0aD0iMTYiIGhlaWdodD0iMiIgcng9IjAiIHJ5PSIwIiBvcGFjaXR5PSIwLjMiIC8+DQog + IDxyZWN0IHg9IjgiIHk9IjIwIiB3aWR0aD0iMTYiIGhlaWdodD0iMiIgcng9IjAiIHJ5PSIwIiBvcGFj + aXR5PSIwLjMiIC8+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPMCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iWm9vbV9JbiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8cG9seWdvbiBwb2ludHM9IjE4LDEyIDE0LDEy + IDE0LDggMTIsOCAxMiwxMiA4LDEyIDgsMTQgMTIsMTQgMTIsMTggMTQsMTggMTQsMTQgMTgsMTQgIiBj + bGFzcz0iQmx1ZSIgLz4NCiAgPHBhdGggZD0iTTI5LjcsMjcuM0wyMiwxOS42YzAsMC0wLjEtMC4xLTAu + MS0wLjFjMS4zLTEuOCwyLjEtNC4xLDIuMS02LjVjMC02LjEtNC45LTExLTExLTExQzYuOSwyLDIsNi45 + LDIsMTMgIHM0LjksMTEsMTEsMTFjMi40LDAsNC43LTAuOCw2LjUtMi4xYzAsMCwwLDAuMSwwLjEsMC4x + bDcuNyw3LjdjMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwyOC4yLDMwLjEsMjcuNiwy + OS43LDI3LjN6ICAgTTQsMTNjMC01LDQtOSw5LTljNSwwLDksNCw5LDlzLTQsOS05LDlDOCwyMiw0LDE4 + LDQsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAM8CAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iWm9vbV9JbiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBpZD0iWm9vbV9PdXQiPg0KICAgIDxyZWN0 + IHg9IjgiIHk9IjEyIiB3aWR0aD0iMTAiIGhlaWdodD0iMiIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iQmx1 + ZSIgLz4NCiAgICA8cGF0aCBkPSJNMjkuNywyNy4zbC03LjktNy45YzEuMy0xLjgsMi4xLTQsMi4xLTYu + NWMwLTYuMS00LjktMTEtMTEtMTFDNi45LDIsMiw2LjksMiwxM3M0LjksMTEsMTEsMTEgICBjMi40LDAs + NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy + OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00 + LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALgCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJvdGF0ZUNvdW50ZXJjbG9ja3dpc2UiPg0KICAg + IDxwYXRoIGQ9Ik0xOCw0QzExLjQsNCw2LDkuNCw2LDE2SDFsNyw3bDctN2gtNWMwLTQuNCwzLjYtOCw4 + LThzOCwzLjYsOCw4cy0zLjYsOC04LDhjLTEuNywwLTMuMy0wLjUtNC42LTEuNCAgIGwtMi45LDIuOWMy + LDEuNiw0LjYsMi42LDcuNCwyLjZjNi42LDAsMTItNS40LDEyLTEyQzMwLDkuNCwyNC42LDQsMTgsNHoi + IGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALACAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJvdGF0ZUNsb2Nrd2lzZSI+DQogICAgPHBhdGgg + ZD0iTTE4LjYsMjIuNkMxNy4zLDIzLjUsMTUuNywyNCwxNCwyNGMtNC40LDAtOC0zLjYtOC04czMuNi04 + LDgtOHM4LDMuNiw4LDhoLTVsNyw3bDctN2gtNWMwLTYuNi01LjQtMTItMTItMTIgICBTMiw5LjQsMiwx + NmMwLDYuNiw1LjQsMTIsMTIsMTJjMi44LDAsNS40LTEsNy40LTIuNkwxOC42LDIyLjZ6IiBjbGFzcz0i + R3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC0CAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + R3JlZW57ZmlsbDojMDM5QzIzO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTIsMzBWMmMwLTEuMSwwLjkt + MiwyLTJoMTB2MzJINEMyLjksMzIsMiwzMS4xLDIsMzB6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDxwYXRo + IGQ9Ik0zMiwzMVYxYzAtMC41LTAuNS0xLTEtMUgxQzAuNSwwLDAsMC41LDAsMXYzMGMwLDAuNSwwLjUs + MSwxLDFoMzBDMzEuNSwzMiwzMiwzMS41LDMyLDMxeiBNMiwzMFYyaDI4djI4SDJ6IiBjbGFzcz0iQmxh + Y2siIC8+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACQCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + R3JlZW57ZmlsbDojMDM5QzIzO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTIsMmgyOGMxLjEsMCwyLDAu + OSwyLDJ2MTBIMFY0QzAsMi45LDAuOSwyLDIsMnoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPHBhdGggZD0i + TTEsMzJoMzBjMC41LDAsMS0wLjUsMS0xVjFjMC0wLjUtMC41LTEtMS0xSDFDMC41LDAsMCwwLjUsMCwx + djMwQzAsMzEuNSwwLjUsMzIsMSwzMnogTTIsMmgyOHYyOEgyVjJ6IiBjbGFzcz0iQmxhY2siIC8+DQo8 + L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKACAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz + dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp + ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTguMywxNS42Yy0wLjUtMC4zLTAuNS0wLjgsMC0xLjFs + MTEuOC03LjNWNC42YzAtMC42LTAuNC0wLjgtMC45LTAuNUwyLjQsMTQuNWMtMC41LDAuMy0wLjUsMC44 + LDAsMS4xICAgbDE2LjgsMTAuM2MwLjUsMC4zLDAuOSwwLjEsMC45LTAuNXYtMi42TDguMywxNS42eiIg + Y2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTEyLjMsMTQuNWMtMC41LDAuMy0wLjUsMC44LDAs + MS4xbDE2LjgsMTAuM2MwLjUsMC4zLDAuOSwwLjEsMC45LTAuNVY0LjdjMC0wLjYtMC40LTAuOC0wLjkt + MC41TDEyLjMsMTQuNXoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQogIDxnIGlkPSJMYXllcl8yIiAv + Pg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALwBAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iUHJldiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg + MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9zdHls + ZT4NCiAgPHBhdGggZD0iTTIzLjEsNC4xQzIzLjYsMy44LDI0LDQuMSwyNCw0LjZ2MjAuN2MwLDAuNi0w + LjQsMC44LTAuOSwwLjVMNi40LDE1LjVjLTAuNS0wLjMtMC41LTAuOCwwLTEuMUwyMy4xLDQuMXoiIGNs + YXNzPSJCbHVlIiAvPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALcBAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTmV4dCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg + MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9zdHls + ZT4NCiAgPHBhdGggZD0iTTguOSw0LjFDOC40LDMuOCw4LDQuMSw4LDQuNnYyMC43YzAsMC42LDAuNCww + LjgsMC45LDAuNWwxNi44LTEwLjNjMC41LTAuMywwLjUtMC44LDAtMS4xTDguOSw0LjF6IiBjbGFzcz0i + Qmx1ZSIgLz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJkCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz + dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp + ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTIzLjcsMTQuNGMwLjUsMC4zLDAuNSwwLjgsMCwxLjFs + LTExLjgsNy4zdjIuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVsMTYuOC0xMC40YzAuNS0wLjMsMC41LTAu + OCwwLTEuMSAgIEwxMi44LDQuMWMtMC41LTAuMy0wLjktMC4xLTAuOSwwLjV2Mi42TDIzLjcsMTQuNHoi + IGNsYXNzPSJCbHVlIiAvPg0KICAgIDxwYXRoIGQ9Ik0xOS43LDE1LjVjMC41LTAuMywwLjUtMC44LDAt + MS4xTDIuOSw0LjFDMi40LDMuOCwyLDQsMiw0LjZ2MjAuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVMMTku + NywxNS41eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCiAgPGcgaWQ9IkxheWVyXzIiIC8+DQo8L3N2 + Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iUHJvcGVydGllcyI+DQogICAgPHBhdGggZD0iTTMwLDE4di00bC00LjQtMC43Yy0w + LjItMC44LTAuNS0xLjUtMC45LTIuMWwyLjYtMy42bC0yLjgtMi44bC0zLjYsMi42Yy0wLjctMC40LTEu + NC0wLjctMi4xLTAuOUwxOCwyaC00ICAgbC0wLjcsNC40Yy0wLjgsMC4yLTEuNSwwLjUtMi4xLDAuOUw3 + LjUsNC43TDQuNyw3LjVsMi42LDMuNmMtMC40LDAuNy0wLjcsMS40LTAuOSwyLjFMMiwxNHY0bDQuNCww + LjdjMC4yLDAuOCwwLjUsMS41LDAuOSwyLjEgICBsLTIuNiwzLjZsMi44LDIuOGwzLjYtMi42YzAuNyww + LjQsMS40LDAuNywyLjEsMC45TDE0LDMwaDRsMC43LTQuNGMwLjgtMC4yLDEuNS0wLjUsMi4xLTAuOWwz + LjYsMi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0x + NiwyMGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4y + LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 368, 25 diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 5fac9b84..5c4a83a3 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -336,7 +336,7 @@ Public Class DocumentViewer btnRotateRight.Enabled = False btnFlipX.Enabled = False btnFlipY.Enabled = False - txtCurrentPage.Text = "0" + txtCurrentPage.EditValue = "0" lblPageCount.Text = "/ 0" cbZoom.SelectedIndex = -1 Else @@ -360,25 +360,25 @@ Public Class DocumentViewer End If End Sub - Private Sub btnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFirstPage.Click + Private Sub btnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFirstPage.Click, buttonFirstPage.ItemClick GdViewer.DisplayFirstPage() End Sub - Private Sub btnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnPreviousPage.Click + Private Sub btnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnPreviousPage.Click, buttonPrevPage.ItemClick GdViewer.DisplayPreviousPage() End Sub - Private Sub btnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnNextPage.Click + Private Sub btnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnNextPage.Click, buttonNextPage.ItemClick GdViewer.DisplayNextPage() End Sub - Private Sub btnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnLastPage.Click + Private Sub btnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnLastPage.Click, buttonLastPage.ItemClick GdViewer.DisplayLastPage() End Sub - Private Sub tbCurrentPage_Leave(ByVal sender As System.Object, ByVal e As EventArgs) Handles txtCurrentPage.Leave + Private Sub tbCurrentPage_Leave(ByVal sender As System.Object, ByVal e As EventArgs) Handles txtCurrentPage.EditValueChanged Dim page As Integer = 0 - If Integer.TryParse(txtCurrentPage.Text, page) Then + If Integer.TryParse(txtCurrentPage.EditValue, page) Then If page > 0 And page <= GdViewer.PageCount Then GdViewer.DisplayPage(page) UpdateaNavigationToolbar() @@ -434,11 +434,11 @@ Public Class DocumentViewer End If End Sub - Private Sub btnZoomOut_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnZoomOut.Click + Private Sub btnZoomOut_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnZoomOut.Click, buttonZoomOut.ItemClick GdViewer.ZoomOUT() End Sub - Private Sub btnZoomIn_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnZoomIn.Click + Private Sub btnZoomIn_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnZoomIn.Click, buttonZoomIn.ItemClick GdViewer.ZoomIN() End Sub @@ -446,7 +446,7 @@ Public Class DocumentViewer ChangeZoomValue() End Sub - Private Sub btnPrint_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnPrint.Click + Private Sub btnPrint_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnPrint.Click, buttonPrint.ItemClick If GdViewer.PageCount = 0 Then Return End If @@ -524,19 +524,19 @@ Public Class DocumentViewer End Using End Sub - Private Sub btnRotateLeft_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnRotateLeft.Click + Private Sub btnRotateLeft_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnRotateLeft.Click, buttonRotateLeft.ItemClick GdViewer.Rotate(RotateFlipType.Rotate270FlipNone) End Sub - Private Sub btnRotateRight_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnRotateRight.Click + Private Sub btnRotateRight_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnRotateRight.Click, buttonRotateRight.ItemClick GdViewer.Rotate(RotateFlipType.Rotate90FlipNone) End Sub - Private Sub btnFlipX_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFlipX.Click + Private Sub btnFlipX_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFlipX.Click, buttonFlipX.ItemClick GdViewer.Rotate(RotateFlipType.RotateNoneFlipX) End Sub - Private Sub btnFlipY_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFlipY.Click + Private Sub btnFlipY_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFlipY.Click, buttonFlipY.ItemClick GdViewer.Rotate(RotateFlipType.RotateNoneFlipY) End Sub @@ -557,7 +557,7 @@ Public Class DocumentViewer End If End Sub - Private Sub btnSettings_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnSettings.Click + Private Sub btnSettings_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnSettings.Click, buttonSettings.ItemClick Using frmSettings As New frmViewerSettings(GdViewer) frmSettings.ShowDialog(Me) End Using @@ -569,7 +569,7 @@ Public Class DocumentViewer Dim oCurrentZoom As Double = GdViewer.Zoom Dim oCurrentPage As Integer = GdViewer.CurrentPage() Dim oPageCount As Integer = GdViewer.PageCount - txtCurrentPage.Text = oCurrentPage.ToString() + txtCurrentPage.EditValue = oCurrentPage.ToString() lblPageCount.Text = "/ " & GdViewer.PageCount.ToString() If oCurrentPage = 1 Or oCurrentPage = oPageCount Then @@ -586,11 +586,11 @@ Public Class DocumentViewer End Try End Sub - Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitWidth.Click + Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitWidth.Click, buttonFitWidth.ItemClick GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer End Sub - Private Sub btnFitPage_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitPage.Click + Private Sub btnFitPage_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitPage.Click, buttonFitPage.ItemClick GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer End Sub diff --git a/Controls.DocumentViewer/My Project/licenses.licx b/Controls.DocumentViewer/My Project/licenses.licx index 6374a2b9..0f6c2b30 100644 --- a/Controls.DocumentViewer/My Project/licenses.licx +++ b/Controls.DocumentViewer/My Project/licenses.licx @@ -1,2 +1,4 @@ DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ZooFlow/frmSearchStart.Designer.vb b/GUIs.ZooFlow/frmSearchStart.Designer.vb index 41bc0a95..d5a5c3dd 100644 --- a/GUIs.ZooFlow/frmSearchStart.Designer.vb +++ b/GUIs.ZooFlow/frmSearchStart.Designer.vb @@ -44,7 +44,6 @@ Partial Class frmSearchStart Me.RepositoryItemDateEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemDateEdit() Me.cmbFilterTimeframe = New DevExpress.XtraBars.BarEditItem() Me.RepositoryItemComboBox2 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() - Me.SwitchFilter = New DevExpress.XtraBars.BarToggleSwitchItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupProfiles = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -98,7 +97,7 @@ Partial Class frmSearchStart ' Me.RibbonControl1.AutoSizeItems = True Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemNewSearch, Me.BarButtonItem2, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarEditItem2, Me.BarStaticItemInfo, Me.BarButtonItem4, Me.BarStaticItem1, Me.txtFilterFrom, Me.txtFilterTo, Me.cmbFilterTimeframe, Me.SwitchFilter}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemNewSearch, Me.BarButtonItem2, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarEditItem2, Me.BarStaticItemInfo, Me.BarButtonItem4, Me.BarStaticItem1, Me.txtFilterFrom, Me.txtFilterTo, Me.cmbFilterTimeframe}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.MaxItemId = 20 Me.RibbonControl1.Name = "RibbonControl1" @@ -121,7 +120,6 @@ Partial Class frmSearchStart Me.BarButtonItem2.Id = 2 Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem2.Name = "BarButtonItem2" - Me.BarButtonItem2.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText ' 'BarHeaderItem1 ' @@ -232,12 +230,6 @@ Partial Class frmSearchStart Me.RepositoryItemComboBox2.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.RepositoryItemComboBox2.Name = "RepositoryItemComboBox2" ' - 'SwitchFilter - ' - Me.SwitchFilter.Caption = "Suche Filtern" - Me.SwitchFilter.Id = 18 - Me.SwitchFilter.Name = "SwitchFilter" - ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupProfiles, Me.RibbonPageGroupFilter}) @@ -250,7 +242,6 @@ Partial Class frmSearchStart Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItemNewSearch) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup1.ItemLinks.Add(Me.SwitchFilter) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Suchfunktionen" ' @@ -263,7 +254,6 @@ Partial Class frmSearchStart ' 'RibbonPageGroupFilter ' - Me.RibbonPageGroupFilter.Enabled = False Me.RibbonPageGroupFilter.ItemLinks.Add(Me.cmbFilterTimeframe) Me.RibbonPageGroupFilter.ItemLinks.Add(Me.txtFilterFrom) Me.RibbonPageGroupFilter.ItemLinks.Add(Me.txtFilterTo) @@ -329,6 +319,7 @@ Partial Class frmSearchStart Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.XtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) + Me.XtraTabControl1.MultiLine = DevExpress.Utils.DefaultBoolean.[False] Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 Me.XtraTabControl1.Size = New System.Drawing.Size(1070, 363) @@ -350,49 +341,49 @@ Partial Class frmSearchStart 'XtraTabPage3 ' Me.XtraTabPage3.Name = "XtraTabPage3" - Me.XtraTabPage3.Size = New System.Drawing.Size(748, 340) + Me.XtraTabPage3.Size = New System.Drawing.Size(1068, 340) Me.XtraTabPage3.Text = "Search#3" ' 'XtraTabPage4 ' Me.XtraTabPage4.Name = "XtraTabPage4" - Me.XtraTabPage4.Size = New System.Drawing.Size(748, 340) + Me.XtraTabPage4.Size = New System.Drawing.Size(1068, 340) Me.XtraTabPage4.Text = "Search#4" ' 'XtraTabPage5 ' Me.XtraTabPage5.Name = "XtraTabPage5" - Me.XtraTabPage5.Size = New System.Drawing.Size(748, 340) + Me.XtraTabPage5.Size = New System.Drawing.Size(1068, 340) Me.XtraTabPage5.Text = "Search#5" ' 'XtraTabPage6 ' Me.XtraTabPage6.Name = "XtraTabPage6" - Me.XtraTabPage6.Size = New System.Drawing.Size(748, 340) + Me.XtraTabPage6.Size = New System.Drawing.Size(1068, 340) Me.XtraTabPage6.Text = "Search#6" ' 'XtraTabPage7 ' Me.XtraTabPage7.Name = "XtraTabPage7" - Me.XtraTabPage7.Size = New System.Drawing.Size(748, 340) + Me.XtraTabPage7.Size = New System.Drawing.Size(1068, 340) Me.XtraTabPage7.Text = "Search#7" ' 'XtraTabPage8 ' Me.XtraTabPage8.Name = "XtraTabPage8" - Me.XtraTabPage8.Size = New System.Drawing.Size(748, 340) + Me.XtraTabPage8.Size = New System.Drawing.Size(1068, 340) Me.XtraTabPage8.Text = "Search#8" ' 'XtraTabPage9 ' Me.XtraTabPage9.Name = "XtraTabPage9" - Me.XtraTabPage9.Size = New System.Drawing.Size(748, 340) + Me.XtraTabPage9.Size = New System.Drawing.Size(1068, 340) Me.XtraTabPage9.Text = "Search#9" ' 'XtraTabPage10 ' Me.XtraTabPage10.Name = "XtraTabPage10" - Me.XtraTabPage10.Size = New System.Drawing.Size(748, 340) + Me.XtraTabPage10.Size = New System.Drawing.Size(1068, 340) Me.XtraTabPage10.Text = "Search#10" ' 'ContextMenuStripSearchTerms @@ -527,6 +518,5 @@ End Sub Friend WithEvents RepositoryItemDateEdit2 As DevExpress.XtraEditors.Repository.RepositoryItemDateEdit Friend WithEvents cmbFilterTimeframe As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemComboBox2 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox - Friend WithEvents SwitchFilter As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents RepositoryItemTimeSpanEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTimeSpanEdit End Class diff --git a/GUIs.ZooFlow/frmSearchStart.vb b/GUIs.ZooFlow/frmSearchStart.vb index 1413bd4d..b20d8091 100644 --- a/GUIs.ZooFlow/frmSearchStart.vb +++ b/GUIs.ZooFlow/frmSearchStart.vb @@ -58,8 +58,8 @@ Public Class frmSearchStart Next RepositoryItemComboBox2.Items.AddRange(New List(Of FilterTimeframe) From { - New FilterTimeframe() With {.Name = "Alle", .From = Nothing, .[To] = Nothing}, - New FilterTimeframe() With {.Name = "Eigener", .From = Nothing, .[To] = Nothing}, + New FilterTimeframe() With {.Name = "Kein", .DisableFilter = True}, + New FilterTimeframe() With {.Name = "Eigener", .CustomFilter = True}, New FilterTimeframe() With { .Name = "letzte 7 Tage", .From = Date.Now.Subtract(TimeSpan.FromDays(7)), @@ -69,6 +69,11 @@ Public Class frmSearchStart .Name = "letzte 14 Tage", .From = Date.Now.Subtract(TimeSpan.FromDays(14)), .[To] = Date.Now + }, + New FilterTimeframe() With { + .Name = "letzte 30 Tage", + .From = Date.Now.Subtract(TimeSpan.FromDays(30)), + .[To] = Date.Now } }) @@ -926,18 +931,12 @@ Public Class frmSearchStart End If End Sub - Private Sub SwitchFilter_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SwitchFilter.CheckedChanged - If SwitchFilter.Checked Then - RibbonPageGroupFilter.Enabled = True - Else - RibbonPageGroupFilter.Enabled = False - End If - End Sub - Private Class FilterTimeframe Public Property Name As String Public Property From As Date Public Property [To] As Date + Public Property DisableFilter As Boolean = False + Public Property CustomFilter As Boolean = False Public Overrides Function ToString() As String Return Name.ToString @@ -947,11 +946,17 @@ Public Class frmSearchStart Private Sub cmbFilterTimeframe_EditValueChanged(sender As Object, e As EventArgs) Handles cmbFilterTimeframe.EditValueChanged Dim oTimeframe As FilterTimeframe = DirectCast(cmbFilterTimeframe.EditValue, FilterTimeframe) - If IsNothing(oTimeframe.From) And IsNothing(oTimeframe.To) Then + If oTimeframe.DisableFilter Then + txtFilterFrom.Enabled = False txtFilterFrom.Reset() + + txtFilterTo.Enabled = False txtFilterTo.Reset() Else + txtFilterFrom.Enabled = True txtFilterFrom.EditValue = oTimeframe.From + + txtFilterTo.Enabled = True txtFilterTo.EditValue = oTimeframe.[To] End If