diff --git a/GUIs.Common/frmDocumentResultList.Designer.vb b/GUIs.Common/frmDocumentResultList.Designer.vb index db5ed8f2..a0773de0 100644 --- a/GUIs.Common/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/frmDocumentResultList.Designer.vb @@ -21,7 +21,7 @@ Partial Class frmDocumentResultList Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocumentResultList)) - Dim FadeTransition1 As DevExpress.Utils.Animation.FadeTransition = New DevExpress.Utils.Animation.FadeTransition() + Dim FadeTransition2 As DevExpress.Utils.Animation.FadeTransition = New DevExpress.Utils.Animation.FadeTransition() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.GridView1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() @@ -97,7 +97,7 @@ Partial Class frmDocumentResultList Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components) Me.DockPanelFileList = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel() + Me.panelContainerStatus = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanelStatus = New DevExpress.XtraBars.Docking.DockPanel() Me.ControlContainer1 = New DevExpress.XtraBars.Docking.ControlContainer() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() @@ -139,7 +139,7 @@ Partial Class frmDocumentResultList CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanelFileList.SuspendLayout() Me.DockPanel2_Container.SuspendLayout() - Me.panelContainer1.SuspendLayout() + Me.panelContainerStatus.SuspendLayout() Me.DockPanelStatus.SuspendLayout() Me.ControlContainer1.SuspendLayout() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -483,7 +483,7 @@ Partial Class frmDocumentResultList 'WorkspaceManager1 ' Me.WorkspaceManager1.TargetControl = Me - Me.WorkspaceManager1.TransitionType = FadeTransition1 + Me.WorkspaceManager1.TransitionType = FadeTransition2 ' 'RibbonPageCategoryFile ' @@ -729,7 +729,7 @@ Partial Class frmDocumentResultList 'DockManager1 ' Me.DockManager1.Form = Me - Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanelFileList, Me.panelContainer1, Me.DockPanelDocViewer}) + Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanelFileList, Me.panelContainerStatus, Me.DockPanelDocViewer}) Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"}) ' 'DockPanelFileList @@ -748,17 +748,17 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DockPanel2_Container, "DockPanel2_Container") Me.DockPanel2_Container.Name = "DockPanel2_Container" ' - 'panelContainer1 + 'panelContainerStatus ' - Me.panelContainer1.ActiveChild = Me.DockPanelStatus - Me.panelContainer1.Controls.Add(Me.DockPanelStatus) - Me.panelContainer1.Controls.Add(Me.DockPanelMetadata) - Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right - Me.panelContainer1.ID = New System.Guid("3d77391e-21ef-4574-8521-d9f3b7468ebe") - resources.ApplyResources(Me.panelContainer1, "panelContainer1") - Me.panelContainer1.Name = "panelContainer1" - Me.panelContainer1.OriginalSize = New System.Drawing.Size(275, 200) - Me.panelContainer1.Tabbed = True + Me.panelContainerStatus.ActiveChild = Me.DockPanelStatus + Me.panelContainerStatus.Controls.Add(Me.DockPanelStatus) + Me.panelContainerStatus.Controls.Add(Me.DockPanelMetadata) + Me.panelContainerStatus.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right + Me.panelContainerStatus.ID = New System.Guid("3d77391e-21ef-4574-8521-d9f3b7468ebe") + resources.ApplyResources(Me.panelContainerStatus, "panelContainerStatus") + Me.panelContainerStatus.Name = "panelContainerStatus" + Me.panelContainerStatus.OriginalSize = New System.Drawing.Size(275, 200) + Me.panelContainerStatus.Tabbed = True ' 'DockPanelStatus ' @@ -894,7 +894,7 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.DockPanelDocViewer) - Me.Controls.Add(Me.panelContainer1) + Me.Controls.Add(Me.panelContainerStatus) Me.Controls.Add(Me.DockPanelFileList) Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonControl) @@ -928,7 +928,7 @@ Partial Class frmDocumentResultList CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit() Me.DockPanelFileList.ResumeLayout(False) Me.DockPanel2_Container.ResumeLayout(False) - Me.panelContainer1.ResumeLayout(False) + Me.panelContainerStatus.ResumeLayout(False) Me.DockPanelStatus.ResumeLayout(False) Me.ControlContainer1.ResumeLayout(False) CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() @@ -1033,7 +1033,7 @@ Partial Class frmDocumentResultList Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents DockPanelStatus As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents ControlContainer1 As DevExpress.XtraBars.Docking.ControlContainer - Friend WithEvents panelContainer1 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents panelContainerStatus As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl Friend WithEvents txtCheckedOutWho As DevExpress.XtraEditors.TextEdit Friend WithEvents dateCheckedOutWhen As DevExpress.XtraEditors.DateEdit diff --git a/GUIs.Common/frmDocumentResultList.resx b/GUIs.Common/frmDocumentResultList.resx index 0e5069e4..4a34bfa3 100644 --- a/GUIs.Common/frmDocumentResultList.resx +++ b/GUIs.Common/frmDocumentResultList.resx @@ -486,40 +486,6 @@ 1189, 671 - - Fill - - - 0, 0 - - - 323, 459 - - - - 0 - - - DocumentViewer1 - - - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.7.0, Culture=neutral, PublicKeyToken=null - - - DockPanel1_Container - - - 0 - - - 3, 26 - - - 323, 459 - - - 0 - DockPanel1_Container @@ -553,103 +519,6 @@ 0 - - 173, 45 - - - 71, 20 - - - 4 - - - txtCheckedOutWho - - - DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControl1 - - - 4 - - - - - - 173, 69 - - - - Combo - - - Combo - - - 71, 20 - - - 5 - - - dateCheckedOutWhen - - - DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControl1 - - - 5 - - - Fill - - - 0, 0 - - - Bearbeitet von - - - In Bearbeitung genommen - - - In Bearbeitung - - - 268, 434 - - - 0 - - - LayoutControl1 - - - LayoutControl1 - - - DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ControlContainer1 - - - 0 - - - 0, 0 - - - 268, 434 - - - 0 - ControlContainer1 @@ -678,44 +547,11 @@ DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - panelContainer1 + panelContainerStatus 0 - - Fill - - - 0, 0 - - - 268, 434 - - - 0 - - - CtrlObjectPropertyDialog - - - DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.9.1.0, Culture=neutral, PublicKeyToken=null - - - DockPanel3_Container - - - 0 - - - 0, 0 - - - 268, 434 - - - 0 - DockPanel3_Container @@ -744,41 +580,32 @@ DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - panelContainer1 + panelContainerStatus 1 - + 914, 158 - + 275, 489 - + panelContainer1 - - panelContainer1 + + panelContainerStatus - + DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + $this - + 1 - - 3, 26 - - - 578, 460 - - - 0 - DockPanel2_Container @@ -1348,60 +1175,19 @@ 0, 0 - - Dokument - - - Dateien und Ordner - - - Aktionen 1 - - - Workflow - - - Bearbeiten - - - Aktionen 2 - Datei - - Attribute - - - Aktionen - Attribute - - Navigation - - - Export - - - Aktualisieren - Start - - Tabellen Einstellungen - - - RibbonPageGroup1 - - - Layout - Layout + False @@ -1618,6 +1404,72 @@ 0 + + Aktionen 1 + + + Dokument + + + Dateien und Ordner + + + Aktionen 2 + + + Workflow + + + Bearbeiten + + + Aktionen + + + Attribute + + + Navigation + + + Export + + + Aktualisieren + + + Tabellen Einstellungen + + + RibbonPageGroup1 + + + Layout + + + Fill + + + 0, 0 + + + 323, 459 + + + 0 + + + DocumentViewer1 + + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.8.0, Culture=neutral, PublicKeyToken=null + + + DockPanel1_Container + + + 0 + 12, 27 @@ -1627,6 +1479,238 @@ 155, 22 + + 3, 26 + + + 578, 460 + + + 0 + + + DockPanel2_Container + + + DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanelFileList + + + 0 + + + LayoutControl1 + + + DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ControlContainer1 + + + 0 + + + 0, 0 + + + 268, 434 + + + 0 + + + ControlContainer1 + + + DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanelStatus + + + 0 + + + 173, 45 + + + 71, 20 + + + 4 + + + txtCheckedOutWho + + + DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControl1 + + + 4 + + + + + + 173, 69 + + + + Combo + + + Combo + + + 71, 20 + + + 5 + + + dateCheckedOutWhen + + + DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControl1 + + + 5 + + + Fill + + + 0, 0 + + + 268, 434 + + + 0 + + + LayoutControl1 + + + LayoutControl1 + + + DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ControlContainer1 + + + 0 + + + In Bearbeitung + + + Bearbeitet von + + + In Bearbeitung genommen + + + CtrlObjectPropertyDialog + + + DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.10.0.0, Culture=neutral, PublicKeyToken=null + + + DockPanel3_Container + + + 0 + + + 0, 0 + + + 268, 434 + + + 0 + + + DockPanel3_Container + + + DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanelMetadata + + + 0 + + + Fill + + + 0, 0 + + + 268, 434 + + + 0 + + + CtrlObjectPropertyDialog + + + DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.10.0.0, Culture=neutral, PublicKeyToken=null + + + DockPanel3_Container + + + 0 + + + DocumentViewer1 + + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.8.0, Culture=neutral, PublicKeyToken=null + + + DockPanel1_Container + + + 0 + + + 3, 26 + + + 323, 459 + + + 0 + + + DockPanel1_Container + + + DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanelDocViewer + + + 0 + 290, 22 diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb index 492dbe70..c4869ff3 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -185,7 +185,7 @@ Public Class frmDocumentResultList End If If OperationMode = OperationMode.NoAppServer Then - DockPanelMetadata.Visibility = Docking.DockVisibility.Hidden + panelContainerStatus.Visibility = Docking.DockVisibility.Hidden End If UpdateTotalResults()