diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 19c7c3bf..c2b25b76 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -65,6 +65,7 @@ ..\packages\NLog.4.7.10\lib\net45\NLog.dll + @@ -73,6 +74,7 @@ + @@ -84,6 +86,8 @@ + + @@ -335,5 +339,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/My Project/Resources.Designer.vb b/GUIs.Common/My Project/Resources.Designer.vb index 75aa3f72..803ad7dc 100644 --- a/GUIs.Common/My Project/Resources.Designer.vb +++ b/GUIs.Common/My Project/Resources.Designer.vb @@ -80,6 +80,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property _private() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("private", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -100,6 +110,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_security_permission() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_security_permission", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_transition() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_transition", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -180,6 +210,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property enablescrolling() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("enablescrolling", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -270,6 +310,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property security_unlock() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("security_unlock", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.Common/My Project/Resources.resx b/GUIs.Common/My Project/Resources.resx index bf5854a4..9a6559ef 100644 --- a/GUIs.Common/My Project/Resources.resx +++ b/GUIs.Common/My Project/Resources.resx @@ -118,6 +118,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\bo_transition.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\security_unlock.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\zoom_less.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -127,15 +133,15 @@ ..\Resources\actions_question.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_security_permission.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -148,15 +154,24 @@ ..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\singlepageview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -178,14 +193,11 @@ ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -193,16 +205,19 @@ ..\Resources\png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\private.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\Copy_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb index e0e5f091..c805ba0b 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb @@ -67,6 +67,7 @@ Partial Class ctrlObjectPropertyDialog Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() + Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() @@ -125,7 +126,7 @@ Partial Class ctrlObjectPropertyDialog Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageObject Me.XtraTabControl1.Size = New System.Drawing.Size(505, 693) Me.XtraTabControl1.TabIndex = 2 - Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageObject, Me.XtraTabPageAttributes, Me.XtraTabPageAttributeHistory}) + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageObject, Me.XtraTabPageAttributes, Me.XtraTabPageAttributeHistory, Me.XtraTabPage1}) ' 'XtraTabPageObject ' @@ -539,6 +540,12 @@ Partial Class ctrlObjectPropertyDialog Me.barDockControlRight.Manager = Me.BarManager1 Me.barDockControlRight.Size = New System.Drawing.Size(0, 693) ' + 'XtraTabPage1 + ' + Me.XtraTabPage1.Name = "XtraTabPage1" + Me.XtraTabPage1.Size = New System.Drawing.Size(503, 668) + Me.XtraTabPage1.Text = "Versionen" + ' 'ctrlObjectPropertyDialog ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -637,4 +644,5 @@ Partial Class ctrlObjectPropertyDialog Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl + Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage End Class diff --git a/GUIs.Common/Resources/bo_security_permission.svg b/GUIs.Common/Resources/bo_security_permission.svg new file mode 100644 index 00000000..90d6694b --- /dev/null +++ b/GUIs.Common/Resources/bo_security_permission.svg @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/bo_transition.svg b/GUIs.Common/Resources/bo_transition.svg new file mode 100644 index 00000000..d056a9f0 --- /dev/null +++ b/GUIs.Common/Resources/bo_transition.svg @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/enablescrolling.svg b/GUIs.Common/Resources/enablescrolling.svg new file mode 100644 index 00000000..d2dc2109 --- /dev/null +++ b/GUIs.Common/Resources/enablescrolling.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/private.svg b/GUIs.Common/Resources/private.svg new file mode 100644 index 00000000..6797ac47 --- /dev/null +++ b/GUIs.Common/Resources/private.svg @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/security_unlock.svg b/GUIs.Common/Resources/security_unlock.svg new file mode 100644 index 00000000..c17024e7 --- /dev/null +++ b/GUIs.Common/Resources/security_unlock.svg @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/frmDocumentResultList.Designer.vb b/GUIs.Common/frmDocumentResultList.Designer.vb index 0c015d90..e13986c2 100644 --- a/GUIs.Common/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/frmDocumentResultList.Designer.vb @@ -50,13 +50,20 @@ Partial Class frmDocumentResultList Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem10 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPageCategoryFile = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() Me.RibbonPage4 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup7 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupFilesystem = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup_Layout = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -80,9 +87,10 @@ Partial Class frmDocumentResultList Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.DockPanelMetadata = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.CtrlObjectPropertyDialog = New DigitalData.GUIs.Common.ctrlObjectPropertyDialog() Me.DockPanelDocViewer = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.CtrlObjectPropertyDialog = New DigitalData.GUIs.Common.ctrlObjectPropertyDialog() + Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -111,10 +119,12 @@ Partial Class frmDocumentResultList Me.DockPanel3_Container.SuspendLayout() Me.DockPanelDocViewer.SuspendLayout() Me.DockPanel1_Container.SuspendLayout() + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplitContainerControl1 ' + Me.SplitContainerControl1.Collapsed = True Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1") Me.SplitContainerControl1.Name = "SplitContainerControl1" @@ -140,17 +150,19 @@ Partial Class frmDocumentResultList ' 'GridView1 ' - Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Gainsboro - Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True - Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.GridView1.Appearance.FocusedCell.BackColor = System.Drawing.Color.Gainsboro + Me.GridView1.Appearance.FocusedCell.Options.UseBackColor = True + Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.Gainsboro Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True Me.GridView1.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1}) Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.Name = "GridView1" Me.GridView1.OptionsBehavior.Editable = False Me.GridView1.OptionsBehavior.ReadOnly = True - Me.GridView1.OptionsView.EnableAppearanceEvenRow = True Me.GridView1.OptionsView.ShowAutoFilterRow = True + Me.GridView1.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsView.ShowIndicator = False + Me.GridView1.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.[False] ' 'GridBand1 ' @@ -167,11 +179,12 @@ Partial Class frmDocumentResultList ' Me.RibbonControl.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified 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.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemPropertiesECM, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemPropertiesECM, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") - Me.RibbonControl.MaxItemId = 36 + Me.RibbonControl.MaxItemId = 40 Me.RibbonControl.Name = "RibbonControl" - Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage4, Me.RibbonPage2, Me.RibbonPageExport}) + Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryFile}) + Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2, Me.RibbonPageExport}) Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl.ShowToolbarCustomizeItem = False @@ -355,28 +368,46 @@ Partial Class frmDocumentResultList Me.BarButtonItem6.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.clearpivottable Me.BarButtonItem6.Name = "BarButtonItem6" ' - 'RibbonPage1 + 'BarButtonItem7 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroup5}) - Me.RibbonPage1.Name = "RibbonPage1" - resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") + resources.ApplyResources(Me.BarButtonItem7, "BarButtonItem7") + Me.BarButtonItem7.Id = 36 + Me.BarButtonItem7.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.bo_transition + Me.BarButtonItem7.Name = "BarButtonItem7" ' - 'RibbonPageGroup_Navigation + 'BarButtonItem8 ' - Me.RibbonPageGroup_Navigation.AllowTextClipping = False - Me.RibbonPageGroup_Navigation.ItemLinks.Add(Me.BarButtonBack) - Me.RibbonPageGroup_Navigation.Name = "RibbonPageGroup_Navigation" - resources.ApplyResources(Me.RibbonPageGroup_Navigation, "RibbonPageGroup_Navigation") + resources.ApplyResources(Me.BarButtonItem8, "BarButtonItem8") + Me.BarButtonItem8.Id = 37 + Me.BarButtonItem8.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.security_unlock + Me.BarButtonItem8.Name = "BarButtonItem8" ' - 'RibbonPageGroup5 + 'BarButtonItem9 ' - Me.RibbonPageGroup5.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup5.ItemLinks.Add(Me.ButtonRefresh) - Me.RibbonPageGroup5.Name = "RibbonPageGroup5" - resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") + resources.ApplyResources(Me.BarButtonItem9, "BarButtonItem9") + Me.BarButtonItem9.Id = 38 + Me.BarButtonItem9.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources._private + Me.BarButtonItem9.Name = "BarButtonItem9" + ' + 'BarButtonItem10 + ' + resources.ApplyResources(Me.BarButtonItem10, "BarButtonItem10") + Me.BarButtonItem10.Id = 39 + Me.BarButtonItem10.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.enablescrolling + Me.BarButtonItem10.Name = "BarButtonItem10" + ' + 'RibbonPageCategoryFile + ' + Me.RibbonPageCategoryFile.Appearance.BackColor = System.Drawing.Color.DarkGreen + Me.RibbonPageCategoryFile.Appearance.Options.UseBackColor = True + Me.RibbonPageCategoryFile.Name = "RibbonPageCategoryFile" + Me.RibbonPageCategoryFile.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage4, Me.RibbonPage3}) + resources.ApplyResources(Me.RibbonPageCategoryFile, "RibbonPageCategoryFile") ' 'RibbonPage4 ' + Me.RibbonPage4.Appearance.BackColor = System.Drawing.Color.Green + Me.RibbonPage4.Appearance.Options.UseBackColor = True Me.RibbonPage4.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup7, Me.RibbonPageGroupFilesystem}) Me.RibbonPage4.Name = "RibbonPage4" resources.ApplyResources(Me.RibbonPage4, "RibbonPage4") @@ -401,6 +432,41 @@ Partial Class frmDocumentResultList Me.RibbonPageGroupFilesystem.Name = "RibbonPageGroupFilesystem" resources.ApplyResources(Me.RibbonPageGroupFilesystem, "RibbonPageGroupFilesystem") ' + 'RibbonPage3 + ' + Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4}) + Me.RibbonPage3.Name = "RibbonPage3" + resources.ApplyResources(Me.RibbonPage3, "RibbonPage3") + ' + 'RibbonPageGroup4 + ' + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem7) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem8) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem9) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem10) + Me.RibbonPageGroup4.Name = "RibbonPageGroup4" + resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroup5}) + Me.RibbonPage1.Name = "RibbonPage1" + resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") + ' + 'RibbonPageGroup_Navigation + ' + Me.RibbonPageGroup_Navigation.AllowTextClipping = False + Me.RibbonPageGroup_Navigation.ItemLinks.Add(Me.BarButtonBack) + Me.RibbonPageGroup_Navigation.Name = "RibbonPageGroup_Navigation" + resources.ApplyResources(Me.RibbonPageGroup_Navigation, "RibbonPageGroup_Navigation") + ' + 'RibbonPageGroup5 + ' + Me.RibbonPageGroup5.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup5.ItemLinks.Add(Me.ButtonRefresh) + Me.RibbonPageGroup5.Name = "RibbonPageGroup5" + resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") + ' 'RibbonPage2 ' Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Layout, Me.RibbonPageGroup1}) @@ -582,6 +648,11 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DockPanel3_Container, "DockPanel3_Container") Me.DockPanel3_Container.Name = "DockPanel3_Container" ' + 'CtrlObjectPropertyDialog + ' + resources.ApplyResources(Me.CtrlObjectPropertyDialog, "CtrlObjectPropertyDialog") + Me.CtrlObjectPropertyDialog.Name = "CtrlObjectPropertyDialog" + ' 'DockPanelDocViewer ' Me.DockPanelDocViewer.Controls.Add(Me.DockPanel1_Container) @@ -598,10 +669,9 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DockPanel1_Container, "DockPanel1_Container") Me.DockPanel1_Container.Name = "DockPanel1_Container" ' - 'CtrlObjectPropertyDialog + 'SvgImageCollection1 ' - resources.ApplyResources(Me.CtrlObjectPropertyDialog, "CtrlObjectPropertyDialog") - Me.CtrlObjectPropertyDialog.Name = "CtrlObjectPropertyDialog" + Me.SvgImageCollection1.Add("pdf", "image://svgimages/export/exporttopdf.svg") ' 'frmDocumentResultList ' @@ -646,6 +716,7 @@ Partial Class frmDocumentResultList Me.DockPanel3_Container.ResumeLayout(False) Me.DockPanelDocViewer.ResumeLayout(False) Me.DockPanel1_Container.ResumeLayout(False) + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -713,4 +784,12 @@ Partial Class frmDocumentResultList Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem Friend WithEvents CtrlObjectPropertyDialog As ctrlObjectPropertyDialog + Friend WithEvents RibbonPageCategoryFile As DevExpress.XtraBars.Ribbon.RibbonPageCategory + Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem10 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection End Class diff --git a/GUIs.Common/frmDocumentResultList.resx b/GUIs.Common/frmDocumentResultList.resx index f7082819..d1750f5e 100644 --- a/GUIs.Common/frmDocumentResultList.resx +++ b/GUIs.Common/frmDocumentResultList.resx @@ -447,18 +447,63 @@ Fenster Layout zurücksetzen + + Adhoc Workflow starten + + + Einchecken + + + Auschecken + + + Versionieren + 0, 0 + + RibbonPageGroup3 + + + RibbonPageGroup7 + + + RibbonPageGroup4 + + + Aktionen 1 + + + RibbonPageGroup4 + + + Aktionen 2 + + + Datei + + + Navigation + + + RibbonPageGroup5 + Start - - Bearbeiten + + Layout + + + RibbonPageGroup1 Layout + + RibbonPageGroup2 + Export @@ -503,7 +548,7 @@ 4 - 325, 529 + 568, 529 0 @@ -557,7 +602,7 @@ GridBand2 - 243, 223 + 0, 0 0 @@ -605,7 +650,7 @@ GridBand3 - 243, 296 + 0, 0 0 @@ -638,7 +683,7 @@ 1 - 243, 529 + 0, 0 0 @@ -694,30 +739,6 @@ 0 - - Navigation - - - RibbonPageGroup5 - - - RibbonPageGroup3 - - - RibbonPageGroup7 - - - RibbonPageGroup4 - - - Layout - - - RibbonPageGroup1 - - - RibbonPageGroup2 - Fill @@ -743,7 +764,7 @@ 0 - 14, 16 + 12, 27 RibbonPageGroup6 @@ -760,6 +781,15 @@ 1189, 671 + + 3, 26 + + + 318, 528 + + + 0 + DockPanel1_Container @@ -859,6 +889,15 @@ 1 + + 3, 26 + + + 578, 529 + + + 0 + DockPanel2_Container @@ -1131,23 +1170,35 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPage1 + + BarButtonItem7 - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup_Navigation + + BarButtonItem8 - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup5 + + BarButtonItem9 - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem10 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageCategoryFile + + + DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a RibbonPage4 @@ -1173,6 +1224,36 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPage3 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup4 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage1 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup_Navigation + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup5 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage2 @@ -1257,52 +1338,19 @@ DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + SvgImageCollection1 + + + DevExpress.Utils.SvgImageCollection, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmDocumentResultList DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 3, 26 - - - 578, 529 - - - 0 - - - DockPanel2_Container - - - DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DockPanelFileList - - - 0 - - - 3, 26 - - - 318, 528 - - - 0 - - - DockPanel1_Container - - - DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DockPanelDocViewer - - - 0 - + + 290, 22 + \ No newline at end of file diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb index aecbe50a..3ec6ee72 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -188,9 +188,7 @@ Public Class frmDocumentResultList SwitchDetailContainerHorizontal.Visibility = BarItemVisibility.Never End If - GridBuilder. - WithDefaults(). - WithReadOnlyOptions() + GridBuilder.WithReadOnlyOptions() AddHandler GridView1.FocusedRowChanged, AddressOf GridView_FocusedRowChanged AddHandler GridView2.FocusedRowChanged, AddressOf GridView_FocusedRowChanged @@ -277,6 +275,10 @@ Public Class frmDocumentResultList 'Await ControlManager.LoadControlsForAttributes(oObjectId, oAttributes, RootMetadata) End If + + RibbonPageCategoryFile.Visible = True + Else + RibbonPageCategoryFile.Visible = False End If Catch ex As Exception ErrorHandler.ShowErrorMessage(ex, "GridView_FocusedRowChanged") @@ -285,6 +287,8 @@ Public Class frmDocumentResultList End Try End Sub +#Region "Watcher" + Public Async Sub Watcher_FileOpened(sender As Object, e As DocumentResultList.Watcher.FileOpenedArgs) Handles Watcher.FileOpened Await _IDBClient.SetObjectStateAsync(e.File.Document.Id, OBJECT_STATE_FILE_OPENED, New Options.SetObjectStateOptions With { .Language = Environment.User.Language, @@ -389,6 +393,8 @@ Public Class frmDocumentResultList End Select End Function +#End Region + Private Function InitAppServer() As Boolean @@ -466,8 +472,6 @@ Public Class frmDocumentResultList End Try End Sub - - Private Sub UpdateGridData() ' Load Grids For oIndex = 0 To ResultLists.Count - 1 @@ -559,8 +563,8 @@ Public Class frmDocumentResultList Private Sub CreateDocumentGrid(GridView As BandedGridView, Result As DocumentResultList.DocumentResult) Try - If IsNothing(GridView.Columns("ICON")) Then - Dim oIconColumn = GridView.Columns.AddVisible("ICON", "ICON") + If IsNothing(GridView.Columns(COLUMN_ICON)) Then + Dim oIconColumn = GridView.Columns.AddVisible(COLUMN_ICON, COLUMN_ICON) With oIconColumn .OptionsColumn.AllowSort = False .OptionsColumn.AllowSize = False @@ -585,38 +589,46 @@ Public Class frmDocumentResultList oChanged = "Changed" End If - Try - Dim oDocIdColumn As GridColumn = GridView.Columns(COLUMN_DOCID) - If Not IsNothing(oDocIdColumn) Then - oDocIdColumn.Visible = False - End If + Dim oColumnsToHide As New List(Of String) From { + oCreated, oChanged, COLUMN_DOCID, COLUMN_FILEPATH, + "CREATED_WHEN", "CREATED_WHO", "ADDED_WHEN", "ADDED_WHO" + } + For Each oFieldName As String In oColumnsToHide + Try + Dim oColumn = GridView.Columns(oFieldName) + If oColumn IsNot Nothing Then + oColumn.Visible = False + End If + Catch ex As Exception + End Try + Next + + Try Dim oFilePathColumn As GridColumn = GridView.Columns(COLUMN_FILEPATH) If Not IsNothing(oFilePathColumn) Then - oFilePathColumn.Visible = False - ' Hide Fullpath column completely in AppServer-Mode If OperationMode = OperationMode.WithAppServer Then oFilePathColumn.OptionsColumn.ShowInCustomizationForm = False End If End If - Dim oCreatedColumn = GridView.Columns(oCreated) - If Not IsNothing(oCreatedColumn) Then - oCreatedColumn.DisplayFormat.FormatType = FormatType.DateTime - oCreatedColumn.DisplayFormat.FormatString = Environment.User.DateFormat & " HH:MM:ss" - End If + 'Dim oCreatedColumn = GridView.Columns(oCreated) + 'If Not IsNothing(oCreatedColumn) Then + ' oCreatedColumn.DisplayFormat.FormatType = FormatType.DateTime + ' oCreatedColumn.DisplayFormat.FormatString = Environment.User.DateFormat & " HH:MM:ss" + 'End If - Dim oChangedColumn = GridView.Columns(oChanged) - If Not IsNothing(oChangedColumn) Then - oChangedColumn.DisplayFormat.FormatType = FormatType.DateTime - oChangedColumn.DisplayFormat.FormatString = Environment.User.DateFormat & " HH:MM:ss" - End If + 'Dim oChangedColumn = GridView.Columns(oChanged) + 'If Not IsNothing(oChangedColumn) Then + ' oChangedColumn.DisplayFormat.FormatType = FormatType.DateTime + ' oChangedColumn.DisplayFormat.FormatString = Environment.User.DateFormat & " HH:MM:ss" + 'End If Catch ex As Exception Logger.Error(ex) End Try - GridView.OptionsView.BestFitMaxRowCount = 30 + GridView.OptionsView.BestFitMaxRowCount = 10 GridView.BestFitColumns() Catch ex As ApplicationException MsgBox($"Error while loading grid data for search {Result.Title}: {vbNewLine}{vbNewLine}{ex.Message}", MsgBoxStyle.Critical, Text) @@ -626,29 +638,41 @@ Public Class frmDocumentResultList End Try End Sub + + 'Private Sub GridView1_CustomDrawCell(sender As Object, e As RowCellCustomDrawEventArgs) Handles GridView1.CustomDrawCell - ' Try - ' If e.RowHandle < 0 Then - ' Exit Sub - ' End If - - ' e.DefaultDraw() - - ' Dim oView As GridView = TryCast(sender, GridView) - ' Dim oCellInfo As GridCellInfo = TryCast(e.Cell, GridCellInfo) - ' Dim oRow As DataRow = oView.GetDataRow(e.RowHandle) + ' If e.RowHandle <> GridControl.NewItemRowHandle AndAlso e.Column.FieldName = COLUMN_ICON Then + ' Dim oRow As DataRow = TryCast(sender, GridView)?.GetDataRow(e.RowHandle) ' Dim oValue = oRow.Item(COLUMN_FILENAME) - ' If e.Column.FieldName = COLUMN_ICON Then - ' Dim oIcon = Helpers.GetIconByExtension(oValue) - ' Dim offsetX = 0 - ' Dim offsetY = 0 - - ' e.Cache.DrawImage(oIcon, e.Bounds.X + offsetX, e.Bounds.Y + offsetY, 18, 18) + ' If oValue.ToString.EndsWith(".pdf") Then + ' Dim oIcon = My.Resources.pdf + ' e.Cache.DrawImage(oIcon, e.Bounds.X + 0, e.Bounds.Y + 0, 18, 18) ' End If - ' Catch ex As Exception - ' Logger.Error(ex) - ' End Try + ' End If + + ' 'Try + ' ' If e.RowHandle < 0 Then + ' ' Exit Sub + ' ' End If + + ' ' e.DefaultDraw() + + ' ' Dim oView As GridView = TryCast(sender, GridView) + ' ' Dim oCellInfo As GridCellInfo = TryCast(e.Cell, GridCellInfo) + ' ' Dim oRow As DataRow = oView.GetDataRow(e.RowHandle) + ' ' Dim oValue = oRow.Item(COLUMN_FILENAME) + + ' ' If e.Column.FieldName = COLUMN_ICON Then + ' ' Dim oIcon = Helpers.GetIconByExtension(oValue) + ' ' Dim offsetX = 0 + ' ' Dim offsetY = 0 + + ' ' e.Cache.DrawImage(oIcon, e.Bounds.X + offsetX, e.Bounds.Y + offsetY, 18, 18) + ' ' End If + ' 'Catch ex As Exception + ' ' Logger.Error(ex) + ' 'End Try 'End Sub Private Sub BarButtonItemExportGrid1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemExportGrid1.ItemClick diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index d632a6d3..3dadd9a3 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -2021,6 +2021,6 @@ 865, 17 - 17, 56 + 1115, 17 \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index b3ddbcad..3aecb4ad 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -1145,10 +1145,6 @@ Public Class frmFlowForm Await My.Database.GetDatatableIDBAsync(DocResultBaseSearch) End Function - Async Function RunQuickSearch2(pSearchText As String, pToken As CancellationToken) As Task - - End Function - Async Function RunQuickSearch1(pSearchText As String) As Threading.Tasks.Task Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) @@ -1300,5 +1296,9 @@ Public Class frmFlowForm Private Async Sub PictureEditQuicksearch1_Click(sender As Object, e As EventArgs) Handles PictureEditQuicksearch1.Click Await CheckRunSearch1() End Sub + + Private Sub PictureEditQuicksearch1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEditQuicksearch1.EditValueChanged + + End Sub End Class