ZooFlow: Improvements and Performance for frmSearchStart

2020-11-20 16:09:29 +01:00
parent baa914d153
commit d0e4ecb4ed
9 changed files with 394 additions and 621 deletions
--- a/GUIs.ZooFlow/frmSearchStart.Designer.vb
+++ b/GUIs.ZooFlow/frmSearchStart.Designer.vb
@@ -26,6 +26,7 @@ Partial Class frmSearchStart
        Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, true, true)
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSearchStart))
        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonNewSearch = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonSaveSearch = New DevExpress.XtraBars.BarButtonItem()
        Me.BarHeaderItem1 = New DevExpress.XtraBars.BarHeaderItem()
@@ -45,11 +46,12 @@ Partial Class frmSearchStart
        Me.cmbFilterTimeframe = New DevExpress.XtraBars.BarEditItem()
        Me.RepositoryItemComboBox2 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
        Me.BarCheckboxOpenSearchInSameWindow = New DevExpress.XtraBars.BarCheckItem()
+        Me.BarButtonItem1 = 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()
+        Me.RibbonPageGroupFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupProfiles = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupFilter = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupSettings = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
        Me.RepositoryItemTimeSpanEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTimeSpanEdit()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
@@ -98,17 +100,28 @@ Partial Class frmSearchStart
        'RibbonControl1
        '
        Me.RibbonControl1.AutoSizeItems = True
+        Me.RibbonControl1.CaptionBarItemLinks.Add(Me.BarButtonItem2)
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonNewSearch, Me.BarButtonSaveSearch, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonClearSearch, Me.BarButtonItem3, Me.BarEditItem2, Me.BarStaticItemInfo, Me.BarButtonStartSearch, Me.BarStaticItem1, Me.txtFilterFrom, Me.txtFilterTo, Me.cmbFilterTimeframe, Me.BarCheckboxOpenSearchInSameWindow})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarButtonItem2, Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonNewSearch, Me.BarButtonSaveSearch, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonClearSearch, Me.BarButtonItem3, Me.BarEditItem2, Me.BarStaticItemInfo, Me.BarButtonStartSearch, Me.BarStaticItem1, Me.txtFilterFrom, Me.txtFilterTo, Me.cmbFilterTimeframe, Me.BarCheckboxOpenSearchInSameWindow, Me.BarButtonItem1})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 22
+        Me.RibbonControl1.MaxItemId = 24
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemRadioGroup1, Me.RepositoryItemComboBox1, Me.RepositoryItemTextEdit1, Me.RepositoryItemDateEdit1, Me.RepositoryItemDateEdit2, Me.RepositoryItemComboBox2, Me.RepositoryItemTimeSpanEdit1})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
-        Me.RibbonControl1.Size = New System.Drawing.Size(1070, 158)
+        Me.RibbonControl1.ShowItemCaptionsInCaptionBar = True
+        Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
+        Me.RibbonControl1.Size = New System.Drawing.Size(1020, 131)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
+        'BarButtonItem2
+        '
+        Me.BarButtonItem2.Caption = "Fenster wiederherstellen"
+        Me.BarButtonItem2.Id = 23
+        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        Me.BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+        '
        'BarButtonNewSearch
        '
        Me.BarButtonNewSearch.Caption = "Neue Suche"
@@ -234,31 +247,32 @@ Partial Class frmSearchStart
        '
        'BarCheckboxOpenSearchInSameWindow
        '
-        Me.BarCheckboxOpenSearchInSameWindow.Caption = "Suche in gleichem Fenster öffnen"
+        Me.BarCheckboxOpenSearchInSameWindow.Caption = "Ergebnis in gleichem Fenster öffnen"
        Me.BarCheckboxOpenSearchInSameWindow.Id = 21
-        Me.BarCheckboxOpenSearchInSameWindow.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarCheckboxOpenSearchInSameWindow.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckboxOpenSearchInSameWindow.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.BarCheckboxOpenSearchInSameWindow.Name = "BarCheckboxOpenSearchInSameWindow"
        '
+        'BarButtonItem1
+        '
+        Me.BarButtonItem1.Caption = "Fenster wiederherstellen"
+        Me.BarButtonItem1.Id = 22
+        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
        'RibbonPage1
        '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroupProfiles, Me.RibbonPageGroupFilter})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupFunctions, Me.RibbonPageGroupProfiles, Me.RibbonPageGroupFilter, Me.RibbonPageGroupSettings})
        Me.RibbonPage1.Name = "RibbonPage1"
        Me.RibbonPage1.Text = "Start"
        '
