diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index 43146318..47a2d4cc 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -64,6 +64,7 @@ Partial Class DocumentViewer Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl() Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl() Me.lblInfo = New System.Windows.Forms.Label() + Me.GdViewer = New GdPicture14.GdViewer() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -346,7 +347,7 @@ Partial Class DocumentViewer ' 'SpreadsheetControl1 ' - Me.SpreadsheetControl1.Location = New System.Drawing.Point(83, 177) + Me.SpreadsheetControl1.Location = New System.Drawing.Point(59, 181) Me.SpreadsheetControl1.MenuManager = Me.BarManager1 Me.SpreadsheetControl1.Name = "SpreadsheetControl1" Me.SpreadsheetControl1.ReadOnly = True @@ -377,13 +378,94 @@ Partial Class DocumentViewer ' 'RichEditControl1 ' - Me.RichEditControl1.Location = New System.Drawing.Point(571, 238) + Me.RichEditControl1.Location = New System.Drawing.Point(385, 166) Me.RichEditControl1.MenuManager = Me.BarManager1 Me.RichEditControl1.Name = "RichEditControl1" Me.RichEditControl1.Size = New System.Drawing.Size(400, 200) Me.RichEditControl1.TabIndex = 5 Me.RichEditControl1.Visible = False ' + 'lblInfo + ' + Me.lblInfo.Location = New System.Drawing.Point(0, 0) + Me.lblInfo.Name = "lblInfo" + Me.lblInfo.Size = New System.Drawing.Size(100, 23) + Me.lblInfo.TabIndex = 0 + ' + 'GdViewer + ' + Me.GdViewer.AllowDropFile = False + Me.GdViewer.AnimateGIF = True + Me.GdViewer.AnnotationDropShadow = True + Me.GdViewer.AnnotationEnableMultiSelect = True + Me.GdViewer.AnnotationResizeRotateHandlesColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.GdViewer.AnnotationResizeRotateHandlesScale = 1.0! + Me.GdViewer.AnnotationSelectionLineColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) + Me.GdViewer.AutoScrollMargin = New System.Drawing.Size(0, 0) + Me.GdViewer.AutoScrollMinSize = New System.Drawing.Size(0, 0) + Me.GdViewer.BackColor = System.Drawing.Color.Black + Me.GdViewer.BackgroundImage = Nothing + Me.GdViewer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.GdViewer.ClipAnnotsToPageBounds = True + Me.GdViewer.ClipRegionsToPageBounds = True + Me.GdViewer.ContinuousViewMode = True + Me.GdViewer.DisplayQuality = GdPicture14.DisplayQuality.DisplayQualityAutomatic + Me.GdViewer.DisplayQualityAuto = True + Me.GdViewer.DocumentAlignment = GdPicture14.ViewerDocumentAlignment.DocumentAlignmentMiddleCenter + Me.GdViewer.DocumentPosition = GdPicture14.ViewerDocumentPosition.DocumentPositionMiddleCenter + Me.GdViewer.DrawPageBorders = True + Me.GdViewer.EnableDeferredPainting = True + Me.GdViewer.EnabledProgressBar = True + Me.GdViewer.EnableFuzzySearch = False + Me.GdViewer.EnableICM = False + Me.GdViewer.EnableMenu = True + Me.GdViewer.EnableMouseWheel = True + Me.GdViewer.EnableTextSelection = True + Me.GdViewer.ForceScrollBars = False + Me.GdViewer.ForceTemporaryMode = False + Me.GdViewer.ForeColor = System.Drawing.Color.Black + Me.GdViewer.Gamma = 1.0! + Me.GdViewer.HQAnnotationRendering = True + Me.GdViewer.IgnoreDocumentResolution = False + Me.GdViewer.KeepDocumentPosition = False + Me.GdViewer.Location = New System.Drawing.Point(290, 372) + Me.GdViewer.LockViewer = False + Me.GdViewer.MagnifierHeight = 90 + Me.GdViewer.MagnifierWidth = 160 + Me.GdViewer.MagnifierZoomX = 2.0! + Me.GdViewer.MagnifierZoomY = 2.0! + Me.GdViewer.MouseButtonForMouseMode = GdPicture14.MouseButton.MouseButtonLeft + Me.GdViewer.MouseMode = GdPicture14.ViewerMouseMode.MouseModePan + Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeZoom + Me.GdViewer.Name = "GdViewer" + Me.GdViewer.PageBordersColor = System.Drawing.Color.Black + Me.GdViewer.PageBordersPenSize = 1 + Me.GdViewer.PageDisplayMode = GdPicture14.PageDisplayMode.MultiplePagesView + Me.GdViewer.PdfDisplayFormField = True + Me.GdViewer.PdfEnableFileLinks = True + Me.GdViewer.PdfEnableLinks = True + Me.GdViewer.PdfIncreaseTextContrast = False + Me.GdViewer.PdfShowDialogForPassword = True + Me.GdViewer.PdfShowOpenFileDialogForDecryption = True + Me.GdViewer.PdfVerifyDigitalCertificates = False + Me.GdViewer.PreserveViewRotation = True + Me.GdViewer.RectBorderColor = System.Drawing.Color.Black + Me.GdViewer.RectBorderSize = 1 + Me.GdViewer.RectIsEditable = True + Me.GdViewer.RegionsAreEditable = True + Me.GdViewer.RenderGdPictureAnnots = True + Me.GdViewer.ScrollBars = True + Me.GdViewer.ScrollLargeChange = CType(50, Short) + Me.GdViewer.ScrollSmallChange = CType(1, Short) + Me.GdViewer.SilentMode = True + Me.GdViewer.Size = New System.Drawing.Size(128, 128) + Me.GdViewer.TabIndex = 0 + Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone + Me.GdViewer.Zoom = 1.0R + Me.GdViewer.ZoomCenterAtMousePosition = False + Me.GdViewer.ZoomMode = GdPicture14.ViewerZoomMode.ZoomMode100 + Me.GdViewer.ZoomStep = 25 + ' 'DocumentViewer ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/Controls.DocumentViewer/DocumentViewer.resx b/Controls.DocumentViewer/DocumentViewer.resx index 249559ce..ff4be476 100644 --- a/Controls.DocumentViewer/DocumentViewer.resx +++ b/Controls.DocumentViewer/DocumentViewer.resx @@ -123,9 +123,6 @@ 285, 22 - - 25 - @@ -222,6 +219,9 @@ OCw4TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + 25 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index f9e46f29..125bc1ab 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -596,111 +596,9 @@ Public Class DocumentViewer Return False End Try End Function - Private Function DoLoadFile(FilePath As String) As Boolean - Try - ' Ensure the embedded GdViewer control exists before using it - If Not EnsureViewerReady() Then - _logger?.Warn("GdViewer control is not initialized yet. Delaying load.") - Return False - End If - lblInfo.Visible = False - Dim oFileInfo = New FileInfo(FilePath) - Dim oExtension As String = oFileInfo.Extension.ToUpper - - lbFileNotLoaded.Visible = False - - SpreadsheetControl1.Visible = False - RichEditControl1.Visible = False - - SpreadsheetControl1.Dock = DockStyle.None - RichEditControl1.Dock = DockStyle.None - Dim Override_SSheet_Filesize As Boolean = False - If oExtension.ToLower = ".xlsx" Then - If oFileInfo.Length > 100000 Then - _logger.Info("Override Spreadsheet as xlsx is too big") - Override_SSheet_Filesize = True - End If - End If - If Override_SSheet_Filesize Then - Dim oFormat = GetSpreadsheetFormat(oExtension) - SpreadsheetControl1.LoadDocument(FilePath, oFormat) - - Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange() - oRange.AutoFitColumns() - - If ViewOverride = "Richtext" Then - RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension)) - RichEditControl1.Visible = True - GdViewer.Visible = False - RichEditControl1.Dock = DockStyle.Fill - _ViewOverride = "Richtext" - _ViewerMode = ViewerMode.Richtext - lblInfo.Visible = True - lblInfo.Text = "This docx-file contains a generic error and will be displayed in a reduced viewer. Please try to open the file in WORD" - Else - _ViewOverride = "" - Select Case oExtension.ToUpper - Case ".CSV" - Dim oFormat = GetSpreadsheetFormat(oExtension) - SpreadsheetControl1.LoadDocument(FilePath, oFormat) - - Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange() - oRange.AutoFitColumns() - - SpreadsheetControl1.Visible = True - GdViewer.Visible = False - SpreadsheetControl1.Dock = DockStyle.Fill - Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT" - RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension)) - - RichEditControl1.Visible = True - GdViewer.Visible = False - RichEditControl1.Dock = DockStyle.Fill - Case Else - GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer - GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter - GdViewer.ForceTemporaryMode = True - GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter - If Viewer_ForceTemporaryMode = True Then - GdViewer.ForceTemporaryMode = True - End If - - GdViewer.AnnotationDropShadow = True - GdViewer.BackColor = Color.White - - Dim oGDPState As GdPicture14.GdPictureStatus = GdViewer.DisplayFromFile(FilePath) - If oGDPState <> GdPictureStatus.OK Then - _logger.Warn($"GdPictureStatus is [{oGDPState}]") - If oExtension.ToUpper = ".DOCX" And oGDPState = GdPictureStatus.GenericError Then - DoLoadFile(FilePath, "Richtext") - Else - Dim oFileName = IO.Path.GetFileName(FilePath) - lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName) - lbFileNotLoaded.Visible = True - End If - - Else - If GdViewer.Visible = False Then - GdViewer.Visible = True - End If - End If - - End Select - - - Return True - Catch ex As Exception - _logger.Error(ex) - Return False - End Try - End Function ' Ensures the embedded GdViewer control exists and is added to the visual tree - Private Function EnsureViewerReady() As Boolean - Try - ' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it - If GdViewer Is Nothing Then Private Function EnsureViewerReady() As Boolean Try ' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it diff --git a/Controls.RegexEditor/RegexEditor.vb b/Controls.RegexEditor/RegexEditor.vb index e6ffbbaf..bd94743a 100644 --- a/Controls.RegexEditor/RegexEditor.vb +++ b/Controls.RegexEditor/RegexEditor.vb @@ -1,7 +1,6 @@ Imports System.ComponentModel Imports System.Drawing.Design Imports System.Windows.Forms.Design -Imports DigitalData.Modules.Language Public Class RegexEditor Inherits UITypeEditor @@ -12,7 +11,7 @@ Public Class RegexEditor Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object Dim oService As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService) - Dim oRegexString As String = Utils.NotNull(value, String.Empty) + Dim oRegexString As String = If(value IsNot Nothing, value.ToString(), String.Empty) If oService IsNot Nothing Then Using oform As New frmRegexEditor(oRegexString) diff --git a/Controls.RegexEditor/RegexEditor.vbproj b/Controls.RegexEditor/RegexEditor.vbproj index 9ada2ea0..d637d186 100644 --- a/Controls.RegexEditor/RegexEditor.vbproj +++ b/Controls.RegexEditor/RegexEditor.vbproj @@ -12,7 +12,7 @@ DigitalData.Controls.RegexEditor 512 Windows - v4.8 + v4.6.2 true @@ -60,10 +60,6 @@ False - - False - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/GUIs.ClipboardWatcher/frmMatch.vb b/GUIs.ClipboardWatcher/frmMatch.vb index 710dd8c6..33025b68 100644 --- a/GUIs.ClipboardWatcher/frmMatch.vb +++ b/GUIs.ClipboardWatcher/frmMatch.vb @@ -53,19 +53,19 @@ Public Class frmMatch DATA_ONLY = 2 End Enum - Public Sub New(LogConfig As LogConfig, Environment As Environment, Params As ClipboardWatcherParams) + Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pParams As ClipboardWatcherParams) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - _LogConfig = LogConfig - _Logger = LogConfig.GetLogger() - _Environment = Environment - _Params = Params + _LogConfig = pLogConfig + _Logger = pLogConfig.GetLogger() + _Environment = pEnvironment + _Params = pParams _ProfileSearch = New ProfileSearches(_LogConfig, _Environment, _Params.ClipboardContents) - _Logger.Debug("ClipboardContents: [{0}]", Params.ClipboardContents) - _Logger.Debug("OperationModeOverride: [{0}]", Params.OperationModeOverride.ToString) + _Logger.Debug("ClipboardContents: [{0}]", pParams.ClipboardContents) + _Logger.Debug("OperationModeOverride: [{0}]", pParams.OperationModeOverride.ToString) _Language = ObjectEx.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US) Thread.CurrentThread.CurrentUICulture = New CultureInfo(_Language) diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb index a50b1d72..eae99e33 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb @@ -116,6 +116,7 @@ Partial Class frmDocumentResultList Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() Me.DockPanelPreview = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -221,9 +222,9 @@ Partial Class frmDocumentResultList Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green Me.RibbonControl.ExpandCollapseItem.Id = 0 Me.RibbonControl.Images = Me.SvgImageCollection1 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarEditItemGridFontSize, Me.btnSaveWorkspace, Me.BarWorkspaceMenuItem1, Me.btnSaveWorkspaceAs, Me.btnSaveAsMySearch, Me.lblCurrentWorkspace}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarEditItemGridFontSize, Me.btnSaveWorkspace, Me.BarWorkspaceMenuItem1, Me.btnSaveWorkspaceAs, Me.btnSaveAsMySearch, Me.lblCurrentWorkspace, Me.BarButtonItem6}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") - Me.RibbonControl.MaxItemId = 61 + Me.RibbonControl.MaxItemId = 62 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPage2}) Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemSearchControl1, Me.cmbGridFontSize}) @@ -547,6 +548,7 @@ Partial Class frmDocumentResultList ' Me.RibbonPageGroupExport.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far Me.RibbonPageGroupExport.ItemLinks.Add(Me.BarButtonItemExportGrid1) + Me.RibbonPageGroupExport.ItemLinks.Add(Me.BarButtonItem6) Me.RibbonPageGroupExport.Name = "RibbonPageGroupExport" resources.ApplyResources(Me.RibbonPageGroupExport, "RibbonPageGroupExport") ' @@ -744,6 +746,7 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") Me.DocumentViewer1.FileLoaded = False Me.DocumentViewer1.Name = "DocumentViewer1" + Me.DocumentViewer1.Viewer_ForceTemporaryMode = False ' 'XtraSaveFileDialog ' @@ -796,7 +799,7 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DockPanelMetadata, "DockPanelMetadata") Me.DockPanelMetadata.Name = "DockPanelMetadata" Me.DockPanelMetadata.Options.ShowCloseButton = False - Me.DockPanelMetadata.OriginalSize = New System.Drawing.Size(268, 434) + Me.DockPanelMetadata.OriginalSize = New System.Drawing.Size(268, 413) ' 'DockPanel3_Container ' @@ -818,7 +821,7 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DockPanelStatus, "DockPanelStatus") Me.DockPanelStatus.Name = "DockPanelStatus" Me.DockPanelStatus.Options.ShowCloseButton = False - Me.DockPanelStatus.OriginalSize = New System.Drawing.Size(268, 434) + Me.DockPanelStatus.OriginalSize = New System.Drawing.Size(268, 413) ' 'ControlContainer1 ' @@ -859,7 +862,7 @@ Partial Class frmDocumentResultList Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.EmptySpaceItem1}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(268, 413) + Me.Root.Size = New System.Drawing.Size(268, 434) Me.Root.TextVisible = False ' 'LayoutControlGroup1 @@ -893,7 +896,7 @@ Partial Class frmDocumentResultList Me.EmptySpaceItem1.AllowHotTrack = False Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 93) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(248, 300) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(248, 321) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'DockPanelPreview @@ -912,14 +915,21 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DockPanel1_Container, "DockPanel1_Container") Me.DockPanel1_Container.Name = "DockPanel1_Container" ' + 'BarButtonItem6 + ' + resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6") + Me.BarButtonItem6.Id = 61 + Me.BarButtonItem6.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem6.Name = "BarButtonItem6" + ' 'frmDocumentResultList ' Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.DockPanelFileList) Me.Controls.Add(Me.DockPanelPreview) Me.Controls.Add(Me.panelContainerStatus) - Me.Controls.Add(Me.DockPanelFileList) Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonControl) Me.IconOptions.Icon = CType(resources.GetObject("frmDocumentResultList.IconOptions.Icon"), System.Drawing.Icon) @@ -1070,4 +1080,5 @@ Partial Class frmDocumentResultList Friend WithEvents btnSaveAsMySearch As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroupSavedSearch As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents lblCurrentWorkspace As DevExpress.XtraBars.BarStaticItem + Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.resx b/GUIs.Common/DocumentResultList/frmDocumentResultList.resx index 6a15dc80..8ee89881 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.resx +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.resx @@ -230,29 +230,28 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAEJSURB - VDhPpZOhCgJBEIava7IICmIx+AZyRdM1X0EQfI8Ds3a70Re4ahKTb2BTsIhR0/p/x57MHmsQwwe788/8 - tzO7l0yXRZ1MrMVBPDysiaEF+XbTFyuxF7kYi5aHNTE0csgNDAhsxUYMnHNJDDSfQ25pUhngitCIFVrI - 8bnUlAb0xdGCL2vfFkfhxFPMjcZJqMnYMJy8VjwUZ0HxRYys7nOYyZoFEx4bYSLugmK0ji00eQz2wIJr - avngTLwExVGMAbfziBnQb7QYYgb1FlJxExQwxG6lWRT/tBAbYk+cBCZXkVrd53yG+O0am2InMKGthdGC - a4S/HhL8/ZQrE1w52s8/k+WH37lI3sUnQlO0bha7AAAAAElFTkSuQmCC + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAESSURB + VDhPpVMxSkNREPx9rNIEFMQmRW4gNkmVbq4gCN4jMHXSp7f0AtNahVS5QToFG0mp1ZcJm/D+5iloioH9 + uzPzd/e914BqEqagFqBWoHYBx8651uGXHzeg5qBeQM1AjUH1A46dc80cczsGTjyBWoIatm3b1OBacMzd + mxwM7OpCL4syzAmuNXsDz+XWOn8GNQC1BtWC+gT1kDqxZuoPL2eWxCNQ2xC/grqtdOKdLBx4w+OiMAH1 + EWLXLrM4eF7syoGPqR/Je1BfIa6iMPDp7GoGnvdE+JtBHuEO1HsIvMSr3H4eobbEa1CbMHmzacXguMSf + jvEC1HOYeKzHotY5RuOsi2ScfZUPJv9+TCX+9Jy/AcUnQlOuZReWAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJwSURB - VFhHxZe/Sh1BFMZNJbeUKIhgZ5fOMp2teBsRkaRIlZA0AZ9AsRZrX8E3EO59A9H8gRAIBOxSpAkEIoaY - zfdb5pO54+ze8Rrd4ifuOd85c3b3zJm9U1VVdUr9p793XMKC2BIHYijOxUWA/7HhQ4M2l2OE0gKeiF3x - QVSFoCWG2FzOmnEFPBKvxakg6V8xEDtiTSyJXoD/seFDg5YYYslBrhtrtBUwL/aF7+hIrKMtAW2IcTy5 - yDmyDloHxCA8FAR+FdtiOl6gBGJCLDnIRc6RItBZbHhUvvN3YiNOOgnkCLn8JK5fB36LDO/Ld37nxQ25 - Qk5ys0a2ADrWDbcdJ0iRvy8ug9Z8EYs5PcjH60DHGvXuwG4nsG0Q0DyN71w+Gixd/LNYyOmN/PSEG5O1 - arudDA72Ltunsdvl2xS/Rbz4JzGf06dIR/GswVp1wXYwvUg2iANi5Hsm/gSdIdFcTt+E9MwJYre4tpER - inEnFhvZX4h08TPxOKdvQzEMK+IPuLaROY5xLRYH30txFfzmRMyk2hIUx8Qkx5BrGzlMMC4l4jfCY3Vi - kpyMbeznXNvIiYaxFwnfijsvDs4Z8nJ2YL/guq2AVyJ99BPhnCFvtoCmV/BcpM13a5Kc2VfQ1oS5wTPR - DgDFZZtw3DZcFb+CxnDA/LdtWDKIVsTPoIuLmM3pm5A+O4hKR/FT8UPERbwXRdNQusZRDKWH0bL4HrTF - RcjfehjBbY5jtN+C1nwUjUXIN/Y4hk4/SKDzTzLo9KPUIPSTAJrnwT7LDY+K9+XGZPs82A+TGDqWbcPe - 9R2NAy0xdbc3UVqAub8fp91RTf0DZ0rWioS6adsAAAAASUVORK5CYII= + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJHSURB + VFhHxZe9ihVBEIXXSDYUFUQw28zM0MxU9iQismhgpGgi7BOsVLxs7Cv4BgW7byD+ggiCsJmBiSC4KOqV + 79K1zJY9Mz1XZYJzuVNddepMd3V1z9pisVibE8sfmbfgosy3ZL4n8wOZH8r8qID/2BjDB98c/wdaBVyW + +WOZv5b5ohH4EkNs5msWcErmD2T+vJD+kvm+zHdkvinzDZmvF/AfG2P44EsMsXDAlfkHBVyQ+W7njZ7K + /EZevz7gW2IiHi44mwTg+KQEfpD5tsxP5yRjIKbEwgEXnCdE1AQwVfHmL2V+MxNPBRyFK2bieDkYD6cA + 6xVv/tfJA0VEzAQ5qgKo2Ci47UySCCXzb6ny38v8UvbtxLAcUZjL3ZEFsG2i4HrXvBRYTv6OvZ99Uxw1 + EYVJrhMCaBzsXbZPb7XL/JbMv6fkbymu7FtDEU8Oci0FxwDdC7L9HNQJvi3zHyk5ROez7xBKnyB2i+cw + 0kIx7uSAMn63kvyFzM9m3zGUZkX8Hs9hpI9j3KwE3JP5z5T8mczPZN8WlI4JxwHPYeQwwbiRnB922urK + SJy0beyHXQGcaBjXO46P/kVykARwdmA/GhNwvzL1K6FFQN8S3KkU32QkzuoSDBVhrfGstAMKX7UIx7bh + dZl/TSI4YCaL6NuGLY3omsy/VEScy75D6GtEra34qsw/JxGvWrvhUCsGrYfRFZl/mipi7DACU45jfD8m + EW+GRLQcx2DWCwmY/UoGZr2UdkXMdi0PzPph0sVsn2YZ/+/jdE78BmdK1op4DTduAAAAAElFTkSuQmCC @@ -506,6 +505,48 @@ 1189, 671 + + 3, 26 + + + 583, 460 + + + 0 + + + DockPanel2_Container + + + DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanelFileList + + + 0 + + + 0, 158 + + + 590, 489 + + + Ergebnisse + + + DockPanelFileList + + + DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + Fill @@ -513,7 +554,7 @@ 0, 0 - 318, 441 + 318, 459 0 @@ -522,7 +563,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.6.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null DockPanel1_Container @@ -531,10 +572,10 @@ 0 - 3, 46 + 3, 26 - 318, 441 + 318, 459 0 @@ -555,7 +596,7 @@ 590, 158 - 324, 491 + 324, 489 Vorschau @@ -570,7 +611,7 @@ $this - 0 + 1 Fill @@ -579,7 +620,7 @@ 0, 0 - 268, 413 + 268, 434 0 @@ -588,7 +629,7 @@ CtrlObjectPropertyDialog - DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.5.8.0, Culture=neutral, PublicKeyToken=null + DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.8.0.0, Culture=neutral, PublicKeyToken=null DockPanel3_Container @@ -600,7 +641,7 @@ 0, 0 - 268, 413 + 268, 434 0 @@ -618,10 +659,10 @@ 0 - 4, 46 + 4, 26 - 268, 413 + 268, 434 Eigenschaften @@ -705,7 +746,7 @@ In Bearbeitung - 268, 413 + 268, 434 0 @@ -729,7 +770,7 @@ 0, 0 - 268, 413 + 268, 434 0 @@ -747,10 +788,10 @@ 0 - 4, 46 + 4, 26 - 268, 413 + 268, 434 Status @@ -771,7 +812,7 @@ 914, 158 - 275, 491 + 275, 489 panelContainer1 @@ -786,58 +827,16 @@ $this - 1 - - - 3, 46 - - - 583, 442 - - - 0 - - - DockPanel2_Container - - - DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DockPanelFileList - - - 0 - - - 0, 158 - - - 590, 491 - - - Ergebnisse - - - DockPanelFileList - - - DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - 2 Arbeitsbereich: {0} - 0, 649 + 0, 647 - 1189, 22 + 1189, 24 RibbonStatusBar @@ -1372,6 +1371,12 @@ DevExpress.XtraLayout.EmptySpaceItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem6 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmDocumentResultList @@ -1384,6 +1389,26 @@ Als meine Suche speichern + + Export + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + R3JlZW57ZmlsbDojMDM5QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IkV4cG9ydCI+DQogICAgPHBhdGgg + ZD0iTTEwLDEySDZWNmg0VjEyeiBNMjIsMTJ2NnY5YzAsMC42LTAuNCwxLTEsMUgxYy0wLjYsMC0xLTAu + NC0xLTFWN2MwLTAuNiwwLjQtMSwxLTFoM3Y4aDE0di0ySDIyeiBNMTgsMThINCAgIHY2aDE0VjE4eiIg + Y2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iMTYsMTAgMjQsMTAgMjQsMTQgMzIs + OCAyNCwyIDI0LDYgMTYsNiAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 0, 0 @@ -1457,7 +1482,7 @@ 4 - 573, 442 + 573, 460 0 @@ -1628,7 +1653,7 @@ 1 - 583, 442 + 583, 460 2 diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 56048b90..cb45dd24 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -29,7 +29,7 @@ Public Class frmDocumentResultList ' Interface implementations Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig - Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger + Private ReadOnly Property _Logger As Logger Implements IBaseForm._Logger Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm ' Helper Classes @@ -50,6 +50,11 @@ Public Class frmDocumentResultList Private ReadOnly Workspace As Workspace(Of Config) Private WithEvents Watcher As Watcher + Private CopyWMFile2Temp As Boolean = False + Private WM_SUFFIX As String = "\\WINDREAM\OBJECTS" + Private MAP_SHAREDRIVE As String = "" + Private MAP_BLACKLIST As String = "" + ' Runtime variables Private Property ResultLists As List(Of DocumentResult) @@ -79,6 +84,7 @@ Public Class frmDocumentResultList Private Property GridList As List(Of GridControl) Private Property ViewList As List(Of BandedGridView) Private Property OperationMode As OperationMode Implements IResultForm.OperationMode + Private _documentPathHandler As DocumentPathHandler Public ReadOnly Property Config1 As ConfigManager(Of Config) Get @@ -112,12 +118,13 @@ Public Class frmDocumentResultList ResultLists = pParams.Results LogConfig = pLogConfig - Logger = pLogConfig.GetLogger() + _Logger = pLogConfig.GetLogger() FormHelper = New FormHelper(pLogConfig, Me) + _documentPathHandler = New DocumentPathHandler(pLogConfig) UserLanguage = ObjectEx.NotNull(Environment.User.Language, State.UserState.LANG_EN_US) - LanguageEx.LogApplicationLanguage(Logger) - LanguageEx.SetApplicationLanguage(Logger, UserLanguage) + LanguageEx.LogApplicationLanguage(_Logger) + LanguageEx.SetApplicationLanguage(_Logger, UserLanguage) Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath, oConfigPath) Helpers = New DocumentResultList.Helpers(pLogConfig) @@ -126,7 +133,6 @@ Public Class frmDocumentResultList FileEx = New Modules.Windows.File(pLogConfig) LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}, pEnvironment) Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1, UserLanguage) - End Sub Private Function GetOperationMode() As OperationMode @@ -139,18 +145,18 @@ Public Class frmDocumentResultList oOperationMode = OperationMode.NoAppServer End If - Logger.Debug("OperationMode set to [{0}]", oOperationMode) + _Logger.Debug("OperationMode set to [{0}]", oOperationMode) If Params.OperationModeOverride <> OperationMode.None Then - Logger.Debug("Overriding OperationMode with [{0}]", Params.OperationModeOverride) + _Logger.Debug("Overriding OperationMode with [{0}]", Params.OperationModeOverride) oOperationMode = Params.OperationModeOverride End If - Logger.Debug("OperationMode is now [{0}]", oOperationMode) + _Logger.Debug("OperationMode is now [{0}]", oOperationMode) Catch ex As Exception - Logger.Error(ex) - Logger.Warn("Error while determining OperationMode. Setting to [{0}]", oOperationMode) + _Logger.Error(ex) + _Logger.Warn("Error while determining OperationMode. Setting to [{0}]", oOperationMode) End Try Return oOperationMode @@ -166,7 +172,7 @@ Public Class frmDocumentResultList End If - LanguageEx.LogApplicationLanguage(Logger) + LanguageEx.LogApplicationLanguage(_Logger) Documentloader = New Loader(LogConfig, OperationMode, EDMI_API_Client, Environment.User) @@ -316,8 +322,11 @@ Public Class frmDocumentResultList End If DocumentViewer1.Done() + If _documentPathHandler IsNot Nothing Then + _documentPathHandler.Cleanup() + End If Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) End Try End Sub @@ -341,19 +350,37 @@ Public Class frmDocumentResultList End If UpdateRibbonActions(oDocument) - + If IsNothing(oDocument) Then + DocumentViewer1.CloseDocument() + FormHelper.ShowErrorMessage(New IOException("File could not be loaded!"), "GridView_FocusedRowChanged") + Exit Sub + End If ' Save reference to current document _CurrentDocument = oDocument ' Load Document in Document Viewer Dim oFileName = $"{oObjectId}.{oDocument.Extension}" - DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents)) - If IsNothing(oDocument) Then - DocumentViewer1.CloseDocument() - FormHelper.ShowErrorMessage(New IOException("File could not be loaded!"), "GridView_FocusedRowChanged") - - Exit Sub + 'If CopyWMFile2Temp = True Then + ' _Logger.Debug("Loading document into viewer with path handler and copying WM file to temp. ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath) + ' ' Optionen konfigurieren + ' Dim options As New DocumentPathHandler.DocumentPathOptions With { + ' .EnableMapping = True, + ' .WMSuffix = WM_SUFFIX, + ' .SpecificDrive = If(Len(MAP_SHAREDRIVE) = 1, MAP_SHAREDRIVE, ""), + ' .DriveBlacklist = MAP_BLACKLIST, + ' .CopyToTemp = True, + ' .TempFolder = TEMP_DOCUMENT_FOLDER, + ' .UnmapAfterCopy = True + ' } + 'Else + If Not IsNothing(oDocument.Contents) Then + _Logger.Debug("Loading document into viewer with MemoryStream handler. ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath) + DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents)) + Else + _Logger.Debug("Loading document into viewer from filepath ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath) + DocumentViewer1.LoadFile_FromPath(oFullPath) End If + 'End If If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then Await CtrlObjectPropertyDialog.LoadObject(oObjectId) @@ -416,7 +443,7 @@ Public Class frmDocumentResultList Return True Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) Return False End Try End Function @@ -531,7 +558,7 @@ Public Class frmDocumentResultList CheckoutManager = New CheckInOut(LogConfig, EDMI_API_Client) If Not EDMI_API_Client.Connect() Then - Logger.Warn("Client could not connect to Service at [{0}]", Environment.Service.Address) + _Logger.Warn("Client could not connect to Service at [{0}]", Environment.Service.Address) Return False End If @@ -568,7 +595,7 @@ Public Class frmDocumentResultList Return True Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) MessageBox.Show("Error while refreshing results:" & vbNewLine & vbNewLine & ex.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error) Return False @@ -580,12 +607,12 @@ Public Class frmDocumentResultList Private Sub LoadGridData(View As GridView, Result As DocumentResultList.DocumentResult) If Result.Datatable.Columns.Contains(ColumnDocumentId) = False Then - Logger.Error($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!") + _Logger.Error($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!") 'Throw New ApplicationException($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!") End If If OperationMode = OperationMode.NoAppServer And Result.Datatable.Columns.Contains(ColumnFilepath) = False Then - Logger.Error($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!") + _Logger.Error($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!") 'Throw New ApplicationException($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!") End If @@ -781,9 +808,9 @@ Public Class frmDocumentResultList GridView.BestFitColumns() Catch ex As ApplicationException MsgBox($"Error while loading grid data for search {Result.Title}: {vbNewLine}{vbNewLine}{ex.Message}", MsgBoxStyle.Critical, Text) - Logger.Error(ex) + _Logger.Error(ex) Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) End Try End Sub @@ -882,7 +909,7 @@ Public Class frmDocumentResultList Await Watcher.OpenDocument(_CurrentDocument) End If Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) End Try End Sub @@ -948,7 +975,7 @@ Public Class frmDocumentResultList Try Await Watcher.OpenDocument(_CurrentDocument) Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) End Try End Sub @@ -1056,7 +1083,7 @@ Public Class frmDocumentResultList End If End If Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) End Try End Sub @@ -1172,7 +1199,4 @@ Public Class frmDocumentResultList End Sub - Private Sub GridView_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridView3.FocusedRowChanged, GridView2.FocusedRowChanged, GridView1.FocusedRowChanged - - End Sub End Class \ No newline at end of file diff --git a/GUIs.Common/IBaseForm.vb b/GUIs.Common/IBaseForm.vb index 27879b8c..be9ff0ed 100644 --- a/GUIs.Common/IBaseForm.vb +++ b/GUIs.Common/IBaseForm.vb @@ -2,5 +2,5 @@ Public Interface IBaseForm ReadOnly Property LogConfig As LogConfig - ReadOnly Property Logger As Logger + ReadOnly Property _Logger As Logger End Interface diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index 7558f39e..425352f9 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb index ad97bbd5..2c6c0515 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb @@ -12,7 +12,7 @@ Public Class ctrlObjectPropertyDialog Implements IBaseForm Private Property LogConfig As LogConfig Implements IBaseForm.LogConfig - Private Property Logger As Logger Implements IBaseForm.Logger + Private Property _Logger As Logger Implements IBaseForm._Logger Private Property ControlManager As AttributeControls Private Property GridBuilder As GridBuilder Private Property Client As Client @@ -38,7 +38,7 @@ Public Class ctrlObjectPropertyDialog Public Sub Initialize(pLogConfig As LogConfig, pHostForm As Form, pClient As Client, pEnv As Environment) LogConfig = pLogConfig - Logger = pLogConfig.GetLogger() + _Logger = pLogConfig.GetLogger() HostForm = pHostForm ControlManager = New AttributeControls(pLogConfig, pEnv, pClient) Helper = New FormHelper(pLogConfig, pHostForm) @@ -58,7 +58,7 @@ Public Class ctrlObjectPropertyDialog Public Async Function SaveChanges() As Task(Of Boolean) Try For Each oChange As KeyValuePair(Of String, Object) In Changes - Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString) + _Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString) Await Client.SetAttributeValueAsync(ObjectId, oChange.Key, oChange.Value, New Options.SetAttributeValueOptions With { .Language = Environment.User.Language, .Username = Environment.User.UserName @@ -131,7 +131,7 @@ Public Class ctrlObjectPropertyDialog Return True Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) Return False Finally Enabled = True @@ -145,7 +145,7 @@ Public Class ctrlObjectPropertyDialog Return True Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) Return False End Try End Function @@ -156,7 +156,7 @@ Public Class ctrlObjectPropertyDialog Return True Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) Return False End Try End Function @@ -176,14 +176,14 @@ Public Class ctrlObjectPropertyDialog Return True Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) Return False End Try End Function Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long)) Try - Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WHERE IDB_OBJ_ID = {ObjectId}" + Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}" Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) If oResult.OK = False Then @@ -202,7 +202,7 @@ Public Class ctrlObjectPropertyDialog Return oEntities End If Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) Return New List(Of Long) End Try End Function @@ -230,7 +230,7 @@ Public Class ctrlObjectPropertyDialog End Function Private Async Function GetPropertiesForObjectId(ObjectId As Long) As Task(Of DataTable) - Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WHERE IDB_OBJ_ID = {ObjectId}" + Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}" Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) Return oResult.Table @@ -246,7 +246,7 @@ Public Class ctrlObjectPropertyDialog ControlManager.LoadControlsForAttributes(oAttributes, Root) Await ControlManager.LoadControlValuesForAttributes(pObjectId, Root) Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) End Try End Sub diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb index fbf2777d..b081817b 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb @@ -19,7 +19,7 @@ Public Class frmObjectPropertyDialog Private Property FormHelper As FormHelper Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig - Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger + Private ReadOnly Property _Logger As Logger Implements IBaseForm._Logger Private ReadOnly Changes As New Dictionary(Of String, Object) @@ -29,7 +29,7 @@ Public Class frmObjectPropertyDialog ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. LogConfig = pLogConfig - Logger = pLogConfig.GetLogger() + _Logger = pLogConfig.GetLogger() Environment = pEnvironment Client = pClient ObjectId = pObjectId @@ -75,7 +75,7 @@ Public Class frmObjectPropertyDialog Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long)) Try - Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WHERE IDB_OBJ_ID = {ObjectId}" + Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}" Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) If oResult.OK = False Then @@ -94,7 +94,7 @@ Public Class frmObjectPropertyDialog Return oEntities End If Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) Return New List(Of Long) End Try End Function @@ -122,7 +122,7 @@ Public Class frmObjectPropertyDialog End Function Private Async Function GetPropertiesForObjectId(ObjectId As Long) As Task(Of DataTable) - Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WHERE IDB_OBJ_ID = {ObjectId}" + Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}" Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) Return oResult.Table @@ -136,7 +136,7 @@ Public Class frmObjectPropertyDialog Dim oEntityId As Long If Long.TryParse(cmbBusinessEntity.EditValue, oEntityId) = False Then - _Logger.Warn("Could not Parse Entity from cmbBusinessEntity") + __Logger.Warn("Could not Parse Entity from cmbBusinessEntity") Exit Sub End If @@ -149,7 +149,7 @@ Public Class frmObjectPropertyDialog ControlManager.LoadControlsForAttributes(oAttributes, AttributeLayout) Await ControlManager.LoadControlValuesForAttributes(ObjectId, AttributeLayout) Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) End Try End Sub @@ -173,7 +173,7 @@ Public Class frmObjectPropertyDialog Return True Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) Return False End Try End Function @@ -184,7 +184,7 @@ Public Class frmObjectPropertyDialog Return True Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) Return False End Try End Function @@ -204,7 +204,7 @@ Public Class frmObjectPropertyDialog Return True Catch ex As Exception - Logger.Error(ex) + _Logger.Error(ex) Return False End Try End Function @@ -212,7 +212,7 @@ Public Class frmObjectPropertyDialog Private Async Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick Try For Each oChange As KeyValuePair(Of String, Object) In Changes - Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString) + _Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString) Await Client.SetAttributeValueAsync(ObjectId, oChange.Key, oChange.Value, New Options.SetAttributeValueOptions With { .Language = Environment.User.Language, diff --git a/GUIs.Common/SQLEditor/frmSQLEditor.vb b/GUIs.Common/SQLEditor/frmSQLEditor.vb index 3a676591..19066476 100644 --- a/GUIs.Common/SQLEditor/frmSQLEditor.vb +++ b/GUIs.Common/SQLEditor/frmSQLEditor.vb @@ -172,7 +172,7 @@ Public Class frmSQLEditor Private Function LoadConnections() As GalleryItemGroup Try - Dim oSql = "SELECT GUID, Bezeichnung FROM TBDD_CONNECTION WHERE AKTIV = 1" + Dim oSql = "SELECT GUID, Bezeichnung FROM TBDD_CONNECTION WITH (NOLOCK) WHERE AKTIV = 1" Dim oTable = Database.GetDatatable(oSql) Dim oConnections = New List(Of Connection) diff --git a/GUIs.Test.TestGUI/frmObjectProperties.vb b/GUIs.Test.TestGUI/frmObjectProperties.vb index 8dda75a1..542ce790 100644 --- a/GUIs.Test.TestGUI/frmObjectProperties.vb +++ b/GUIs.Test.TestGUI/frmObjectProperties.vb @@ -11,10 +11,10 @@ Public Class frmObjectProperties ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. LogConfig = pLogConfig - Logger = pLogConfig.GetLogger() + _Logger = pLogConfig.GetLogger() End Sub Public ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig - Public ReadOnly Property Logger As Logger Implements IBaseForm.Logger + Public ReadOnly Property _Logger As Logger Implements IBaseForm._Logger End Class \ No newline at end of file