From da966226c9039af616901864a69841943849f473 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 4 Mar 2022 11:44:22 +0100 Subject: [PATCH] Zooflow: Restore Doctype changes --- .../Administration/ClassDetailForm.vb | 13 ++++++++++++- .../Administration/frmAdmin_Start.Designer.vb | 19 +++++++++++-------- GUIs.ZooFlow/ClassModules.vb | 2 +- .../Modules/Globix/frmGlobix_Index.vb | 2 +- GUIs.ZooFlow/frmFlowForm.Designer.vb | 14 +++++++------- GUIs.ZooFlow/frmFlowForm.vb | 12 ++++++++++++ 6 files changed, 44 insertions(+), 18 deletions(-) diff --git a/GUIs.ZooFlow/Administration/ClassDetailForm.vb b/GUIs.ZooFlow/Administration/ClassDetailForm.vb index 823f0d04..4e62915e 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailForm.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailForm.vb @@ -59,11 +59,17 @@ Public Class ClassDetailForm .Entity = PAGE_GI_RELATIONS }}, {PAGE_IDB_DOCTYPE_CONFIG, New DetailSettings With { - .GridTitle = "Doctype Configuration", + .GridTitle = "Detail Doctype Configuration", .NewRecordTitle = "New Configuration", .[Module] = MODULE_IDB, .Entity = PAGE_IDB_DOCTYPE_CONFIG }}, + {PAGE_IDB_DOCTYPE, New DetailSettings With { + .GridTitle = "Doctype Configuration", + .NewRecordTitle = "New Doctype", + .[Module] = MODULE_IDB, + .Entity = PAGE_IDB_DOCTYPE + }}, {PAGE_USERS_USERLIST, New DetailSettings With { .GridTitle = "Benutzer Übersicht", .NewRecordTitle = "Neuer Benutzer", @@ -166,6 +172,11 @@ Public Class ClassDetailForm oForm.ShowDialog() Return True + Case PAGE_IDB_DOCTYPE + Dim oForm As New frmAdmin_Doctype(0) + oForm.ShowDialog() + Return True + Case PAGE_USERS_USERLIST Load_User(PrimaryKey, IsInsert) Return True diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 0c109fcc..1cc1f6a0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -422,19 +422,20 @@ Partial Class frmAdmin_Start Me.TreeListMenu.AppendNode(New Object() {"Attribute"}, 0, 2, 2, -1, "IDB_ATTRIBUTES") Me.TreeListMenu.AppendNode(New Object() {"Attribute Relations"}, 1, 9, 9, -1, "ATTRIBUTE_RELATIONS") Me.TreeListMenu.AppendNode(New Object() {"Business Entities"}, 0, 1, 1, -1, "IDB_BUSINESS_ENTITIES") - Me.TreeListMenu.AppendNode(New Object() {"Doctype Config"}, 0, 10, 0, -1, "IDB_DOCTYPE_CONFIG") + Me.TreeListMenu.AppendNode(New Object() {"Doctypes"}, 0, 10, 10, -1, "DOCTYPE_DEF") + Me.TreeListMenu.AppendNode(New Object() {"Doctype Config"}, 4, 10, 10, -1, "IDB_DOCTYPE_CONFIG") Me.TreeListMenu.AppendNode(New Object() {"Object Stores"}, 0, "IDB_OBJECT_STORES") Me.TreeListMenu.AppendNode(New Object() {"Global Indexer"}, -1, 6, 6, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 6, 4, 4, -1, "GI_PROFILES") - Me.TreeListMenu.AppendNode(New Object() {"Profile Relations"}, 7, 9, 9, -1, "GI_RELATIONS") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 7, 4, 4, -1, "GI_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profile Relations"}, 8, 9, 9, -1, "GI_RELATIONS") Me.TreeListMenu.AppendNode(New Object() {"Clipboard Watcher"}, -1, 7, 7, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 9, 4, 4, -1, "CW_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 10, 4, 4, -1, "CW_PROFILES") Me.TreeListMenu.AppendNode(New Object() {"Administration"}, -1) - Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 11, 3, 3, -1, "META_SOURCE_SQL") + Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 12, 3, 3, -1, "META_SOURCE_SQL") Me.TreeListMenu.AppendNode(New Object() {"User Management"}, -1, 11, 11, -1) - Me.TreeListMenu.AppendNode(New Object() {"User List"}, 13, 5, 5, -1, "USERS_USERLIST") - Me.TreeListMenu.AppendNode(New Object() {"Group List"}, 13, 12, 12, -1, "USERS_GROUPLIST") - Me.TreeListMenu.AppendNode(New Object() {"Module List"}, 13, 13, 13, -1, "USERS_MODULELIST") + Me.TreeListMenu.AppendNode(New Object() {"User List"}, 14, 5, 5, -1, "USERS_USERLIST") + Me.TreeListMenu.AppendNode(New Object() {"Group List"}, 14, 12, 12, -1, "USERS_GROUPLIST") + Me.TreeListMenu.AppendNode(New Object() {"Module List"}, 14, 13, 13, -1, "USERS_MODULELIST") Me.TreeListMenu.EndUnboundLoad() Me.TreeListMenu.OptionsBehavior.Editable = False Me.TreeListMenu.OptionsView.ShowColumns = False @@ -515,6 +516,8 @@ Partial Class frmAdmin_Start Me.TableAdapterManager.TBIDB_CATALOG_USERTableAdapter = Nothing Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing + Me.TableAdapterManager.TBIDB_DOCTYPETableAdapter = Nothing + Me.TableAdapterManager.TBIDB_LANGUAGETableAdapter = Nothing Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete diff --git a/GUIs.ZooFlow/ClassModules.vb b/GUIs.ZooFlow/ClassModules.vb index 33dc972c..1d47ec45 100644 --- a/GUIs.ZooFlow/ClassModules.vb +++ b/GUIs.ZooFlow/ClassModules.vb @@ -72,7 +72,7 @@ Public Class ClassModules Dim oPathFromRegistry = GetProductPathFromRegistryFor(pSubKey) If oPathFromRegistry IsNot Nothing Then - Return pSubKey + Return oPathFromRegistry Else Return GetProductPathFromConfig(pProduct) End If diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb index e7cf3ce3..03004f64 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb @@ -761,7 +761,7 @@ Public Class frmGlobix_Index Dim oObjectStore As String = SelectedDocType.ObjectStore Dim oObjectKind As String = "DOC" Dim oBusinessEntity As String = "DEFAULT" - sd + Dim oProfileId As Integer = SelectedDocType.Guid Dim oAttributes As List(Of UserAttributeValue) = oValues Dim oOptions As New Options.ImportFileOptions diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 659f729a..930b7805 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -153,7 +153,7 @@ Partial Class frmFlowForm Me.PictureBoxPM.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.PictureBoxPM.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark Me.PictureBoxPM.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxPM.Location = New System.Drawing.Point(54, 114) + Me.PictureBoxPM.Location = New System.Drawing.Point(60, 114) Me.PictureBoxPM.Name = "PictureBoxPM" Me.PictureBoxPM.Size = New System.Drawing.Size(90, 90) Me.PictureBoxPM.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom @@ -181,7 +181,7 @@ Partial Class frmFlowForm Me.PictureBoxSearch1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.PictureBoxSearch1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark Me.PictureBoxSearch1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxSearch1.Location = New System.Drawing.Point(54, 3) + Me.PictureBoxSearch1.Location = New System.Drawing.Point(60, 3) Me.PictureBoxSearch1.Name = "PictureBoxSearch1" Me.PictureBoxSearch1.Size = New System.Drawing.Size(90, 90) Me.PictureBoxSearch1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch @@ -200,6 +200,7 @@ Partial Class frmFlowForm Me.pnlQuicksearch1.Controls.Add(Me.PictureEdit1) Me.pnlQuicksearch1.Controls.Add(Me.TextEdit1) Me.pnlQuicksearch1.Controls.Add(Me.lblQuicksearch1) + Me.pnlQuicksearch1.Dock = System.Windows.Forms.DockStyle.Top Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 0) Me.pnlQuicksearch1.Name = "pnlQuicksearch1" Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 73) @@ -247,7 +248,7 @@ Partial Class frmFlowForm Me.PictureBoxGlobix.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.PictureBoxGlobix.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark Me.PictureBoxGlobix.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxGlobix.Location = New System.Drawing.Point(54, 222) + Me.PictureBoxGlobix.Location = New System.Drawing.Point(60, 222) Me.PictureBoxGlobix.Name = "PictureBoxGlobix" Me.PictureBoxGlobix.Size = New System.Drawing.Size(90, 90) Me.PictureBoxGlobix.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom @@ -268,15 +269,14 @@ Partial Class frmFlowForm ' 'Panel2 ' - Me.Panel2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel2.Controls.Add(Me.PictureBoxSearch1) Me.Panel2.Controls.Add(Me.PictureBoxGlobix) Me.Panel2.Controls.Add(Me.PictureBoxAbo) Me.Panel2.Controls.Add(Me.PictureBoxPM) - Me.Panel2.Location = New System.Drawing.Point(3, 92) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel2.Location = New System.Drawing.Point(0, 73) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(196, 364) + Me.Panel2.Size = New System.Drawing.Size(202, 389) Me.Panel2.TabIndex = 17 ' 'PopupMenu1 diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 280a79ba..8e53bc0f 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -1266,5 +1266,17 @@ Public Class frmFlowForm Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemGlobixGE.ItemClick frmGlobixBasicConfig.ShowDialog() End Sub + + Private Sub PictureBoxPM_Click(sender As Object, e As EventArgs) Handles PictureBoxPM.Click + Try + Dim oProcessManagerPath = Modules.GetProductPath(DigitalData.Modules.Base.ECM.Product.ProcessManager) + + If oProcessManagerPath IsNot Nothing AndAlso IO.File.Exists(oProcessManagerPath) Then + Process.Start(oProcessManagerPath) + End If + Catch ex As Exception + ShowErrorMessage(ex) + End Try + End Sub End Class