Zooflow: round up the search form

GUIs.Common/Base/BaseErrorHandler.vb

@@ -1,77 +0,0 @@
-Imports System.Reflection
-Imports System.Windows.Forms
-Imports DigitalData.Modules.Logging
-
-Namespace Base
-    Public Class NNBaseErrorHandler
-        Private ReadOnly _LogConfig As LogConfig
-        Private ReadOnly _Logger As Logger
-        Private ReadOnly _Form As Form
-
-        Public Sub New(LogConfig As LogConfig, Logger As Logger, Form As Form)
-            _LogConfig = LogConfig
-            _Logger = Logger
-            _Form = Form
-        End Sub
-
-        Public Sub New(pLogConfig As LogConfig, pForm As Form)
-            _LogConfig = pLogConfig
-            _Logger = pLogConfig.GetLogger(LogConfig.GetClassFullName())
-            _Form = pForm
-        End Sub
-
-        Public Sub ShowErrorMessage(Exception As Exception, Origin As String)
-            Dim oMessage = GetMessage(Exception, Origin)
-            ShowErrorMessage(Exception, Origin, oMessage)
-        End Sub
-
-        Public Sub ShowErrorMessage(Exception As Exception, Origin As String, Message As String)
-            _Logger.Error(Exception)
-            MessageBox.Show(Message & vbNewLine & Exception?.Message, _Form.Text & Origin, MessageBoxButtons.OK, MessageBoxIcon.Error)
-        End Sub
-
-        Public Sub ShowErrorMessage(Text As String)
-            _Logger.Info(Text)
-            MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Error)
-        End Sub
-
-        Public Sub ShowWarningMessage(Text As String)
-            _Logger.Info(Text)
-            MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning)
-        End Sub
-
-        Public Sub ShowInfoMessage(Text As String)
-            _Logger.Info(Text)
-            MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Information)
-        End Sub
-
-        Private Function GetMessage(Exception As Exception, Origin As String) As String
-            Dim oMessage As String = String.Empty
-
-            If TypeOf Exception Is SqlClient.SqlException Then
-                Dim oNumber As Integer = DirectCast(Exception, SqlClient.SqlException).Number
-                Select Case oNumber
-                    Case 2627
-                        oMessage = "Es wurde ein Doppelter Wert in eine Spalte eingetragen, die einzigartig sein muss."
-                    Case Else
-                        oMessage = Exception.Message
-                End Select
-            ElseIf TypeOf Exception Is NoNullAllowedException Then
-                oMessage = "Einige benötigte Felder wurde nicht ausgefüllt."
-            Else
-                oMessage = $"An unhandled exception occurred in {Origin}: " & vbNewLine &
-                    Exception.Message & vbNewLine & vbNewLine &
-                    "More information can be found in the Application Log."
-            End If
-
-            If _LogConfig.Debug Then
-                oMessage &= vbNewLine & vbNewLine & "=== Debug Information ==="
-                oMessage &= vbNewLine & vbNewLine & "Stacktrace:"
-                oMessage &= vbNewLine & Exception.StackTrace
-            End If
-
-            Return oMessage
-        End Function
-    End Class
-
-End Namespace

GUIs.Common/Base/BaseForm.vb

