MS

2021-01-12 17:25:58 +01:00
parent ce6c69b742
commit 0a5439e413
14 changed files with 129 additions and 91 deletions
--- a/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb
+++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb
@@ -39,7 +39,6 @@ Partial Class frmGlobix_Index
        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarHeaderItem1 = New DevExpress.XtraBars.BarHeaderItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupMultiIndex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -49,21 +48,22 @@ Partial Class frmGlobix_Index
        Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
        Me.pnlIndex = New System.Windows.Forms.Panel()
        Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.cmbDoctype = New System.Windows.Forms.ComboBox()
        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
-        Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerControl1.SuspendLayout()
        Me.Panel3.SuspendLayout()
-        Me.Panel1.SuspendLayout()
        CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel1.SuspendLayout()
        Me.SuspendLayout()
        '
        'RibbonControl1
        '
+        Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem2, Me.BarButtonItem3, Me.SkipItem, Me.BarButtonItem5, Me.checkItemTopMost, Me.SourceDeleteItem, Me.checkItemPreselection, Me.PreviewItem, Me.labelFilePath, Me.labelError, Me.labelNotice, Me.chkMultiindexing, Me.BarButtonItem1, Me.BarHeaderItem1})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
@@ -71,7 +71,8 @@ Partial Class frmGlobix_Index
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
-        Me.RibbonControl1.Size = New System.Drawing.Size(1005, 158)
+        Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
+        Me.RibbonControl1.Size = New System.Drawing.Size(1005, 66)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
        'BarButtonItem2
@@ -185,18 +186,10 @@ Partial Class frmGlobix_Index
        '
        'RibbonPage1
        '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup1, Me.RibbonPageGroupMultiIndex, Me.RibbonPageGroup2})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupMultiIndex, Me.RibbonPageGroup2})
        Me.RibbonPage1.Name = "RibbonPage1"
        Me.RibbonPage1.Text = "Start"
        '
-        'RibbonPageGroup3
-        '
-        Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup3.AllowTextClipping = False
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        Me.RibbonPageGroup3.Text = "Start"
-        '
        'RibbonPageGroup1
        '
        Me.RibbonPageGroup1.ItemLinks.Add(Me.SourceDeleteItem)
@@ -224,10 +217,10 @@ Partial Class frmGlobix_Index
        Me.RibbonStatusBar1.ItemLinks.Add(Me.labelFilePath)
        Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError)
        Me.RibbonStatusBar1.ItemLinks.Add(Me.labelNotice)
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 572)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 574)
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1005, 24)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1005, 22)
        '
        'RibbonPage2
        '
@@ -245,7 +238,7 @@ Partial Class frmGlobix_Index
        '
        Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
        Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 158)
+        Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 66)
        Me.SplitContainerControl1.Name = "SplitContainerControl1"
        Me.SplitContainerControl1.Panel1.Controls.Add(Me.pnlIndex)
        Me.SplitContainerControl1.Panel1.Controls.Add(Me.Panel3)
@@ -253,7 +246,7 @@ Partial Class frmGlobix_Index
        Me.SplitContainerControl1.Panel1.Text = "Panel1"
        Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1)
        Me.SplitContainerControl1.Panel2.Text = "Panel2"
-        Me.SplitContainerControl1.Size = New System.Drawing.Size(1005, 414)
+        Me.SplitContainerControl1.Size = New System.Drawing.Size(1005, 508)
        Me.SplitContainerControl1.SplitterPosition = 591
        Me.SplitContainerControl1.TabIndex = 2
        '
@@ -262,18 +255,31 @@ Partial Class frmGlobix_Index
        Me.pnlIndex.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlIndex.Location = New System.Drawing.Point(0, 50)
        Me.pnlIndex.Name = "pnlIndex"
-        Me.pnlIndex.Size = New System.Drawing.Size(591, 255)
+        Me.pnlIndex.Size = New System.Drawing.Size(591, 383)
        Me.pnlIndex.TabIndex = 3
        '
        'Panel3
        '
        Me.Panel3.Controls.Add(Me.PictureEdit1)
        Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel3.Location = New System.Drawing.Point(0, 305)
+        Me.Panel3.Location = New System.Drawing.Point(0, 433)
        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(591, 109)
+        Me.Panel3.Size = New System.Drawing.Size(591, 75)
        Me.Panel3.TabIndex = 2
        '
+        'PictureEdit1
+        '
+        Me.PictureEdit1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_25
+        Me.PictureEdit1.Location = New System.Drawing.Point(0, 0)
+        Me.PictureEdit1.MenuManager = Me.RibbonControl1
+        Me.PictureEdit1.Name = "PictureEdit1"
+        Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Office2003
+        Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto]
+        Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom
+        Me.PictureEdit1.Size = New System.Drawing.Size(591, 75)
+        Me.PictureEdit1.TabIndex = 0
+        '
        'Panel1
        '
        Me.Panel1.Controls.Add(Me.Label1)
@@ -308,23 +314,12 @@ Partial Class frmGlobix_Index
        'DocumentViewer1
        '
        Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.DocumentViewer1.FileLoaded = False
        Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
        Me.DocumentViewer1.Name = "DocumentViewer1"
-        Me.DocumentViewer1.Size = New System.Drawing.Size(404, 414)
+        Me.DocumentViewer1.Size = New System.Drawing.Size(404, 508)
        Me.DocumentViewer1.TabIndex = 0
        '
-        'PictureEdit1
-        '
-        Me.PictureEdit1.Dock = System.Windows.Forms.DockStyle.Right
-        Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_25
-        Me.PictureEdit1.Location = New System.Drawing.Point(384, 0)
-        Me.PictureEdit1.MenuManager = Me.RibbonControl1
-        Me.PictureEdit1.Name = "PictureEdit1"
-        Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto]
-        Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom
-        Me.PictureEdit1.Size = New System.Drawing.Size(207, 109)
-        Me.PictureEdit1.TabIndex = 0
-        '
        'frmGlobix_Index
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -341,9 +336,9 @@ Partial Class frmGlobix_Index
        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerControl1.ResumeLayout(False)
        Me.Panel3.ResumeLayout(False)
+        CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel1.ResumeLayout(False)
        Me.Panel1.PerformLayout()
-        CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -370,7 +365,6 @@ Partial Class frmGlobix_Index
    Friend WithEvents chkMultiindexing As DevExpress.XtraBars.BarCheckItem
    Friend WithEvents RibbonPageGroupMultiIndex As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
    Friend WithEvents Panel1 As Panel
    Friend WithEvents cmbDoctype As ComboBox