-        'RibbonPageGroup1
+        'RibbonPageGroupFunctions
        '
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonStartSearch)
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonClearSearch)
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonNewSearch)
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonSaveSearch)
-        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
-        Me.RibbonPageGroup1.Text = "Suchfunktionen"
-        '
-        'RibbonPageGroup2
-        '
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarCheckboxOpenSearchInSameWindow)
-        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
-        Me.RibbonPageGroup2.Text = "Sucheinstellungen"
+        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.BarButtonStartSearch)
+        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.BarButtonNewSearch)
+        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.BarButtonClearSearch)
+        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.BarButtonSaveSearch)
+        Me.RibbonPageGroupFunctions.Name = "RibbonPageGroupFunctions"
+        Me.RibbonPageGroupFunctions.Text = "Suchfunktionen"
        '
        'RibbonPageGroupProfiles
        '
@@ -275,6 +289,12 @@ Partial Class frmSearchStart
        Me.RibbonPageGroupFilter.Name = "RibbonPageGroupFilter"
        Me.RibbonPageGroupFilter.Text = "Filter"
        '
+        'RibbonPageGroupSettings
+        '
+        Me.RibbonPageGroupSettings.ItemLinks.Add(Me.BarCheckboxOpenSearchInSameWindow)
+        Me.RibbonPageGroupSettings.Name = "RibbonPageGroupSettings"
+        Me.RibbonPageGroupSettings.Text = "Sucheinstellungen"
+        '
        'RepositoryItemTextEdit1
        '
        Me.RepositoryItemTextEdit1.AutoHeight = False
@@ -289,10 +309,10 @@ Partial Class frmSearchStart
        'RibbonStatusBar1
        '
        Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemInfo)
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 577)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 455)
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1070, 24)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1020, 22)
        '
        'pnlProfileChoose
        '
@@ -301,10 +321,10 @@ Partial Class frmSearchStart
        Me.pnlProfileChoose.Controls.Add(Me.Label1)
        Me.pnlProfileChoose.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlProfileChoose.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.pnlProfileChoose.Location = New System.Drawing.Point(0, 158)
+        Me.pnlProfileChoose.Location = New System.Drawing.Point(0, 131)
        Me.pnlProfileChoose.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3)
        Me.pnlProfileChoose.Name = "pnlProfileChoose"
-        Me.pnlProfileChoose.Size = New System.Drawing.Size(1070, 57)
+        Me.pnlProfileChoose.Size = New System.Drawing.Size(1020, 57)
        Me.pnlProfileChoose.TabIndex = 5
        '
        'cmbProfile
@@ -315,7 +335,7 @@ Partial Class frmSearchStart
        Me.cmbProfile.FormattingEnabled = True
        Me.cmbProfile.Location = New System.Drawing.Point(3, 23)
        Me.cmbProfile.Name = "cmbProfile"
-        Me.cmbProfile.Size = New System.Drawing.Size(1065, 21)
+        Me.cmbProfile.Size = New System.Drawing.Size(1015, 21)
        Me.cmbProfile.TabIndex = 2
        Me.cmbProfile.ValueMember = "DOKART_ID"
        '
@@ -337,68 +357,68 @@ Partial Class frmSearchStart
        Me.XtraTabControl1.MultiLine = DevExpress.Utils.DefaultBoolean.[False]
        Me.XtraTabControl1.Name = "XtraTabControl1"
        Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
-        Me.XtraTabControl1.Size = New System.Drawing.Size(1070, 362)
+        Me.XtraTabControl1.Size = New System.Drawing.Size(1020, 267)
        Me.XtraTabControl1.TabIndex = 12
        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2, Me.XtraTabPage3, Me.XtraTabPage4, Me.XtraTabPage5, Me.XtraTabPage6, Me.XtraTabPage7, Me.XtraTabPage8, Me.XtraTabPage9, Me.XtraTabPage10})
        '
        'XtraTabPage1
        '
        Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(1068, 337)
+        Me.XtraTabPage1.Size = New System.Drawing.Size(1018, 244)
        Me.XtraTabPage1.Text = "Search#1"
        '
        'XtraTabPage2
        '
        Me.XtraTabPage2.Name = "XtraTabPage2"
-        Me.XtraTabPage2.Size = New System.Drawing.Size(1068, 337)
+        Me.XtraTabPage2.Size = New System.Drawing.Size(1018, 244)
        Me.XtraTabPage2.Text = "Search#2"
        '
        'XtraTabPage3
        '
        Me.XtraTabPage3.Name = "XtraTabPage3"
-        Me.XtraTabPage3.Size = New System.Drawing.Size(1068, 337)
+        Me.XtraTabPage3.Size = New System.Drawing.Size(1018, 244)
        Me.XtraTabPage3.Text = "Search#3"
        '
        'XtraTabPage4
        '
        Me.XtraTabPage4.Name = "XtraTabPage4"
