Zooflow: Replace old Usermenu, waiting overlay for search and globix
This commit is contained in:
@@ -46,6 +46,7 @@ Partial Class frmGlobix_Index
|
||||
Me.chkMultiindexing = New DevExpress.XtraBars.BarCheckItem()
|
||||
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.BarHeaderItem1 = New DevExpress.XtraBars.BarHeaderItem()
|
||||
Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
@@ -60,9 +61,7 @@ Partial Class frmGlobix_Index
|
||||
Me.cmbDocType = New DevExpress.XtraEditors.ComboBoxEdit()
|
||||
Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
|
||||
Me.GlobixDataset = New DigitalData.GUIs.ZooFlow.GlobixDataset()
|
||||
Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.DigitalData.GUIs.ZooFlow.frmWaitForm), True, True)
|
||||
Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
|
||||
Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
|
||||
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -88,7 +87,7 @@ Partial Class frmGlobix_Index
|
||||
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
|
||||
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
|
||||
Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
|
||||
Me.RibbonControl1.Size = New System.Drawing.Size(1005, 67)
|
||||
Me.RibbonControl1.Size = New System.Drawing.Size(1005, 63)
|
||||
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
|
||||
'
|
||||
'BarButtonItem2
|
||||
@@ -200,6 +199,12 @@ Partial Class frmGlobix_Index
|
||||
Me.BarHeaderItem1.Name = "BarHeaderItem1"
|
||||
Me.BarHeaderItem1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
|
||||
'
|
||||
'BarButtonItem4
|
||||
'
|
||||
Me.BarButtonItem4.Caption = "BarButtonItem4"
|
||||
Me.BarButtonItem4.Id = 16
|
||||
Me.BarButtonItem4.Name = "BarButtonItem4"
|
||||
'
|
||||
'RibbonPage1
|
||||
'
|
||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
|
||||
@@ -229,10 +234,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, 574)
|
||||
Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 572)
|
||||
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
|
||||
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
|
||||
Me.RibbonStatusBar1.Size = New System.Drawing.Size(1005, 22)
|
||||
Me.RibbonStatusBar1.Size = New System.Drawing.Size(1005, 24)
|
||||
'
|
||||
'RibbonPage2
|
||||
'
|
||||
@@ -250,7 +255,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, 67)
|
||||
Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 63)
|
||||
Me.SplitContainerControl1.Name = "SplitContainerControl1"
|
||||
'
|
||||
'SplitContainerControl1.Panel1
|
||||
@@ -264,7 +269,7 @@ Partial Class frmGlobix_Index
|
||||
'
|
||||
Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1)
|
||||
Me.SplitContainerControl1.Panel2.Text = "Panel2"
|
||||
Me.SplitContainerControl1.Size = New System.Drawing.Size(1005, 507)
|
||||
Me.SplitContainerControl1.Size = New System.Drawing.Size(1005, 509)
|
||||
Me.SplitContainerControl1.SplitterPosition = 522
|
||||
Me.SplitContainerControl1.TabIndex = 2
|
||||
'
|
||||
@@ -276,14 +281,14 @@ Partial Class frmGlobix_Index
|
||||
Me.pnlIndex.ForeColor = System.Drawing.SystemColors.ControlText
|
||||
Me.pnlIndex.Location = New System.Drawing.Point(0, 33)
|
||||
Me.pnlIndex.Name = "pnlIndex"
|
||||
Me.pnlIndex.Size = New System.Drawing.Size(522, 399)
|
||||
Me.pnlIndex.Size = New System.Drawing.Size(522, 401)
|
||||
Me.pnlIndex.TabIndex = 3
|
||||
'
|
||||
'Panel3
|
||||
'
|
||||
Me.Panel3.Controls.Add(Me.SimpleButton1)
|
||||
Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom
|
||||
Me.Panel3.Location = New System.Drawing.Point(0, 432)
|
||||
Me.Panel3.Location = New System.Drawing.Point(0, 434)
|
||||
Me.Panel3.Name = "Panel3"
|
||||
Me.Panel3.Size = New System.Drawing.Size(522, 75)
|
||||
Me.Panel3.TabIndex = 2
|
||||
@@ -332,7 +337,7 @@ Partial Class frmGlobix_Index
|
||||
Me.DocumentViewer1.FileLoaded = False
|
||||
Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
|
||||
Me.DocumentViewer1.Name = "DocumentViewer1"
|
||||
Me.DocumentViewer1.Size = New System.Drawing.Size(473, 507)
|
||||
Me.DocumentViewer1.Size = New System.Drawing.Size(473, 509)
|
||||
Me.DocumentViewer1.TabIndex = 0
|
||||
'
|
||||
'GlobixDataset
|
||||
@@ -340,20 +345,10 @@ Partial Class frmGlobix_Index
|
||||
Me.GlobixDataset.DataSetName = "GlobixDataset"
|
||||
Me.GlobixDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
|
||||
'
|
||||
'SplashScreenManager
|
||||
'
|
||||
Me.SplashScreenManager.ClosingDelay = 500
|
||||
'
|
||||
'SvgImageCollection1
|
||||
'
|
||||
Me.SvgImageCollection1.Add("check", "image://svgimages/icon builder/actions_checkcircled.svg")
|
||||
'
|
||||
'BarButtonItem4
|
||||
'
|
||||
Me.BarButtonItem4.Caption = "BarButtonItem4"
|
||||
Me.BarButtonItem4.Id = 16
|
||||
Me.BarButtonItem4.Name = "BarButtonItem4"
|
||||
'
|
||||
'frmGlobix_Index
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@@ -414,7 +409,6 @@ Partial Class frmGlobix_Index
|
||||
Friend WithEvents GlobixDataset As GlobixDataset
|
||||
Friend WithEvents cmbDocType As DevExpress.XtraEditors.ComboBoxEdit
|
||||
Friend WithEvents SimpleButton1 As SimpleButton
|
||||
Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager
|
||||
Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
|
||||
Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
|
||||
End Class
|
||||
|
||||
@@ -15,6 +15,7 @@ Imports DigitalData.Modules.Language.Utils
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Patterns
|
||||
Imports DevExpress.XtraEditors
|
||||
Imports DevExpress.XtraSplashScreen
|
||||
|
||||
Public Class frmGlobix_Index
|
||||
#Region "+++++ Variablen ++++++"
|
||||
@@ -39,6 +40,8 @@ Public Class frmGlobix_Index
|
||||
Private Property Database As DatabaseWithFallback
|
||||
Private Property Patterns2 As Patterns2
|
||||
|
||||
Private Property OverlayHandle As IOverlaySplashScreenHandle
|
||||
|
||||
'Public Class ControlMeta
|
||||
' Public Property IndexName As String
|
||||
' Public Property IndexType As String
|
||||
@@ -67,14 +70,15 @@ Public Class frmGlobix_Index
|
||||
' Abbruchzähler zurücksetzen
|
||||
CancelAttempts = 0
|
||||
|
||||
' Show Loading Overlay
|
||||
OverlayHandle = SplashScreenManager.ShowOverlayForm(Me)
|
||||
|
||||
My.Application.Globix.INDEXING_ACTIVE = True
|
||||
End Sub
|
||||
|
||||
Private Async Sub frmGlobix_Index_Shown(sender As Object, e As EventArgs) Handles Me.Shown
|
||||
Cursor = Cursors.Default
|
||||
|
||||
SplashScreenManager.ShowWaitForm()
|
||||
|
||||
checkItemTopMost.Checked = My.UIConfig.Globix.TopMost
|
||||
TopMost = My.UIConfig.Globix.TopMost
|
||||
BringToFront()
|
||||
@@ -176,7 +180,7 @@ Public Class frmGlobix_Index
|
||||
Catch ex As Exception
|
||||
Logger.Warn("Unexpected error DTTBGI_REGEX_DOCTYPE - ErrorMessage: " & vbNewLine & ex.Message)
|
||||
Finally
|
||||
SplashScreenManager.CloseWaitForm()
|
||||
SplashScreenManager.CloseOverlayForm(OverlayHandle)
|
||||
FormLoaded = True
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user