From f8c186d915927042182eab53ef36a8bb47e7e373 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 17 Mar 2022 10:44:38 +0100 Subject: [PATCH 1/4] Zooflow: fix small things --- .../Search/frmFlowSearch1.Designer.vb | 59 ++++++++----------- GUIs.ZooFlow/frmFlowForm.Designer.vb | 3 - GUIs.ZooFlow/frmFlowForm.vb | 6 +- 3 files changed, 26 insertions(+), 42 deletions(-) diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb index d61978dc..ef3726b2 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb @@ -58,9 +58,8 @@ Partial Class frmFlowSearch1 Me.Label1 = New System.Windows.Forms.Label() Me.cmbLimitationDateAttr = New System.Windows.Forms.ComboBox() Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() - Me.txtSearchInput = New System.Windows.Forms.TextBox() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() - Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.txtSearchInput = New DevExpress.XtraEditors.TextEdit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel1.SuspendLayout() @@ -82,7 +81,7 @@ Partial Class frmFlowSearch1 CType(Me.ToggleSwitchYear_Last.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtSearchInput.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 @@ -263,7 +262,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth_Last.Name = "ToggleSwitchMonth_Last" Me.ToggleSwitchMonth_Last.Properties.OffText = "Letzter Monat" Me.ToggleSwitchMonth_Last.Properties.OnText = "Letzter Monat" - Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchMonth_Last.TabIndex = 9 ' 'ToggleSwitchDateto @@ -273,14 +272,14 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchDateto.Name = "ToggleSwitchDateto" Me.ToggleSwitchDateto.Properties.OffText = "Datum bis" Me.ToggleSwitchDateto.Properties.OnText = "Datum bis" - Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 18) + Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 19) Me.ToggleSwitchDateto.TabIndex = 0 ' 'lblDatefrom ' Me.lblDatefrom.Location = New System.Drawing.Point(3, 211) Me.lblDatefrom.Name = "lblDatefrom" - Me.lblDatefrom.Size = New System.Drawing.Size(31, 13) + Me.lblDatefrom.Size = New System.Drawing.Size(34, 13) Me.lblDatefrom.TabIndex = 3 Me.lblDatefrom.Text = "Datum" ' @@ -304,7 +303,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth.Name = "ToggleSwitchMonth" Me.ToggleSwitchMonth.Properties.OffText = "Dieser Monat" Me.ToggleSwitchMonth.Properties.OnText = "Dieser Monat" - Me.ToggleSwitchMonth.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchMonth.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchMonth.TabIndex = 8 ' 'ToggleSwitchTomorrow @@ -314,7 +313,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchTomorrow.Name = "ToggleSwitchTomorrow" Me.ToggleSwitchTomorrow.Properties.OffText = "Morgen" Me.ToggleSwitchTomorrow.Properties.OnText = "Morgen" - Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 18) + Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 19) Me.ToggleSwitchTomorrow.TabIndex = 7 Me.ToggleSwitchTomorrow.Visible = False ' @@ -325,7 +324,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchToday.Name = "ToggleSwitchToday" Me.ToggleSwitchToday.Properties.OffText = "Heute" Me.ToggleSwitchToday.Properties.OnText = "Heute" - Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 18) + Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 19) Me.ToggleSwitchToday.TabIndex = 2 ' 'ToggleSwitchLastWeek @@ -335,7 +334,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchLastWeek.Name = "ToggleSwitchLastWeek" Me.ToggleSwitchLastWeek.Properties.OffText = "Letzten 7 Tage" Me.ToggleSwitchLastWeek.Properties.OnText = "Letzten 7 Tage" - Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchLastWeek.TabIndex = 6 ' 'ToggleSwitchYesterday @@ -345,7 +344,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYesterday.Name = "ToggleSwitchYesterday" Me.ToggleSwitchYesterday.Properties.OffText = "Gestern" Me.ToggleSwitchYesterday.Properties.OnText = "Gestern" - Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 18) + Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 19) Me.ToggleSwitchYesterday.TabIndex = 3 ' 'ToggleSwitchYear_Last @@ -355,7 +354,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear_Last.Name = "ToggleSwitchYear_Last" Me.ToggleSwitchYear_Last.Properties.OffText = "Letztes Jahr" Me.ToggleSwitchYear_Last.Properties.OnText = "Letztes Jahr" - Me.ToggleSwitchYear_Last.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchYear_Last.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchYear_Last.TabIndex = 5 ' 'ToggleSwitchYear @@ -365,7 +364,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear.Name = "ToggleSwitchYear" Me.ToggleSwitchYear.Properties.OffText = "Dieses Jahr" Me.ToggleSwitchYear.Properties.OnText = "Dieses Jahr" - Me.ToggleSwitchYear.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchYear.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchYear.TabIndex = 4 ' 'XtraTabPage2 @@ -379,7 +378,7 @@ Partial Class frmFlowSearch1 Me.Label1.AutoSize = True Me.Label1.Location = New System.Drawing.Point(4, 8) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(44, 13) + Me.Label1.Size = New System.Drawing.Size(47, 13) Me.Label1.TabIndex = 0 Me.Label1.Text = "Attribut" ' @@ -401,16 +400,6 @@ Partial Class frmFlowSearch1 Me.LabelControl1.TabIndex = 3 Me.LabelControl1.Text = "Suchbegriff:" ' - 'txtSearchInput - ' - Me.txtSearchInput.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtSearchInput.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSearchInput.Location = New System.Drawing.Point(231, 189) - Me.txtSearchInput.Name = "txtSearchInput" - Me.txtSearchInput.Size = New System.Drawing.Size(693, 25) - Me.txtSearchInput.TabIndex = 4 - ' 'PictureEdit1 ' Me.PictureEdit1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -429,14 +418,14 @@ Partial Class frmFlowSearch1 Me.PictureEdit1.Size = New System.Drawing.Size(208, 200) Me.PictureEdit1.TabIndex = 8 ' - 'TextEdit1 + 'txtSearchInput ' - Me.TextEdit1.Location = New System.Drawing.Point(231, 220) - Me.TextEdit1.MenuManager = Me.RibbonControl1 - Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Properties.Padding = New System.Windows.Forms.Padding(10) - Me.TextEdit1.Size = New System.Drawing.Size(528, 40) - Me.TextEdit1.TabIndex = 12 + Me.txtSearchInput.Location = New System.Drawing.Point(227, 189) + Me.txtSearchInput.MenuManager = Me.RibbonControl1 + Me.txtSearchInput.Name = "txtSearchInput" + Me.txtSearchInput.Properties.Padding = New System.Windows.Forms.Padding(10) + Me.txtSearchInput.Size = New System.Drawing.Size(697, 40) + Me.txtSearchInput.TabIndex = 12 ' 'frmFlowSearch1 ' @@ -445,9 +434,8 @@ Partial Class frmFlowSearch1 Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(936, 769) - Me.Controls.Add(Me.TextEdit1) - Me.Controls.Add(Me.PictureEdit1) Me.Controls.Add(Me.txtSearchInput) + Me.Controls.Add(Me.PictureEdit1) Me.Controls.Add(Me.LabelControl1) Me.Controls.Add(Me.DockPanel1) Me.Controls.Add(Me.RibbonStatusBar1) @@ -480,7 +468,7 @@ Partial Class frmFlowSearch1 CType(Me.ToggleSwitchYear_Last.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtSearchInput.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -505,7 +493,6 @@ Partial Class frmFlowSearch1 Friend WithEvents ToggleSwitchMonth As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents txtSearchInput As TextBox Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl Friend WithEvents bsiStatus As DevExpress.XtraBars.BarStaticItem Friend WithEvents ToggleSwitchYear As DevExpress.XtraEditors.ToggleSwitch @@ -522,5 +509,5 @@ 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 TextEdit1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtSearchInput As DevExpress.XtraEditors.TextEdit End Class diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 449b0b42..21871106 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -133,9 +133,6 @@ Partial Class frmFlowForm Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' - 'TimerRefreshData - ' - ' 'PictureBoxPM ' Me.PictureBoxPM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 06b58481..77d50979 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -1220,7 +1220,7 @@ Public Class frmFlowForm End Try End If End Function - Private Async Function PictureEdit1_Click(sender As Object, e As EventArgs) As Task Handles PictureBoxSearch.Click + Private Async Function PictureEdit1_Click(sender As Object, e As EventArgs) As Task Handles SvgImageBox2.Click If TextEdit1.Text = String.Empty Then Open_FlowSearch() Return @@ -1293,8 +1293,8 @@ Public Class frmFlowForm PictureBoxPM.SvgImage = My.Resources.FLOW_Sidebar_Task_inaktiv End Sub - Private Sub TimerRefreshData_Tick_1(sender As Object, e As EventArgs) Handles TimerRefreshData.Tick - TaskBadge.Properties.Text = Date.Now.Millisecond.ToString.Last + Private Sub SvgImageBox2_Click(sender As Object, e As EventArgs) Handles SvgImageBox2.Click + Open_FlowSearch() End Sub End Class From dbd33ceed404dabd5a34dfd0a7ff90ecd32b7e82 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 17 Mar 2022 10:59:08 +0100 Subject: [PATCH 2/4] Zooflow: Fix product path for pm --- GUIs.ZooFlow/frmFlowForm.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 77d50979..d05bc840 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -1268,7 +1268,7 @@ Public Class frmFlowForm Private Sub PictureBoxPM_Click(sender As Object, e As EventArgs) Handles PictureBoxPM.Click Try - Dim oProcessManagerPath = Modules.GetProductPath(DigitalData.Modules.Base.ECM.Product.ProcessManager) + Dim oProcessManagerPath = Modules.GetProductProgramPath(DigitalData.Modules.Base.ECM.Product.ProcessManager) If oProcessManagerPath IsNot Nothing AndAlso IO.File.Exists(oProcessManagerPath) Then Process.Start(oProcessManagerPath) End If From 0b1bd49990fb7df06885513285029bb1b7fd0fdd Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 17 Mar 2022 11:07:04 +0100 Subject: [PATCH 3/4] Zooflow: Fix pm path --- GUIs.ZooFlow/ClassModules.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GUIs.ZooFlow/ClassModules.vb b/GUIs.ZooFlow/ClassModules.vb index 1d47ec45..f3137c40 100644 --- a/GUIs.ZooFlow/ClassModules.vb +++ b/GUIs.ZooFlow/ClassModules.vb @@ -69,12 +69,12 @@ Public Class ClassModules End Function Private Function GetProductPathFor(pProduct As Product, pSubKey As String) As String - Dim oPathFromRegistry = GetProductPathFromRegistryFor(pSubKey) + Dim oPathFromConfig = GetProductPathFromConfig(pProduct) If oPathFromRegistry IsNot Nothing Then Return oPathFromRegistry Else - Return GetProductPathFromConfig(pProduct) + Return GetProductPathFromRegistryFor(pSubKey) End If End Function From 5029b4f08ae2c16a1cb0b89edd154478347641ae Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 17 Mar 2022 11:07:45 +0100 Subject: [PATCH 4/4] Zooflow: fix pm path --- GUIs.ZooFlow/ClassModules.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GUIs.ZooFlow/ClassModules.vb b/GUIs.ZooFlow/ClassModules.vb index f3137c40..a5e94225 100644 --- a/GUIs.ZooFlow/ClassModules.vb +++ b/GUIs.ZooFlow/ClassModules.vb @@ -71,8 +71,8 @@ Public Class ClassModules Private Function GetProductPathFor(pProduct As Product, pSubKey As String) As String Dim oPathFromConfig = GetProductPathFromConfig(pProduct) - If oPathFromRegistry IsNot Nothing Then - Return oPathFromRegistry + If oPathFromConfig IsNot Nothing Then + Return oPathFromConfig Else Return GetProductPathFromRegistryFor(pSubKey) End If