From 0c28699d737fb0994f318b4bb79f3f41022ea521 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 23 Apr 2021 11:30:11 +0200 Subject: [PATCH] DocumentViewer: Show page count --- .../DocumentViewer.Designer.vb | 58 +++++++++++-------- Controls.DocumentViewer/DocumentViewer.vb | 5 +- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index 048e66ed..96f8fb05 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -45,21 +45,22 @@ Partial Class DocumentViewer Me.buttonNextPage = New DevExpress.XtraBars.BarButtonItem() Me.buttonLastPage = New DevExpress.XtraBars.BarButtonItem() Me.buttonSettings = New DevExpress.XtraBars.BarButtonItem() - Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() - Me.RepositoryItemColorEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorEdit() 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.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() + Me.RepositoryItemColorEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorEdit() + Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl() Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument() + Me.labelPageCount = New DevExpress.XtraBars.BarStaticItem() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GdViewer @@ -161,9 +162,9 @@ Partial Class DocumentViewer 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.BarStaticItem1}) + 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.labelPageCount}) Me.BarManager1.MainMenu = Me.ToolbarDocumentViewer - Me.BarManager1.MaxItemId = 24 + Me.BarManager1.MaxItemId = 25 Me.BarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemColorEdit1, Me.RepositoryItemComboBox1}) ' 'ToolbarDocumentViewer @@ -172,7 +173,7 @@ Partial Class DocumentViewer 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.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.labelPageCount), 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 @@ -305,22 +306,6 @@ Partial Class DocumentViewer Me.buttonSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) Me.buttonSettings.Name = "buttonSettings" ' - 'RepositoryItemComboBox1 - ' - Me.RepositoryItemComboBox1.AutoHeight = False - Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.RepositoryItemComboBox1.Items.AddRange(New Object() {"Arrow", "Text"}) - Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" - ' - 'RepositoryItemColorEdit1 - ' - Me.RepositoryItemColorEdit1.AutoHeight = False - Me.RepositoryItemColorEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.RepositoryItemColorEdit1.Name = "RepositoryItemColorEdit1" - Me.RepositoryItemColorEdit1.ShowCustomColors = False - Me.RepositoryItemColorEdit1.ShowSystemColors = False - Me.RepositoryItemColorEdit1.ShowWebColors = False - ' 'barDockControlTop ' Me.barDockControlTop.CausesValidation = False @@ -364,6 +349,22 @@ Partial Class DocumentViewer Me.RepositoryItemTextEdit1.AutoHeight = False Me.RepositoryItemTextEdit1.Name = "RepositoryItemTextEdit1" ' + 'RepositoryItemColorEdit1 + ' + Me.RepositoryItemColorEdit1.AutoHeight = False + Me.RepositoryItemColorEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemColorEdit1.Name = "RepositoryItemColorEdit1" + Me.RepositoryItemColorEdit1.ShowCustomColors = False + Me.RepositoryItemColorEdit1.ShowSystemColors = False + Me.RepositoryItemColorEdit1.ShowWebColors = False + ' + 'RepositoryItemComboBox1 + ' + Me.RepositoryItemComboBox1.AutoHeight = False + Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemComboBox1.Items.AddRange(New Object() {"Arrow", "Text"}) + Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" + ' 'SpreadsheetControl1 ' Me.SpreadsheetControl1.Location = New System.Drawing.Point(461, 377) @@ -375,6 +376,12 @@ Partial Class DocumentViewer Me.SpreadsheetControl1.Text = "SpreadsheetControl1" Me.SpreadsheetControl1.Visible = False ' + 'labelPageCount + ' + Me.labelPageCount.Caption = "BarStaticItem2" + Me.labelPageCount.Id = 24 + Me.labelPageCount.Name = "labelPageCount" + ' 'DocumentViewer ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -390,9 +397,9 @@ Partial Class DocumentViewer Me.Size = New System.Drawing.Size(1015, 590) CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -429,4 +436,5 @@ Partial Class DocumentViewer Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem Friend WithEvents RepositoryItemColorEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemColorEdit Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox + Friend WithEvents labelPageCount As DevExpress.XtraBars.BarStaticItem End Class diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 5c07cacf..b6687cf6 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -442,9 +442,10 @@ Public Class DocumentViewer Private Sub UpdateaNavigationToolbar() Try Dim oCurrentZoom As Double = GdViewer.Zoom - Dim oCurrentPage As Integer = GdViewer.CurrentPage() + Dim oCurrentPage As Integer = GdViewer.CurrentPage Dim oPageCount As Integer = GdViewer.PageCount - txtCurrentPage.EditValue = oCurrentPage.ToString() + txtCurrentPage.EditValue = oCurrentPage + labelPageCount.Caption = $"/ {oPageCount}" If oCurrentPage = oPageCount Then buttonLastPage.Enabled = False