AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS Commit

Browse Source
This commit is contained in:
SchreiberM
2023-04-24 16:47:22 +02:00
parent 0032ee9941
commit 88791832ec
3 changed files with 59 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Controls.DocumentViewer/Classes/Search.vb
View File

@@ -45,14 +45,18 @@ Public Class Search
Public Sub NextHighlight() Public Sub NextHighlight()
' This also applies when the page has *NO* occurrences, so 0 = 0 ' This also applies when the page has *NO* occurrences, so 0 = 0
If _CurrentOccurrenceCount = _CurrentSelectedOccurrence Then If _CurrentOccurrenceCount = _CurrentSelectedOccurrence Then
Dim oCount = 0
' If there are no occurrences on the current page, got to the *next page* ' If there are no occurrences on the current page, got to the *next page*
While _CurrentOccurrenceCount = _CurrentSelectedOccurrence And _CurrentPage <= _Viewer.PageCount While _CurrentOccurrenceCount = _CurrentSelectedOccurrence And _CurrentPage <= _Viewer.PageCount
oCount += 1
If _CurrentPage = _Viewer.PageCount Then If _CurrentPage = _Viewer.PageCount Then
_Viewer.DisplayFirstPage() _Viewer.DisplayFirstPage()
Else Else
_Viewer.DisplayNextPage() _Viewer.DisplayNextPage()
End If End If
If oCount > 333 Then
Exit While
End If
End While End While
' Safeguard against selecting a non-existing occurrence on the last page ' Safeguard against selecting a non-existing occurrence on the last page
@@ -69,14 +73,17 @@ Public Class Search
Public Sub PrevHighlight() Public Sub PrevHighlight()
If _CurrentOccurrenceCount = 0 Or _CurrentSelectedOccurrence = 1 Then If _CurrentOccurrenceCount = 0 Or _CurrentSelectedOccurrence = 1 Then
Dim oCount = 0
While (_CurrentOccurrenceCount = 0 Or _CurrentSelectedOccurrence = 1) And _CurrentPage >= 1 While (_CurrentOccurrenceCount = 0 Or _CurrentSelectedOccurrence = 1) And _CurrentPage >= 1
oCount += 1
If _CurrentPage = 1 Then If _CurrentPage = 1 Then
_Viewer.DisplayLastPage() _Viewer.DisplayLastPage()
Else Else
_Viewer.DisplayPreviousPage() _Viewer.DisplayPreviousPage()
End If End If
If oCount > 333 Then
Exit While
End If
End While End While
If _CurrentOccurrenceCount > 0 Then If _CurrentOccurrenceCount > 0 Then

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

@@ -913,9 +913,9 @@ Partial Class frmDocumentResultList
Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True]
resources.ApplyResources(Me, "$this") resources.ApplyResources(Me, "$this")
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.DockPanelFileList)
Me.Controls.Add(Me.DockPanelPreview) Me.Controls.Add(Me.DockPanelPreview)
Me.Controls.Add(Me.panelContainerStatus) Me.Controls.Add(Me.panelContainerStatus)
Me.Controls.Add(Me.DockPanelFileList)
Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonStatusBar)
Me.Controls.Add(Me.RibbonControl) Me.Controls.Add(Me.RibbonControl)
Me.IconOptions.Icon = CType(resources.GetObject("frmDocumentResultList.IconOptions.Icon"), System.Drawing.Icon) Me.IconOptions.Icon = CType(resources.GetObject("frmDocumentResultList.IconOptions.Icon"), System.Drawing.Icon)

93
GUIs.Common/DocumentResultList/frmDocumentResultList.resx
View File

@@ -497,6 +497,9 @@
<metadata name="WorkspaceManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="WorkspaceManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>456, 22</value> <value>456, 22</value>
</metadata> </metadata>
<metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>en</value>
</metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@@ -506,48 +509,6 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1189, 671</value> <value>1189, 671</value>
</data> </data>
<data name="DockPanel2_Container.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 46</value>
</data>
<data name="DockPanel2_Container.Size" type="System.Drawing.Size, System.Drawing">
<value>583, 442</value>
</data>
<data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.Name" xml:space="preserve">
<value>DockPanel2_Container</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.Parent" xml:space="preserve">
<value>DockPanelFileList</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DockPanelFileList.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 158</value>
</data>
<data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
<value>590, 491</value>
</data>
<data name="DockPanelFileList.Text" xml:space="preserve">
<value>Ergebnisse</value>
</data>
<data name="&gt;&gt;DockPanelFileList.Name" xml:space="preserve">
<value>DockPanelFileList</value>
</data>
<data name="&gt;&gt;DockPanelFileList.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;DockPanelFileList.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;DockPanelFileList.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DocumentViewer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="DocumentViewer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
@@ -564,7 +525,7 @@
<value>DocumentViewer1</value> <value>DocumentViewer1</value>
</data> </data>
<data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve"> <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null</value> <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve"> <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
<value>DockPanel1_Container</value> <value>DockPanel1_Container</value>
@@ -612,7 +573,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;DockPanelPreview.ZOrder" xml:space="preserve"> <data name="&gt;&gt;DockPanelPreview.ZOrder" xml:space="preserve">
<value>1</value> <value>0</value>
</data> </data>
<data name="CtrlObjectPropertyDialog.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="CtrlObjectPropertyDialog.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
@@ -630,7 +591,7 @@
<value>CtrlObjectPropertyDialog</value> <value>CtrlObjectPropertyDialog</value>
</data> </data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve"> <data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve">
<value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.1.0.0, Culture=neutral, PublicKeyToken=null</value> <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.5.1.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve"> <data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve">
<value>DockPanel3_Container</value> <value>DockPanel3_Container</value>
@@ -828,6 +789,48 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;panelContainerStatus.ZOrder" xml:space="preserve"> <data name="&gt;&gt;panelContainerStatus.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="DockPanel2_Container.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 46</value>
</data>
<data name="DockPanel2_Container.Size" type="System.Drawing.Size, System.Drawing">
<value>583, 442</value>
</data>
<data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.Name" xml:space="preserve">
<value>DockPanel2_Container</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.Parent" xml:space="preserve">
<value>DockPanelFileList</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DockPanelFileList.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 158</value>
</data>
<data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
<value>590, 491</value>
</data>
<data name="DockPanelFileList.Text" xml:space="preserve">
<value>Ergebnisse</value>
</data>
<data name="&gt;&gt;DockPanelFileList.Name" xml:space="preserve">
<value>DockPanelFileList</value>
</data>
<data name="&gt;&gt;DockPanelFileList.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;DockPanelFileList.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;DockPanelFileList.ZOrder" xml:space="preserve">
<value>2</value> <value>2</value>
</data> </data>
<data name="lblCurrentWorkspace.Caption" xml:space="preserve"> <data name="lblCurrentWorkspace.Caption" xml:space="preserve">