MS Diverses

2022-05-11 10:30:52 +02:00
parent 2dd19e6c3e
commit 924e379733
8 changed files with 94 additions and 83 deletions
--- a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb
@@ -58,8 +58,9 @@ Partial Class frmFlowSearch1
        Me.Label1 = New System.Windows.Forms.Label()
        Me.cmbLimitationDateAttr = New System.Windows.Forms.ComboBox()
        Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit()
-        Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton()
        Me.TextEditSearch = New DevExpress.XtraEditors.TextEdit()
+        Me.AdornerUIManager1 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components)
+        Me.Guide1 = New DevExpress.Utils.VisualEffects.Guide()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.DockPanel1.SuspendLayout()
@@ -82,6 +83,7 @@ Partial Class frmFlowSearch1
        CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TextEditSearch.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.AdornerUIManager1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'RibbonControl1
@@ -94,7 +96,7 @@ Partial Class frmFlowSearch1
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
-        Me.RibbonControl1.Size = New System.Drawing.Size(943, 89)
+        Me.RibbonControl1.Size = New System.Drawing.Size(767, 89)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
        'BarButtonStartSearch
@@ -103,7 +105,6 @@ Partial Class frmFlowSearch1
        Me.BarButtonStartSearch.Id = 1
        Me.BarButtonStartSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonStartSearch.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.BarButtonStartSearch.Name = "BarButtonStartSearch"
-        Me.BarButtonStartSearch.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
        '
        'BarButtonReset
        '
@@ -134,14 +135,14 @@ Partial Class frmFlowSearch1
        'BarToggleSwitchItemTerm
        '
        Me.BarToggleSwitchItemTerm.BindableChecked = True
-        Me.BarToggleSwitchItemTerm.Caption = "Suche nach Term"
+        Me.BarToggleSwitchItemTerm.Caption = "Suche nach Begriff"
        Me.BarToggleSwitchItemTerm.Checked = True
        Me.BarToggleSwitchItemTerm.Id = 6
        Me.BarToggleSwitchItemTerm.Name = "BarToggleSwitchItemTerm"
        '
        'BarToggleSwitchItemFulltext
        '
-        Me.BarToggleSwitchItemFulltext.Caption = "Volltext inkludieren"
+        Me.BarToggleSwitchItemFulltext.Caption = "Suche Volltext"
        Me.BarToggleSwitchItemFulltext.Enabled = False
        Me.BarToggleSwitchItemFulltext.Id = 7
        Me.BarToggleSwitchItemFulltext.Name = "BarToggleSwitchItemFulltext"
@@ -170,10 +171,10 @@ Partial Class frmFlowSearch1
        'RibbonStatusBar1
        '
        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiStatus)
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 515)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 503)
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(943, 24)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(767, 24)
        '
        'RibbonPage2
        '
@@ -197,7 +198,7 @@ Partial Class frmFlowSearch1
        Me.DockPanel1.Location = New System.Drawing.Point(0, 89)
        Me.DockPanel1.Name = "DockPanel1"
        Me.DockPanel1.OriginalSize = New System.Drawing.Size(193, 200)
-        Me.DockPanel1.Size = New System.Drawing.Size(193, 426)
+        Me.DockPanel1.Size = New System.Drawing.Size(193, 414)
        Me.DockPanel1.Text = "Datum"
        '
        'DockPanel1_Container
@@ -207,7 +208,7 @@ Partial Class frmFlowSearch1
        Me.DockPanel1_Container.Controls.Add(Me.cmbLimitationDateAttr)
        Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 40)
        Me.DockPanel1_Container.Name = "DockPanel1_Container"
-        Me.DockPanel1_Container.Size = New System.Drawing.Size(186, 383)
+        Me.DockPanel1_Container.Size = New System.Drawing.Size(186, 371)
        Me.DockPanel1_Container.TabIndex = 0
        '
        'XtraTabControl1
@@ -220,7 +221,7 @@ Partial Class frmFlowSearch1
        Me.XtraTabControl1.Name = "XtraTabControl1"
        Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
        Me.XtraTabControl1.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True]
-        Me.XtraTabControl1.Size = New System.Drawing.Size(171, 322)
+        Me.XtraTabControl1.Size = New System.Drawing.Size(171, 310)
        Me.XtraTabControl1.TabIndex = 10
        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
        '
@@ -241,7 +242,7 @@ Partial Class frmFlowSearch1
        Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYear_Last)
        Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYear)
        Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(169, 297)
+        Me.XtraTabPage1.Size = New System.Drawing.Size(169, 285)
        Me.XtraTabPage1.Text = "Standard"
        '
        'DateEditTill
@@ -262,7 +263,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 +273,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(2, 190)
        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 +304,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 +314,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 +325,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 +335,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 +345,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 +355,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,13 +365,13 @@ 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
        '
        Me.XtraTabPage2.Name = "XtraTabPage2"
-        Me.XtraTabPage2.Size = New System.Drawing.Size(169, 297)
+        Me.XtraTabPage2.Size = New System.Drawing.Size(169, 285)
        Me.XtraTabPage2.Text = "...tbd"
        '
        'Label1
@@ -378,7 +379,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"
        '
@@ -394,7 +395,7 @@ Partial Class frmFlowSearch1
        '
        Me.PictureEdit1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress
-        Me.PictureEdit1.Location = New System.Drawing.Point(716, 307)
+        Me.PictureEdit1.Location = New System.Drawing.Point(540, 139)
        Me.PictureEdit1.MenuManager = Me.RibbonControl1
        Me.PictureEdit1.Name = "PictureEdit1"
        Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.SystemColors.Control
