AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jj: show results over search start

Browse Source
This commit is contained in:
Jonathan Jenne
2020-11-24 15:48:15 +01:00
parent 4b2286f97e
commit 48fb53127e
4 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb generated
View File

@@ -30,7 +30,7 @@ Partial Class frmDocumentResultList
Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
Me.labelResultCount = New DevExpress.XtraBars.BarStaticItem()
Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonBack = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroupNavigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -75,7 +75,7 @@ Partial Class frmDocumentResultList
'RibbonControl
'
Me.RibbonControl.ExpandCollapseItem.Id = 0
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonItem4, Me.BarButtonItem5})
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonItem5})
Me.RibbonControl.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl.MaxItemId = 11
Me.RibbonControl.Name = "RibbonControl"
@@ -142,13 +142,13 @@ Partial Class frmDocumentResultList
Me.labelResultCount.Id = 8
Me.labelResultCount.Name = "labelResultCount"
'
'BarButtonItem4
'BarButtonBack
'
Me.BarButtonItem4.Caption = "Zurück"
Me.BarButtonItem4.Id = 9
Me.BarButtonItem4.ImageOptions.Image = CType(resources.GetObject("BarButtonItem4.ImageOptions.Image"), System.Drawing.Image)
Me.BarButtonItem4.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.LargeImage"), System.Drawing.Image)
Me.BarButtonItem4.Name = "BarButtonItem4"
Me.BarButtonBack.Caption = "Zurück"
Me.BarButtonBack.Id = 9
Me.BarButtonBack.ImageOptions.Image = CType(resources.GetObject("BarButtonItem4.ImageOptions.Image"), System.Drawing.Image)
Me.BarButtonBack.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.LargeImage"), System.Drawing.Image)
Me.BarButtonBack.Name = "BarButtonBack"
'
'BarButtonItem5
'
@@ -166,7 +166,7 @@ Partial Class frmDocumentResultList
'RibbonPageGroupNavigation
'
Me.RibbonPageGroupNavigation.AllowTextClipping = False
Me.RibbonPageGroupNavigation.ItemLinks.Add(Me.BarButtonItem4)
Me.RibbonPageGroupNavigation.ItemLinks.Add(Me.BarButtonBack)
Me.RibbonPageGroupNavigation.Name = "RibbonPageGroupNavigation"
Me.RibbonPageGroupNavigation.Text = "Navigation"
'
@@ -440,7 +440,7 @@ Partial Class frmDocumentResultList
Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
Friend WithEvents labelResultCount As DevExpress.XtraBars.BarStaticItem
Friend WithEvents XtraSaveFileDialog As DevExpress.XtraEditors.XtraSaveFileDialog
Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonBack As DevExpress.XtraBars.BarButtonItem
Friend WithEvents RibbonPageGroupNavigation As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents EigenschaftenToolStripMenuItem As Windows.Forms.ToolStripMenuItem

8
GUIs.Common/DocumentResultList/frmDocumentResultList.vb
View File

@@ -62,9 +62,7 @@ Public Class frmDocumentResultList
SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance
SwitchDetailContainerHorizontal.Checked = _Config.Config.SplitContainer2Horizontal
If _IsLegacy = True Then
RibbonPageGroupNavigation.Visible = True
Else
If _IsLegacy = False Then
' Location and size will be managed by the ZooFlow Search Window
If Utils.IsVisibleOnAnyScreen(_Config.Config.WindowLocation) Then
If Utils.LocationIsVisible(_Config.Config.WindowLocation) Then
@@ -75,10 +73,8 @@ Public Class frmDocumentResultList
End If
End If
RibbonPageGroupNavigation.Visible = False
SwitchMainContainerHorizontal.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
SwitchDetailContainerHorizontal.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If
RibbonControl.Minimized = True
@@ -569,7 +565,7 @@ Public Class frmDocumentResultList
UpdateGridHeader(_ResultLists, 2, oRowCount)
End Sub
Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonBack.ItemClick
ShouldReturnToPreviousForm = True
Close()
End Sub