From 347c83cac2a336bd29171ed176710cbe4c5a63c2 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 8 Apr 2022 16:22:42 +0200 Subject: [PATCH] Zooflow: Clean up FlowSearch1, work on FlowSearch2 --- GUIs.Common/frmDocumentResultList.Designer.vb | 41 +- GUIs.Common/frmDocumentResultList.resx | 540 ++++++++---------- GUIs.Common/frmDocumentResultList.vb | 6 +- .../Search/frmFlowSearch1.Designer.vb | 22 +- GUIs.ZooFlow/Search/frmFlowSearch1.vb | 201 ++++--- .../Search/frmFlowSearch2.Designer.vb | 253 +++++++- GUIs.ZooFlow/Search/frmFlowSearch2.vb | 8 + GUIs.ZooFlow/frmFlowForm.Designer.vb | 26 +- GUIs.ZooFlow/frmFlowForm.vb | 5 + 9 files changed, 650 insertions(+), 452 deletions(-) diff --git a/GUIs.Common/frmDocumentResultList.Designer.vb b/GUIs.Common/frmDocumentResultList.Designer.vb index a0773de0..55712932 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 FadeTransition2 As DevExpress.Utils.Animation.FadeTransition = New DevExpress.Utils.Animation.FadeTransition() + Dim FadeTransition1 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() @@ -33,7 +33,7 @@ Partial Class frmDocumentResultList Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() Me.labelResultCount = New DevExpress.XtraBars.BarStaticItem() Me.BarButtonBack = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonResetLayout = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonResetGridLayout = New DevExpress.XtraBars.BarButtonItem() Me.labelCriticalError = New DevExpress.XtraBars.BarStaticItem() Me.labelWarning = New DevExpress.XtraBars.BarStaticItem() Me.MenuItemFileOpen = New DevExpress.XtraBars.BarButtonItem() @@ -50,7 +50,7 @@ Partial Class frmDocumentResultList Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonResetWindowLayout = New DevExpress.XtraBars.BarButtonItem() Me.MenuItemStartAdhocWorkflow = New DevExpress.XtraBars.BarButtonItem() Me.MenuItemCheckInFile = New DevExpress.XtraBars.BarButtonItem() Me.MenuItemCheckOutFile = New DevExpress.XtraBars.BarButtonItem() @@ -216,7 +216,7 @@ Partial Class frmDocumentResultList 'RibbonControl ' 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.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarWorkspaceMenuItem1}) + 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.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonResetWindowLayout, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarWorkspaceMenuItem1}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") Me.RibbonControl.MaxItemId = 49 Me.RibbonControl.Name = "RibbonControl" @@ -274,13 +274,13 @@ Partial Class frmDocumentResultList Me.BarButtonBack.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonBack.ImageOptions.LargeImage"), System.Drawing.Image) Me.BarButtonBack.Name = "BarButtonBack" ' - 'BarButtonResetLayout + 'BarButtonResetGridLayout ' - resources.ApplyResources(Me.BarButtonResetLayout, "BarButtonResetLayout") - Me.BarButtonResetLayout.Id = 10 - Me.BarButtonResetLayout.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonResetLayout.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonResetLayout.Name = "BarButtonResetLayout" - Me.BarButtonResetLayout.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing + resources.ApplyResources(Me.BarButtonResetGridLayout, "BarButtonResetGridLayout") + Me.BarButtonResetGridLayout.Id = 10 + Me.BarButtonResetGridLayout.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonResetLayout.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonResetGridLayout.Name = "BarButtonResetGridLayout" + Me.BarButtonResetGridLayout.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' 'labelCriticalError ' @@ -401,12 +401,12 @@ Partial Class frmDocumentResultList Me.BarButtonItem5.Id = 34 Me.BarButtonItem5.Name = "BarButtonItem5" ' - 'BarButtonItem6 + 'BarButtonResetWindowLayout ' - resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6") - Me.BarButtonItem6.Id = 35 - Me.BarButtonItem6.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.clearpivottable - Me.BarButtonItem6.Name = "BarButtonItem6" + resources.ApplyResources(Me.BarButtonResetWindowLayout, "BarButtonResetWindowLayout") + Me.BarButtonResetWindowLayout.Id = 35 + Me.BarButtonResetWindowLayout.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.clearpivottable + Me.BarButtonResetWindowLayout.Name = "BarButtonResetWindowLayout" ' 'MenuItemStartAdhocWorkflow ' @@ -483,7 +483,7 @@ Partial Class frmDocumentResultList 'WorkspaceManager1 ' Me.WorkspaceManager1.TargetControl = Me - Me.WorkspaceManager1.TransitionType = FadeTransition2 + Me.WorkspaceManager1.TransitionType = FadeTransition1 ' 'RibbonPageCategoryFile ' @@ -598,8 +598,9 @@ Partial Class frmDocumentResultList ' 'RibbonPageGroup1 ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonResetLayout) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem6) + Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonResetGridLayout) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonResetWindowLayout) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") ' @@ -973,7 +974,7 @@ Partial Class frmDocumentResultList Friend WithEvents XtraSaveFileDialog As DevExpress.XtraEditors.XtraSaveFileDialog Friend WithEvents BarButtonBack As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup_Navigation As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents BarButtonResetLayout As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonResetGridLayout As DevExpress.XtraBars.BarButtonItem Friend WithEvents RepositoryItemTextEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit Friend WithEvents RepositoryItemTextEdit2 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit Friend WithEvents labelCriticalError As DevExpress.XtraBars.BarStaticItem @@ -1009,7 +1010,7 @@ Partial Class frmDocumentResultList Friend WithEvents DockPanel3_Container As DevExpress.XtraBars.Docking.ControlContainer Friend WithEvents DockPanelFileList As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer - Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonResetWindowLayout As DevExpress.XtraBars.BarButtonItem Friend WithEvents CtrlObjectPropertyDialog As ctrlObjectPropertyDialog Friend WithEvents RibbonPageCategoryFile As DevExpress.XtraBars.Ribbon.RibbonPageCategory Friend WithEvents RibbonPageActions2 As DevExpress.XtraBars.Ribbon.RibbonPage diff --git a/GUIs.Common/frmDocumentResultList.resx b/GUIs.Common/frmDocumentResultList.resx index 4a34bfa3..2fcae6c6 100644 --- a/GUIs.Common/frmDocumentResultList.resx +++ b/GUIs.Common/frmDocumentResultList.resx @@ -252,7 +252,7 @@ 9R2NAy0xdbc3UVqAub8fp91RTf0DZ0rWioS6adsAAAAASUVORK5CYII= - + Aktives Tabellen Layout zurücksetzen @@ -444,7 +444,7 @@ BarButtonItem5 - + Fenster Layout zurücksetzen @@ -486,6 +486,40 @@ 1189, 671 + + 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 + + + 3, 26 + + + 323, 459 + + + 0 + DockPanel1_Container @@ -519,6 +553,103 @@ 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 @@ -552,6 +683,39 @@ 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 + + + 0, 0 + + + 268, 434 + + + 0 + DockPanel3_Container @@ -606,6 +770,15 @@ 1 + + 3, 26 + + + 578, 460 + + + 0 + DockPanel2_Container @@ -788,10 +961,10 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonResetLayout + + BarButtonResetGridLayout - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -890,10 +1063,10 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem6 + + BarButtonResetWindowLayout - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1175,19 +1348,60 @@ 0, 0 + + Dokument + + + Dateien und Ordner + + + Aktionen 1 + + + Workflow + + + Bearbeiten + + + Aktionen 2 + Datei + + Attribute + + + Aktionen + Attribute + + Navigation + + + Export + + + Aktualisieren + Start + + Tabellen Einstellungen + + + Zurücksetzen + + + Layout + Layout - False @@ -1404,313 +1618,15 @@ 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 - - - RibbonPageGroup6 + + 12, 27 + + + RibbonPageGroup6 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 0ca3d276..b6d14275 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -758,7 +758,7 @@ Public Class frmDocumentResultList End Function Private Sub GridControl_Enter(sender As GridControl, e As EventArgs) Handles GridControl1.Enter, GridControl2.Enter, GridControl3.Enter _ActiveGrid = sender - BarButtonResetLayout.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + BarButtonResetGridLayout.Visibility = DevExpress.XtraBars.BarItemVisibility.Always BarButtonItemExportGrid1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always SetActiveGridBand() End Sub @@ -810,7 +810,7 @@ Public Class frmDocumentResultList End Try End Sub - Private Sub BarButtonResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonResetLayout.ItemClick + Private Sub BarButtonResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonResetGridLayout.ItemClick If Not IsNothing(_ActiveGrid) Then Try Dim oFile = LayoutManager.GetGrid_LayoutName(_ActiveGrid.MainView) @@ -1013,7 +1013,7 @@ Public Class frmDocumentResultList RaiseEvent NeedsRefresh(Me, Params.ProfileGuid) End Sub - Private Sub BarButtonItem6_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem6.ItemClick + Private Sub BarButtonItem6_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonResetWindowLayout.ItemClick Try Dim oFile = LayoutManager.GetDockmanager_LayoutName() If File.Exists(oFile) Then diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb index 08efb06f..652c6a48 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb @@ -262,7 +262,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth_Last.Name = "ToggleSwitchMonth_Last" Me.ToggleSwitchMonth_Last.Properties.OffText = "Letzter Monat" Me.ToggleSwitchMonth_Last.Properties.OnText = "Letzter Monat" - Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(195, 19) + Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(195, 18) Me.ToggleSwitchMonth_Last.TabIndex = 9 ' 'ToggleSwitchDateto @@ -272,14 +272,14 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchDateto.Name = "ToggleSwitchDateto" Me.ToggleSwitchDateto.Properties.OffText = "Datum bis" Me.ToggleSwitchDateto.Properties.OnText = "Datum bis" - Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 19) + Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 18) Me.ToggleSwitchDateto.TabIndex = 0 ' 'lblDatefrom ' Me.lblDatefrom.Location = New System.Drawing.Point(3, 211) Me.lblDatefrom.Name = "lblDatefrom" - Me.lblDatefrom.Size = New System.Drawing.Size(34, 13) + Me.lblDatefrom.Size = New System.Drawing.Size(31, 13) Me.lblDatefrom.TabIndex = 3 Me.lblDatefrom.Text = "Datum" ' @@ -303,7 +303,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth.Name = "ToggleSwitchMonth" Me.ToggleSwitchMonth.Properties.OffText = "Dieser Monat" Me.ToggleSwitchMonth.Properties.OnText = "Dieser Monat" - Me.ToggleSwitchMonth.Size = New System.Drawing.Size(195, 19) + Me.ToggleSwitchMonth.Size = New System.Drawing.Size(195, 18) Me.ToggleSwitchMonth.TabIndex = 8 ' 'ToggleSwitchTomorrow @@ -313,7 +313,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchTomorrow.Name = "ToggleSwitchTomorrow" Me.ToggleSwitchTomorrow.Properties.OffText = "Morgen" Me.ToggleSwitchTomorrow.Properties.OnText = "Morgen" - Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 19) + Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 18) Me.ToggleSwitchTomorrow.TabIndex = 7 Me.ToggleSwitchTomorrow.Visible = False ' @@ -324,7 +324,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchToday.Name = "ToggleSwitchToday" Me.ToggleSwitchToday.Properties.OffText = "Heute" Me.ToggleSwitchToday.Properties.OnText = "Heute" - Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 19) + Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 18) Me.ToggleSwitchToday.TabIndex = 2 ' 'ToggleSwitchLastWeek @@ -334,7 +334,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchLastWeek.Name = "ToggleSwitchLastWeek" Me.ToggleSwitchLastWeek.Properties.OffText = "Letzten 7 Tage" Me.ToggleSwitchLastWeek.Properties.OnText = "Letzten 7 Tage" - Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(195, 19) + Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(195, 18) Me.ToggleSwitchLastWeek.TabIndex = 6 ' 'ToggleSwitchYesterday @@ -344,7 +344,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYesterday.Name = "ToggleSwitchYesterday" Me.ToggleSwitchYesterday.Properties.OffText = "Gestern" Me.ToggleSwitchYesterday.Properties.OnText = "Gestern" - Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 19) + Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 18) Me.ToggleSwitchYesterday.TabIndex = 3 ' 'ToggleSwitchYear_Last @@ -354,7 +354,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear_Last.Name = "ToggleSwitchYear_Last" Me.ToggleSwitchYear_Last.Properties.OffText = "Letztes Jahr" Me.ToggleSwitchYear_Last.Properties.OnText = "Letztes Jahr" - Me.ToggleSwitchYear_Last.Size = New System.Drawing.Size(195, 19) + Me.ToggleSwitchYear_Last.Size = New System.Drawing.Size(195, 18) Me.ToggleSwitchYear_Last.TabIndex = 5 ' 'ToggleSwitchYear @@ -364,7 +364,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear.Name = "ToggleSwitchYear" Me.ToggleSwitchYear.Properties.OffText = "Dieses Jahr" Me.ToggleSwitchYear.Properties.OnText = "Dieses Jahr" - Me.ToggleSwitchYear.Size = New System.Drawing.Size(195, 19) + Me.ToggleSwitchYear.Size = New System.Drawing.Size(195, 18) Me.ToggleSwitchYear.TabIndex = 4 ' 'XtraTabPage2 @@ -378,7 +378,7 @@ Partial Class frmFlowSearch1 Me.Label1.AutoSize = True Me.Label1.Location = New System.Drawing.Point(4, 8) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(47, 13) + Me.Label1.Size = New System.Drawing.Size(44, 13) Me.Label1.TabIndex = 0 Me.Label1.Text = "Attribut" ' diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index 735facaf..56760c77 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -10,23 +10,38 @@ Public Class frmFlowSearch1 Private Logger As Logger Private TOGGLE_Change As Boolean = False - Private LIMITATION_DATE As Boolean = False - Private SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" - Private SEARCH_FACT_DATE As String = "MONTH(OBJ.ADDED_WHEN) <> 13" - Private CONST_CR_TODAY As String = "CREATED_TODAY" - Private CONST_CR_YDAY As String = "CREATED_YESTERDAY" - Private CONST_CR_L7DAYS As String = "CREATED_LAST7DAYS" - Private CONST_CR_Y_CURR As String = "CREATED_YEAR_CURRENT" - Private CONST_CR_Y_LAST As String = "CREATED_YEAR_LAST" - Private CONST_CR_M_CURR As String = "CREATED_MONTH_CURRENT" - Private CONST_CR_M_LAST As String = "CREATED_MONTH_LAST" - - Private CONST_DATE_TOMORROW As String = "TOMORROW" - Private SEARCH_PARAM3 + Private AttributeSearch As String = "ADDED_WHEN" + Private DateConstraint As String = "" + Private BaseSearchSQL As String + + 'Private LIMITATION_DATE As Boolean = False + 'Private SEARCH_FACT_DATE As String = "MONTH(OBJ.ADDED_WHEN) <> 13" + + Private Const SEARCH_FACT_DATE_DEFAULT As String = "ADDED_WHEN" + + Private Const CREATED_TOMORROW As String = "TOMORROW" + Private Const CREATED_TODAY As String = "ECM_CREATED_TODAY" + Private Const CREATED_YESTERDAY As String = "ECM_CREATED_YESTERDAY" + Private Const CREATED_LAST_7_DAYS As String = "ECM_CREATED_LAST7DAYS" + Private Const CREATED_YEAR_CURRENT As String = "ECM_CREATED_YEAR_CURRENT" + Private Const CREATED_YEAR_LAST As String = "ECM_CREATED_YEAR_LAST" + Private Const CREATED_MONTH_CURR As String = "ECM_CREATED_MONTH_CURRENT" + Private Const CREATED_MONTH_LAST As String = "ECM_CREATED_MONTH_LAST" + Private ExplizitDate As Boolean = False - Dim oBASESEARCH As String + 'Private Enum DateConstraintEnum + ' Today + ' Yesterday + ' Last7Days + ' CurrentYear + ' LastYear + ' CurrentMonth + ' LastMonth + 'End Enum + + Sub ResetTogglesDate() TOGGLE_Change = True ToggleSwitchToday.IsOn = False @@ -58,7 +73,7 @@ Public Class frmFlowSearch1 If oToggle.IsOn Then TOGGLE_Change = True - Dim oWHENDATE As String + 'Dim oWHENDATE As String Select Case oToggle.Name Case "ToggleSwitchTomorrow" ToggleSwitchToday.IsOn = False @@ -69,7 +84,9 @@ Public Class frmFlowSearch1 ToggleSwitchYear.IsOn = False ToggleSwitchMonth.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CONST_DATE_TOMORROW) + 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_TOMORROW) + DateConstraint = CREATED_TOMORROW + Case "ToggleSwitchYear" ToggleSwitchToday.IsOn = False ToggleSwitchYesterday.IsOn = False @@ -78,7 +95,9 @@ Public Class frmFlowSearch1 ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CONST_CR_Y_CURR) + 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_CURRENT) + + DateConstraint = CREATED_YEAR_CURRENT Case "ToggleSwitchYear_Last" ToggleSwitchToday.IsOn = False ToggleSwitchYesterday.IsOn = False @@ -87,7 +106,8 @@ Public Class frmFlowSearch1 ToggleSwitchYear.IsOn = False ToggleSwitchMonth.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CONST_CR_TODAY) + 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_LAST) + DateConstraint = CREATED_TODAY Case "ToggleSwitchMonth" ToggleSwitchToday.IsOn = False @@ -97,7 +117,9 @@ Public Class frmFlowSearch1 ToggleSwitchYear.IsOn = False ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CONST_CR_M_CURR) + 'oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CREATED_MONTH_CURR) + DateConstraint = CREATED_MONTH_CURR + Case "ToggleSwitchMonth_Last" ToggleSwitchToday.IsOn = False ToggleSwitchYesterday.IsOn = False @@ -106,12 +128,14 @@ Public Class frmFlowSearch1 ToggleSwitchYear.IsOn = False ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth.IsOn = False - Dim currentDate As DateTime = DateTime.Now - If currentDate.Month = 1 Then - oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = 12 " & vbNewLine & "AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CONST_CR_M_LAST) - Else - oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CONST_CR_M_LAST) - End If + 'Dim currentDate As DateTime = DateTime.Now + 'If currentDate.Month = 1 Then + ' oWHENDATE = GET_DATE_LIMITATION($"MONTH(@ATTRIBUTE) = 12 {vbNewLine}AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CREATED_MONTH_LAST) + 'Else + ' oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CREATED_MONTH_LAST) + 'End If + DateConstraint = CREATED_MONTH_LAST + Case "ToggleSwitchToday" ToggleSwitchYesterday.IsOn = False ToggleSwitchTomorrow.IsOn = False @@ -120,7 +144,9 @@ Public Class frmFlowSearch1 ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CONST_CR_TODAY) + 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CREATED_TODAY) + DateConstraint = CREATED_TODAY + Case "ToggleSwitchYesterday" ToggleSwitchToday.IsOn = False ToggleSwitchTomorrow.IsOn = False @@ -129,7 +155,9 @@ Public Class frmFlowSearch1 ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CONST_CR_YDAY) + 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_YESTERDAY) + DateConstraint = CREATED_YESTERDAY + Case "ToggleSwitchLastWeek" ToggleSwitchToday.IsOn = False ToggleSwitchTomorrow.IsOn = False @@ -138,35 +166,70 @@ Public Class frmFlowSearch1 ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CONST_CR_L7DAYS) + 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_LAST_7_DAYS) + DateConstraint = CREATED_LAST_7_DAYS + End Select - SEARCH_FACT_DATE = oWHENDATE + 'SEARCH_FACT_DATE = oWHENDATE TOGGLE_Change = False - LIMITATION_DATE = True + 'LIMITATION_DATE = True Else If ToggleSwitchToday.IsOn = False And ToggleSwitchYesterday.IsOn = False And ToggleSwitchYear.IsOn = False And ToggleSwitchYear_Last.IsOn = False And ToggleSwitchMonth_Last.IsOn = False And ToggleSwitchMonth.IsOn = False And ToggleSwitchLastWeek.IsOn = False And ToggleSwitchTomorrow.IsOn = False Then - LIMITATION_DATE = False - SEARCH_PARAM3 = "" + 'LIMITATION_DATE = False + DateConstraint = "" End If End If End Sub - Private Function GET_DATE_LIMITATION(pInput As String, pVariant As String) As String - Try - If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then - SEARCH_PARAM3 = "ECM_" & pVariant - Return pInput.Replace("@ATTRIBUTE", "OBJ.ADDED_WHEN") - Else - Dim oSTR = $"GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]" - Return pInput.Replace("@ATTRIBUTE", oSTR) - End If - Catch ex As Exception - Return pInput - Logger.Error(ex) - End Try - End Function + 'Private Function GetDateConstraint(pDateConstraint As DateConstraint) As String + ' Select Case pDateConstraint + ' Case DateConstraint.Today + ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CREATED_TODAY) + + ' Case DateConstraint.Yesterday + ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_YESTERDAY) + + ' Case DateConstraint.Last7Days + ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_LAST_7_DAYS) + + ' Case DateConstraint.CurrentMonth + ' Return GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CREATED_MONTH_CURR) + + ' Case DateConstraint.LastMonth + ' If Now.Month = 1 Then + ' Return GET_DATE_LIMITATION($"MONTH(@ATTRIBUTE) = 12 {vbNewLine}AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CREATED_MONTH_LAST) + ' Else + ' Return GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CREATED_MONTH_LAST) + ' End If + + ' Case DateConstraint.CurrentYear + ' Return GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_CURRENT) + + ' Case DateConstraint.LastYear + ' Return GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_LAST) + + ' Case Else + ' Return "" + ' End Select + 'End Function + + 'Private Function GET_DATE_LIMITATION(pInput As String, pVariant As String) As String + ' Try + ' If SEARCH_FACT_DATE_ATTRIBUTE = SEARCH_FACT_DATE_DEFAULT Then + ' SEARCH_PARAM3 = pVariant + ' Return pInput.Replace("@ATTRIBUTE", "OBJ.ADDED_WHEN") + + ' Else + ' Dim oSTR = $"GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]" + ' Return pInput.Replace("@ATTRIBUTE", oSTR) + ' End If + ' Catch ex As Exception + ' Return pInput + ' Logger.Error(ex) + ' End Try + 'End Function Private Sub cmbLimitationDateAttr_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbLimitationDateAttr.SelectedValueChanged If cmbLimitationDateAttr.SelectedIndex <> -1 Then @@ -175,10 +238,10 @@ Public Class frmFlowSearch1 Dim oEditValue As String = cmbLimitationDateAttr.SelectedItem.ToString If oEditValue = IDB_ADDED_WHEN_String_German Or oEditValue = IDB_ADDED_WHEN_String_Englisch Then - SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" + AttributeSearch = SEARCH_FACT_DATE_DEFAULT Else - SEARCH_FACT_DATE_ATTRIBUTE = oEditValue - SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13" + AttributeSearch = oEditValue + 'SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13" End If 'SearchContent() Catch ex As Exception @@ -217,9 +280,9 @@ Public Class frmFlowSearch1 For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then - oBASESEARCH = oRow.Item("SQL_COMMAND") - oBASESEARCH = oBASESEARCH.Replace("@USER_ID", My.Application.User.UserId) - oBASESEARCH = oBASESEARCH.Replace("@LANG_CODE", My.Application.User.Language) + BaseSearchSQL = oRow.Item("SQL_COMMAND") + BaseSearchSQL = BaseSearchSQL.Replace("@USER_ID", My.Application.User.UserId) + BaseSearchSQL = BaseSearchSQL.Replace("@LANG_CODE", My.Application.User.Language) End If Next Catch ex As Exception @@ -235,17 +298,15 @@ Public Class frmFlowSearch1 Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - Await Search_GO() + Await ExecuteSearch() Catch ex As Exception Logger.Error(ex) Finally SplashScreenManager.CloseOverlayForm(oHandle) End Try End Function - Private Async Function Search_GO() As Threading.Tasks.Task - Dim oWindowTitle + Private Async Function ExecuteSearch() As Threading.Tasks.Task Dim oSearchTerm = txtSearchInput.Text - Dim oParams = New DocumentResultList.Params() With { .WindowGuid = "FlowSearch", .WindowTitle = GetResultWindowString(oSearchTerm), @@ -256,7 +317,7 @@ Public Class frmFlowSearch1 } } - Dim oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~{SEARCH_PARAM3}" + Dim oP3 = $"{AttributeSearch}~{DateConstraint}" If ExplizitDate Then Dim oDate2 As Date If Not IsNothing(DateEditTill.EditValue) Then @@ -266,14 +327,14 @@ Public Class frmFlowSearch1 End If Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{CDate(DateEditFrom.EditValue)}','{oDate2}'" If Await My.Database.ExecuteNonQueryIDBAsync(oProc) = True Then - oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~DATEPART" + oP3 = $"{AttributeSearch}~DATEPART" End If End If Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then - Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(oBASESEARCH) + Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(BaseSearchSQL) If oDTDocResult.Rows.Count > 0 Then oParams.Results.Add(New DocumentResultList.DocumentResult() With { .Title = "FlowSearchXYZ", @@ -305,7 +366,7 @@ Public Class frmFlowSearch1 Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - Await Search_GO() + Await ExecuteSearch() Catch ex As Exception Logger.Error(ex) Finally @@ -328,8 +389,6 @@ Public Class frmFlowSearch1 Return $"Search via date" End If End If - - End Function Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick @@ -351,23 +410,11 @@ Public Class frmFlowSearch1 End If End Sub - Private Sub DateEdit1_DateTimeChanged(sender As Object, e As EventArgs) Handles DateEditFrom.DateTimeChanged - Dim oobj = DateEditFrom.EditValue - If Not IsNothing(oobj) Then - ResetTogglesDate() - End If - - End Sub - Private Sub DateEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles DateEditFrom.EditValueChanged - Dim oobj = DateEditFrom.EditValue - If Not IsNothing(oobj) Then + Dim oDateFrom = DateEditFrom.EditValue + If Not IsNothing(oDateFrom) Then + ResetTogglesDate() ExplizitDate = True End If - - End Sub - - Private Sub PictureEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEdit1.EditValueChanged - End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb index d965c20d..71de65ca 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb @@ -33,8 +33,24 @@ Partial Class frmFlowSearch2 Me.PanelControl2 = New DevExpress.XtraEditors.PanelControl() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.RadioGroup1 = New DevExpress.XtraEditors.RadioGroup() + Me.DateEditFrom = New DevExpress.XtraEditors.DateEdit() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.DateEditTo = New DevExpress.XtraEditors.DateEdit() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.HyperlinkLabelControl1 = New DevExpress.XtraEditors.HyperlinkLabelControl() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.HyperlinkLabelControl2 = New DevExpress.XtraEditors.HyperlinkLabelControl() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.HyperlinkLabelControl3 = New DevExpress.XtraEditors.HyperlinkLabelControl() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + Me.HyperlinkLabelControl4 = New DevExpress.XtraEditors.HyperlinkLabelControl() + Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() + Me.HyperlinkLabelControl5 = New DevExpress.XtraEditors.HyperlinkLabelControl() + Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() + Me.HyperlinkLabelControl6 = New DevExpress.XtraEditors.HyperlinkLabelControl() + Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() + Me.HyperlinkLabelControl7 = New DevExpress.XtraEditors.HyperlinkLabelControl() + Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -44,8 +60,19 @@ Partial Class frmFlowSearch2 CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEditFrom.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEditFrom.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEditTo.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEditTo.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 @@ -115,15 +142,22 @@ Partial Class frmFlowSearch2 Me.PanelControl2.Dock = System.Windows.Forms.DockStyle.Fill Me.PanelControl2.Location = New System.Drawing.Point(32, 72) Me.PanelControl2.Name = "PanelControl2" - Me.PanelControl2.Padding = New System.Windows.Forms.Padding(0, 30, 0, 30) Me.PanelControl2.Size = New System.Drawing.Size(947, 383) Me.PanelControl2.TabIndex = 3 ' 'LayoutControl1 ' - Me.LayoutControl1.Controls.Add(Me.RadioGroup1) + Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl7) + Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl6) + Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl5) + Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl4) + Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl3) + Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl2) + Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl1) + Me.LayoutControl1.Controls.Add(Me.DateEditFrom) + Me.LayoutControl1.Controls.Add(Me.DateEditTo) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Top - Me.LayoutControl1.Location = New System.Drawing.Point(2, 32) + Me.LayoutControl1.Location = New System.Drawing.Point(2, 2) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root Me.LayoutControl1.Size = New System.Drawing.Size(943, 120) @@ -134,28 +168,179 @@ Partial Class frmFlowSearch2 ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem1, Me.LayoutControlItem7, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem4, Me.LayoutControlItem3, Me.LayoutControlItem8, Me.LayoutControlItem9}) Me.Root.Name = "Root" Me.Root.Size = New System.Drawing.Size(943, 120) Me.Root.TextVisible = False ' - 'RadioGroup1 + 'DateEditFrom ' - Me.RadioGroup1.Location = New System.Drawing.Point(120, 12) - Me.RadioGroup1.MenuManager = Me.RibbonControl1 - Me.RadioGroup1.Name = "RadioGroup1" - Me.RadioGroup1.Properties.Items.AddRange(New DevExpress.XtraEditors.Controls.RadioGroupItem() {New DevExpress.XtraEditors.Controls.RadioGroupItem("Gestern", "Yesterday", True, "YESTERDAY"), New DevExpress.XtraEditors.Controls.RadioGroupItem("Heute", "Today", True, "TODAY", "")}) - Me.RadioGroup1.Size = New System.Drawing.Size(811, 96) - Me.RadioGroup1.StyleController = Me.LayoutControl1 - Me.RadioGroup1.TabIndex = 4 + Me.DateEditFrom.EditValue = Nothing + Me.DateEditFrom.Location = New System.Drawing.Point(76, 12) + Me.DateEditFrom.MenuManager = Me.RibbonControl1 + Me.DateEditFrom.Name = "DateEditFrom" + Me.DateEditFrom.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEditFrom.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEditFrom.Size = New System.Drawing.Size(162, 20) + Me.DateEditFrom.StyleController = Me.LayoutControl1 + Me.DateEditFrom.TabIndex = 5 + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.DateEditFrom + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Size = New System.Drawing.Size(230, 24) + Me.LayoutControlItem2.Text = "Datum von" + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(52, 13) + ' + 'DateEditTo + ' + Me.DateEditTo.EditValue = Nothing + Me.DateEditTo.Location = New System.Drawing.Point(306, 12) + Me.DateEditTo.MenuManager = Me.RibbonControl1 + Me.DateEditTo.Name = "DateEditTo" + Me.DateEditTo.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEditTo.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEditTo.Size = New System.Drawing.Size(625, 20) + Me.DateEditTo.StyleController = Me.LayoutControl1 + Me.DateEditTo.TabIndex = 6 ' 'LayoutControlItem1 ' - Me.LayoutControlItem1.Control = Me.RadioGroup1 - Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem1.Control = Me.DateEditTo + Me.LayoutControlItem1.Location = New System.Drawing.Point(230, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Size = New System.Drawing.Size(923, 100) - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(96, 13) + Me.LayoutControlItem1.Size = New System.Drawing.Size(693, 24) + Me.LayoutControlItem1.Text = "Datum bis" + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(52, 13) + ' + 'HyperlinkLabelControl1 + ' + Me.HyperlinkLabelControl1.Location = New System.Drawing.Point(224, 36) + Me.HyperlinkLabelControl1.Name = "HyperlinkLabelControl1" + Me.HyperlinkLabelControl1.Size = New System.Drawing.Size(67, 13) + Me.HyperlinkLabelControl1.StyleController = Me.LayoutControl1 + Me.HyperlinkLabelControl1.TabIndex = 7 + Me.HyperlinkLabelControl1.Text = "Letzter Monat" + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.HyperlinkLabelControl1 + Me.LayoutControlItem3.Location = New System.Drawing.Point(212, 24) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Size = New System.Drawing.Size(71, 76) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem3.TextVisible = False + ' + 'HyperlinkLabelControl2 + ' + Me.HyperlinkLabelControl2.Location = New System.Drawing.Point(157, 36) + Me.HyperlinkLabelControl2.Name = "HyperlinkLabelControl2" + Me.HyperlinkLabelControl2.Size = New System.Drawing.Size(63, 13) + Me.HyperlinkLabelControl2.StyleController = Me.LayoutControl1 + Me.HyperlinkLabelControl2.TabIndex = 8 + Me.HyperlinkLabelControl2.Text = "Dieser Monat" + ' + 'LayoutControlItem4 + ' + Me.LayoutControlItem4.Control = Me.HyperlinkLabelControl2 + Me.LayoutControlItem4.Location = New System.Drawing.Point(145, 24) + Me.LayoutControlItem4.Name = "LayoutControlItem4" + Me.LayoutControlItem4.Size = New System.Drawing.Size(67, 76) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem4.TextVisible = False + ' + 'HyperlinkLabelControl3 + ' + Me.HyperlinkLabelControl3.Location = New System.Drawing.Point(87, 36) + Me.HyperlinkLabelControl3.Name = "HyperlinkLabelControl3" + Me.HyperlinkLabelControl3.Size = New System.Drawing.Size(66, 13) + Me.HyperlinkLabelControl3.StyleController = Me.LayoutControl1 + Me.HyperlinkLabelControl3.TabIndex = 9 + Me.HyperlinkLabelControl3.Text = "Letzte 7 Tage" + ' + 'LayoutControlItem5 + ' + Me.LayoutControlItem5.Control = Me.HyperlinkLabelControl3 + Me.LayoutControlItem5.Location = New System.Drawing.Point(75, 24) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Size = New System.Drawing.Size(70, 76) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem5.TextVisible = False + ' + 'HyperlinkLabelControl4 + ' + Me.HyperlinkLabelControl4.Location = New System.Drawing.Point(45, 36) + Me.HyperlinkLabelControl4.Name = "HyperlinkLabelControl4" + Me.HyperlinkLabelControl4.Size = New System.Drawing.Size(38, 13) + Me.HyperlinkLabelControl4.StyleController = Me.LayoutControl1 + Me.HyperlinkLabelControl4.TabIndex = 10 + Me.HyperlinkLabelControl4.Text = "Gestern" + ' + 'LayoutControlItem6 + ' + Me.LayoutControlItem6.Control = Me.HyperlinkLabelControl4 + Me.LayoutControlItem6.Location = New System.Drawing.Point(33, 24) + Me.LayoutControlItem6.Name = "LayoutControlItem6" + Me.LayoutControlItem6.Size = New System.Drawing.Size(42, 76) + Me.LayoutControlItem6.Text = "LayoutControlItem6" + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem6.TextVisible = False + ' + 'HyperlinkLabelControl5 + ' + Me.HyperlinkLabelControl5.Location = New System.Drawing.Point(12, 36) + Me.HyperlinkLabelControl5.Name = "HyperlinkLabelControl5" + Me.HyperlinkLabelControl5.Size = New System.Drawing.Size(29, 13) + Me.HyperlinkLabelControl5.StyleController = Me.LayoutControl1 + Me.HyperlinkLabelControl5.TabIndex = 11 + Me.HyperlinkLabelControl5.Text = "Heute" + ' + 'LayoutControlItem7 + ' + Me.LayoutControlItem7.Control = Me.HyperlinkLabelControl5 + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 24) + Me.LayoutControlItem7.Name = "LayoutControlItem7" + Me.LayoutControlItem7.Size = New System.Drawing.Size(33, 76) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem7.TextVisible = False + ' + 'HyperlinkLabelControl6 + ' + Me.HyperlinkLabelControl6.Location = New System.Drawing.Point(295, 36) + Me.HyperlinkLabelControl6.Name = "HyperlinkLabelControl6" + Me.HyperlinkLabelControl6.Size = New System.Drawing.Size(55, 13) + Me.HyperlinkLabelControl6.StyleController = Me.LayoutControl1 + Me.HyperlinkLabelControl6.TabIndex = 12 + Me.HyperlinkLabelControl6.Text = "Dieses Jahr" + ' + 'LayoutControlItem8 + ' + Me.LayoutControlItem8.Control = Me.HyperlinkLabelControl6 + Me.LayoutControlItem8.Location = New System.Drawing.Point(283, 24) + Me.LayoutControlItem8.Name = "LayoutControlItem8" + Me.LayoutControlItem8.Size = New System.Drawing.Size(59, 76) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem8.TextVisible = False + ' + 'HyperlinkLabelControl7 + ' + Me.HyperlinkLabelControl7.Location = New System.Drawing.Point(354, 36) + Me.HyperlinkLabelControl7.Name = "HyperlinkLabelControl7" + Me.HyperlinkLabelControl7.Size = New System.Drawing.Size(59, 13) + Me.HyperlinkLabelControl7.StyleController = Me.LayoutControl1 + Me.HyperlinkLabelControl7.TabIndex = 13 + Me.HyperlinkLabelControl7.Text = "Letztes Jahr" + ' + 'LayoutControlItem9 + ' + Me.LayoutControlItem9.Control = Me.HyperlinkLabelControl7 + Me.LayoutControlItem9.Location = New System.Drawing.Point(342, 24) + Me.LayoutControlItem9.Name = "LayoutControlItem9" + Me.LayoutControlItem9.Size = New System.Drawing.Size(581, 76) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem9.TextVisible = False ' 'frmFlowSearch2 ' @@ -177,9 +362,21 @@ Partial Class frmFlowSearch2 Me.PanelControl2.ResumeLayout(False) CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) + Me.LayoutControl1.PerformLayout() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEditFrom.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEditFrom.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEditTo.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEditTo.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -196,6 +393,22 @@ Partial Class frmFlowSearch2 Friend WithEvents PanelControl2 As DevExpress.XtraEditors.PanelControl Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents RadioGroup1 As DevExpress.XtraEditors.RadioGroup + Friend WithEvents DateEditFrom As DevExpress.XtraEditors.DateEdit + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents HyperlinkLabelControl5 As DevExpress.XtraEditors.HyperlinkLabelControl + Friend WithEvents HyperlinkLabelControl4 As DevExpress.XtraEditors.HyperlinkLabelControl + Friend WithEvents HyperlinkLabelControl3 As DevExpress.XtraEditors.HyperlinkLabelControl + Friend WithEvents HyperlinkLabelControl2 As DevExpress.XtraEditors.HyperlinkLabelControl + Friend WithEvents HyperlinkLabelControl1 As DevExpress.XtraEditors.HyperlinkLabelControl + Friend WithEvents DateEditTo As DevExpress.XtraEditors.DateEdit Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents HyperlinkLabelControl7 As DevExpress.XtraEditors.HyperlinkLabelControl + Friend WithEvents HyperlinkLabelControl6 As DevExpress.XtraEditors.HyperlinkLabelControl + Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.vb b/GUIs.ZooFlow/Search/frmFlowSearch2.vb index 802f66d9..85f9e85a 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch2.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch2.vb @@ -1,3 +1,11 @@ Public Class frmFlowSearch2 + Private Sub HyperlinkLabelControl5_Click(sender As Object, e As EventArgs) Handles HyperlinkLabelControl5.Click + DateEditFrom.EditValue = Date.Today + DateEditTo.EditValue = Date.Today + End Sub + Private Sub HyperlinkLabelControl4_Click(sender As Object, e As EventArgs) Handles HyperlinkLabelControl4.Click + DateEditFrom.EditValue = Date.Today.AddDays(-1) + DateEditTo.EditValue = Date.Today.AddDays(-1) + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index db565341..8f114ec2 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -37,6 +37,7 @@ Partial Class frmFlowForm Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SucheEntwurfToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox() @@ -95,52 +96,58 @@ Partial Class frmFlowForm ' 'ContextMenuSystray ' - Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EinblendenToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem}) + Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EinblendenToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.SucheEntwurfToolStripMenuItem, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem}) Me.ContextMenuSystray.Name = "ContextMenuSystray" - Me.ContextMenuSystray.Size = New System.Drawing.Size(170, 110) + Me.ContextMenuSystray.Size = New System.Drawing.Size(181, 154) ' 'EinblendenToolStripMenuItem ' Me.EinblendenToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.action_add_16xMD Me.EinblendenToolStripMenuItem.Name = "EinblendenToolStripMenuItem" - Me.EinblendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) + Me.EinblendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.EinblendenToolStripMenuItem.Text = "Einblenden" Me.EinblendenToolStripMenuItem.Visible = False ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6) ' 'VerwaltungToolStripMenuItem ' Me.VerwaltungToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.gear_32xLG Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem" - Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(169, 22) + Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.VerwaltungToolStripMenuItem.Text = "Verwaltung" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6) ' 'TestToolStripMenuItem ' Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem" - Me.TestToolStripMenuItem.Size = New System.Drawing.Size(169, 22) + Me.TestToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.TestToolStripMenuItem.Text = "Test" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6) ' 'ZooFlowBeendenToolStripMenuItem ' Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem" - Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) + Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' + 'SucheEntwurfToolStripMenuItem + ' + Me.SucheEntwurfToolStripMenuItem.Name = "SucheEntwurfToolStripMenuItem" + Me.SucheEntwurfToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SucheEntwurfToolStripMenuItem.Text = "Suche Entwurf" + ' 'PictureBoxPM ' Me.PictureBoxPM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -502,4 +509,5 @@ Partial Class frmFlowForm Friend WithEvents Panel3 As Panel Friend WithEvents bbtnitmAusblenden As DevExpress.XtraBars.BarButtonItem Friend WithEvents EinblendenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents SucheEntwurfToolStripMenuItem As ToolStripMenuItem End Class diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 211a0f3d..7d3fb227 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -1294,5 +1294,10 @@ Public Class frmFlowForm RegisterBar(ABEdge.ABE_RIGHT) Me.Visible = True End Sub + + Private Sub SucheEntwurfToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SucheEntwurfToolStripMenuItem.Click + Dim oForm = New frmFlowSearch2() + oForm.Show() + End Sub End Class