@@ -406,16 +407,6 @@ Partial Class frmFlowSearch1
        Me.PictureEdit1.Size = New System.Drawing.Size(215, 202)
        Me.PictureEdit1.TabIndex = 8
        '
-        'SimpleButton1
-        '
-        Me.SimpleButton1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.SimpleButton1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress
-        Me.SimpleButton1.ImageOptions.SvgImageSize = New System.Drawing.Size(40, 40)
-        Me.SimpleButton1.Location = New System.Drawing.Point(885, 95)
-        Me.SimpleButton1.Name = "SimpleButton1"
-        Me.SimpleButton1.Size = New System.Drawing.Size(46, 46)
-        Me.SimpleButton1.TabIndex = 16
-        '
        'TextEditSearch
        '
        Me.TextEditSearch.Location = New System.Drawing.Point(199, 95)
@@ -423,18 +414,32 @@ Partial Class frmFlowSearch1
        Me.TextEditSearch.Name = "TextEditSearch"
        Me.TextEditSearch.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 18.0!)
        Me.TextEditSearch.Properties.Appearance.Options.UseFont = True
-        Me.TextEditSearch.Size = New System.Drawing.Size(680, 38)
+        Me.TextEditSearch.Size = New System.Drawing.Size(556, 38)
        Me.TextEditSearch.TabIndex = 20
        '
+        'AdornerUIManager1
+        '
+        Me.AdornerUIManager1.Elements.Add(Me.Guide1)
+        Me.AdornerUIManager1.Owner = Me
+        '
+        'Guide1
+        '
+        Me.Guide1.Appearances.Hovered.BackColor = System.Drawing.Color.Fuchsia
+        Me.Guide1.Appearances.Hovered.Options.UseBackColor = True
+        Me.Guide1.Appearances.Normal.BackColor = System.Drawing.Color.Red
+        Me.Guide1.Appearances.Normal.Options.UseBackColor = True
+        Me.Guide1.Appearances.Pressed.BackColor = System.Drawing.Color.Blue
+        Me.Guide1.Appearances.Pressed.Options.UseBackColor = True
+        Me.Guide1.TargetElement = Me.TextEditSearch
+        '
        'frmFlowSearch1
        '
        Me.Appearance.BackColor = System.Drawing.SystemColors.Control
        Me.Appearance.Options.UseBackColor = True
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(943, 539)
+        Me.ClientSize = New System.Drawing.Size(767, 527)
        Me.Controls.Add(Me.TextEditSearch)
-        Me.Controls.Add(Me.SimpleButton1)
        Me.Controls.Add(Me.PictureEdit1)
        Me.Controls.Add(Me.DockPanel1)
        Me.Controls.Add(Me.RibbonStatusBar1)
@@ -468,6 +473,7 @@ Partial Class frmFlowSearch1
        CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TextEditSearch.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.AdornerUIManager1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -507,6 +513,7 @@ Partial Class frmFlowSearch1
    Friend WithEvents DateEditTill As DevExpress.XtraEditors.DateEdit
    Friend WithEvents DateEditFrom As DevExpress.XtraEditors.DateEdit
    Friend WithEvents ToggleSwitchDateto As DevExpress.XtraEditors.ToggleSwitch
-    Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton
    Friend WithEvents TextEditSearch As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents AdornerUIManager1 As DevExpress.Utils.VisualEffects.AdornerUIManager
+    Friend WithEvents Guide1 As DevExpress.Utils.VisualEffects.Guide
 End Class
--- a/GUIs.ZooFlow/Search/frmFlowSearch1.resx
+++ b/GUIs.ZooFlow/Search/frmFlowSearch1.resx
@@ -172,6 +172,9 @@
  <metadata name="DockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>58</value>
+  </metadata>
  <data name="DockPanel1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@@ -222,4 +225,7 @@
        QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
  </data>
+  <metadata name="AdornerUIManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>152, 17</value>
+  </metadata>
 </root>
--- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb
@@ -185,22 +185,6 @@ Public Class frmFlowSearch1
        BringToFront()
    End Sub

-    Private Async Function BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) As Threading.Tasks.Task Handles BarButtonStartSearch.ItemClick
-        Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
-
-        Try
-            Dim oResult = Await SearchRunner.Run(TextEditSearch.Text, DateEditFrom.EditValue, DateEditTill.EditValue)
-            If oResult.OK = False Then
-                bsiStatus.Caption = oResult.ErrorMessage
-            End If
-        Catch ex As Exception
-            Logger.Error(ex)
-        Finally
-            SplashScreenManager.CloseOverlayForm(oHandle)
-        End Try
-    End Function
-
-
    Private Sub Form_NeedsRefresh(sender As Object, e As Integer)

    End Sub
@@ -232,7 +216,7 @@ Public Class frmFlowSearch1
        End If
    End Sub

-    Private Async Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click
+    Private Async Sub SimpleButton1_Click(sender As Object, e As EventArgs)
        RunSearch()
    End Sub
    Private Async Sub RunSearch()
@@ -263,4 +247,19 @@ Public Class frmFlowSearch1
    Private Sub PictureEdit1_Click(sender As Object, e As EventArgs) Handles PictureEdit1.Click
        RunSearch()
    End Sub
+
+    Private Async Function BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) As Threading.Tasks.Task Handles BarButtonStartSearch.ItemClick
+        Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
+
+        Try
+            Dim oResult = Await SearchRunner.Run(TextEditSearch.Text, DateEditFrom.EditValue, DateEditTill.EditValue)
+            If oResult.OK = False Then
+                bsiStatus.Caption = oResult.ErrorMessage
+            End If
+        Catch ex As Exception
+            Logger.Error(ex)
+        Finally
+            SplashScreenManager.CloseOverlayForm(oHandle)
+        End Try
+    End Function
 End Class