MSLoadingForms

2019-07-10 16:58:51 +02:00
parent 7e75bfc49e
commit 718286b8aa
8 changed files with 435 additions and 320 deletions
--- a/app/DD_Clipboard_Searcher/frmDocView.designer.vb
+++ b/app/DD_Clipboard_Searcher/frmDocView.designer.vb
@@ -27,6 +27,10 @@ Partial Class frmDocView
        Me.tpThumbnails = New System.Windows.Forms.TabPage()
        Me.ToolStripContainer1 = New System.Windows.Forms.ToolStripContainer()
        Me.thumbnailPanelToolstrip = New System.Windows.Forms.ToolStrip()
+        Me.btnThumbSize = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.LargeThumbnailsToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.MediumThumbnailsToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.SmallThumbnailsToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ThumbnailEx1 = New GdPicture14.ThumbnailEx()
        Me.tpBookmarks = New System.Windows.Forms.TabPage()
        Me.Panel5 = New System.Windows.Forms.Panel()
@@ -52,6 +56,7 @@ Partial Class frmDocView
        Me.Panel2 = New System.Windows.Forms.Panel()
        Me.tbSearch = New System.Windows.Forms.TextBox()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
        Me.lblSearchFor = New System.Windows.Forms.Label()
        Me.scMain = New System.Windows.Forms.SplitContainer()
        Me.Panel6 = New System.Windows.Forms.Panel()
@@ -59,6 +64,9 @@ Partial Class frmDocView
        Me.Panel7 = New System.Windows.Forms.Panel()
        Me.lblSnapInPanel = New System.Windows.Forms.Label()
        Me.pSnapInButtons = New System.Windows.Forms.Panel()
+        Me.btnSnapInThumbnails = New System.Windows.Forms.Button()
+        Me.btnSnapInBookmarks = New System.Windows.Forms.Button()
+        Me.btnSnapInSearch = New System.Windows.Forms.Button()
        Me.pGamma = New System.Windows.Forms.Panel()
        Me.lblGamma = New System.Windows.Forms.Label()
        Me.tbGamma = New System.Windows.Forms.TrackBar()
@@ -67,51 +75,43 @@ Partial Class frmDocView
        Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel()
        Me.ToolStripStatusLabel2 = New System.Windows.Forms.ToolStripStatusLabel()
        Me.mainToolStrip = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator()
-        Me.tbCurrentPage = New System.Windows.Forms.ToolStripTextBox()
-        Me.lblPageCount = New System.Windows.Forms.ToolStripLabel()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.cbZoom = New System.Windows.Forms.ToolStripComboBox()
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
-        Me.pMain = New System.Windows.Forms.Panel()
-        Me.btnThumbSize = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.LargeThumbnailsToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.MediumThumbnailsToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.SmallThumbnailsToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.btnSnapInThumbnails = New System.Windows.Forms.Button()
-        Me.btnSnapInBookmarks = New System.Windows.Forms.Button()
-        Me.btnSnapInSearch = New System.Windows.Forms.Button()
        Me.btnOpen = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator()
        Me.btnClose = New System.Windows.Forms.ToolStripButton()
        Me.btnPrint = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
        Me.btnSettings = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator()
        Me.btnMouseMode = New System.Windows.Forms.ToolStripDropDownButton()
        Me.DefaultToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.AreaSelectionToolStripMenuItem = 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.tbCurrentPage = 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.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
        Me.btnFitWidth = New System.Windows.Forms.ToolStripButton()
        Me.btnFitPage = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
        Me.btnAdjustGamma = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator10 = 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.btnAbout = New System.Windows.Forms.ToolStripButton()
+        Me.pMain = New System.Windows.Forms.Panel()
        Me.tcLeftPanel.SuspendLayout()
        Me.tpThumbnails.SuspendLayout()
        Me.ToolStripContainer1.BottomToolStripPanel.SuspendLayout()
