diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index 05ed4e97..82974584 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -25,39 +25,10 @@ Partial Class DocumentViewer 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() - Me.btnPrint = New System.Windows.Forms.ToolStripButton() - Me.btnFitWidth = New System.Windows.Forms.ToolStripButton() - Me.btnFitPage = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() - Me.btnMouseMode = New System.Windows.Forms.ToolStripDropDownButton() - Me.DefaultToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.PanToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AreaSelectionToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AreaZoomingToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.MagnifierToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() - Me.btnFirstPage = New System.Windows.Forms.ToolStripButton() - Me.btnPreviousPage = New System.Windows.Forms.ToolStripButton() - 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() - Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.btnZoomOut = New System.Windows.Forms.ToolStripButton() - Me.cbZoom = New System.Windows.Forms.ToolStripComboBox() - Me.btnZoomIn = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() - Me.btnRotateLeft = New System.Windows.Forms.ToolStripButton() - Me.btnRotateRight = New System.Windows.Forms.ToolStripButton() - Me.btnFlipX = New System.Windows.Forms.ToolStripButton() - Me.btnFlipY = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() - 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.ToolbarDocumentViewer = New DevExpress.XtraBars.Bar() Me.buttonPrint = New DevExpress.XtraBars.BarButtonItem() Me.buttonFitWidth = New DevExpress.XtraBars.BarButtonItem() Me.buttonFitPage = New DevExpress.XtraBars.BarButtonItem() @@ -74,7 +45,6 @@ Partial Class DocumentViewer 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() @@ -82,7 +52,7 @@ Partial Class DocumentViewer Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl() Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument() - Me.mainToolStrip.SuspendLayout() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -121,7 +91,7 @@ Partial Class DocumentViewer Me.GdViewer.HQAnnotationRendering = True Me.GdViewer.IgnoreDocumentResolution = False Me.GdViewer.KeepDocumentPosition = False - Me.GdViewer.Location = New System.Drawing.Point(0, 67) + Me.GdViewer.Location = New System.Drawing.Point(0, 33) Me.GdViewer.LockViewer = False Me.GdViewer.MagnifierHeight = 90 Me.GdViewer.MagnifierWidth = 160 @@ -151,7 +121,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, 504) + Me.GdViewer.Size = New System.Drawing.Size(1015, 557) Me.GdViewer.TabIndex = 0 Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone Me.GdViewer.Zoom = 1.0R @@ -159,255 +129,6 @@ Partial Class DocumentViewer Me.GdViewer.ZoomMode = GdPicture14.ViewerZoomMode.ZoomMode100 Me.GdViewer.ZoomStep = 25 ' - 'mainToolStrip - ' - 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.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 - Me.mainToolStrip.Text = "ToolStrip1" - ' - 'btnPrint - ' - Me.btnPrint.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnPrint.Image = CType(resources.GetObject("btnPrint.Image"), System.Drawing.Image) - Me.btnPrint.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnPrint.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnPrint.Name = "btnPrint" - Me.btnPrint.Size = New System.Drawing.Size(28, 28) - Me.btnPrint.Text = "Print document" - ' - 'btnFitWidth - ' - Me.btnFitWidth.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnFitWidth.Image = CType(resources.GetObject("btnFitWidth.Image"), System.Drawing.Image) - Me.btnFitWidth.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnFitWidth.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnFitWidth.Name = "btnFitWidth" - Me.btnFitWidth.Size = New System.Drawing.Size(28, 28) - Me.btnFitWidth.Text = "Adjust to page width" - ' - 'btnFitPage - ' - Me.btnFitPage.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnFitPage.Image = CType(resources.GetObject("btnFitPage.Image"), System.Drawing.Image) - Me.btnFitPage.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnFitPage.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnFitPage.Name = "btnFitPage" - Me.btnFitPage.Size = New System.Drawing.Size(28, 28) - Me.btnFitPage.Text = "Adjust to whole page" - ' - 'ToolStripSeparator2 - ' - Me.ToolStripSeparator2.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0) - Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31) - ' - 'btnMouseMode - ' - Me.btnMouseMode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnMouseMode.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DefaultToolStripMenuItem, Me.PanToolStripMenuItem, Me.AreaSelectionToolStripMenuItem, Me.AreaZoomingToolStripMenuItem, Me.MagnifierToolStripMenuItem}) - Me.btnMouseMode.Image = CType(resources.GetObject("btnMouseMode.Image"), System.Drawing.Image) - Me.btnMouseMode.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnMouseMode.Name = "btnMouseMode" - Me.btnMouseMode.Size = New System.Drawing.Size(37, 28) - Me.btnMouseMode.Text = "Mouse mode" - ' - 'DefaultToolStripMenuItem - ' - Me.DefaultToolStripMenuItem.CheckOnClick = True - Me.DefaultToolStripMenuItem.Name = "DefaultToolStripMenuItem" - Me.DefaultToolStripMenuItem.Size = New System.Drawing.Size(151, 22) - Me.DefaultToolStripMenuItem.Text = "Default" - ' - 'PanToolStripMenuItem - ' - Me.PanToolStripMenuItem.Checked = True - Me.PanToolStripMenuItem.CheckOnClick = True - Me.PanToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked - Me.PanToolStripMenuItem.Name = "PanToolStripMenuItem" - Me.PanToolStripMenuItem.Size = New System.Drawing.Size(151, 22) - Me.PanToolStripMenuItem.Text = "Pan" - ' - 'AreaSelectionToolStripMenuItem - ' - Me.AreaSelectionToolStripMenuItem.CheckOnClick = True - Me.AreaSelectionToolStripMenuItem.Name = "AreaSelectionToolStripMenuItem" - Me.AreaSelectionToolStripMenuItem.Size = New System.Drawing.Size(151, 22) - Me.AreaSelectionToolStripMenuItem.Text = "Area selection" - ' - 'AreaZoomingToolStripMenuItem - ' - Me.AreaZoomingToolStripMenuItem.CheckOnClick = True - Me.AreaZoomingToolStripMenuItem.Name = "AreaZoomingToolStripMenuItem" - Me.AreaZoomingToolStripMenuItem.Size = New System.Drawing.Size(151, 22) - Me.AreaZoomingToolStripMenuItem.Text = "Area zooming" - ' - 'MagnifierToolStripMenuItem - ' - Me.MagnifierToolStripMenuItem.CheckOnClick = True - Me.MagnifierToolStripMenuItem.Name = "MagnifierToolStripMenuItem" - Me.MagnifierToolStripMenuItem.Size = New System.Drawing.Size(151, 22) - Me.MagnifierToolStripMenuItem.Text = "Magnifier" - ' - 'ToolStripSeparator6 - ' - Me.ToolStripSeparator6.Margin = New System.Windows.Forms.Padding(5, 0, 10, 0) - Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(6, 31) - ' - 'btnFirstPage - ' - Me.btnFirstPage.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnFirstPage.Image = CType(resources.GetObject("btnFirstPage.Image"), System.Drawing.Image) - Me.btnFirstPage.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnFirstPage.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnFirstPage.Name = "btnFirstPage" - Me.btnFirstPage.Size = New System.Drawing.Size(28, 28) - Me.btnFirstPage.Text = "Go to first page" - ' - 'btnPreviousPage - ' - Me.btnPreviousPage.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnPreviousPage.Image = CType(resources.GetObject("btnPreviousPage.Image"), System.Drawing.Image) - Me.btnPreviousPage.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnPreviousPage.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnPreviousPage.Name = "btnPreviousPage" - Me.btnPreviousPage.Size = New System.Drawing.Size(28, 28) - Me.btnPreviousPage.Text = "Go to previous page" - ' - 'txtCurrentPageold - ' - 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 - ' - Me.lblPageCount.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblPageCount.Name = "lblPageCount" - Me.lblPageCount.Size = New System.Drawing.Size(25, 28) - Me.lblPageCount.Text = "/ X" - ' - 'btnNextPage - ' - Me.btnNextPage.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnNextPage.Image = CType(resources.GetObject("btnNextPage.Image"), System.Drawing.Image) - Me.btnNextPage.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnNextPage.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnNextPage.Name = "btnNextPage" - Me.btnNextPage.Size = New System.Drawing.Size(28, 28) - Me.btnNextPage.Text = "Go to next page" - ' - 'btnLastPage - ' - Me.btnLastPage.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnLastPage.Image = CType(resources.GetObject("btnLastPage.Image"), System.Drawing.Image) - Me.btnLastPage.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnLastPage.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnLastPage.Name = "btnLastPage" - Me.btnLastPage.Size = New System.Drawing.Size(28, 28) - Me.btnLastPage.Text = "Go to last page" - ' - 'ToolStripSeparator1 - ' - Me.ToolStripSeparator1.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0) - Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31) - ' - 'btnZoomOut - ' - Me.btnZoomOut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnZoomOut.Image = CType(resources.GetObject("btnZoomOut.Image"), System.Drawing.Image) - Me.btnZoomOut.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnZoomOut.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnZoomOut.Name = "btnZoomOut" - Me.btnZoomOut.Size = New System.Drawing.Size(28, 28) - Me.btnZoomOut.Text = "Zoom out" - ' - 'cbZoom - ' - Me.cbZoom.DropDownWidth = 200 - Me.cbZoom.Name = "cbZoom" - Me.cbZoom.Size = New System.Drawing.Size(75, 31) - ' - 'btnZoomIn - ' - Me.btnZoomIn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnZoomIn.Image = CType(resources.GetObject("btnZoomIn.Image"), System.Drawing.Image) - Me.btnZoomIn.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnZoomIn.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnZoomIn.Name = "btnZoomIn" - Me.btnZoomIn.Size = New System.Drawing.Size(28, 28) - Me.btnZoomIn.Text = "Zoom In" - ' - 'ToolStripSeparator5 - ' - Me.ToolStripSeparator5.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0) - Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 31) - ' - 'btnRotateLeft - ' - Me.btnRotateLeft.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnRotateLeft.Image = CType(resources.GetObject("btnRotateLeft.Image"), System.Drawing.Image) - Me.btnRotateLeft.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnRotateLeft.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnRotateLeft.Name = "btnRotateLeft" - Me.btnRotateLeft.Size = New System.Drawing.Size(28, 28) - Me.btnRotateLeft.Text = "Rotate left" - ' - 'btnRotateRight - ' - Me.btnRotateRight.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnRotateRight.Image = CType(resources.GetObject("btnRotateRight.Image"), System.Drawing.Image) - Me.btnRotateRight.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnRotateRight.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnRotateRight.Name = "btnRotateRight" - Me.btnRotateRight.Size = New System.Drawing.Size(28, 28) - Me.btnRotateRight.Text = "Rotate right" - ' - 'btnFlipX - ' - Me.btnFlipX.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnFlipX.Image = CType(resources.GetObject("btnFlipX.Image"), System.Drawing.Image) - Me.btnFlipX.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnFlipX.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnFlipX.Name = "btnFlipX" - Me.btnFlipX.Size = New System.Drawing.Size(28, 28) - Me.btnFlipX.Text = "Vertical flip" - ' - 'btnFlipY - ' - Me.btnFlipY.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnFlipY.Image = CType(resources.GetObject("btnFlipY.Image"), System.Drawing.Image) - Me.btnFlipY.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnFlipY.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnFlipY.Name = "btnFlipY" - Me.btnFlipY.Size = New System.Drawing.Size(28, 28) - Me.btnFlipY.Text = "Horizontal flip" - ' - 'ToolStripSeparator4 - ' - Me.ToolStripSeparator4.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0) - Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 31) - ' - 'btnSettings - ' - Me.btnSettings.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnSettings.Image = CType(resources.GetObject("btnSettings.Image"), System.Drawing.Image) - Me.btnSettings.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.btnSettings.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnSettings.Name = "btnSettings" - Me.btnSettings.Size = New System.Drawing.Size(28, 28) - Me.btnSettings.Text = "Viewer settings" - ' 'OpenFileDialog ' Me.OpenFileDialog.FileName = "OpenFileDialog1" @@ -427,30 +148,29 @@ Partial Class DocumentViewer ' 'BarManager1 ' - Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.Bar2, Me.Bar3}) + Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.ToolbarDocumentViewer}) 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.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.BarStaticItem1}) + Me.BarManager1.MainMenu = Me.ToolbarDocumentViewer + Me.BarManager1.MaxItemId = 18 Me.BarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2}) - Me.BarManager1.StatusBar = Me.Bar3 ' - 'Bar2 + 'ToolbarDocumentViewer ' - 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ü" + Me.ToolbarDocumentViewer.BarName = "Hauptmenü" + Me.ToolbarDocumentViewer.DockCol = 0 + Me.ToolbarDocumentViewer.DockRow = 0 + Me.ToolbarDocumentViewer.DockStyle = DevExpress.XtraBars.BarDockStyle.Top + Me.ToolbarDocumentViewer.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.ToolbarDocumentViewer.OptionsBar.AllowCollapse = True + Me.ToolbarDocumentViewer.OptionsBar.AllowQuickCustomization = False + Me.ToolbarDocumentViewer.OptionsBar.DrawDragBorder = False + Me.ToolbarDocumentViewer.OptionsBar.UseWholeRow = True + Me.ToolbarDocumentViewer.Text = "Hauptmenü" ' 'buttonPrint ' @@ -578,49 +298,37 @@ Partial Class DocumentViewer 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) + Me.barDockControlTop.Size = New System.Drawing.Size(1015, 33) ' 'barDockControlBottom ' Me.barDockControlBottom.CausesValidation = False Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.barDockControlBottom.Location = New System.Drawing.Point(0, 571) + Me.barDockControlBottom.Location = New System.Drawing.Point(0, 590) Me.barDockControlBottom.Manager = Me.BarManager1 - Me.barDockControlBottom.Size = New System.Drawing.Size(1015, 19) + Me.barDockControlBottom.Size = New System.Drawing.Size(1015, 0) ' 'barDockControlLeft ' Me.barDockControlLeft.CausesValidation = False Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left - Me.barDockControlLeft.Location = New System.Drawing.Point(0, 36) + Me.barDockControlLeft.Location = New System.Drawing.Point(0, 33) Me.barDockControlLeft.Manager = Me.BarManager1 - Me.barDockControlLeft.Size = New System.Drawing.Size(0, 535) + Me.barDockControlLeft.Size = New System.Drawing.Size(0, 557) ' 'barDockControlRight ' Me.barDockControlRight.CausesValidation = False Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right - Me.barDockControlRight.Location = New System.Drawing.Point(1015, 36) + Me.barDockControlRight.Location = New System.Drawing.Point(1015, 33) Me.barDockControlRight.Manager = Me.BarManager1 - Me.barDockControlRight.Size = New System.Drawing.Size(0, 535) + Me.barDockControlRight.Size = New System.Drawing.Size(0, 557) ' 'RepositoryItemTextEdit1 ' @@ -638,6 +346,12 @@ Partial Class DocumentViewer Me.SpreadsheetControl1.Text = "SpreadsheetControl1" Me.SpreadsheetControl1.Visible = False ' + 'BarStaticItem1 + ' + Me.BarStaticItem1.Caption = "Seiten" + Me.BarStaticItem1.Id = 17 + Me.BarStaticItem1.Name = "BarStaticItem1" + ' 'DocumentViewer ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -645,15 +359,12 @@ Partial Class DocumentViewer Me.Controls.Add(Me.SpreadsheetControl1) 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() @@ -663,41 +374,12 @@ Partial Class DocumentViewer End Sub Friend WithEvents GdViewer As GdPicture14.GdViewer - Friend WithEvents mainToolStrip As ToolStrip - Friend WithEvents btnPrint As ToolStripButton - Friend WithEvents btnFitWidth As ToolStripButton - Friend WithEvents btnFitPage As ToolStripButton - Friend WithEvents ToolStripSeparator2 As ToolStripSeparator - Friend WithEvents btnMouseMode As ToolStripDropDownButton - Friend WithEvents DefaultToolStripMenuItem As ToolStripMenuItem - Friend WithEvents PanToolStripMenuItem As ToolStripMenuItem - Friend WithEvents AreaSelectionToolStripMenuItem As ToolStripMenuItem - Friend WithEvents AreaZoomingToolStripMenuItem As ToolStripMenuItem - Friend WithEvents MagnifierToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ToolStripSeparator6 As ToolStripSeparator - Friend WithEvents btnFirstPage As ToolStripButton - Friend WithEvents btnPreviousPage As ToolStripButton - Friend WithEvents txtCurrentPageold As ToolStripTextBox - Friend WithEvents lblPageCount As ToolStripLabel - Friend WithEvents btnNextPage As ToolStripButton - Friend WithEvents btnLastPage As ToolStripButton - Friend WithEvents ToolStripSeparator1 As ToolStripSeparator - Friend WithEvents btnZoomOut As ToolStripButton - Friend WithEvents cbZoom As ToolStripComboBox - Friend WithEvents btnZoomIn As ToolStripButton - Friend WithEvents ToolStripSeparator5 As ToolStripSeparator - Friend WithEvents btnRotateLeft As ToolStripButton - Friend WithEvents btnRotateRight As ToolStripButton - Friend WithEvents btnFlipX As ToolStripButton - Friend WithEvents btnFlipY As ToolStripButton - Friend WithEvents ToolStripSeparator4 As ToolStripSeparator - Friend WithEvents btnSettings As ToolStripButton Friend WithEvents OpenFileDialog As OpenFileDialog 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 ToolbarDocumentViewer 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 @@ -708,7 +390,6 @@ Partial Class DocumentViewer 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 @@ -720,4 +401,5 @@ Partial Class DocumentViewer Friend WithEvents txtCurrentPage As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemTextEdit2 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit Friend WithEvents RepositoryItemTextEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit + Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem End Class diff --git a/Controls.DocumentViewer/DocumentViewer.resx b/Controls.DocumentViewer/DocumentViewer.resx index db9f24aa..d40b2bef 100644 --- a/Controls.DocumentViewer/DocumentViewer.resx +++ b/Controls.DocumentViewer/DocumentViewer.resx @@ -117,211 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - 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= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADqSURBVEhLzZYxCoMwFIY9T+9Q8BiC3iAudmj3Utw8jD2A - Im7duvUEnTt2iHnllwaMRnmxSv3ghwwv73uPLPF2x1zuT1daI+jt4fB8vVcJehuC8yWlKIooCAJWUJsk - B7rdH0ZjnYEgDENyAYKqqkgIYZUMBJjKBdQ3TUN1XVsliwlAWZYk4tiQTAqyLBuNpisARVG0m7AEHFDf - D96FJbBNrqNRShmRUvIFHH4S2CafCsB7oAdLMAcngW3KqYBtbTAXJ4Hv+9/TOP0atgAXuYJuHUugL7kG - bGMDDVfQxUkwh/8Klk4rWPfbkssPTk9lK76uM3AAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABjSURBVEhLY9Aq2/jHtnzTf1pgkNkMIMazDz9ogkFm09+C - 8vLy/8XFxWRjZLOwWgBSRC4YfBb09PQQhWFg1AcEwagPcGIYGPUBQTACfUAqGDwWUIKRzcJqATUxfSyg - bbNl4x8AxmOG+ql7uj8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - 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 - 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== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHKSURBVEhLY6AZqK9ngrKoC4zTzrDalG0OsS3bdAIqRB1g - X7+fw7Z8U4pdxeYbQPwfhKFSlAH7/PUCduWbyy1KNz2zLa//BzIYRIMwVAl5wKlqszTQxZ02RZveIBtK - sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yxtd/0 - F9kAiiwIDV3FbFuxKdymdPMpO/vNf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp - ohSIn+LTgMzHpQaZDTbctnxjg23BmnfEaEDmE6MebIFdxZY064rN9+0qIJLUxGALQMAjdxu7fcWmWJuy - DZfxuQiZj0sNMhtqPAIAyxMWm8pNAcCMdASkkFIMNRY7sCvd4GhdvnGHfPz83zAXIbsQRuNjQ43CD+zK - NxjalG1cYZu16SeyAVSzAAaARYW6bfnmqfr567+DDCEGQ7WSBmyrtkuCSlG7io1vsbkamQ3VQh6wqdgi - aFu2sRJUD9DEAhgAFS+gvGRXsuEuyHBkDFVCHQBK4ralm6OBtdtZqvoAAwCLeKDrvaxLNx2EitAK/Gdk - YGBgAAAbpYfOsB0S1AAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHCSURBVEhLYwCD+nomCINGwLZs0wmbss0hxmlnWKFC1AV2 - FZv/Q/EN2/JNKfb1+zmgUtQBtuX1/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG - KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMftNf23L - N+yxr9jiQlQSB2kkC9tv/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp - FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXH9P+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+ - YlOsR+42drDhIACSpBiXbT5iU7kpAFiOsUCNRQB8LkJmI4uBsHz8/N/W5Rt32JVucIQahR3ANBBtQdam - nzZlG1fYlW8whBqBH4A0EoP189d/ty3fPBVYVKhDtRIH0F2Kyd74FlSq2lZtl4RqIQ1gN3Tzf1C9YFu2 - sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEAr3eH - zjV331AAAAAASUVORK5CYII= - - - - - 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 - AAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALDSURBVEhLpVY9aFNRFA6ig4sOijqpU5QK/clLcClmUVwM - CLr4g91SJcl7994X1KEQdNBJBCuIOEjRCpW+vpeKruJiFwdbHRwKXcTFRYVWqDHP892cG6/5qSH94HDP - +e453zn33hdIwiDlzZ5kVyMjQ//A2ONfxF9hqn847uxTRwSxo6IZxMMyGMqoKAY3IIKaTtoMRgrPfkCw - k6Vl9IjT+sdRt7oX00IQa6oUfGz6IpjktM3BNBguzQzo+NrzneAafFjKVl5v1Yn9wHHn90N8QEVrTGnQ - m7wHbywtouO81TscGY7/nTSKU+7cKfAZUT3S4MM4rap0VWE84kfHsOe7bkYIESulYlpvgOsKmnLFboA1 - KaZXG34YZ7zgZVY9mRoV07ey6uFu1EjPG7cavNBC3eCo6gl9fDU3Rd/+ffiNmN5DRUvIuaqKNSnlG11A - IOEI4rBisfiVafDnwFHuEFPtwG8Ap0CDjJh9pURxVSkZSz2xrGHF9Llc7jfE4PNpFiw/9jzvEEu2Az8u - NHC8cOGyuD7mUwNbkCasmxgrcXXLR4PPLNUZg2ouOegHezhMkOCimcyImBir1byOuFAo7OLS3oArgkCL - TZLYHVrXW/iYyzaGlO5FErhLtogia8r1SqWyhdM0XNf9ZnJwAvLf0hsI4kc5pR0o6GJt3z1xhZacpnFK - O7CJaXgi+wRlTmmCpr1kcqw8bZzSDnrYM1R4m465ZDegB/zCKU2Q0CeTA1FcGdk81U9wSnfgvlFsG4ks - +75/lvzTNMiH1n3aa36BPYEm+YnJUGymNDHWlmv5zmW9gQqqRtisxuzY+GhCp7rJ5RujVCrtQKFlay1x - V6Mm21lmY1ByEgV0TQ8Ql8vlfTTlMiYFT+sK7R3EHvnvmP/nD8R/kc/nt7GrQSL4AeoGJH6PaQ3iDrPb - P+j45yHOdoHpDkgk/gApB2EJ0sMvWwAAAABJRU5ErkJggg== - - 233, 25 @@ -347,26 +142,6 @@ 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== @@ -388,6 +163,26 @@ IjE2IiB3aWR0aD0iMTYiIGhlaWdodD0iMiIgcng9IjAiIHJ5PSIwIiBvcGFjaXR5PSIwLjMiIC8+DQog IDxyZWN0IHg9IjgiIHk9IjIwIiB3aWR0aD0iMTYiIGhlaWdodD0iMiIgcng9IjAiIHJ5PSIwIiBvcGFj aXR5PSIwLjMiIC8+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4CAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBlbmFibGUt + YmFja2dyb3VuZD0ibmV3IDAgMCAzMiAzMiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgaWQ9IkxheWVyXzEi + Pg0KICA8ZyBpZD0iTGF5ZXJfMV8yXyI+DQogICAgPHBvbHlnb24gcG9pbnRzPSI0LDIgNCw0IDYsNCA2 + LDIyIDQsMjIgNCwyNCA4LDI0IDgsMiAgIiBmaWxsPSIjMzc3QUI1IiAvPg0KICAgIDxwb2x5Z29uIHBv + aW50cz0iMTAsMzAgMTIsMzAgMTIsMjggMjYsMjggMjYsMzAgMjgsMzAgMjgsMjYgMTAsMjYgICIgZmls + bD0iIzM3N0FCNSIgLz4NCiAgICA8ZyBpZD0iTGF5ZXJfMV8xXyI+DQogICAgICA8cG9seWdvbiBwb2lu + dHM9IjEwLDIgMTAsMjQgMjgsMjQgMjgsOCAyMiwyICAgIiBvcGFjaXR5PSIwLjYiIC8+DQogICAgICA8 + cG9seWdvbiBwb2ludHM9IjEyLDQgMTIsMjIgMjYsMjIgMjYsMTAgMjAsMTAgMjAsNCAgICIgZmlsbD0i + I0ZGRkZGRiIgLz4NCiAgICAgIDxwb2x5Z29uIHBvaW50cz0iMjIsNCAyMiw4IDI2LDggICAiIGZpbGw9 + IiNGRkZGRkYiIC8+DQogICAgPC9nPg0KICAgIDxnIGlkPSJMYXllcl8yXzFfIiAvPg0KICA8L2c+DQog + IDxnIGlkPSJMYXllcl8yIiAvPg0KPC9zdmc+Cw== @@ -427,25 +222,6 @@ NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00 LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALgCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJvdGF0ZUNvdW50ZXJjbG9ja3dpc2UiPg0KICAg - IDxwYXRoIGQ9Ik0xOCw0QzExLjQsNCw2LDkuNCw2LDE2SDFsNyw3bDctN2gtNWMwLTQuNCwzLjYtOCw4 - LThzOCwzLjYsOCw4cy0zLjYsOC04LDhjLTEuNywwLTMuMy0wLjUtNC42LTEuNCAgIGwtMi45LDIuOWMy - LDEuNiw0LjYsMi42LDcuNCwyLjZjNi42LDAsMTItNS40LDEyLTEyQzMwLDkuNCwyNC42LDQsMTgsNHoi - IGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -465,6 +241,25 @@ LDgtOHM4LDMuNiw4LDhoLTVsNyw3bDctN2gtNWMwLTYuNi01LjQtMTItMTItMTIgICBTMiw5LjQsMiwx NmMwLDYuNiw1LjQsMTIsMTIsMTJjMi44LDAsNS40LTEsNy40LTIuNkwxOC42LDIyLjZ6IiBjbGFzcz0i R3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALgCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJvdGF0ZUNvdW50ZXJjbG9ja3dpc2UiPg0KICAg + IDxwYXRoIGQ9Ik0xOCw0QzExLjQsNCw2LDkuNCw2LDE2SDFsNyw3bDctN2gtNWMwLTQuNCwzLjYtOCw4 + LThzOCwzLjYsOCw4cy0zLjYsOC04LDhjLTEuNywwLTMuMy0wLjUtNC42LTEuNCAgIGwtMi45LDIuOWMy + LDEuNiw0LjYsMi42LDcuNCwyLjZjNi42LDAsMTItNS40LDEyLTEyQzMwLDkuNCwyNC42LDQsMTgsNHoi + IGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -501,23 +296,28 @@ L3N2Zz4L - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKACAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz - dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp - ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTguMywxNS42Yy0wLjUtMC4zLTAuNS0wLjgsMC0xLjFs - MTEuOC03LjNWNC42YzAtMC42LTAuNC0wLjgtMC45LTAuNUwyLjQsMTQuNWMtMC41LDAuMy0wLjUsMC44 - LDAsMS4xICAgbDE2LjgsMTAuM2MwLjUsMC4zLDAuOSwwLjEsMC45LTAuNXYtMi42TDguMywxNS42eiIg - Y2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTEyLjMsMTQuNWMtMC41LDAuMy0wLjUsMC44LDAs - MS4xbDE2LjgsMTAuM2MwLjUsMC4zLDAuOSwwLjEsMC45LTAuNVY0LjdjMC0wLjYtMC40LTAuOC0wLjkt - MC41TDEyLjMsMTQuNXoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQogIDxnIGlkPSJMYXllcl8yIiAv - Pg0KPC9zdmc+Cw== + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iUHJvcGVydGllcyI+DQogICAgPHBhdGggZD0iTTMwLDE4di00bC00LjQtMC43Yy0w + LjItMC44LTAuNS0xLjUtMC45LTIuMWwyLjYtMy42bC0yLjgtMi44bC0zLjYsMi42Yy0wLjctMC40LTEu + NC0wLjctMi4xLTAuOUwxOCwyaC00ICAgbC0wLjcsNC40Yy0wLjgsMC4yLTEuNSwwLjUtMi4xLDAuOUw3 + LjUsNC43TDQuNyw3LjVsMi42LDMuNmMtMC40LDAuNy0wLjcsMS40LTAuOSwyLjFMMiwxNHY0bDQuNCww + LjdjMC4yLDAuOCwwLjUsMS41LDAuOSwyLjEgICBsLTIuNiwzLjZsMi44LDIuOGwzLjYtMi42YzAuNyww + LjQsMS40LDAuNywyLjEsMC45TDE0LDMwaDRsMC43LTQuNGMwLjgtMC4yLDEuNS0wLjUsMi4xLTAuOWwz + LjYsMi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0x + NiwyMGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4y + LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= @@ -548,6 +348,25 @@ ZT4NCiAgPHBhdGggZD0iTTguOSw0LjFDOC40LDMuOCw4LDQuMSw4LDQuNnYyMC43YzAsMC42LDAuNCww LjgsMC45LDAuNWwxNi44LTEwLjNjMC41LTAuMywwLjUtMC44LDAtMS4xTDguOSw0LjF6IiBjbGFzcz0i Qmx1ZSIgLz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKACAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz + dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp + ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTguMywxNS42Yy0wLjUtMC4zLTAuNS0wLjgsMC0xLjFs + MTEuOC03LjNWNC42YzAtMC42LTAuNC0wLjgtMC45LTAuNUwyLjQsMTQuNWMtMC41LDAuMy0wLjUsMC44 + LDAsMS4xICAgbDE2LjgsMTAuM2MwLjUsMC4zLDAuOSwwLjEsMC45LTAuNXYtMi42TDguMywxNS42eiIg + Y2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTEyLjMsMTQuNWMtMC41LDAuMy0wLjUsMC44LDAs + MS4xbDE2LjgsMTAuM2MwLjUsMC4zLDAuOSwwLjEsMC45LTAuNVY0LjdjMC0wLjYtMC40LTAuOC0wLjkt + MC41TDEyLjMsMTQuNXoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQogIDxnIGlkPSJMYXllcl8yIiAv + Pg0KPC9zdmc+Cw== @@ -567,30 +386,6 @@ 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= diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 5c4a83a3..95faa224 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -35,21 +35,6 @@ Public Class DocumentViewer Private _TempFiles As New List(Of String) Private Sub DocumentViewer_Load(sender As Object, e As EventArgs) Handles Me.Load - Dim zoomModes As New Dictionary(Of ZoomMode, String) From { - {ZoomMode.Zoom50, "50%"}, - {ZoomMode.Zoom100, "100%"}, - {ZoomMode.Zoom150, "150%"}, - {ZoomMode.Zoom200, "200%"}, - {ZoomMode.ZoomSelectedArea, "Zoom to selected area"}, - {ZoomMode.ZoomFitToViewer, "Fit to viewer"}, - {ZoomMode.ZoomFitWidth, "Fit to viewer width"}, - {ZoomMode.ZoomFitHeight, "Fit to viewer height"} - } - - For Each item In zoomModes - cbZoom.Items.Add(item.Value) - Next - _TempFiles.Clear() UpdateMainUi() @@ -155,7 +140,7 @@ Public Class DocumentViewer SpreadsheetControl1.Visible = False SpreadsheetControl1.Dock = DockStyle.None - mainToolStrip.Visible = False + ToolbarDocumentViewer.Visible = False Select Case oExtension.ToUpper Case ".MSG" @@ -189,7 +174,7 @@ Public Class DocumentViewer SpreadsheetControl1.Dock = DockStyle.Fill Case Else - mainToolStrip.Visible = True + ToolbarDocumentViewer.Visible = True GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter @@ -211,7 +196,7 @@ Public Class DocumentViewer SpreadsheetControl1.Visible = False SpreadsheetControl1.Dock = DockStyle.None - mainToolStrip.Visible = False + ToolbarDocumentViewer.Visible = False Select Case Extension.ToUpper Case ".MSG" @@ -246,7 +231,7 @@ Public Class DocumentViewer SpreadsheetControl1.Dock = DockStyle.Fill Case Else - mainToolStrip.Visible = True + ToolbarDocumentViewer.Visible = True GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter @@ -309,70 +294,30 @@ Public Class DocumentViewer ''' Public Sub RightOnlyView(ViewOnly As Boolean) If ViewOnly Then - btnPrint.Visible = False + buttonPrint.Visibility = XtraBars.BarItemVisibility.Never Else - btnPrint.Visible = True + buttonPrint.Visibility = XtraBars.BarItemVisibility.Always End If _hide_file_info_from_user = Not ViewOnly End Sub Private Sub UpdateMainUi() - Exit Sub - If GdViewer.PageCount = 0 Then - btnPrint.Enabled = False - btnFirstPage.Enabled = False - btnPreviousPage.Enabled = False - txtCurrentPage.Enabled = False - lblPageCount.Enabled = False - btnNextPage.Enabled = False - btnLastPage.Enabled = False - btnZoomOut.Enabled = False - cbZoom.Enabled = False - btnZoomIn.Enabled = False - btnFitPage.Enabled = False - btnFitWidth.Enabled = False - btnRotateLeft.Enabled = False - btnRotateRight.Enabled = False - btnFlipX.Enabled = False - btnFlipY.Enabled = False - txtCurrentPage.EditValue = "0" - lblPageCount.Text = "/ 0" - cbZoom.SelectedIndex = -1 - Else - btnPrint.Enabled = True - btnFirstPage.Enabled = True - btnPreviousPage.Enabled = True - txtCurrentPage.Enabled = True - lblPageCount.Enabled = True - btnNextPage.Enabled = True - btnLastPage.Enabled = True - btnZoomOut.Enabled = True - cbZoom.Enabled = True - btnZoomIn.Enabled = True - btnFitPage.Enabled = True - btnFitWidth.Enabled = True - btnRotateLeft.Enabled = True - btnRotateRight.Enabled = True - btnFlipX.Enabled = True - btnFlipY.Enabled = True - UpdateaNavigationToolbar() - End If End Sub - Private Sub btnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFirstPage.Click, buttonFirstPage.ItemClick + Private Sub btnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonFirstPage.ItemClick GdViewer.DisplayFirstPage() End Sub - Private Sub btnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnPreviousPage.Click, buttonPrevPage.ItemClick + Private Sub btnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonPrevPage.ItemClick GdViewer.DisplayPreviousPage() End Sub - Private Sub btnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnNextPage.Click, buttonNextPage.ItemClick + Private Sub btnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonNextPage.ItemClick GdViewer.DisplayNextPage() End Sub - Private Sub btnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnLastPage.Click, buttonLastPage.ItemClick + Private Sub btnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonLastPage.ItemClick GdViewer.DisplayLastPage() End Sub @@ -390,43 +335,6 @@ Public Class DocumentViewer UpdateaNavigationToolbar() End Sub - Private Sub ChangeZoomValue() - If cbZoom.SelectedIndex <> -1 Then - Select Case cbZoom.SelectedIndex - Case ZoomMode.Zoom50 - GdViewer.Zoom = 50.0F / 100 - Case ZoomMode.Zoom100 - GdViewer.Zoom = 100.0F / 100 - Case ZoomMode.Zoom150 - GdViewer.Zoom = 150.0F / 100 - Case ZoomMode.Zoom200 - GdViewer.Zoom = 250.0F / 100 - Case ZoomMode.ZoomSelectedArea - If GdViewer.IsRect() Then - GdViewer.ZoomRect() - Else - GdViewer.MouseMode = ViewerMouseMode.MouseModeAreaSelection - GdViewer.Focus() - End If - Case ZoomMode.ZoomFitToViewer - GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer - Case ZoomMode.ZoomFitWidth - GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer - Case ZoomMode.ZoomFitHeight - GdViewer.ZoomMode = ViewerZoomMode.ZoomModeHeightViewer - End Select - Else - If (IsNumeric(Regex.Replace(cbZoom.Text, "[^0-9,.]", ""))) Then - GdViewer.Zoom = Val(Regex.Replace(cbZoom.Text, "[^0-9,.]", "")) / 100 - End If - End If - UpdateaNavigationToolbar() - End Sub - - Private Sub cbZoom_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As EventArgs) Handles cbZoom.SelectedIndexChanged - ChangeZoomValue() - End Sub - Private Sub GdViewer1_AfterZoomChange() Handles GdViewer.AfterZoomChange UpdateaNavigationToolbar() If GdViewer.MouseMode = ViewerMouseMode.MouseModeAreaZooming Then @@ -434,109 +342,108 @@ Public Class DocumentViewer End If End Sub - Private Sub btnZoomOut_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnZoomOut.Click, buttonZoomOut.ItemClick + Private Sub btnZoomOut_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonZoomOut.ItemClick GdViewer.ZoomOUT() End Sub - Private Sub btnZoomIn_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnZoomIn.Click, buttonZoomIn.ItemClick + Private Sub btnZoomIn_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonZoomIn.ItemClick GdViewer.ZoomIN() End Sub - Private Sub cbZoom_TextUpdate(ByVal sender As System.Object, ByVal e As EventArgs) Handles cbZoom.Validating - ChangeZoomValue() - End Sub - - Private Sub btnPrint_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnPrint.Click, buttonPrint.ItemClick + Private Sub btnPrint_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonPrint.ItemClick If GdViewer.PageCount = 0 Then Return End If - Using f As New frmViewerPrint(GdViewer) - f.ShowDialog(Me) - If f.DialogResult <> DialogResult.OK Then - Return - End If - Dim printSettings As frmViewerPrint.PrintSettings = f.printConfiguration - If Not GdViewer.PrintSetActivePrinter(printSettings.Printer) Then - Return - End If - GdViewer.PrintSetDocumentName("GdPicture Print Job " + DateTime.Now.ToString("yyyy-MM-dd HH\mm")) - GdViewer.PrintSetAlignment(printSettings.PrintAlignment) - Select Case printSettings.Orientation - Case frmViewerPrint.PrintOrientation.AutoDetection - GdViewer.PrintSetAutoRotation(True) - Exit Select - Case frmViewerPrint.PrintOrientation.Portrait - GdViewer.PrintSetAutoRotation(False) - GdViewer.PrintSetOrientation(PrinterOrientation.PrinterOrientationPortrait) - Exit Select - Case frmViewerPrint.PrintOrientation.Paysage - GdViewer.PrintSetAutoRotation(False) - GdViewer.PrintSetOrientation(PrinterOrientation.PrinterOrientationLandscape) - Exit Select - End Select - GdViewer.PrintSetCopies(printSettings.Copies) - If printSettings.Copies > 1 Then - GdViewer.PrintSetCollate(printSettings.Collate) - End If - Select Case printSettings.PagesToPrint - Case frmViewerPrint.PagesToPrint.All - GdViewer.PrintSetFromToPage(1, GdViewer.PageCount) - GdViewer.Print(printSettings.PrintSize) - Exit Select - Case frmViewerPrint.PagesToPrint.Current - GdViewer.PrintSetFromToPage(GdViewer.CurrentPage, GdViewer.CurrentPage) - GdViewer.Print(printSettings.PrintSize) - Exit Select - Case frmViewerPrint.PagesToPrint.Range - If printSettings.PageRange IsNot Nothing And printSettings.PageRange <> String.Empty Then - If printSettings.PageRange.Contains("-") Then - Dim pageStart As Integer = 0 - If Integer.TryParse(printSettings.PageRange.Split("-"c)(0), pageStart) Then - Dim pageEnd As Integer = 0 - If Integer.TryParse(printSettings.PageRange.Split("-"c)(1), pageEnd) Then - If pageEnd < pageStart Then - GdViewer.PrintSetFromToPage(pageEnd, pageStart) - GdViewer.Print(printSettings.PrintSize) - Else - GdViewer.PrintSetFromToPage(pageStart, pageEnd) - GdViewer.Print(printSettings.PrintSize) - End If - Else - MessageBox.Show("Page range is invalid.", "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - End If - Else - MessageBox.Show("Page range is invalid.", "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - End If - Else - Dim page As Integer = 0 - If Integer.TryParse(printSettings.PageRange, page) Then - GdViewer.PrintSetFromToPage(page, page) - GdViewer.Print(printSettings.PrintSize) - Else - MessageBox.Show("Page range is invalid.", "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - End If - End If - Else - MessageBox.Show("Page range is invalid.", "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - End If - Exit Select - End Select - End Using + + GdViewer.PrintDialog() + + 'Using f As New frmViewerPrint(GdViewer) + ' f.ShowDialog(Me) + ' If f.DialogResult <> DialogResult.OK Then + ' Return + ' End If + ' Dim printSettings As frmViewerPrint.PrintSettings = f.printConfiguration + ' If Not GdViewer.PrintSetActivePrinter(printSettings.Printer) Then + ' Return + ' End If + ' GdViewer.PrintSetDocumentName("GdPicture Print Job " + DateTime.Now.ToString("yyyy-MM-dd HH\mm")) + ' GdViewer.PrintSetAlignment(printSettings.PrintAlignment) + ' Select Case printSettings.Orientation + ' Case frmViewerPrint.PrintOrientation.AutoDetection + ' GdViewer.PrintSetAutoRotation(True) + ' Exit Select + ' Case frmViewerPrint.PrintOrientation.Portrait + ' GdViewer.PrintSetAutoRotation(False) + ' GdViewer.PrintSetOrientation(PrinterOrientation.PrinterOrientationPortrait) + ' Exit Select + ' Case frmViewerPrint.PrintOrientation.Paysage + ' GdViewer.PrintSetAutoRotation(False) + ' GdViewer.PrintSetOrientation(PrinterOrientation.PrinterOrientationLandscape) + ' Exit Select + ' End Select + ' GdViewer.PrintSetCopies(printSettings.Copies) + ' If printSettings.Copies > 1 Then + ' GdViewer.PrintSetCollate(printSettings.Collate) + ' End If + ' Select Case printSettings.PagesToPrint + ' Case frmViewerPrint.PagesToPrint.All + ' GdViewer.PrintSetFromToPage(1, GdViewer.PageCount) + ' GdViewer.Print(printSettings.PrintSize) + ' Exit Select + ' Case frmViewerPrint.PagesToPrint.Current + ' GdViewer.PrintSetFromToPage(GdViewer.CurrentPage, GdViewer.CurrentPage) + ' GdViewer.Print(printSettings.PrintSize) + ' Exit Select + ' Case frmViewerPrint.PagesToPrint.Range + ' If printSettings.PageRange IsNot Nothing And printSettings.PageRange <> String.Empty Then + ' If printSettings.PageRange.Contains("-") Then + ' Dim pageStart As Integer = 0 + ' If Integer.TryParse(printSettings.PageRange.Split("-"c)(0), pageStart) Then + ' Dim pageEnd As Integer = 0 + ' If Integer.TryParse(printSettings.PageRange.Split("-"c)(1), pageEnd) Then + ' If pageEnd < pageStart Then + ' GdViewer.PrintSetFromToPage(pageEnd, pageStart) + ' GdViewer.Print(printSettings.PrintSize) + ' Else + ' GdViewer.PrintSetFromToPage(pageStart, pageEnd) + ' GdViewer.Print(printSettings.PrintSize) + ' End If + ' Else + ' MessageBox.Show("Page range is invalid.", "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' End If + ' Else + ' MessageBox.Show("Page range is invalid.", "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' End If + ' Else + ' Dim page As Integer = 0 + ' If Integer.TryParse(printSettings.PageRange, page) Then + ' GdViewer.PrintSetFromToPage(page, page) + ' GdViewer.Print(printSettings.PrintSize) + ' Else + ' MessageBox.Show("Page range is invalid.", "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' End If + ' End If + ' Else + ' MessageBox.Show("Page range is invalid.", "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' End If + ' Exit Select + ' End Select + 'End Using End Sub - Private Sub btnRotateLeft_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnRotateLeft.Click, buttonRotateLeft.ItemClick + Private Sub btnRotateLeft_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonRotateLeft.ItemClick GdViewer.Rotate(RotateFlipType.Rotate270FlipNone) End Sub - Private Sub btnRotateRight_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnRotateRight.Click, buttonRotateRight.ItemClick + Private Sub btnRotateRight_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonRotateRight.ItemClick GdViewer.Rotate(RotateFlipType.Rotate90FlipNone) End Sub - Private Sub btnFlipX_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFlipX.Click, buttonFlipX.ItemClick + Private Sub btnFlipX_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonFlipX.ItemClick GdViewer.Rotate(RotateFlipType.RotateNoneFlipX) End Sub - Private Sub btnFlipY_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFlipY.Click, buttonFlipY.ItemClick + Private Sub btnFlipY_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonFlipY.ItemClick GdViewer.Rotate(RotateFlipType.RotateNoneFlipY) End Sub @@ -545,10 +452,6 @@ Public Class DocumentViewer UpdateMainUi() End Sub - Private Sub cbZoom_Validating(ByVal sender As System.Object, ByVal e As CancelEventArgs) Handles cbZoom.Validating - ChangeZoomValue() - End Sub - Private Sub AddSearchRegion(ByVal occurence As Integer, ByVal leftCoordinate As Single, ByVal topCoordinate As Single, ByVal regionWidth As Single, ByVal regionheight As Single, ByVal ensureVisibility As Boolean) Dim searchRegion As Integer = GdViewer.AddRegionInches("SearchResult" & occurence, leftCoordinate, topCoordinate, regionWidth, regionheight, ForegroundMixMode.ForegroundMixModeMASKPEN, Color.Yellow) GdViewer.SetRegionEditable(searchRegion, False) @@ -557,7 +460,7 @@ Public Class DocumentViewer End If End Sub - Private Sub btnSettings_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnSettings.Click, buttonSettings.ItemClick + Private Sub btnSettings_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonSettings.ItemClick Using frmSettings As New frmViewerSettings(GdViewer) frmSettings.ShowDialog(Me) End Using @@ -570,83 +473,43 @@ Public Class DocumentViewer Dim oCurrentPage As Integer = GdViewer.CurrentPage() Dim oPageCount As Integer = GdViewer.PageCount txtCurrentPage.EditValue = oCurrentPage.ToString() - lblPageCount.Text = "/ " & GdViewer.PageCount.ToString() - If oCurrentPage = 1 Or oCurrentPage = oPageCount Then - btnFirstPage.Enabled = False - btnPreviousPage.Enabled = False + If oCurrentPage = oPageCount Then + buttonLastPage.Enabled = False + buttonNextPage.Enabled = False + buttonPrevPage.Enabled = True + buttonFirstPage.Enabled = True + ElseIf oCurrentPage = 1 Then + buttonPrevPage.Enabled = False + buttonFirstPage.Enabled = False + buttonLastPage.Enabled = True + buttonNextPage.Enabled = True Else - btnFirstPage.Enabled = True - btnPreviousPage.Enabled = True + buttonPrevPage.Enabled = True + buttonFirstPage.Enabled = True + buttonLastPage.Enabled = True + buttonNextPage.Enabled = True End If - - cbZoom.Text = String.Format(format:="{0:#0.##%}", arg0:=oCurrentZoom) Catch ex As Exception _logger.Error(ex) End Try End Sub - Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitWidth.Click, buttonFitWidth.ItemClick + Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonFitWidth.ItemClick GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer End Sub - Private Sub btnFitPage_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitPage.Click, buttonFitPage.ItemClick + Private Sub btnFitPage_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonFitPage.ItemClick GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer End Sub - Private Sub DefaultToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles DefaultToolStripMenuItem.Click - GdViewer.MouseMode = ViewerMouseMode.MouseModeDefault - DefaultToolStripMenuItem.Checked = True - AreaSelectionToolStripMenuItem.Checked = False - PanToolStripMenuItem.Checked = False - AreaZoomingToolStripMenuItem.Checked = False - MagnifierToolStripMenuItem.Checked = False - GdViewer.Focus() - End Sub - - Private Sub AreaSelectionToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles AreaSelectionToolStripMenuItem.Click - GdViewer.MouseMode = ViewerMouseMode.MouseModeAreaSelection - DefaultToolStripMenuItem.Checked = False - AreaSelectionToolStripMenuItem.Checked = True - PanToolStripMenuItem.Checked = False - AreaZoomingToolStripMenuItem.Checked = False - MagnifierToolStripMenuItem.Checked = False - GdViewer.Focus() - End Sub - - Private Sub PanToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles PanToolStripMenuItem.Click - GdViewer.MouseMode = ViewerMouseMode.MouseModePan - DefaultToolStripMenuItem.Checked = False - AreaSelectionToolStripMenuItem.Checked = False - PanToolStripMenuItem.Checked = True - AreaZoomingToolStripMenuItem.Checked = False - MagnifierToolStripMenuItem.Checked = False - GdViewer.Focus() - End Sub - - Private Sub AreaZoomingToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles AreaZoomingToolStripMenuItem.Click - GdViewer.MouseMode = ViewerMouseMode.MouseModeAreaZooming - DefaultToolStripMenuItem.Checked = False - AreaSelectionToolStripMenuItem.Checked = False - PanToolStripMenuItem.Checked = False - AreaZoomingToolStripMenuItem.Checked = True - MagnifierToolStripMenuItem.Checked = False - GdViewer.Focus() - End Sub - - Private Sub MagnifierToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles MagnifierToolStripMenuItem.Click - GdViewer.MouseMode = ViewerMouseMode.MouseModeMagnifier - DefaultToolStripMenuItem.Checked = False - AreaSelectionToolStripMenuItem.Checked = False - PanToolStripMenuItem.Checked = False - AreaZoomingToolStripMenuItem.Checked = False - MagnifierToolStripMenuItem.Checked = True - GdViewer.Focus() - End Sub - Private Sub RichEditControl1_SizeChanged(sender As Object, e As EventArgs) Handles RichEditControl1.SizeChanged Dim oControlWidth = RichEditControl1.Width - 100 Dim oPageWidth = Units.DocumentsToPixelsF(RichEditControl1.Document.Sections(0).Page.Width, RichEditControl1.DpiX) RichEditControl1.Views.PrintLayoutView.ZoomFactor = oControlWidth / oPageWidth End Sub + + Private Sub btnSettings_Click(sender As Object, e As XtraBars.ItemClickEventArgs) Handles buttonSettings.ItemClick + + End Sub End Class