-        Me.XtraTabPage4.Size = New System.Drawing.Size(1068, 337)
+        Me.XtraTabPage4.Size = New System.Drawing.Size(1018, 244)
        Me.XtraTabPage4.Text = "Search#4"
        '
        'XtraTabPage5
        '
        Me.XtraTabPage5.Name = "XtraTabPage5"
-        Me.XtraTabPage5.Size = New System.Drawing.Size(1068, 337)
+        Me.XtraTabPage5.Size = New System.Drawing.Size(1018, 244)
        Me.XtraTabPage5.Text = "Search#5"
        '
        'XtraTabPage6
        '
        Me.XtraTabPage6.Name = "XtraTabPage6"
-        Me.XtraTabPage6.Size = New System.Drawing.Size(1068, 337)
+        Me.XtraTabPage6.Size = New System.Drawing.Size(1018, 244)
        Me.XtraTabPage6.Text = "Search#6"
        '
        'XtraTabPage7
        '
        Me.XtraTabPage7.Name = "XtraTabPage7"
-        Me.XtraTabPage7.Size = New System.Drawing.Size(1068, 337)
+        Me.XtraTabPage7.Size = New System.Drawing.Size(1018, 244)
        Me.XtraTabPage7.Text = "Search#7"
        '
        'XtraTabPage8
        '
        Me.XtraTabPage8.Name = "XtraTabPage8"
-        Me.XtraTabPage8.Size = New System.Drawing.Size(1068, 337)
+        Me.XtraTabPage8.Size = New System.Drawing.Size(1018, 244)
        Me.XtraTabPage8.Text = "Search#8"
        '
        'XtraTabPage9
        '
        Me.XtraTabPage9.Name = "XtraTabPage9"
-        Me.XtraTabPage9.Size = New System.Drawing.Size(1068, 337)
+        Me.XtraTabPage9.Size = New System.Drawing.Size(1018, 244)
        Me.XtraTabPage9.Text = "Search#9"
        '
        'XtraTabPage10
        '
        Me.XtraTabPage10.Name = "XtraTabPage10"
-        Me.XtraTabPage10.Size = New System.Drawing.Size(1068, 337)
+        Me.XtraTabPage10.Size = New System.Drawing.Size(1018, 244)
        Me.XtraTabPage10.Text = "Search#10"
        '
        'ContextMenuStripSearchTerms
@@ -437,13 +457,13 @@ Partial Class frmSearchStart
        Me.SplitContainerControlSearch.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
        Me.SplitContainerControlSearch.Dock = System.Windows.Forms.DockStyle.Fill
        Me.SplitContainerControlSearch.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2
-        Me.SplitContainerControlSearch.Location = New System.Drawing.Point(0, 215)
+        Me.SplitContainerControlSearch.Location = New System.Drawing.Point(0, 188)
        Me.SplitContainerControlSearch.Name = "SplitContainerControlSearch"
        Me.SplitContainerControlSearch.Panel1.Controls.Add(Me.XtraTabControl1)
        Me.SplitContainerControlSearch.Panel1.Text = "Panel1"
        Me.SplitContainerControlSearch.Panel2.Text = "Panel2"
        Me.SplitContainerControlSearch.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1
-        Me.SplitContainerControlSearch.Size = New System.Drawing.Size(1070, 362)
+        Me.SplitContainerControlSearch.Size = New System.Drawing.Size(1020, 267)
        Me.SplitContainerControlSearch.SplitterPosition = 310
        Me.SplitContainerControlSearch.TabIndex = 16
        '
@@ -453,13 +473,14 @@ Partial Class frmSearchStart
        Me.Appearance.Options.UseFont = True
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1070, 601)
+        Me.ClientSize = New System.Drawing.Size(1020, 477)
        Me.Controls.Add(Me.SplitContainerControlSearch)
        Me.Controls.Add(Me.pnlProfileChoose)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.RibbonControl1)
        Me.IconOptions.Icon = CType(resources.GetObject("frmSearchStart.IconOptions.Icon"), System.Drawing.Icon)
        Me.IconOptions.SvgImage = CType(resources.GetObject("frmSearchStart.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.IconOptions.SvgImageColorizationMode = DevExpress.Utils.SvgImageColorizationMode.Full
        Me.KeyPreview = True
        Me.Name = "frmSearchStart"
        Me.Ribbon = Me.RibbonControl1
@@ -489,7 +510,7 @@ End Sub

    Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
    Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
-    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupFunctions As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
    Friend WithEvents pnlProfileChoose As Panel
    Friend WithEvents cmbProfile As ComboBox
@@ -534,5 +555,7 @@ End Sub
    Friend WithEvents RepositoryItemComboBox2 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox
    Friend WithEvents RepositoryItemTimeSpanEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTimeSpanEdit
    Friend WithEvents BarCheckboxOpenSearchInSameWindow As DevExpress.XtraBars.BarCheckItem
-    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupSettings As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
 End Class