@@ -127,6 +127,7 @@ Partial Class frmDocView
        Me.GroupBox2.SuspendLayout()
        Me.Panel2.SuspendLayout()
        Me.Panel1.SuspendLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.scMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.scMain.Panel1.SuspendLayout()
        Me.scMain.Panel2.SuspendLayout()
@@ -140,7 +141,6 @@ Partial Class frmDocView
        Me.statusbar.SuspendLayout()
        Me.mainToolStrip.SuspendLayout()
        Me.pMain.SuspendLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'tcLeftPanel
@@ -200,6 +200,37 @@ Partial Class frmDocView
        Me.thumbnailPanelToolstrip.Stretch = True
        Me.thumbnailPanelToolstrip.TabIndex = 0
        '
+        'btnThumbSize
+        '
+        Me.btnThumbSize.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.btnThumbSize.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LargeThumbnailsToolStripMenuItem1, Me.MediumThumbnailsToolStripMenuItem1, Me.SmallThumbnailsToolStripMenuItem1})
+        Me.btnThumbSize.Image = CType(resources.GetObject("btnThumbSize.Image"), System.Drawing.Image)
+        Me.btnThumbSize.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.btnThumbSize.Name = "btnThumbSize"
+        Me.btnThumbSize.Size = New System.Drawing.Size(29, 22)
+        Me.btnThumbSize.Text = "btnThumbnailSize"
+        Me.btnThumbSize.ToolTipText = "Thumbnail size"
+        '
+        'LargeThumbnailsToolStripMenuItem1
+        '
+        Me.LargeThumbnailsToolStripMenuItem1.Checked = True
+        Me.LargeThumbnailsToolStripMenuItem1.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.LargeThumbnailsToolStripMenuItem1.Name = "LargeThumbnailsToolStripMenuItem1"
+        Me.LargeThumbnailsToolStripMenuItem1.Size = New System.Drawing.Size(182, 22)
+        Me.LargeThumbnailsToolStripMenuItem1.Text = "Large thumbnails"
+        '
+        'MediumThumbnailsToolStripMenuItem1
+        '
+        Me.MediumThumbnailsToolStripMenuItem1.Name = "MediumThumbnailsToolStripMenuItem1"
+        Me.MediumThumbnailsToolStripMenuItem1.Size = New System.Drawing.Size(182, 22)
+        Me.MediumThumbnailsToolStripMenuItem1.Text = "Medium thumbnails"
+        '
+        'SmallThumbnailsToolStripMenuItem1
+        '
+        Me.SmallThumbnailsToolStripMenuItem1.Name = "SmallThumbnailsToolStripMenuItem1"
+        Me.SmallThumbnailsToolStripMenuItem1.Size = New System.Drawing.Size(182, 22)
+        Me.SmallThumbnailsToolStripMenuItem1.Text = "Small thumbnails"
+        '
        'ThumbnailEx1
        '
        Me.ThumbnailEx1.AllowDropFiles = False
@@ -462,6 +493,15 @@ Partial Class frmDocView
        Me.Panel1.Size = New System.Drawing.Size(306, 26)
        Me.Panel1.TabIndex = 14
        '
+        'PictureBox1
+        '
+        Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image)
+        Me.PictureBox1.Location = New System.Drawing.Point(3, 3)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(20, 20)
+        Me.PictureBox1.TabIndex = 11
+        Me.PictureBox1.TabStop = False
+        '
        'lblSearchFor
        '
        Me.lblSearchFor.AutoSize = True
@@ -550,6 +590,45 @@ Partial Class frmDocView
        Me.pSnapInButtons.Size = New System.Drawing.Size(32, 674)
        Me.pSnapInButtons.TabIndex = 4
        '
