diff --git a/app/DD-Record-Organizer/MailLicense.xml b/app/DD-Record-Organizer/MailLicense.xml new file mode 100644 index 0000000..0510526 --- /dev/null +++ b/app/DD-Record-Organizer/MailLicense.xml @@ -0,0 +1,23 @@ + + + 4dc5ef40-f1a9-468b-994c-b7ed600ad878 + Mail.dll + 2022-07-29 + Digital Data GmbH + single developer + Digital Data GmbH + + + + + + + + + + 75MRtl4ipYelIZYlpT8O7QDX9Zc= + + + Raxfkz6DfQVs/sMvH+F2nH0eHXD8FoUFSdP3t7AgBUdpABJQx86srlyuMSEhXPlc1THCqPouEVob4RsWnd9OXvTiPPSOUSK9zuNG6uz93KLAhpSD5PraAgBCF4jwZArlAp7aCNfZpHqQ3w6TRHS+CfravUU0AHHG3MZ1ZcRkGuo= + + \ No newline at end of file diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index 1ed4fd0..223a252 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -198,5 +198,5 @@ Module ModuleRuntimeVariables Public SQL_DOC_RESULT_RECORD As String = "" Public CURRENT_DT_TBPMO_DOC_RECORD_LINK As DataTable - Public MYDB_ECM As MSSQLServer + Public Property MYDB_ECM As MSSQLServer End Module diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index a661b2d..9a80e5f 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -15,7 +15,7 @@ Imports System.Runtime.InteropServices - + @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/OrgFlow.vbproj b/app/DD-Record-Organizer/OrgFlow.vbproj index 826f04e..74de88f 100644 --- a/app/DD-Record-Organizer/OrgFlow.vbproj +++ b/app/DD-Record-Organizer/OrgFlow.vbproj @@ -169,6 +169,9 @@ False + + ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + ..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll @@ -1602,6 +1605,9 @@ + + PreserveNewest + diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb index 0d43bb3..88f0c8b 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb @@ -41,7 +41,9 @@ Partial Class frmNodeNavigation Me.bbtnitmReloadView = New DevExpress.XtraBars.BarButtonItem() Me.BbtnitmNodeReorder = New DevExpress.XtraBars.BarButtonItem() Me.bbtnItm_TV_Collape_Expand = New DevExpress.XtraBars.BarButtonItem() + Me.checkShowPreview = New DevExpress.XtraBars.BarCheckItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroupView = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupRecord = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupDocResult = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -80,6 +82,8 @@ Partial Class frmNodeNavigation Me.tsmiFileDelete = New System.Windows.Forms.ToolStripMenuItem() Me.TimerFileHandle = New System.Windows.Forms.Timer(Me.components) Me.TimerClearResultfiles = New System.Windows.Forms.Timer(Me.components) + Me.SplitContainerDocView = New DevExpress.XtraEditors.SplitContainerControl() + Me.DocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer() CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -97,14 +101,20 @@ Partial Class frmNodeNavigation CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit() Me.cmsResultFilesBasic.SuspendLayout() Me.cmsResultFileDetail.SuspendLayout() + CType(Me.SplitContainerDocView, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerDocView.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerDocView.Panel1.SuspendLayout() + CType(Me.SplitContainerDocView.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerDocView.Panel2.SuspendLayout() + Me.SplitContainerDocView.SuspendLayout() Me.SuspendLayout() ' 'ribbonNodeNavigation ' Me.ribbonNodeNavigation.ExpandCollapseItem.Id = 0 - Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand}) + Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand, Me.checkShowPreview}) Me.ribbonNodeNavigation.Location = New System.Drawing.Point(0, 0) - Me.ribbonNodeNavigation.MaxItemId = 18 + Me.ribbonNodeNavigation.MaxItemId = 19 Me.ribbonNodeNavigation.Name = "ribbonNodeNavigation" Me.ribbonNodeNavigation.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.ribbonNodeNavigation.PopupMenuAlignment = DevExpress.XtraBars.PopupMenuAlignment.Left @@ -225,12 +235,26 @@ Partial Class frmNodeNavigation Me.bbtnItm_TV_Collape_Expand.ImageOptions.SvgImage = CType(resources.GetObject("bbtnItm_TV_Collape_Expand.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.bbtnItm_TV_Collape_Expand.Name = "bbtnItm_TV_Collape_Expand" ' + 'checkShowPreview + ' + Me.checkShowPreview.Caption = "Vorschau anzeigen" + Me.checkShowPreview.Id = 18 + Me.checkShowPreview.ImageOptions.SvgImage = CType(resources.GetObject("checkShowPreview.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.checkShowPreview.Name = "checkShowPreview" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupRecord, Me.RibbonPageGroupDocResult, Me.RibbonPageGroup1, Me.RPGNodes}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupView, Me.RibbonPageGroupRecord, Me.RibbonPageGroupDocResult, Me.RibbonPageGroup1, Me.RPGNodes}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Node Navigation" ' + 'RibbonPageGroupView + ' + Me.RibbonPageGroupView.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroupView.ItemLinks.Add(Me.checkShowPreview) + Me.RibbonPageGroupView.Name = "RibbonPageGroupView" + Me.RibbonPageGroupView.Text = "Ansicht" + ' 'RibbonPageGroupRecord ' Me.RibbonPageGroupRecord.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far @@ -284,7 +308,7 @@ Partial Class frmNodeNavigation 'SplitContainerMain ' Me.SplitContainerMain.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerMain.Location = New System.Drawing.Point(0, 158) + Me.SplitContainerMain.Location = New System.Drawing.Point(0, 0) Me.SplitContainerMain.Name = "SplitContainerMain" ' 'SplitContainerMain.Panel1 @@ -296,8 +320,8 @@ Partial Class frmNodeNavigation ' Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainer1) Me.SplitContainerMain.Panel2.Text = "Panel2" - Me.SplitContainerMain.Size = New System.Drawing.Size(1307, 664) - Me.SplitContainerMain.SplitterPosition = 451 + Me.SplitContainerMain.Size = New System.Drawing.Size(1297, 664) + Me.SplitContainerMain.SplitterPosition = 289 Me.SplitContainerMain.TabIndex = 2 ' 'TreeListDevexpress @@ -332,7 +356,7 @@ Partial Class frmNodeNavigation Me.TreeListDevexpress.OptionsView.ShowTreeLines = DevExpress.Utils.DefaultBoolean.[False] Me.TreeListDevexpress.OptionsView.ShowVertLines = False Me.TreeListDevexpress.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Dark - Me.TreeListDevexpress.Size = New System.Drawing.Size(451, 664) + Me.TreeListDevexpress.Size = New System.Drawing.Size(289, 664) Me.TreeListDevexpress.StateImageList = Me.ImageCollection1 Me.TreeListDevexpress.TabIndex = 1 ' @@ -355,8 +379,8 @@ Partial Class frmNodeNavigation 'SplitContainer1.Panel2 ' Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlDocSearch) - Me.SplitContainer1.Size = New System.Drawing.Size(846, 664) - Me.SplitContainer1.SplitterDistance = 215 + Me.SplitContainer1.Size = New System.Drawing.Size(998, 664) + Me.SplitContainer1.SplitterDistance = 214 Me.SplitContainer1.TabIndex = 0 ' 'pnlControls @@ -366,7 +390,7 @@ Partial Class frmNodeNavigation Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlControls.Location = New System.Drawing.Point(0, 0) Me.pnlControls.Name = "pnlControls" - Me.pnlControls.Size = New System.Drawing.Size(846, 215) + Me.pnlControls.Size = New System.Drawing.Size(998, 214) Me.pnlControls.TabIndex = 0 ' 'GridControlDocSearch @@ -379,7 +403,7 @@ Partial Class frmNodeNavigation Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0) Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search Me.GridControlDocSearch.Name = "GridControlDocSearch" - Me.GridControlDocSearch.Size = New System.Drawing.Size(846, 445) + Me.GridControlDocSearch.Size = New System.Drawing.Size(998, 446) Me.GridControlDocSearch.TabIndex = 8 Me.GridControlDocSearch.TabStop = False Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search}) @@ -562,12 +586,42 @@ Partial Class frmNodeNavigation ' Me.TimerClearResultfiles.Interval = 3000 ' + 'SplitContainerDocView + ' + Me.SplitContainerDocView.Collapsed = True + Me.SplitContainerDocView.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 + Me.SplitContainerDocView.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 158) + Me.SplitContainerDocView.Name = "SplitContainerDocView" + ' + 'SplitContainerDocView.Panel1 + ' + Me.SplitContainerDocView.Panel1.Controls.Add(Me.SplitContainerMain) + Me.SplitContainerDocView.Panel1.Text = "Panel1" + ' + 'SplitContainerDocView.Panel2 + ' + Me.SplitContainerDocView.Panel2.Controls.Add(Me.DocumentViewer) + Me.SplitContainerDocView.Panel2.Text = "Panel2" + Me.SplitContainerDocView.Size = New System.Drawing.Size(1307, 664) + Me.SplitContainerDocView.SplitterPosition = 969 + Me.SplitContainerDocView.TabIndex = 0 + ' + 'DocumentViewer + ' + Me.DocumentViewer.Dock = System.Windows.Forms.DockStyle.Fill + Me.DocumentViewer.FileLoaded = False + Me.DocumentViewer.Location = New System.Drawing.Point(0, 0) + Me.DocumentViewer.Name = "DocumentViewer" + Me.DocumentViewer.Size = New System.Drawing.Size(0, 0) + Me.DocumentViewer.TabIndex = 0 + ' 'frmNodeNavigation ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1307, 844) - Me.Controls.Add(Me.SplitContainerMain) + Me.Controls.Add(Me.SplitContainerDocView) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.ribbonNodeNavigation) Me.IconOptions.SvgImage = CType(resources.GetObject("frmNodeNavigation.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) @@ -592,6 +646,12 @@ Partial Class frmNodeNavigation CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit() Me.cmsResultFilesBasic.ResumeLayout(False) Me.cmsResultFileDetail.ResumeLayout(False) + CType(Me.SplitContainerDocView.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDocView.Panel1.ResumeLayout(False) + CType(Me.SplitContainerDocView.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDocView.Panel2.ResumeLayout(False) + CType(Me.SplitContainerDocView, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDocView.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -652,4 +712,8 @@ Partial Class frmNodeNavigation Friend WithEvents BbtnitmNodeReorder As DevExpress.XtraBars.BarButtonItem Friend WithEvents RPGNodes As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents bbtnItm_TV_Collape_Expand As DevExpress.XtraBars.BarButtonItem + Friend WithEvents SplitContainerDocView As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents DocumentViewer As DigitalData.Controls.DocumentViewer.DocumentViewer + Friend WithEvents RibbonPageGroupView As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents checkShowPreview As DevExpress.XtraBars.BarCheckItem End Class diff --git a/app/DD-Record-Organizer/frmNodeNavigation.resx b/app/DD-Record-Organizer/frmNodeNavigation.resx index cc85f24..9e4be43 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.resx +++ b/app/DD-Record-Organizer/frmNodeNavigation.resx @@ -424,6 +424,28 @@ LDEwaC00djRIOHYtNEg0VjhoNFY0aDJ2NGg0VjEweiIgY2xhc3M9IkdyZWVuIiAvPg0KICAgIDxwYXRo IGQ9Ik0yMSwxMmMtNSwwLTksNC05LDlzNCw5LDksOXM5LTQsOS05UzI2LDEyLDIxLDEyeiBNMjYsMjJI MTZ2LTJoMTBWMjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlByZXZpZXciPg0KICAgIDxwYXRoIGQ9Ik0yMS40 + LDI4SDE4bDAsMGwwLDBIOFY0aDEydjVjMCwwLjYsMC40LDEsMSwxaDV2MTMuNGwyLDJWOWwtNy03SDdD + Ni40LDIsNiwyLjQsNiwzdjI2YzAsMC42LDAuNCwxLDEsMWgxNi40ICAgTDIxLjQsMjh6IiBjbGFzcz0i + QmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE4LDE0YzMuMywwLDYsMi43LDYsNmMwLDEuMi0wLjQsMi4z + LTEsMy4zbDQuNiw0LjZjMC41LDAuNSwwLjUsMS4zLDAsMS43Yy0wLjUsMC41LTEuMywwLjUtMS43LDBM + MjEuMywyNSAgIGMtMC45LDAuNi0yLjEsMS0zLjMsMWMtMy4zLDAtNi0yLjctNi02QzEyLDE2LjcsMTQu + NywxNCwxOCwxNHogTTE4LDI0YzIuMiwwLDQtMS44LDQtNHMtMS44LTQtNC00cy00LDEuOC00LDRTMTUu + OCwyNCwxOCwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index a3dd4fd..d25f7db 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -15,6 +15,7 @@ Imports System.Runtime.InteropServices Imports DD_LIB_Standards Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Database Public Class frmNodeNavigation #Region "Laufzeitvariablen & Konstanten" @@ -93,6 +94,7 @@ Public Class frmNodeNavigation DocList = New ClassWindreamDocGrid(GridViewDoc_Search) WindowsEx = New WindowsEx(LOGCONFIG) + End Sub Private Function Get_Splitter_Layout_Filename() Dim Filename As String = String.Format("{0}-{1}-SplitterLayout.xml", CONSTRUCTOR_DETAIL_ID, CONSTRUCTOR_DETAIL_ID.ToString) @@ -149,6 +151,11 @@ Public Class frmNodeNavigation DT_VWPMO_CONSTRUCTOR_FORMS = MYDB_ECM.GetDatatable(Sql) CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = MYDB_ECM.GetDatatable(String.Format("SELECT T.* FROM TBPMO_ENTITY_RIGHT_CONTROLS T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID where T1.CONSTRUCT_ID = {0}", CONSTRUCTORID)) + + Dim oGDPictureLicenseKey = MYDB_ECM.GetScalarValue(Queries.DD_ECM.ThirdPartyModules.GdPictureLicense) + DocumentViewer.Init(LOGCONFIG, oGDPictureLicenseKey) + + ' Hintergrund Bild initialisieren 'If (System.IO.File.Exists(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png")) Then ' WM_LOGO = New Bitmap(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png") @@ -951,8 +958,20 @@ Public Class frmNodeNavigation End If sw.Done() End Sub + + Private LastFindFilterText As String = "" + Private Sub TreeListDevexpress_ColumnFilterChanged_1(sender As Object, e As EventArgs) Handles TreeListDevexpress.ColumnFilterChanged 'oFilterActive = True + Dim oFilterText As String = TreeListDevexpress.FindFilterText + Dim oNode = TreeListDevexpress.FocusedNode + + If LastFindFilterText <> "" And oFilterText = "" Then + TreeListDevexpress.FocusedNode = FocusedNode + TreeListDevexpress.MakeNodeVisible(FocusedNode) + End If + + LastFindFilterText = oFilterText End Sub Private Sub LoadRecord(pRecord As Integer) Try @@ -1759,6 +1778,8 @@ Public Class frmNodeNavigation If ClassWindreamDocGrid.SELECTED_DOC_ID <> 0 Then Dim omsg = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString Update_DocID_Label(True, omsg, EditState.Update) + + Else Update_DocID_Label(True, "DocRow not selected", EditState.None) End If @@ -2851,4 +2872,20 @@ Public Class frmNodeNavigation Private Sub bbtnitmRecSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmRecSave.ItemClick Save_Record() End Sub + + Private Sub checkShowPreview_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkShowPreview.CheckedChanged + SplitContainerDocView.Collapsed = Not checkShowPreview.Checked + End Sub + + Private Sub GridViewDoc_Search_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles GridViewDoc_Search.SelectionChanged + Dim oSelectedDocs = ClassWindreamDocGrid.GetSelectedDocuments(GridViewDoc_Search) + + If oSelectedDocs.Count = 1 Then + Dim oDocument As ClassWindreamDocGrid.WindreamDoc = oSelectedDocs.First() + Dim oPath = ClassHelper.FORMAT_WM_PATH(oDocument.DocPath) + DocumentViewer.LoadFile(oPath) + Else + DocumentViewer.CloseDocument() + End If + End Sub End Class \ No newline at end of file diff --git a/app/Setup_NoUpdaterVS19/Config.wxi b/app/Setup_NoUpdaterVS19/Config.wxi index bb09a59..8aa173a 100644 --- a/app/Setup_NoUpdaterVS19/Config.wxi +++ b/app/Setup_NoUpdaterVS19/Config.wxi @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/app/Setup_NoUpdaterVS19/Product.wxs b/app/Setup_NoUpdaterVS19/Product.wxs index 457a9ed..11438a3 100644 --- a/app/Setup_NoUpdaterVS19/Product.wxs +++ b/app/Setup_NoUpdaterVS19/Product.wxs @@ -143,6 +143,8 @@ + + @@ -156,6 +158,13 @@ + + + + + + + @@ -165,13 +174,21 @@ + + + + + + + + - + @@ -187,7 +204,10 @@ + + + @@ -214,7 +234,9 @@ + + @@ -289,6 +311,8 @@ + +