diff --git a/GUIs.Common/Base/BaseErrorHandler.vb b/GUIs.Common/Base/BaseErrorHandler.vb deleted file mode 100644 index 481cc53b..00000000 --- a/GUIs.Common/Base/BaseErrorHandler.vb +++ /dev/null @@ -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 diff --git a/GUIs.Common/Base/BaseForm.vb b/GUIs.Common/Base/BaseForm.vb deleted file mode 100644 index 9ea5b30b..00000000 --- a/GUIs.Common/Base/BaseForm.vb +++ /dev/null @@ -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 - diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 8ecd345b..c2e9ea07 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -107,10 +107,6 @@ - - - Form - diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb index f0308a2f..83ee1a85 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb +++ b/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") diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 92cb8335..e3a991ac 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -1050,6 +1050,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1610,6 +1620,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 3de1570b..e943300a 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -259,6 +259,9 @@ ..\Resources\link1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\enablesearch.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\bo_category1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -325,6 +328,9 @@ ..\Resources\markcomplete1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_appointment1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_options.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -421,9 +427,6 @@ ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save9.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -550,6 +553,9 @@ ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save9.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -643,7 +649,7 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_appointment1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\undo.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/enablesearch.svg b/GUIs.ZooFlow/Resources/enablesearch.svg new file mode 100644 index 00000000..5e415948 --- /dev/null +++ b/GUIs.ZooFlow/Resources/enablesearch.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/undo.svg b/GUIs.ZooFlow/Resources/undo.svg new file mode 100644 index 00000000..791f759a --- /dev/null +++ b/GUIs.ZooFlow/Resources/undo.svg @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/SearchRunner.vb b/GUIs.ZooFlow/Search/SearchRunner.vb index 1033e4b8..25a3877d 100644 --- a/GUIs.ZooFlow/Search/SearchRunner.vb +++ b/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) diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb index 0e8495cf..e58a63bf 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb @@ -23,13 +23,13 @@ Partial Class frmFlowSearch2 _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim TableColumnDefinition1 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TableColumnDefinition2 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TableRowDefinition1 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim TableRowDefinition2 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 TileViewItemElement2 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 TableColumnDefinition3 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition4 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableRowDefinition3 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition4 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TileViewItemElement4 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 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 - TableColumnDefinition1.PaddingRight = 5 - TableColumnDefinition2.Length.Value = 129.0R - Me.TileView1.TileColumns.Add(TableColumnDefinition1) - Me.TileView1.TileColumns.Add(TableColumnDefinition2) - TableRowDefinition1.Length.Value = 21.0R - TableRowDefinition2.Length.Value = 43.0R - Me.TileView1.TileRows.Add(TableRowDefinition1) - Me.TileView1.TileRows.Add(TableRowDefinition2) - TileViewItemElement1.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 - TileViewItemElement1.Column = Me.colName - TileViewItemElement1.ColumnIndex = 1 - TileViewItemElement1.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement1.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze - TileViewItemElement1.Text = "colName" - TileViewItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement2.Column = Me.colDescription - TileViewItemElement2.ColumnIndex = 1 - TileViewItemElement2.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement2.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze - TileViewItemElement2.RowIndex = 1 - TileViewItemElement2.Text = "colDescription" - TileViewItemElement2.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement3.Column = Me.colImage - TileViewItemElement3.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement3.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze - TileViewItemElement3.RowIndex = 1 - TileViewItemElement3.Text = "colImage" - TileViewItemElement3.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - Me.TileView1.TileTemplate.Add(TileViewItemElement1) - Me.TileView1.TileTemplate.Add(TileViewItemElement2) - Me.TileView1.TileTemplate.Add(TileViewItemElement3) + TableColumnDefinition3.Length.Value = 35.0R + TableColumnDefinition3.PaddingRight = 5 + TableColumnDefinition4.Length.Value = 129.0R + Me.TileView1.TileColumns.Add(TableColumnDefinition3) + Me.TileView1.TileColumns.Add(TableColumnDefinition4) + TableRowDefinition3.Length.Value = 21.0R + TableRowDefinition4.Length.Value = 43.0R + Me.TileView1.TileRows.Add(TableRowDefinition3) + Me.TileView1.TileRows.Add(TableRowDefinition4) + TileViewItemElement4.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.Options.UseFont = True + TileViewItemElement4.Column = Me.colName + TileViewItemElement4.ColumnIndex = 1 + TileViewItemElement4.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement4.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement4.Text = "colName" + TileViewItemElement4.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement5.Column = Me.colDescription + TileViewItemElement5.ColumnIndex = 1 + TileViewItemElement5.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement5.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement5.RowIndex = 1 + TileViewItemElement5.Text = "colDescription" + TileViewItemElement5.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement6.Column = Me.colImage + TileViewItemElement6.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement6.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement6.RowIndex = 1 + TileViewItemElement6.Text = "colImage" + TileViewItemElement6.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + Me.TileView1.TileTemplate.Add(TileViewItemElement4) + Me.TileView1.TileTemplate.Add(TileViewItemElement5) + 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 diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.vb b/GUIs.ZooFlow/Search/frmFlowSearch2.vb index c271bd89..19fc03a1 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch2.vb +++ b/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 \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 609d5694..282da679 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -1123,6 +1123,8 @@ + +