+        'btnSnapInThumbnails
+        '
+        Me.btnSnapInThumbnails.BackColor = System.Drawing.SystemColors.AppWorkspace
+        Me.btnSnapInThumbnails.FlatAppearance.BorderColor = System.Drawing.SystemColors.Control
+        Me.btnSnapInThumbnails.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSnapInThumbnails.Image = CType(resources.GetObject("btnSnapInThumbnails.Image"), System.Drawing.Image)
+        Me.btnSnapInThumbnails.Location = New System.Drawing.Point(0, 0)
+        Me.btnSnapInThumbnails.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnSnapInThumbnails.Name = "btnSnapInThumbnails"
+        Me.btnSnapInThumbnails.Size = New System.Drawing.Size(32, 32)
+        Me.btnSnapInThumbnails.TabIndex = 0
+        Me.btnSnapInThumbnails.UseVisualStyleBackColor = False
+        '
+        'btnSnapInBookmarks
+        '
+        Me.btnSnapInBookmarks.BackColor = System.Drawing.SystemColors.AppWorkspace
+        Me.btnSnapInBookmarks.FlatAppearance.BorderColor = System.Drawing.SystemColors.Window
+        Me.btnSnapInBookmarks.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSnapInBookmarks.Image = CType(resources.GetObject("btnSnapInBookmarks.Image"), System.Drawing.Image)
+        Me.btnSnapInBookmarks.Location = New System.Drawing.Point(0, 31)
+        Me.btnSnapInBookmarks.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnSnapInBookmarks.Name = "btnSnapInBookmarks"
+        Me.btnSnapInBookmarks.Size = New System.Drawing.Size(32, 32)
+        Me.btnSnapInBookmarks.TabIndex = 1
+        Me.btnSnapInBookmarks.UseVisualStyleBackColor = False
+        '
+        'btnSnapInSearch
+        '
+        Me.btnSnapInSearch.BackColor = System.Drawing.SystemColors.AppWorkspace
+        Me.btnSnapInSearch.FlatAppearance.BorderColor = System.Drawing.SystemColors.Window
+        Me.btnSnapInSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSnapInSearch.Image = CType(resources.GetObject("btnSnapInSearch.Image"), System.Drawing.Image)
+        Me.btnSnapInSearch.Location = New System.Drawing.Point(0, 62)
+        Me.btnSnapInSearch.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnSnapInSearch.Name = "btnSnapInSearch"
+        Me.btnSnapInSearch.Size = New System.Drawing.Size(32, 32)
+        Me.btnSnapInSearch.TabIndex = 2
+        Me.btnSnapInSearch.UseVisualStyleBackColor = False
+        '
        'pGamma
        '
        Me.pGamma.AutoSize = True
@@ -675,6 +754,7 @@ Partial Class frmDocView
        '
        '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.btnOpen, Me.ToolStripSeparator9, Me.btnClose, Me.btnPrint, Me.ToolStripSeparator3, Me.btnSettings, Me.ToolStripSeparator8, Me.btnMouseMode, Me.ToolStripSeparator6, Me.btnFirstPage, Me.btnPreviousPage, Me.tbCurrentPage, Me.lblPageCount, Me.btnNextPage, Me.btnLastPage, Me.ToolStripSeparator1, Me.btnZoomOut, Me.cbZoom, Me.btnZoomIn, Me.ToolStripSeparator2, Me.btnFitWidth, Me.btnFitPage, Me.ToolStripSeparator5, Me.btnAdjustGamma, Me.ToolStripSeparator10, Me.btnRotateLeft, Me.btnRotateRight, Me.btnFlipX, Me.btnFlipY, Me.ToolStripSeparator4, Me.btnAbout})
@@ -684,179 +764,23 @@ Partial Class frmDocView
        Me.mainToolStrip.TabIndex = 5
        Me.mainToolStrip.Text = "ToolStrip1"
        '