@@ -1,49 +0,0 @@
-
-Imports DevExpress.XtraEditors
-Imports DigitalData.Modules.Logging
-
-Namespace Base
-    Public Class NNBaseForm
-        Inherits XtraForm
-
-        Private ReadOnly _Logger As Logger
-
-        Protected ReadOnly Property Logger As Logger
-            Get
-                Return _Logger
-            End Get
-        End Property
-
-        Public Sub New()
-        End Sub
-
-        Public Sub New(LogConfig As LogConfig)
-            ' Get the full name of the inheriting form
-            ' so the log messages have the right classname
-            Dim oClassName = [GetType]().FullName
-
-            ' My.LogConfig is undefined in the designer
-            _Logger = LogConfig.GetLogger(oClassName)
-            '_ErrorHandler = New BaseErrorHandler(LogConfig, _Logger, Me)
-
-            ' When you add something, be careful if it 
-            ' depends on a global var like My.LogConfig
-            ' you might need to check for its existence with ?
-        End Sub
-
-        ''' ============== PUBLIC METHODS ==============
-        Public Sub ShowInfoMessage(Message As String)
-            '_ErrorHandler.ShowInfoMessage(Message)
-        End Sub
-
-        Public Sub ShowErrorMessage(Exception As Exception)
-            Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2)
-            '_ErrorHandler.ShowErrorMessage(Exception, oCallingClass)
-        End Sub
-
-        Public Sub ShowErrorMessage(ErrorMessage As String)
-            '_ErrorHandler.ShowErrorMessage(ErrorMessage)
-        End Sub
-    End Class
-End Namespace
-

GUIs.Common/Common.vbproj

@@ -107,10 +107,6 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Base\BaseErrorHandler.vb" />
-    <Compile Include="Base\BaseForm.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="Base\BaseResult.vb" />
     <Compile Include="Constants.vb" />
     <Compile Include="DataResultList\DataResultConfig.vb" />

GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb

@@ -66,7 +66,7 @@ Public Class ctrlObjectPropertyDialog
                 })
             Next
 
-            FormHelper.ShowInfoMessage($"{Changes.Count} Änderungen gespeichert!")
+            FormHelper.ShowInfoMessage($"{Changes.Count} Änderungen gespeichert!", "SaveChanges")
             Changes.Clear()
         Catch ex As Exception
             FormHelper.ShowErrorMessage(ex, "SaveChanges")

GUIs.ZooFlow/My Project/Resources.Designer.vb

@@ -1050,6 +1050,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property enablesearch() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("enablesearch", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -1610,6 +1620,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property undo() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("undo", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>

GUIs.ZooFlow/My Project/Resources.resx

@@ -259,6 +259,9 @@
   <data name="link1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\link1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="enablesearch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\enablesearch.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="bo_category1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_category1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -325,6 +328,9 @@
   <data name="markcomplete1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\markcomplete1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="bo_appointment1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_appointment1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="actions_options" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_options.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -421,9 +427,6 @@
   <data name="pagesetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="save9" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\save9.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="refresh_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -550,6 +553,9 @@
   <data name="bell_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="save9" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\save9.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="save2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -643,7 +649,7 @@
   <data name="del3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="bo_appointment1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_appointment1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\undo.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

GUIs.ZooFlow/Resources/enablesearch.svg

@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.Red{fill:#D11C1C;}
+	.Yellow{fill:#FFB115;}
+	.Blue{fill:#1177D7;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+</style>
+  <g id="EnableSearch">
+    <path d="M14.5,17.8C10.8,17.1,8,13.9,8,10c0-4.4,3.6-8,8-8s8,3.6,8,8c0,1.5-0.4,2.8-1.1,4c0,0,0.1,0,0.1,0   c0.7,0,1.4,0.1,2.1,0.2c0.6-1.3,0.9-2.7,0.9-4.2c0-5.5-4.5-10-10-10C10.5,0,6,4.5,6,10c0,2.1,0.7,4.1,1.8,5.7l-7.5,7.6   c-0.4,0.3-0.4,0.9,0,1.3l1.2,1.2c0.3,0.3,0.9,0.3,1.2,0l7.6-7.6c0.9,0.6,1.9,1.1,2.9,1.4C13.6,19,14,18.4,14.5,17.8z" class="Blue" />
+    <path d="M23,16c-4.4,0-8.1,3-9,7c0.9,4,4.6,7,9,7c4.4,0,8.1-3,9-7C31.1,19,27.4,16,23,16z M23,28c-3.3,0-6.1-2-7-5   c0.9-3,3.7-5,7-5s6.1,2,7,5C29.1,26,26.3,28,23,28z M23,26c-1.7,0-3-1.3-3-3s1.3-3,3-3s3,1.3,3,3S24.7,26,23,26z" class="Black" />
+  </g>
+</svg>

GUIs.ZooFlow/Resources/undo.svg

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.White{fill:#FFFFFF;}
+	.Green{fill:#039C23;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+	.st2{opacity:0.25;}
+	.st3{fill:#FFB115;}
+</style>
+  <g />
+  <g id="Undo_1_">
+    <path d="M14,12V9.6V6L4,16l10,10v-6c7.7,0,14,2.7,14,6C28,18.3,21.7,12,14,12z" class="Blue" />
+  </g>
+</svg>

GUIs.ZooFlow/Search/SearchRunner.vb

@@ -119,6 +119,13 @@ Public Class SearchRunner
     End Function
 
     Public Async Function RunWithTokens(pTokens As IEnumerable(Of Search.SearchToken.Token), pDateFrom As Date, pDateTo As Date, pSearchTitle As String) As Task(Of SearchResult)
+        If pTokens.Count = 0 And
+            pDateFrom = Date.MinValue And
+            pDateTo = Date.MinValue And
+            _ActiveDateConstraint = String.Empty Then
+            Return New SearchResult(0)
+        End If
+
         Return Await RunWithSearchTerm(New SearchOptions With {
                                             .SearchTokens = pTokens,
                                             .DateFrom = pDateFrom,
@@ -186,8 +193,6 @@ Public Class SearchRunner
         End If
     End Function
 
-
-
     Private Async Function GetDateConstraint(pDateFrom As Date, pDateTo As Date) As Task(Of String)
         Dim oSimpleDateConstraint = $"{_ActiveDateAttribute}~{_ActiveDateConstraint}"
         Dim oExplicitConstraint = Await MaybeSetExplicitDateConstraint(pDateFrom, pDateTo)

GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb

@@ -23,13 +23,13 @@ Partial Class frmFlowSearch2
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim TableColumnDefinition1 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
+        Dim TableColumnDefinition3 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
-        Dim TableColumnDefinition2 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
+        Dim TableColumnDefinition4 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
-        Dim TableRowDefinition1 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
+        Dim TableRowDefinition3 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
-        Dim TableRowDefinition2 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
+        Dim TableRowDefinition4 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
-        Dim TileViewItemElement1 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
+        Dim TileViewItemElement4 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
-        Dim TileViewItemElement2 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
+        Dim TileViewItemElement5 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
-        Dim TileViewItemElement3 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
+        Dim TileViewItemElement6 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
         Me.colName = New DevExpress.XtraGrid.Columns.TileViewColumn()
         Me.colDescription = New DevExpress.XtraGrid.Columns.TileViewColumn()
         Me.colImage = New DevExpress.XtraGrid.Columns.TileViewColumn()
@@ -40,7 +40,10 @@ Partial Class frmFlowSearch2
         Me.chkDatefilter2 = New DevExpress.XtraBars.BarCheckItem()
         Me.BarCheckItem4 = New DevExpress.XtraBars.BarCheckItem()
         Me.chkSearchEverywhere = New DevExpress.XtraBars.BarCheckItem()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RepositoryItemMarqueeProgressBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemMarqueeProgressBar()
@@ -128,9 +131,9 @@ Partial Class frmFlowSearch2
         '
         Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.lblResults, Me.chkOperatorAnd, Me.chkOperatorOr, Me.chkDatefilter2, Me.BarCheckItem4, Me.chkSearchEverywhere})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.lblResults, Me.chkOperatorAnd, Me.chkOperatorOr, Me.chkDatefilter2, Me.BarCheckItem4, Me.chkSearchEverywhere, Me.BarButtonItem1, Me.BarButtonItem2})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 21
+        Me.RibbonControl1.MaxItemId = 23
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemMarqueeProgressBar1})
@@ -190,12 +193,33 @@ Partial Class frmFlowSearch2
         Me.chkSearchEverywhere.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.bo_category1
         Me.chkSearchEverywhere.Name = "chkSearchEverywhere"
         '
+        'BarButtonItem1
+        '
+        Me.BarButtonItem1.Caption = "Suchen"
+        Me.BarButtonItem1.Id = 21
+        Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.enablesearch
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
+        'BarButtonItem2
+        '
+        Me.BarButtonItem2.Caption = "Zurücksetzen"
+        Me.BarButtonItem2.Id = 22
+        Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.undo
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup5})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup5})
         Me.RibbonPage1.Name = "RibbonPage1"
         Me.RibbonPage1.Text = "Suche"
         '
+        'RibbonPageGroup1
+        '
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+        Me.RibbonPageGroup1.Text = "Allgemein"
+        '
         'RibbonPageGroup2
         '
         Me.RibbonPageGroup2.ItemLinks.Add(Me.BarCheckItem4)
@@ -278,7 +302,9 @@ Partial Class frmFlowSearch2
         Me.TokenEditEx1.Properties.Appearance.Options.UseBackColor = True
         Me.TokenEditEx1.Properties.Appearance.Options.UseFont = True
         Me.TokenEditEx1.Properties.NullText = "Suchbegriff eingeben.."
+        Me.TokenEditEx1.Properties.PopupFilterMode = DevExpress.XtraEditors.TokenEditPopupFilterMode.Contains
         Me.TokenEditEx1.Properties.Separators.AddRange(New String() {","})
+        Me.TokenEditEx1.Properties.ShowDropDownOnClick = DevExpress.Utils.DefaultBoolean.[False]
         Me.TokenEditEx1.Size = New System.Drawing.Size(866, 44)
         Me.TokenEditEx1.StyleController = Me.LayoutControl1
         Me.TokenEditEx1.TabIndex = 4
@@ -303,39 +329,39 @@ Partial Class frmFlowSearch2
         Me.TileView1.OptionsTiles.Orientation = System.Windows.Forms.Orientation.Vertical
         Me.TileView1.OptionsTiles.RowCount = 2
         Me.TileView1.OptionsTiles.VerticalContentAlignment = DevExpress.Utils.VertAlignment.Center
-        TableColumnDefinition1.Length.Value = 35.0R
+        TableColumnDefinition3.Length.Value = 35.0R
-        TableColumnDefinition1.PaddingRight = 5
+        TableColumnDefinition3.PaddingRight = 5
-        TableColumnDefinition2.Length.Value = 129.0R
+        TableColumnDefinition4.Length.Value = 129.0R
-        Me.TileView1.TileColumns.Add(TableColumnDefinition1)
+        Me.TileView1.TileColumns.Add(TableColumnDefinition3)
-        Me.TileView1.TileColumns.Add(TableColumnDefinition2)
+        Me.TileView1.TileColumns.Add(TableColumnDefinition4)
-        TableRowDefinition1.Length.Value = 21.0R
+        TableRowDefinition3.Length.Value = 21.0R
-        TableRowDefinition2.Length.Value = 43.0R
+        TableRowDefinition4.Length.Value = 43.0R
-        Me.TileView1.TileRows.Add(TableRowDefinition1)
+        Me.TileView1.TileRows.Add(TableRowDefinition3)
-        Me.TileView1.TileRows.Add(TableRowDefinition2)
+        Me.TileView1.TileRows.Add(TableRowDefinition4)
-        TileViewItemElement1.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        TileViewItemElement4.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        TileViewItemElement1.Appearance.Normal.Options.UseFont = True
+        TileViewItemElement4.Appearance.Normal.Options.UseFont = True
-        TileViewItemElement1.Column = Me.colName
+        TileViewItemElement4.Column = Me.colName
-        TileViewItemElement1.ColumnIndex = 1
+        TileViewItemElement4.ColumnIndex = 1
-        TileViewItemElement1.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
+        TileViewItemElement4.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
-        TileViewItemElement1.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
+        TileViewItemElement4.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
-        TileViewItemElement1.Text = "colName"
+        TileViewItemElement4.Text = "colName"
-        TileViewItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
+        TileViewItemElement4.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
-        TileViewItemElement2.Column = Me.colDescription
+        TileViewItemElement5.Column = Me.colDescription
-        TileViewItemElement2.ColumnIndex = 1
+        TileViewItemElement5.ColumnIndex = 1
-        TileViewItemElement2.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
+        TileViewItemElement5.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
-        TileViewItemElement2.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
+        TileViewItemElement5.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
-        TileViewItemElement2.RowIndex = 1
+        TileViewItemElement5.RowIndex = 1
-        TileViewItemElement2.Text = "colDescription"
+        TileViewItemElement5.Text = "colDescription"
-        TileViewItemElement2.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
+        TileViewItemElement5.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
-        TileViewItemElement3.Column = Me.colImage
+        TileViewItemElement6.Column = Me.colImage
-        TileViewItemElement3.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
+        TileViewItemElement6.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
-        TileViewItemElement3.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
+        TileViewItemElement6.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
-        TileViewItemElement3.RowIndex = 1
+        TileViewItemElement6.RowIndex = 1
-        TileViewItemElement3.Text = "colImage"
+        TileViewItemElement6.Text = "colImage"
-        TileViewItemElement3.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
+        TileViewItemElement6.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
-        Me.TileView1.TileTemplate.Add(TileViewItemElement1)
+        Me.TileView1.TileTemplate.Add(TileViewItemElement4)
-        Me.TileView1.TileTemplate.Add(TileViewItemElement2)
+        Me.TileView1.TileTemplate.Add(TileViewItemElement5)
-        Me.TileView1.TileTemplate.Add(TileViewItemElement3)
+        Me.TileView1.TileTemplate.Add(TileViewItemElement6)
         '
         'colCount
         '
@@ -353,24 +379,24 @@ Partial Class frmFlowSearch2
         'DateEditFrom
         '
         Me.DateEditFrom.EditValue = Nothing
-        Me.DateEditFrom.Location = New System.Drawing.Point(101, 236)
+        Me.DateEditFrom.Location = New System.Drawing.Point(95, 236)
         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(778, 20)
+        Me.DateEditFrom.Size = New System.Drawing.Size(784, 20)
         Me.DateEditFrom.StyleController = Me.LayoutControl1
         Me.DateEditFrom.TabIndex = 5
         '
         'DateEditTo
         '
         Me.DateEditTo.EditValue = Nothing
-        Me.DateEditTo.Location = New System.Drawing.Point(101, 289)
+        Me.DateEditTo.Location = New System.Drawing.Point(95, 288)
         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(778, 20)
+        Me.DateEditTo.Size = New System.Drawing.Size(784, 20)
         Me.DateEditTo.StyleController = Me.LayoutControl1
         Me.DateEditTo.TabIndex = 7
         '
@@ -381,17 +407,17 @@ Partial Class frmFlowSearch2
         Me.CheckEdit1.Name = "CheckEdit1"
         Me.CheckEdit1.Properties.OffText = "Datum bis deaktiviert"
         Me.CheckEdit1.Properties.OnText = "Datum bis aktiviert"
-        Me.CheckEdit1.Size = New System.Drawing.Size(878, 19)
+        Me.CheckEdit1.Size = New System.Drawing.Size(878, 18)
         Me.CheckEdit1.StyleController = Me.LayoutControl1
         Me.CheckEdit1.TabIndex = 8
         '
         'ComboBoxDateAttributes
         '
-        Me.ComboBoxDateAttributes.Location = New System.Drawing.Point(101, 319)
+        Me.ComboBoxDateAttributes.Location = New System.Drawing.Point(95, 318)
         Me.ComboBoxDateAttributes.MenuManager = Me.RibbonControl1
         Me.ComboBoxDateAttributes.Name = "ComboBoxDateAttributes"
         Me.ComboBoxDateAttributes.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.ComboBoxDateAttributes.Size = New System.Drawing.Size(778, 20)
+        Me.ComboBoxDateAttributes.Size = New System.Drawing.Size(784, 20)
         Me.ComboBoxDateAttributes.StyleController = Me.LayoutControl1
         Me.ComboBoxDateAttributes.TabIndex = 9
         '
@@ -428,25 +454,25 @@ Partial Class frmFlowSearch2
         Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem2.Size = New System.Drawing.Size(882, 30)
         Me.LayoutControlItem2.Text = "Datum Von"
-        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(82, 13)
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(76, 13)
         '
         'LayoutControlItem4
         '
         Me.LayoutControlItem4.Control = Me.DateEditTo
         Me.LayoutControlItem4.Enabled = False
-        Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 53)
+        Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 52)
         Me.LayoutControlItem4.Name = "LayoutControlItem4"
         Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem4.Size = New System.Drawing.Size(882, 30)
         Me.LayoutControlItem4.Text = "Datum Bis"
-        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(82, 13)
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(76, 13)
         '
         'EmptySpaceItem1
         '
         Me.EmptySpaceItem1.AllowHotTrack = False
-        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 113)
+        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 112)
         Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
-        Me.EmptySpaceItem1.Size = New System.Drawing.Size(882, 67)
+        Me.EmptySpaceItem1.Size = New System.Drawing.Size(882, 68)
         Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
         '
         'LayoutControlItem6
@@ -454,19 +480,19 @@ Partial Class frmFlowSearch2
         Me.LayoutControlItem6.Control = Me.CheckEdit1
         Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 30)
         Me.LayoutControlItem6.Name = "LayoutControlItem6"
-        Me.LayoutControlItem6.Size = New System.Drawing.Size(882, 23)
+        Me.LayoutControlItem6.Size = New System.Drawing.Size(882, 22)
         Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem6.TextVisible = False
         '
         'LayoutControlItem8
         '
         Me.LayoutControlItem8.Control = Me.ComboBoxDateAttributes
-        Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 83)
+        Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 82)
         Me.LayoutControlItem8.Name = "LayoutControlItem8"
         Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem8.Size = New System.Drawing.Size(882, 30)
         Me.LayoutControlItem8.Text = "Datums Attribut"
-        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(82, 13)
+        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(76, 13)
         '
         'LayoutControlGroup3
         '
@@ -591,4 +617,7 @@ Partial Class frmFlowSearch2
     Friend WithEvents BarCheckItem4 As DevExpress.XtraBars.BarCheckItem
     Friend WithEvents chkSearchEverywhere As DevExpress.XtraBars.BarCheckItem
     Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
 End Class

GUIs.ZooFlow/Search/frmFlowSearch2.vb

@@ -32,6 +32,8 @@ Public Class frmFlowSearch2
 
         TokenTable = GetTokenTable()
         ComboBoxDateAttributes.Properties.Items.AddRange(LoadDateAttributes())
+        ComboBoxDateAttributes.SelectedIndex = 0
+
         GridPredefinedSearches.DataSource = LoadPredefinedSearches()
 
         Dim oTokens = GetTokensFromTable(Of AttributeValueToken)(TokenTable)
@@ -152,6 +154,10 @@ Public Class frmFlowSearch2
         Await RunSearch2(GetTokens())
     End Sub
 
+    Private Async Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+        Await RunSearch2(GetTokens())
+    End Sub
+
     Private Async Function RunSearch2(pTokens As IEnumerable(Of Token)) As Threading.Tasks.Task
         Dim oHandle = StartUpdateUI()
         Dim oSearchTitle As String = "Suche"
@@ -368,4 +374,14 @@ Public Class frmFlowSearch2
     Private Sub TokenEditEx1_Properties_TokenAdded(sender As Object, e As TokenEditTokenAddedEventArgs) Handles TokenEditEx1.Properties.TokenAdded
 
     End Sub
+
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+        FormLoading = True
+        DateEditFrom.EditValue = Nothing
+        DateEditTo.EditValue = Nothing
+        CheckEdit1.IsOn = False
+        ComboBoxDateAttributes.SelectedIndex = 0
+        TokenEditEx1.EditValue = Nothing
+        FormLoading = False
+    End Sub
 End Class

GUIs.ZooFlow/ZooFlow.vbproj

@@ -1123,6 +1123,8 @@
     <None Include="Resources\viewmergeddata1.svg" />
     <None Include="Resources\bo_category1.svg" />
     <None Include="Resources\bo_appointment1.svg" />
+    <None Include="Resources\enablesearch.svg" />
+    <None Include="Resources\undo.svg" />
     <Content Include="Zooflow.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />