diff --git a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb index 48caf73..69620ec 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb @@ -52,6 +52,8 @@ Partial Class frmGlobalSearch Me.BarToggleSearchCombined = New DevExpress.XtraBars.BarToggleSwitchItem() Me.BarToggleSearchRecord = New DevExpress.XtraBars.BarToggleSwitchItem() Me.BarToggleFulltext = New DevExpress.XtraBars.BarToggleSwitchItem() + Me.bbtnitmJump2Filestore = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupRecords = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -62,8 +64,6 @@ Partial Class frmGlobalSearch Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.DD_ECMAdmin1 = New DD_Record_Organizer.DD_ECMAdmin() Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.Panel1.SuspendLayout() @@ -223,7 +223,7 @@ Partial Class frmGlobalSearch 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarToggleSearchCombined, Me.BarToggleSearchRecord, Me.BarToggleFulltext, Me.BarButtonItem1, Me.BarButtonItem2}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarToggleSearchCombined, Me.BarToggleSearchRecord, Me.BarToggleFulltext, Me.bbtnitmJump2Filestore, Me.BarButtonItem2}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 17 Me.RibbonControl1.Name = "RibbonControl1" @@ -307,6 +307,20 @@ Partial Class frmGlobalSearch Me.BarToggleFulltext.Id = 14 Me.BarToggleFulltext.Name = "BarToggleFulltext" ' + 'bbtnitmJump2Filestore + ' + resources.ApplyResources(Me.bbtnitmJump2Filestore, "bbtnitmJump2Filestore") + Me.bbtnitmJump2Filestore.Id = 15 + Me.bbtnitmJump2Filestore.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitmJump2Filestore.Name = "bbtnitmJump2Filestore" + ' + 'BarButtonItem2 + ' + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 16 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupRecords, Me.RibbonPageGroupFiles, Me.RibbonPageGroupExcel, Me.RibbonPageGroup3}) @@ -337,7 +351,7 @@ Partial Class frmGlobalSearch Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem8) Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem10) - Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroupFiles.ItemLinks.Add(Me.bbtnitmJump2Filestore) Me.RibbonPageGroupFiles.Name = "RibbonPageGroupFiles" resources.ApplyResources(Me.RibbonPageGroupFiles, "RibbonPageGroupFiles") ' @@ -380,20 +394,6 @@ Partial Class frmGlobalSearch Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1" resources.ApplyResources(Me.XtraSaveFileDialog1, "XtraSaveFileDialog1") ' - 'BarButtonItem1 - ' - resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") - Me.BarButtonItem1.Id = 15 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" - ' - 'BarButtonItem2 - ' - resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") - Me.BarButtonItem2.Id = 16 - Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem2.Name = "BarButtonItem2" - ' 'frmGlobalSearch ' resources.ApplyResources(Me, "$this") @@ -469,6 +469,6 @@ Partial Class frmGlobalSearch Friend WithEvents BarToggleFulltext As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents bbtnitmJump2Filestore As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD-Record-Organizer/frmGlobalSearch.resx b/app/DD-Record-Organizer/frmGlobalSearch.resx index 3eecd10..2de171e 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.resx +++ b/app/DD-Record-Organizer/frmGlobalSearch.resx @@ -123,7 +123,7 @@ - 0, 237 + 0, 248 Fill @@ -135,7 +135,7 @@ orgFLOW-Datensätze - 616, 412 + 616, 402 @@ -156,6 +156,12 @@ 17, 17 + + 0, 22 + + + 6, 25 + 0, 0 @@ -205,7 +211,7 @@ Dateien - 839, 412 + 841, 402 4 @@ -228,11 +234,17 @@ Tahoma, 9pt + + Segoe UI, 8.25pt, style=Bold, Italic + + + 0, 22 + 0, 0 - 839, 25 + 841, 25 3 @@ -268,7 +280,7 @@ 1 - 1467, 437 + 1467, 427 8 @@ -288,18 +300,6 @@ 0 - - 0, 22 - - - 6, 25 - - - Segoe UI, 8.25pt, style=Bold, Italic - - - 0, 22 - True @@ -330,78 +330,6 @@ 4 - - LabelControl1 - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - - - lblFT_Irregular - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - txtSearch - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 2 - - - Label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 3 - - - Top - - - 0, 147 - - - 1467, 90 - - - 7 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - Tahoma, 8.25pt, style=Italic @@ -510,6 +438,30 @@ 3 + + Top + + + 0, 158 + + + 1467, 90 + + + 7 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + Tahoma, 8.25pt, style=Bold, Italic @@ -735,7 +687,7 @@ Nur in Volltext - + Springe zu Filestore @@ -805,13 +757,13 @@ Globale Suche - 1467, 147 + 1467, 158 - 0, 674 + 0, 675 - 1467, 23 + 1467, 22 RibbonStatusBar1 @@ -1009,6 +961,18 @@ DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + bbtnitmJump2Filestore + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -1063,18 +1027,6 @@ DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem1 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarButtonItem2 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmGlobalSearch diff --git a/app/DD-Record-Organizer/frmGlobalSearch.vb b/app/DD-Record-Organizer/frmGlobalSearch.vb index 104aea5..1b12d3e 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.vb @@ -289,7 +289,11 @@ Public Class frmGlobalSearch End Function Private Sub frmSearchAllOVer_Load(sender As Object, e As EventArgs) Handles Me.Load - + If OF_FILESTORE_ENTITY = 0 Then + bbtnitmJump2Filestore.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + Else + bbtnitmJump2Filestore.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + End If _Helper = New ClassHelper Load_DocGrid_Layout() Load_RecordGrid_Layout() @@ -408,7 +412,7 @@ Public Class frmGlobalSearch End Sub - Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmJump2Filestore.ItemClick For Each row In GridViewFiles.GetSelectedRows Dim SELECTED_DOC_ID = GridViewFiles.GetRowCellValue(row, "DocID") Dim oJumpToDocSQL = String.Format("DECLARE @PID BIGINT diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 5830728..f4e3391 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -2527,7 +2527,7 @@ Public Class frmNodeNavigation Else tsmiFileRenameDisplayname.Visible = False End If - If CURRENT_ENTITY_ID <> OF_FILESTORE_ENTITY Then + If CURRENT_ENTITY_ID <> OF_FILESTORE_ENTITY And OF_FILESTORE_ENTITY <> 0 Then TsmitmJumpToFilestore.Visible = True Else TsmitmJumpToFilestore.Visible = False