-        'ToolStripSeparator9
-        '
-        Me.ToolStripSeparator9.Margin = New System.Windows.Forms.Padding(5, 0, 10, 0)
-        Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
-        Me.ToolStripSeparator9.Size = New System.Drawing.Size(6, 31)
-        '
-        'ToolStripSeparator3
-        '
-        Me.ToolStripSeparator3.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0)
-        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
-        '
-        'ToolStripSeparator8
-        '
-        Me.ToolStripSeparator8.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0)
-        Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
-        Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 31)
-        '
-        '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)
-        '
-        'tbCurrentPage
-        '
-        Me.tbCurrentPage.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.tbCurrentPage.Name = "tbCurrentPage"
-        Me.tbCurrentPage.Size = New System.Drawing.Size(40, 31)
-        Me.tbCurrentPage.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        '
-        'lblPageCount
-        '
-        Me.lblPageCount.Font = New System.Drawing.Font("Segoe UI", 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"
-        '
-        '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)
-        '
-        'cbZoom
-        '
-        Me.cbZoom.DropDownWidth = 200
-        Me.cbZoom.Name = "cbZoom"
-        Me.cbZoom.Size = New System.Drawing.Size(75, 31)
-        '
-        '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)
-        '
-        '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)
-        '
-        'ToolStripSeparator10
-        '
-        Me.ToolStripSeparator10.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0)
-        Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(6, 31)
-        '
-        '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)
-        '
-        'pMain
-        '
-        Me.pMain.Controls.Add(Me.scMain)
-        Me.pMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pMain.Location = New System.Drawing.Point(0, 31)
-        Me.pMain.Name = "pMain"
-        Me.pMain.Size = New System.Drawing.Size(1264, 676)
-        Me.pMain.TabIndex = 6
-        '
-        'btnThumbSize
-        '
-        Me.btnThumbSize.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.btnThumbSize.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LargeThumbnailsToolStripMenuItem1, Me.MediumThumbnailsToolStripMenuItem1, Me.SmallThumbnailsToolStripMenuItem1})
-        Me.btnThumbSize.Image = CType(resources.GetObject("btnThumbSize.Image"), System.Drawing.Image)
-        Me.btnThumbSize.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.btnThumbSize.Name = "btnThumbSize"
-        Me.btnThumbSize.Size = New System.Drawing.Size(29, 22)
-        Me.btnThumbSize.Text = "btnThumbnailSize"
-        Me.btnThumbSize.ToolTipText = "Thumbnail size"
-        '
-        'LargeThumbnailsToolStripMenuItem1
-        '
-        Me.LargeThumbnailsToolStripMenuItem1.Checked = True
-        Me.LargeThumbnailsToolStripMenuItem1.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.LargeThumbnailsToolStripMenuItem1.Name = "LargeThumbnailsToolStripMenuItem1"
-        Me.LargeThumbnailsToolStripMenuItem1.Size = New System.Drawing.Size(182, 22)
-        Me.LargeThumbnailsToolStripMenuItem1.Text = "Large thumbnails"
-        '
-        'MediumThumbnailsToolStripMenuItem1
-        '
-        Me.MediumThumbnailsToolStripMenuItem1.Name = "MediumThumbnailsToolStripMenuItem1"
-        Me.MediumThumbnailsToolStripMenuItem1.Size = New System.Drawing.Size(182, 22)
-        Me.MediumThumbnailsToolStripMenuItem1.Text = "Medium thumbnails"
-        '
-        'SmallThumbnailsToolStripMenuItem1
-        '
-        Me.SmallThumbnailsToolStripMenuItem1.Name = "SmallThumbnailsToolStripMenuItem1"
-        Me.SmallThumbnailsToolStripMenuItem1.Size = New System.Drawing.Size(182, 22)
-        Me.SmallThumbnailsToolStripMenuItem1.Text = "Small thumbnails"
-        '
-        'PictureBox1
-        '
-        Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image)
-        Me.PictureBox1.Location = New System.Drawing.Point(3, 3)
-        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(20, 20)
-        Me.PictureBox1.TabIndex = 11
-        Me.PictureBox1.TabStop = False
-        '
-        'btnSnapInThumbnails
-        '
-        Me.btnSnapInThumbnails.BackColor = System.Drawing.SystemColors.AppWorkspace
-        Me.btnSnapInThumbnails.FlatAppearance.BorderColor = System.Drawing.SystemColors.Control
-        Me.btnSnapInThumbnails.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSnapInThumbnails.Image = CType(resources.GetObject("btnSnapInThumbnails.Image"), System.Drawing.Image)
-        Me.btnSnapInThumbnails.Location = New System.Drawing.Point(0, 0)
-        Me.btnSnapInThumbnails.Margin = New System.Windows.Forms.Padding(0)
-        Me.btnSnapInThumbnails.Name = "btnSnapInThumbnails"
-        Me.btnSnapInThumbnails.Size = New System.Drawing.Size(32, 32)
-        Me.btnSnapInThumbnails.TabIndex = 0
-        Me.btnSnapInThumbnails.UseVisualStyleBackColor = False
-        '
-        'btnSnapInBookmarks
-        '
-        Me.btnSnapInBookmarks.BackColor = System.Drawing.SystemColors.AppWorkspace
-        Me.btnSnapInBookmarks.FlatAppearance.BorderColor = System.Drawing.SystemColors.Window
-        Me.btnSnapInBookmarks.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSnapInBookmarks.Image = CType(resources.GetObject("btnSnapInBookmarks.Image"), System.Drawing.Image)
-        Me.btnSnapInBookmarks.Location = New System.Drawing.Point(0, 31)
-        Me.btnSnapInBookmarks.Margin = New System.Windows.Forms.Padding(0)
-        Me.btnSnapInBookmarks.Name = "btnSnapInBookmarks"
-        Me.btnSnapInBookmarks.Size = New System.Drawing.Size(32, 32)
-        Me.btnSnapInBookmarks.TabIndex = 1
-        Me.btnSnapInBookmarks.UseVisualStyleBackColor = False
-        '
-        'btnSnapInSearch
-        '
-        Me.btnSnapInSearch.BackColor = System.Drawing.SystemColors.AppWorkspace
-        Me.btnSnapInSearch.FlatAppearance.BorderColor = System.Drawing.SystemColors.Window
-        Me.btnSnapInSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSnapInSearch.Image = CType(resources.GetObject("btnSnapInSearch.Image"), System.Drawing.Image)
-        Me.btnSnapInSearch.Location = New System.Drawing.Point(0, 62)
-        Me.btnSnapInSearch.Margin = New System.Windows.Forms.Padding(0)
-        Me.btnSnapInSearch.Name = "btnSnapInSearch"
-        Me.btnSnapInSearch.Size = New System.Drawing.Size(32, 32)
-        Me.btnSnapInSearch.TabIndex = 2
-        Me.btnSnapInSearch.UseVisualStyleBackColor = False
-        '
        'btnOpen
        '
-        Me.btnOpen.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnOpen.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.btnOpen.Image = CType(resources.GetObject("btnOpen.Image"), System.Drawing.Image)
        Me.btnOpen.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
        Me.btnOpen.ImageTransparentColor = System.Drawing.Color.Magenta
        Me.btnOpen.Margin = New System.Windows.Forms.Padding(10, 1, 0, 2)
        Me.btnOpen.Name = "btnOpen"
-        Me.btnOpen.Size = New System.Drawing.Size(130, 28)
+        Me.btnOpen.Size = New System.Drawing.Size(126, 28)
        Me.btnOpen.Text = "Open document"
        '
+        'ToolStripSeparator9
+        '
+        Me.ToolStripSeparator9.Margin = New System.Windows.Forms.Padding(5, 0, 10, 0)
+        Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
+        Me.ToolStripSeparator9.Size = New System.Drawing.Size(6, 31)
+        '
        'btnClose
        '
        Me.btnClose.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -877,6 +801,12 @@ Partial Class frmDocView
        Me.btnPrint.Size = New System.Drawing.Size(28, 28)
        Me.btnPrint.Text = "Print document"
        '
+        'ToolStripSeparator3
+        '
+        Me.ToolStripSeparator3.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0)
+        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+        '
        'btnSettings
        '
        Me.btnSettings.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -887,6 +817,12 @@ Partial Class frmDocView
        Me.btnSettings.Size = New System.Drawing.Size(28, 28)
        Me.btnSettings.Text = "Viewer settings"
        '
+        'ToolStripSeparator8
+        '
+        Me.ToolStripSeparator8.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0)
+        Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
+        Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 31)
+        '
        'btnMouseMode
        '
        Me.btnMouseMode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -901,39 +837,45 @@ Partial Class frmDocView
        '
        Me.DefaultToolStripMenuItem.CheckOnClick = True
        Me.DefaultToolStripMenuItem.Name = "DefaultToolStripMenuItem"
-        Me.DefaultToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.DefaultToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
        Me.DefaultToolStripMenuItem.Text = "Default"
        '
-        'AreaSelectionToolStripMenuItem
-        '
-        Me.AreaSelectionToolStripMenuItem.CheckOnClick = True
-        Me.AreaSelectionToolStripMenuItem.Name = "AreaSelectionToolStripMenuItem"
-        Me.AreaSelectionToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.AreaSelectionToolStripMenuItem.Text = "Area selection"
-        '
        '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(180, 22)
+        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(180, 22)
+        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(180, 22)
+        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
@@ -954,6 +896,20 @@ Partial Class frmDocView
        Me.btnPreviousPage.Size = New System.Drawing.Size(28, 28)
        Me.btnPreviousPage.Text = "Go to previous page"
        '
+        'tbCurrentPage
+        '
+        Me.tbCurrentPage.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.tbCurrentPage.Name = "tbCurrentPage"
+        Me.tbCurrentPage.Size = New System.Drawing.Size(40, 31)
+        Me.tbCurrentPage.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
@@ -974,6 +930,12 @@ Partial Class frmDocView
        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
@@ -984,6 +946,12 @@ Partial Class frmDocView
        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
@@ -994,6 +962,12 @@ Partial Class frmDocView
        Me.btnZoomIn.Size = New System.Drawing.Size(28, 28)
        Me.btnZoomIn.Text = "Zoom In"
        '
+        '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)
+        '
        'btnFitWidth
        '
        Me.btnFitWidth.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -1014,6 +988,12 @@ Partial Class frmDocView
        Me.btnFitPage.Size = New System.Drawing.Size(28, 28)
        Me.btnFitPage.Text = "Adjust to whole page"
        '
+        '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)
+        '
        'btnAdjustGamma
        '
        Me.btnAdjustGamma.CheckOnClick = True
@@ -1024,6 +1004,12 @@ Partial Class frmDocView
        Me.btnAdjustGamma.Size = New System.Drawing.Size(28, 28)
        Me.btnAdjustGamma.Text = "Adjust gamma"
        '
+        'ToolStripSeparator10
+        '
+        Me.ToolStripSeparator10.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0)
+        Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(6, 31)
+        '
        'btnRotateLeft
        '
        Me.btnRotateLeft.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -1064,6 +1050,12 @@ Partial Class frmDocView
        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)
+        '
        'btnAbout
        '
        Me.btnAbout.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -1074,6 +1066,15 @@ Partial Class frmDocView
        Me.btnAbout.Size = New System.Drawing.Size(28, 28)
        Me.btnAbout.Text = "About"
        '
+        'pMain
+        '
+        Me.pMain.Controls.Add(Me.scMain)
+        Me.pMain.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pMain.Location = New System.Drawing.Point(0, 31)
+        Me.pMain.Name = "pMain"
+        Me.pMain.Size = New System.Drawing.Size(1264, 676)
+        Me.pMain.TabIndex = 6
+        '
        'frmDocView
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1108,6 +1109,7 @@ Partial Class frmDocView
        Me.Panel2.PerformLayout()
        Me.Panel1.ResumeLayout(False)
        Me.Panel1.PerformLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.scMain.Panel1.ResumeLayout(False)
        Me.scMain.Panel2.ResumeLayout(False)
        Me.scMain.Panel2.PerformLayout()
@@ -1127,7 +1129,6 @@ Partial Class frmDocView
        Me.mainToolStrip.ResumeLayout(False)
        Me.mainToolStrip.PerformLayout()
        Me.pMain.ResumeLayout(False)
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()