diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb index 68e5629a..6e77f67e 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb @@ -295,18 +295,16 @@ Partial Class frmGlobix_Index ' 'SimpleButton1 ' - Me.SimpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary Me.SimpleButton1.Appearance.Font = New System.Drawing.Font("Segoe UI", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.SimpleButton1.Appearance.Options.UseBackColor = True Me.SimpleButton1.Appearance.Options.UseFont = True Me.SimpleButton1.Dock = System.Windows.Forms.DockStyle.Fill Me.SimpleButton1.ImageOptions.Location = DevExpress.XtraEditors.ImageLocation.MiddleRight - Me.SimpleButton1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_send + Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.SimpleButton1.Location = New System.Drawing.Point(0, 0) Me.SimpleButton1.Name = "SimpleButton1" Me.SimpleButton1.Size = New System.Drawing.Size(522, 75) Me.SimpleButton1.TabIndex = 2 - Me.SimpleButton1.Text = "Starte ZooFile (Ablage)" + Me.SimpleButton1.Text = "Verarbeite Datei" ' 'Panel1 ' @@ -363,7 +361,7 @@ Partial Class frmGlobix_Index Me.Name = "frmGlobix_Index" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "ZooFlow - Ablage" + Me.Text = "FileFlow" Me.TopMost = True CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.resx b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.resx index b33bdce8..fcb0d70e 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.resx +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.resx @@ -517,6 +517,24 @@ Mkg2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iMjgsMjAgMjYsMTggMjIs MjIgMTgsMTggMTYsMjAgMjAsMjQgMTYsMjggMTgsMzAgMjIsMjYgMjYsMzAgMjgsMjggMjQsMjQgICIg Y2xhc3M9IlJlZCIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHgCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwv + c3R5bGU+DQogIDxwYXRoIGQ9Ik0xNiw2SDh2OGg4VjZ6IE0xMiwxMmgtMlY4aDJWMTJ6IiBjbGFzcz0i + QmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0yMiw2djEwSDZWNkgzQzIuNCw2LDIsNi40LDIsN3YyMmMwLDAu + NiwwLjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjE4di0yVjdjMC0wLjYtMC40LTEtMS0xSDIyeiBN + MjIsMjZINiAgdi02aDE2VjI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8cGF0aCBkPSJNMjgsMkg3QzYu + NCwyLDYsMi40LDYsM3YxaDIydjIyaDFjMC42LDAsMS0wLjQsMS0xVjRWM2MwLTAuNi0wLjQtMS0xLTFI + Mjh6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/My Project/AssemblyInfo.vb b/GUIs.ZooFlow/My Project/AssemblyInfo.vb index cefd29a4..0390d6c3 100644 --- a/GUIs.ZooFlow/My Project/AssemblyInfo.vb +++ b/GUIs.ZooFlow/My Project/AssemblyInfo.vb @@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices ' You can specify all the values or you can default the Build and Revision Numbers ' by using the '*' as shown below: ' [assembly: AssemblyVersion("1.0.*")] - + diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb index b8f3072a..93dfb1c2 100644 --- 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 diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.resx b/GUIs.ZooFlow/Search/frmFlowSearch1.resx index db5b0340..c62bf592 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.resx +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.resx @@ -172,6 +172,9 @@ 17, 17 + + 58 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -222,4 +225,7 @@ QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 152, 17 + \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index 96b1d308..2e8b03f6 100644 --- 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 \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 15eaae55..fbbfba0a 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -74,7 +74,6 @@ Partial Class frmFlowForm Me.colSecondary = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() Me.AdornerUIManager1 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components) - Me.PMTaskBadgeInd = New DevExpress.Utils.VisualEffects.Badge() Me.PMTaskBadgeGroup = New DevExpress.Utils.VisualEffects.Badge() Me.PMTaskBadgeIndividual = New DevExpress.Utils.VisualEffects.Badge() Me.TimerDisplay = New System.Windows.Forms.Timer(Me.components) @@ -497,23 +496,10 @@ Partial Class frmFlowForm ' 'AdornerUIManager1 ' - Me.AdornerUIManager1.Elements.Add(Me.PMTaskBadgeInd) Me.AdornerUIManager1.Elements.Add(Me.PMTaskBadgeGroup) Me.AdornerUIManager1.Elements.Add(Me.PMTaskBadgeIndividual) Me.AdornerUIManager1.Owner = Me ' - 'PMTaskBadgeInd - ' - Me.PMTaskBadgeInd.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) - Me.PMTaskBadgeInd.Appearance.Options.UseBackColor = True - Me.PMTaskBadgeInd.Properties.Location = System.Drawing.ContentAlignment.TopRight - Me.PMTaskBadgeInd.Properties.Offset = New System.Drawing.Point(0, 0) - Me.PMTaskBadgeInd.Properties.PaintStyle = DevExpress.Utils.VisualEffects.BadgePaintStyle.[Default] - Me.PMTaskBadgeInd.Properties.Text = "0" - Me.PMTaskBadgeInd.TargetElement = Me.PictureBoxPM - Me.PMTaskBadgeInd.TargetElementRegion = DevExpress.Utils.VisualEffects.TargetElementRegion.Control - Me.PMTaskBadgeInd.Visible = False - ' 'PMTaskBadgeGroup ' Me.PMTaskBadgeGroup.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) @@ -532,7 +518,7 @@ Partial Class frmFlowForm Me.PMTaskBadgeIndividual.Appearance.Options.UseBackColor = True Me.PMTaskBadgeIndividual.Appearance.Options.UseFont = True Me.PMTaskBadgeIndividual.Appearance.Options.UseForeColor = True - Me.PMTaskBadgeIndividual.Properties.Location = System.Drawing.ContentAlignment.TopLeft + Me.PMTaskBadgeIndividual.Properties.Location = System.Drawing.ContentAlignment.TopRight Me.PMTaskBadgeIndividual.Properties.PaintStyle = DevExpress.Utils.VisualEffects.BadgePaintStyle.Information Me.PMTaskBadgeIndividual.Properties.Text = "0" Me.PMTaskBadgeIndividual.TargetElement = Me.PictureBoxPM @@ -615,7 +601,6 @@ Partial Class frmFlowForm Friend WithEvents Panel2 As Panel Friend WithEvents btnGlobixConfig As DevExpress.XtraBars.BarButtonItem Friend WithEvents AdornerUIManager1 As DevExpress.Utils.VisualEffects.AdornerUIManager - Friend WithEvents PMTaskBadgeInd As DevExpress.Utils.VisualEffects.Badge Friend WithEvents PictureEditQuicksearch1 As PictureEdit Friend WithEvents PictureEdit2 As PictureEdit Friend WithEvents Panel3 As Panel diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 0d7655f9..580d46b6 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -1282,15 +1282,15 @@ Public Class frmFlowForm If oDT.Rows.Count > 0 Then Dim oTooLTip = "TaskFlow " PMTaskBadgeGroup.Visible = False - PMTaskBadgeInd.Visible = False + PMTaskBadgeIndividual.Visible = False For Each oRow As DataRow In oDT.Rows If oRow.Item("JOB_TITLE") = "PM_INDIVIDUAL_JOB" Then - PMTaskBadgeInd.Properties.Text = oRow.Item("DESCR") + PMTaskBadgeIndividual.Properties.Text = oRow.Item("DESCR") - PMTaskBadgeInd.Visible = True + PMTaskBadgeIndividual.Visible = True - oTooLTip += $"({PMTaskBadgeInd.Properties.Text} Individual" + oTooLTip += $"({PMTaskBadgeIndividual.Properties.Text} Individual" ElseIf oRow.Item("JOB_TITLE") = "PM_GROUP_JOB" Then PMTaskBadgeGroup.Properties.Text = oRow.Item("DESCR") oTooLTip += $"- and {PMTaskBadgeGroup.Properties.Text} Group-" @@ -1301,12 +1301,10 @@ Public Class frmFlowForm PictureBoxPM.ToolTip = oTooLTip Else PMTaskBadgeGroup.Visible = False - PMTaskBadgeInd.Visible = False PMTaskBadgeIndividual.Visible = False End If Else PMTaskBadgeGroup.Visible = False - PMTaskBadgeInd.Visible = False PMTaskBadgeIndividual.Visible = False End If