diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb index e88466a3..4ebf1260 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb @@ -33,22 +33,21 @@ Partial Class frmDocumentResultList Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupNavigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() + Me.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() + Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() + Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PfadInZwischenablageKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.GridView1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() - Me.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() - Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() - Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.GridView2 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() Me.GridBand2 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() Me.GridControl3 = New DevExpress.XtraGrid.GridControl() @@ -61,11 +60,11 @@ Partial Class frmDocumentResultList CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.SuspendLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.ContextMenuGrid.SuspendLayout() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl2.SuspendLayout() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ContextMenuGrid.SuspendLayout() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -82,7 +81,7 @@ Partial Class frmDocumentResultList Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl.Size = New System.Drawing.Size(1189, 158) + Me.RibbonControl.Size = New System.Drawing.Size(1189, 159) Me.RibbonControl.StatusBar = Me.RibbonStatusBar ' 'SwitchMainContainerHorizontal @@ -160,24 +159,16 @@ Partial Class frmDocumentResultList ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4, Me.RibbonPageGroup3, Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupNavigation, Me.RibbonPageGroup1, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Ergebnisse" ' - 'RibbonPageGroup4 + 'RibbonPageGroupNavigation ' - Me.RibbonPageGroup4.AllowTextClipping = False - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem4) - Me.RibbonPageGroup4.Name = "RibbonPageGroup4" - Me.RibbonPageGroup4.Text = "Navigation" - ' - 'RibbonPageGroup3 - ' - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem3) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - Me.RibbonPageGroup3.Text = "Dateiaktionen" + Me.RibbonPageGroupNavigation.AllowTextClipping = False + Me.RibbonPageGroupNavigation.ItemLinks.Add(Me.BarButtonItem4) + Me.RibbonPageGroupNavigation.Name = "RibbonPageGroupNavigation" + Me.RibbonPageGroupNavigation.Text = "Navigation" ' 'RibbonPageGroup1 ' @@ -196,10 +187,10 @@ Partial Class frmDocumentResultList 'RibbonStatusBar ' Me.RibbonStatusBar.ItemLinks.Add(Me.labelResultCount) - Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 647) + Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 649) Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl - Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 24) + Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 22) ' 'SplitContainerControl1 ' @@ -211,7 +202,7 @@ Partial Class frmDocumentResultList Me.SplitContainerControl1.Panel1.Text = "Panel1" Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 489) + Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 490) Me.SplitContainerControl1.SplitterPosition = 382 Me.SplitContainerControl1.TabIndex = 2 Me.SplitContainerControl1.Text = "SplitContainerControl1" @@ -223,10 +214,58 @@ Partial Class frmDocumentResultList Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(382, 489) + Me.GridControl1.Size = New System.Drawing.Size(382, 490) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' + 'GridView1 + ' + Me.GridView1.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1}) + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsView.ShowAutoFilterRow = True + ' + 'GridBand1 + ' + Me.GridBand1.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold) + Me.GridBand1.AppearanceHeader.Options.UseFont = True + Me.GridBand1.Caption = "GridBand1" + Me.GridBand1.Name = "GridBand1" + Me.GridBand1.OptionsBand.AllowHotTrack = False + Me.GridBand1.OptionsBand.AllowMove = False + Me.GridBand1.OptionsBand.AllowPress = False + Me.GridBand1.OptionsBand.AllowSize = False + Me.GridBand1.VisibleIndex = 0 + Me.GridBand1.Width = 513 + ' + 'SplitContainerControl2 + ' + Me.SplitContainerControl2.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 + Me.SplitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl2.Horizontal = False + Me.SplitContainerControl2.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerControl2.Name = "SplitContainerControl2" + Me.SplitContainerControl2.Panel1.Controls.Add(Me.GridControl2) + Me.SplitContainerControl2.Panel1.Text = "Panel1" + Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3) + Me.SplitContainerControl2.Panel2.Text = "Panel2" + Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 490) + Me.SplitContainerControl2.SplitterPosition = 223 + Me.SplitContainerControl2.TabIndex = 0 + Me.SplitContainerControl2.Text = "SplitContainerControl2" + ' + 'GridControl2 + ' + Me.GridControl2.ContextMenuStrip = Me.ContextMenuGrid + Me.GridControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl2.Location = New System.Drawing.Point(0, 0) + Me.GridControl2.MainView = Me.GridView2 + Me.GridControl2.MenuManager = Me.RibbonControl + Me.GridControl2.Name = "GridControl2" + Me.GridControl2.Size = New System.Drawing.Size(370, 223) + Me.GridControl2.TabIndex = 0 + Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) + ' 'ContextMenuGrid ' Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.OrdnerÖffnenToolStripMenuItem, Me.PfadInZwischenablageKopierenToolStripMenuItem, Me.EigenschaftenToolStripMenuItem}) @@ -260,54 +299,6 @@ Partial Class frmDocumentResultList Me.EigenschaftenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) Me.EigenschaftenToolStripMenuItem.Text = "Eigenschaften" ' - 'GridView1 - ' - Me.GridView1.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1}) - Me.GridView1.GridControl = Me.GridControl1 - Me.GridView1.Name = "GridView1" - Me.GridView1.OptionsView.ShowAutoFilterRow = True - ' - 'GridBand1 - ' - Me.GridBand1.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GridBand1.AppearanceHeader.Options.UseFont = True - Me.GridBand1.Caption = "GridBand1" - Me.GridBand1.Name = "GridBand1" - Me.GridBand1.OptionsBand.AllowHotTrack = False - Me.GridBand1.OptionsBand.AllowMove = False - Me.GridBand1.OptionsBand.AllowPress = False - Me.GridBand1.OptionsBand.AllowSize = False - Me.GridBand1.VisibleIndex = 0 - Me.GridBand1.Width = 513 - ' - 'SplitContainerControl2 - ' - Me.SplitContainerControl2.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 - Me.SplitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl2.Horizontal = False - Me.SplitContainerControl2.Location = New System.Drawing.Point(0, 0) - Me.SplitContainerControl2.Name = "SplitContainerControl2" - Me.SplitContainerControl2.Panel1.Controls.Add(Me.GridControl2) - Me.SplitContainerControl2.Panel1.Text = "Panel1" - Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3) - Me.SplitContainerControl2.Panel2.Text = "Panel2" - Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 489) - Me.SplitContainerControl2.SplitterPosition = 223 - Me.SplitContainerControl2.TabIndex = 0 - Me.SplitContainerControl2.Text = "SplitContainerControl2" - ' - 'GridControl2 - ' - Me.GridControl2.ContextMenuStrip = Me.ContextMenuGrid - Me.GridControl2.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl2.Location = New System.Drawing.Point(0, 0) - Me.GridControl2.MainView = Me.GridView2 - Me.GridControl2.MenuManager = Me.RibbonControl - Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(370, 223) - Me.GridControl2.TabIndex = 0 - Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) - ' 'GridView2 ' Me.GridView2.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand2}) @@ -317,7 +308,7 @@ Partial Class frmDocumentResultList ' 'GridBand2 ' - Me.GridBand2.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GridBand2.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold) Me.GridBand2.AppearanceHeader.Options.UseFont = True Me.GridBand2.Caption = "GridBand2" Me.GridBand2.Name = "GridBand2" @@ -335,7 +326,7 @@ Partial Class frmDocumentResultList Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.MenuManager = Me.RibbonControl Me.GridControl3.Name = "GridControl3" - Me.GridControl3.Size = New System.Drawing.Size(370, 256) + Me.GridControl3.Size = New System.Drawing.Size(370, 257) Me.GridControl3.TabIndex = 0 Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -348,7 +339,7 @@ Partial Class frmDocumentResultList ' 'GridBand3 ' - Me.GridBand3.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GridBand3.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold) Me.GridBand3.AppearanceHeader.Options.UseFont = True Me.GridBand3.Caption = "GridBand3" Me.GridBand3.Name = "GridBand3" @@ -361,13 +352,13 @@ Partial Class frmDocumentResultList 'SplitContainerControl3 ' Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 158) + Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 159) Me.SplitContainerControl3.Name = "SplitContainerControl3" Me.SplitContainerControl3.Panel1.Controls.Add(Me.SplitContainerControl1) Me.SplitContainerControl3.Panel1.Text = "Panel1" Me.SplitContainerControl3.Panel2.Controls.Add(Me.DocumentViewer1) Me.SplitContainerControl3.Panel2.Text = "Panel2" - Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 489) + Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 490) Me.SplitContainerControl3.SplitterPosition = 762 Me.SplitContainerControl3.TabIndex = 5 Me.SplitContainerControl3.Text = "SplitContainerControl3" @@ -377,7 +368,7 @@ Partial Class frmDocumentResultList Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Name = "DocumentViewer1" - Me.DocumentViewer1.Size = New System.Drawing.Size(417, 489) + Me.DocumentViewer1.Size = New System.Drawing.Size(417, 490) Me.DocumentViewer1.TabIndex = 0 ' 'XtraSaveFileDialog @@ -386,6 +377,7 @@ Partial Class frmDocumentResultList ' 'frmDocumentResultList ' + Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1189, 671) @@ -402,11 +394,11 @@ Partial Class frmDocumentResultList CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.ResumeLayout(False) CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.ContextMenuGrid.ResumeLayout(False) CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl2.ResumeLayout(False) CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.ContextMenuGrid.ResumeLayout(False) CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() @@ -440,7 +432,6 @@ Partial Class frmDocumentResultList Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents ContextMenuGrid As Windows.Forms.ContextMenuStrip Friend WithEvents DateiÖffnenToolStripMenuItem As Windows.Forms.ToolStripMenuItem @@ -450,7 +441,7 @@ Partial Class frmDocumentResultList Friend WithEvents labelResultCount As DevExpress.XtraBars.BarStaticItem Friend WithEvents XtraSaveFileDialog As DevExpress.XtraEditors.XtraSaveFileDialog Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupNavigation As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem Friend WithEvents EigenschaftenToolStripMenuItem As Windows.Forms.ToolStripMenuItem End Class diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 159ceebd..aecd81c5 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -34,6 +34,7 @@ Public Class frmDocumentResultList Private Const COLUMN_DOCID = "DocID" Private _IsLoading As Boolean = True + Private _IsLegacy As Boolean = True Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm @@ -44,6 +45,7 @@ Public Class frmDocumentResultList ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. Dim oConfigPath As String = Path.Combine(Application.UserAppDataPath, "ResultList", Params.WindowGuid) + _IsLegacy = Not Params.IsIDBResult _LogConfig = LogConfig _Logger = LogConfig.GetLogger() _Config = New ConfigManager(Of DocumentResultConfig)(LogConfig, oConfigPath, oConfigPath) @@ -69,6 +71,14 @@ Public Class frmDocumentResultList End If End If + If _IsLegacy = True Then + RibbonPageGroupNavigation.Visible = True + Else + RibbonPageGroupNavigation.Visible = False + End If + + RibbonControl.Minimized = True + ' Initialize Viewer with GDPicture.NET License DocumentViewer1.Init(_LogConfig, _Environment.Settings.GdPictureKey) @@ -110,6 +120,7 @@ Public Class frmDocumentResultList ' Hide Grids depending on Result count Select Case _ResultLists.Count Case 0 + SplitContainerControl1.SetPanelCollapsed(True) SplitContainerControl2.SetPanelCollapsed(True) @@ -118,12 +129,18 @@ Public Class frmDocumentResultList MessageBox.Show(Constants.MESSAGE_ERROR_IN_SEARCHES, Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) Case 1 + SplitContainerControl1.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 + SplitContainerControl2.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 + SplitContainerControl1.SetPanelCollapsed(True) SplitContainerControl2.SetPanelCollapsed(True) SwitchMainContainerHorizontal.Enabled = False SwitchDetailContainerHorizontal.Enabled = False Case 2 + SplitContainerControl1.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both + SplitContainerControl2.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 + SplitContainerControl2.SetPanelCollapsed(True) SwitchDetailContainerHorizontal.Enabled = False