Compare commits
4 Commits
ca567dc9bc
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45485400e1 | ||
|
|
734e056248 | ||
|
|
b586bf496b | ||
|
|
e497490e82 |
86
Controls.DocumentViewer/DocumentViewer.Designer.vb
generated
86
Controls.DocumentViewer/DocumentViewer.Designer.vb
generated
@@ -64,6 +64,7 @@ Partial Class DocumentViewer
|
|||||||
Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl()
|
Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl()
|
||||||
Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
|
Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
|
||||||
Me.lblInfo = New System.Windows.Forms.Label()
|
Me.lblInfo = New System.Windows.Forms.Label()
|
||||||
|
Me.GdViewer = New GdPicture14.GdViewer()
|
||||||
CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
@@ -346,7 +347,7 @@ Partial Class DocumentViewer
|
|||||||
'
|
'
|
||||||
'SpreadsheetControl1
|
'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.MenuManager = Me.BarManager1
|
||||||
Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
|
Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
|
||||||
Me.SpreadsheetControl1.ReadOnly = True
|
Me.SpreadsheetControl1.ReadOnly = True
|
||||||
@@ -377,13 +378,94 @@ Partial Class DocumentViewer
|
|||||||
'
|
'
|
||||||
'RichEditControl1
|
'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.MenuManager = Me.BarManager1
|
||||||
Me.RichEditControl1.Name = "RichEditControl1"
|
Me.RichEditControl1.Name = "RichEditControl1"
|
||||||
Me.RichEditControl1.Size = New System.Drawing.Size(400, 200)
|
Me.RichEditControl1.Size = New System.Drawing.Size(400, 200)
|
||||||
Me.RichEditControl1.TabIndex = 5
|
Me.RichEditControl1.TabIndex = 5
|
||||||
Me.RichEditControl1.Visible = False
|
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
|
'DocumentViewer
|
||||||
'
|
'
|
||||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||||
|
|||||||
@@ -123,9 +123,6 @@
|
|||||||
<metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
<metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
<value>285, 22</value>
|
<value>285, 22</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>25</value>
|
|
||||||
</metadata>
|
|
||||||
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<data name="buttonPrint.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="buttonPrint.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
@@ -222,6 +219,9 @@
|
|||||||
OCw4TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
|
OCw4TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
|
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>25</value>
|
||||||
|
</metadata>
|
||||||
<data name="btnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="btnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
|
||||||
|
|||||||
@@ -596,111 +596,9 @@ Public Class DocumentViewer
|
|||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
End Function
|
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
|
' 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
|
Private Function EnsureViewerReady() As Boolean
|
||||||
Try
|
Try
|
||||||
' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it
|
' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
Imports System.ComponentModel
|
Imports System.ComponentModel
|
||||||
Imports System.Drawing.Design
|
Imports System.Drawing.Design
|
||||||
Imports System.Windows.Forms.Design
|
Imports System.Windows.Forms.Design
|
||||||
Imports DigitalData.Modules.Language
|
|
||||||
|
|
||||||
Public Class RegexEditor
|
Public Class RegexEditor
|
||||||
Inherits UITypeEditor
|
Inherits UITypeEditor
|
||||||
@@ -12,7 +11,7 @@ Public Class RegexEditor
|
|||||||
|
|
||||||
Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object
|
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 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
|
If oService IsNot Nothing Then
|
||||||
Using oform As New frmRegexEditor(oRegexString)
|
Using oform As New frmRegexEditor(oRegexString)
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<AssemblyName>DigitalData.Controls.RegexEditor</AssemblyName>
|
<AssemblyName>DigitalData.Controls.RegexEditor</AssemblyName>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<MyType>Windows</MyType>
|
<MyType>Windows</MyType>
|
||||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
@@ -60,10 +60,6 @@
|
|||||||
<Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
|
<Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="DigitalData.Modules.Language, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
|
|
||||||
<SpecificVersion>False</SpecificVersion>
|
|
||||||
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Logging">
|
<Reference Include="DigitalData.Modules.Logging">
|
||||||
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
|
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
|||||||
@@ -53,19 +53,19 @@ Public Class frmMatch
|
|||||||
DATA_ONLY = 2
|
DATA_ONLY = 2
|
||||||
End Enum
|
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.
|
' Dieser Aufruf ist für den Designer erforderlich.
|
||||||
InitializeComponent()
|
InitializeComponent()
|
||||||
|
|
||||||
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
|
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
|
||||||
_LogConfig = LogConfig
|
_LogConfig = pLogConfig
|
||||||
_Logger = LogConfig.GetLogger()
|
_Logger = pLogConfig.GetLogger()
|
||||||
_Environment = Environment
|
_Environment = pEnvironment
|
||||||
_Params = Params
|
_Params = pParams
|
||||||
_ProfileSearch = New ProfileSearches(_LogConfig, _Environment, _Params.ClipboardContents)
|
_ProfileSearch = New ProfileSearches(_LogConfig, _Environment, _Params.ClipboardContents)
|
||||||
|
|
||||||
_Logger.Debug("ClipboardContents: [{0}]", Params.ClipboardContents)
|
_Logger.Debug("ClipboardContents: [{0}]", pParams.ClipboardContents)
|
||||||
_Logger.Debug("OperationModeOverride: [{0}]", Params.OperationModeOverride.ToString)
|
_Logger.Debug("OperationModeOverride: [{0}]", pParams.OperationModeOverride.ToString)
|
||||||
|
|
||||||
_Language = ObjectEx.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US)
|
_Language = ObjectEx.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US)
|
||||||
Thread.CurrentThread.CurrentUICulture = New CultureInfo(_Language)
|
Thread.CurrentThread.CurrentUICulture = New CultureInfo(_Language)
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ Partial Class frmDocumentResultList
|
|||||||
Me.btnSaveWorkspaceAs = New DevExpress.XtraBars.BarButtonItem()
|
Me.btnSaveWorkspaceAs = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.btnSaveAsMySearch = New DevExpress.XtraBars.BarButtonItem()
|
Me.btnSaveAsMySearch = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.lblCurrentWorkspace = New DevExpress.XtraBars.BarStaticItem()
|
Me.lblCurrentWorkspace = New DevExpress.XtraBars.BarStaticItem()
|
||||||
|
Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||||
Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
Me.RibbonPageGroupExport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonPageGroupExport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
@@ -221,9 +222,9 @@ Partial Class frmDocumentResultList
|
|||||||
Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
|
Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
|
||||||
Me.RibbonControl.ExpandCollapseItem.Id = 0
|
Me.RibbonControl.ExpandCollapseItem.Id = 0
|
||||||
Me.RibbonControl.Images = Me.SvgImageCollection1
|
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")
|
resources.ApplyResources(Me.RibbonControl, "RibbonControl")
|
||||||
Me.RibbonControl.MaxItemId = 61
|
Me.RibbonControl.MaxItemId = 62
|
||||||
Me.RibbonControl.Name = "RibbonControl"
|
Me.RibbonControl.Name = "RibbonControl"
|
||||||
Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPage2})
|
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})
|
Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemSearchControl1, Me.cmbGridFontSize})
|
||||||
@@ -530,6 +531,13 @@ Partial Class frmDocumentResultList
|
|||||||
Me.lblCurrentWorkspace.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
|
Me.lblCurrentWorkspace.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
|
||||||
Me.lblCurrentWorkspace.Tag = "Arbeitsbereich: {0}"
|
Me.lblCurrentWorkspace.Tag = "Arbeitsbereich: {0}"
|
||||||
'
|
'
|
||||||
|
'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"
|
||||||
|
'
|
||||||
'RibbonPageStart
|
'RibbonPageStart
|
||||||
'
|
'
|
||||||
Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroupExport, Me.RibbonPageRefresh, Me.RibbonPageGroupDocument, Me.RibbonPageGroupFilesystem, Me.RibbonPageGroupCheckInOut, Me.RibbonPageGroupWorkflow, Me.RibbonPageGroupAttribute, Me.RibbonPageGroupWorkspace, Me.RibbonPageGroupSavedSearch})
|
Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroupExport, Me.RibbonPageRefresh, Me.RibbonPageGroupDocument, Me.RibbonPageGroupFilesystem, Me.RibbonPageGroupCheckInOut, Me.RibbonPageGroupWorkflow, Me.RibbonPageGroupAttribute, Me.RibbonPageGroupWorkspace, Me.RibbonPageGroupSavedSearch})
|
||||||
@@ -547,6 +555,7 @@ Partial Class frmDocumentResultList
|
|||||||
'
|
'
|
||||||
Me.RibbonPageGroupExport.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
|
Me.RibbonPageGroupExport.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
|
||||||
Me.RibbonPageGroupExport.ItemLinks.Add(Me.BarButtonItemExportGrid1)
|
Me.RibbonPageGroupExport.ItemLinks.Add(Me.BarButtonItemExportGrid1)
|
||||||
|
Me.RibbonPageGroupExport.ItemLinks.Add(Me.BarButtonItem6)
|
||||||
Me.RibbonPageGroupExport.Name = "RibbonPageGroupExport"
|
Me.RibbonPageGroupExport.Name = "RibbonPageGroupExport"
|
||||||
resources.ApplyResources(Me.RibbonPageGroupExport, "RibbonPageGroupExport")
|
resources.ApplyResources(Me.RibbonPageGroupExport, "RibbonPageGroupExport")
|
||||||
'
|
'
|
||||||
@@ -744,6 +753,7 @@ Partial Class frmDocumentResultList
|
|||||||
resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
|
resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
|
||||||
Me.DocumentViewer1.FileLoaded = False
|
Me.DocumentViewer1.FileLoaded = False
|
||||||
Me.DocumentViewer1.Name = "DocumentViewer1"
|
Me.DocumentViewer1.Name = "DocumentViewer1"
|
||||||
|
Me.DocumentViewer1.Viewer_ForceTemporaryMode = False
|
||||||
'
|
'
|
||||||
'XtraSaveFileDialog
|
'XtraSaveFileDialog
|
||||||
'
|
'
|
||||||
@@ -877,7 +887,7 @@ Partial Class frmDocumentResultList
|
|||||||
Me.LayoutControlItem1.Name = "LayoutControlItem1"
|
Me.LayoutControlItem1.Name = "LayoutControlItem1"
|
||||||
Me.LayoutControlItem1.Size = New System.Drawing.Size(224, 24)
|
Me.LayoutControlItem1.Size = New System.Drawing.Size(224, 24)
|
||||||
resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1")
|
resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1")
|
||||||
Me.LayoutControlItem1.TextSize = New System.Drawing.Size(126, 13)
|
Me.LayoutControlItem1.TextSize = New System.Drawing.Size(124, 13)
|
||||||
'
|
'
|
||||||
'LayoutControlItem2
|
'LayoutControlItem2
|
||||||
'
|
'
|
||||||
@@ -886,7 +896,7 @@ Partial Class frmDocumentResultList
|
|||||||
Me.LayoutControlItem2.Name = "LayoutControlItem2"
|
Me.LayoutControlItem2.Name = "LayoutControlItem2"
|
||||||
Me.LayoutControlItem2.Size = New System.Drawing.Size(224, 24)
|
Me.LayoutControlItem2.Size = New System.Drawing.Size(224, 24)
|
||||||
resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2")
|
resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2")
|
||||||
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(126, 13)
|
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(124, 13)
|
||||||
'
|
'
|
||||||
'EmptySpaceItem1
|
'EmptySpaceItem1
|
||||||
'
|
'
|
||||||
@@ -917,9 +927,9 @@ Partial Class frmDocumentResultList
|
|||||||
Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True]
|
Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True]
|
||||||
resources.ApplyResources(Me, "$this")
|
resources.ApplyResources(Me, "$this")
|
||||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||||
|
Me.Controls.Add(Me.DockPanelFileList)
|
||||||
Me.Controls.Add(Me.DockPanelPreview)
|
Me.Controls.Add(Me.DockPanelPreview)
|
||||||
Me.Controls.Add(Me.panelContainerStatus)
|
Me.Controls.Add(Me.panelContainerStatus)
|
||||||
Me.Controls.Add(Me.DockPanelFileList)
|
|
||||||
Me.Controls.Add(Me.RibbonStatusBar)
|
Me.Controls.Add(Me.RibbonStatusBar)
|
||||||
Me.Controls.Add(Me.RibbonControl)
|
Me.Controls.Add(Me.RibbonControl)
|
||||||
Me.IconOptions.Icon = CType(resources.GetObject("frmDocumentResultList.IconOptions.Icon"), System.Drawing.Icon)
|
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 btnSaveAsMySearch As DevExpress.XtraBars.BarButtonItem
|
||||||
Friend WithEvents RibbonPageGroupSavedSearch As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
Friend WithEvents RibbonPageGroupSavedSearch As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
||||||
Friend WithEvents lblCurrentWorkspace As DevExpress.XtraBars.BarStaticItem
|
Friend WithEvents lblCurrentWorkspace As DevExpress.XtraBars.BarStaticItem
|
||||||
|
Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -230,29 +230,28 @@
|
|||||||
<data name="BarButtonBack.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="BarButtonBack.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
|
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
|
||||||
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAEJSURB
|
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAESSURB
|
||||||
VDhPpZOhCgJBEIava7IICmIx+AZyRdM1X0EQfI8Ds3a70Re4ahKTb2BTsIhR0/p/x57MHmsQwwe788/8
|
VDhPpVMxSkNREPx9rNIEFMQmRW4gNkmVbq4gCN4jMHXSp7f0AtNahVS5QToFG0mp1ZcJm/D+5iloioH9
|
||||||
tzO7l0yXRZ1MrMVBPDysiaEF+XbTFyuxF7kYi5aHNTE0csgNDAhsxUYMnHNJDDSfQ25pUhngitCIFVrI
|
uzPzd/e914BqEqagFqBWoHYBx8651uGXHzeg5qBeQM1AjUH1A46dc80cczsGTjyBWoIatm3b1OBacMzd
|
||||||
8bnUlAb0xdGCL2vfFkfhxFPMjcZJqMnYMJy8VjwUZ0HxRYys7nOYyZoFEx4bYSLugmK0ji00eQz2wIJr
|
mxwM7OpCL4syzAmuNXsDz+XWOn8GNQC1BtWC+gT1kDqxZuoPL2eWxCNQ2xC/grqtdOKdLBx4w+OiMAH1
|
||||||
avngTLwExVGMAbfziBnQb7QYYgb1FlJxExQwxG6lWRT/tBAbYk+cBCZXkVrd53yG+O0am2InMKGthdGC
|
EWLXLrM4eF7syoGPqR/Je1BfIa6iMPDp7GoGnvdE+JtBHuEO1HsIvMSr3H4eobbEa1CbMHmzacXguMSf
|
||||||
a4S/HhL8/ZQrE1w52s8/k+WH37lI3sUnQlO0bha7AAAAAElFTkSuQmCC
|
jvEC1HOYeKzHotY5RuOsi2ScfZUPJv9+TCX+9Jy/AcUnQlOuZReWAAAAAElFTkSuQmCC
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="BarButtonBack.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="BarButtonBack.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
|
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
|
||||||
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJwSURB
|
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJHSURB
|
||||||
VFhHxZe/Sh1BFMZNJbeUKIhgZ5fOMp2teBsRkaRIlZA0AZ9AsRZrX8E3EO59A9H8gRAIBOxSpAkEIoaY
|
VFhHxZe9ihVBEIXXSDYUFUQw28zM0MxU9iQismhgpGgi7BOsVLxs7Cv4BgW7byD+ggiCsJmBiSC4KOqV
|
||||||
zfdb5pO54+ze8Rrd4ifuOd85c3b3zJm9U1VVdUr9p793XMKC2BIHYijOxUWA/7HhQ4M2l2OE0gKeiF3x
|
79K1zJY9Mz1XZYJzuVNddepMd3V1z9pisVibE8sfmbfgosy3ZL4n8wOZH8r8qID/2BjDB98c/wdaBVyW
|
||||||
QVSFoCWG2FzOmnEFPBKvxakg6V8xEDtiTSyJXoD/seFDg5YYYslBrhtrtBUwL/aF7+hIrKMtAW2IcTy5
|
+WOZv5b5ohH4EkNs5msWcErmD2T+vJD+kvm+zHdkvinzDZmvF/AfG2P44EsMsXDAlfkHBVyQ+W7njZ7K
|
||||||
yDmyDloHxCA8FAR+FdtiOl6gBGJCLDnIRc6RItBZbHhUvvN3YiNOOgnkCLn8JK5fB36LDO/Ld37nxQ25
|
/EZevz7gW2IiHi44mwTg+KQEfpD5tsxP5yRjIKbEwgEXnCdE1AQwVfHmL2V+MxNPBRyFK2bieDkYD6cA
|
||||||
Qk5ys0a2ADrWDbcdJ0iRvy8ug9Z8EYs5PcjH60DHGvXuwG4nsG0Q0DyN71w+Gixd/LNYyOmN/PSEG5O1
|
6xVv/tfJA0VEzAQ5qgKo2Ci47UySCCXzb6ny38v8UvbtxLAcUZjL3ZEFsG2i4HrXvBRYTv6OvZ99Uxw1
|
||||||
arudDA72Ltunsdvl2xS/Rbz4JzGf06dIR/GswVp1wXYwvUg2iANi5Hsm/gSdIdFcTt+E9MwJYre4tpER
|
EYVJrhMCaBzsXbZPb7XL/JbMv6fkbymu7FtDEU8Oci0FxwDdC7L9HNQJvi3zHyk5ROez7xBKnyB2i+cw
|
||||||
inEnFhvZX4h08TPxOKdvQzEMK+IPuLaROY5xLRYH30txFfzmRMyk2hIUx8Qkx5BrGzlMMC4l4jfCY3Vi
|
0kIx7uSAMn63kvyFzM9m3zGUZkX8Hs9hpI9j3KwE3JP5z5T8mczPZN8WlI4JxwHPYeQwwbiRnB922urK
|
||||||
kpyMbeznXNvIiYaxFwnfijsvDs4Z8nJ2YL/guq2AVyJ99BPhnCFvtoCmV/BcpM13a5Kc2VfQ1oS5wTPR
|
SJy0beyHXQGcaBjXO46P/kVykARwdmA/GhNwvzL1K6FFQN8S3KkU32QkzuoSDBVhrfGstAMKX7UIx7bh
|
||||||
DgDFZZtw3DZcFb+CxnDA/LdtWDKIVsTPoIuLmM3pm5A+O4hKR/FT8UPERbwXRdNQusZRDKWH0bL4HrTF
|
dZl/TSI4YCaL6NuGLY3omsy/VEScy75D6GtEra34qsw/JxGvWrvhUCsGrYfRFZl/mipi7DACU45jfD8m
|
||||||
RcjfehjBbY5jtN+C1nwUjUXIN/Y4hk4/SKDzTzLo9KPUIPSTAJrnwT7LDY+K9+XGZPs82A+TGDqWbcPe
|
EW+GRLQcx2DWCwmY/UoGZr2UdkXMdi0PzPph0sVsn2YZ/+/jdE78BmdK1op4DTduAAAAAElFTkSuQmCC
|
||||||
9R2NAy0xdbc3UVqAub8fp91RTf0DZ0rWioS6adsAAAAASUVORK5CYII=
|
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="BarButtonResetGridLayout.Caption" xml:space="preserve">
|
<data name="BarButtonResetGridLayout.Caption" xml:space="preserve">
|
||||||
@@ -506,6 +505,48 @@
|
|||||||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>1189, 671</value>
|
<value>1189, 671</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="DockPanel2_Container.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
|
<value>3, 46</value>
|
||||||
|
</data>
|
||||||
|
<data name="DockPanel2_Container.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>583, 442</value>
|
||||||
|
</data>
|
||||||
|
<data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
|
||||||
|
<value>0</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>DockPanel2_Container.Name" xml:space="preserve">
|
||||||
|
<value>DockPanel2_Container</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>DockPanel2_Container.Type" xml:space="preserve">
|
||||||
|
<value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>DockPanel2_Container.Parent" xml:space="preserve">
|
||||||
|
<value>DockPanelFileList</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>DockPanel2_Container.ZOrder" xml:space="preserve">
|
||||||
|
<value>0</value>
|
||||||
|
</data>
|
||||||
|
<data name="DockPanelFileList.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
|
<value>0, 158</value>
|
||||||
|
</data>
|
||||||
|
<data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>590, 491</value>
|
||||||
|
</data>
|
||||||
|
<data name="DockPanelFileList.Text" xml:space="preserve">
|
||||||
|
<value>Ergebnisse</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>DockPanelFileList.Name" xml:space="preserve">
|
||||||
|
<value>DockPanelFileList</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>DockPanelFileList.Type" xml:space="preserve">
|
||||||
|
<value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>DockPanelFileList.Parent" xml:space="preserve">
|
||||||
|
<value>$this</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>DockPanelFileList.ZOrder" xml:space="preserve">
|
||||||
|
<value>0</value>
|
||||||
|
</data>
|
||||||
<data name="DocumentViewer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
<data name="DocumentViewer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||||
<value>Fill</value>
|
<value>Fill</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -522,7 +563,7 @@
|
|||||||
<value>DocumentViewer1</value>
|
<value>DocumentViewer1</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>DocumentViewer1.Type" xml:space="preserve">
|
<data name=">>DocumentViewer1.Type" xml:space="preserve">
|
||||||
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.6.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.7.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>DocumentViewer1.Parent" xml:space="preserve">
|
<data name=">>DocumentViewer1.Parent" xml:space="preserve">
|
||||||
<value>DockPanel1_Container</value>
|
<value>DockPanel1_Container</value>
|
||||||
@@ -570,7 +611,7 @@
|
|||||||
<value>$this</value>
|
<value>$this</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>DockPanelPreview.ZOrder" xml:space="preserve">
|
<data name=">>DockPanelPreview.ZOrder" xml:space="preserve">
|
||||||
<value>0</value>
|
<value>1</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="CtrlObjectPropertyDialog.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
<data name="CtrlObjectPropertyDialog.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||||
<value>Fill</value>
|
<value>Fill</value>
|
||||||
@@ -588,7 +629,7 @@
|
|||||||
<value>CtrlObjectPropertyDialog</value>
|
<value>CtrlObjectPropertyDialog</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>CtrlObjectPropertyDialog.Type" xml:space="preserve">
|
<data name=">>CtrlObjectPropertyDialog.Type" xml:space="preserve">
|
||||||
<value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.5.8.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.7.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>CtrlObjectPropertyDialog.Parent" xml:space="preserve">
|
<data name=">>CtrlObjectPropertyDialog.Parent" xml:space="preserve">
|
||||||
<value>DockPanel3_Container</value>
|
<value>DockPanel3_Container</value>
|
||||||
@@ -639,10 +680,10 @@
|
|||||||
<value>0</value>
|
<value>0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="txtCheckedOutWho.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="txtCheckedOutWho.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>162, 45</value>
|
<value>160, 45</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="txtCheckedOutWho.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="txtCheckedOutWho.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>82, 20</value>
|
<value>84, 20</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="txtCheckedOutWho.TabIndex" type="System.Int32, mscorlib">
|
<data name="txtCheckedOutWho.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>4</value>
|
<value>4</value>
|
||||||
@@ -663,7 +704,7 @@
|
|||||||
<value />
|
<value />
|
||||||
</data>
|
</data>
|
||||||
<data name="dateCheckedOutWhen.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="dateCheckedOutWhen.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>162, 69</value>
|
<value>160, 69</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="dateCheckedOutWhen.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
|
<data name="dateCheckedOutWhen.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
|
||||||
<value>Combo</value>
|
<value>Combo</value>
|
||||||
@@ -672,7 +713,7 @@
|
|||||||
<value>Combo</value>
|
<value>Combo</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="dateCheckedOutWhen.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="dateCheckedOutWhen.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>82, 20</value>
|
<value>84, 20</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="dateCheckedOutWhen.TabIndex" type="System.Int32, mscorlib">
|
<data name="dateCheckedOutWhen.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>5</value>
|
<value>5</value>
|
||||||
@@ -786,48 +827,6 @@
|
|||||||
<value>$this</value>
|
<value>$this</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>panelContainerStatus.ZOrder" xml:space="preserve">
|
<data name=">>panelContainerStatus.ZOrder" xml:space="preserve">
|
||||||
<value>1</value>
|
|
||||||
</data>
|
|
||||||
<data name="DockPanel2_Container.Location" type="System.Drawing.Point, System.Drawing">
|
|
||||||
<value>3, 46</value>
|
|
||||||
</data>
|
|
||||||
<data name="DockPanel2_Container.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>583, 442</value>
|
|
||||||
</data>
|
|
||||||
<data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
|
|
||||||
<value>0</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>DockPanel2_Container.Name" xml:space="preserve">
|
|
||||||
<value>DockPanel2_Container</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>DockPanel2_Container.Type" xml:space="preserve">
|
|
||||||
<value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>DockPanel2_Container.Parent" xml:space="preserve">
|
|
||||||
<value>DockPanelFileList</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>DockPanel2_Container.ZOrder" xml:space="preserve">
|
|
||||||
<value>0</value>
|
|
||||||
</data>
|
|
||||||
<data name="DockPanelFileList.Location" type="System.Drawing.Point, System.Drawing">
|
|
||||||
<value>0, 158</value>
|
|
||||||
</data>
|
|
||||||
<data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>590, 491</value>
|
|
||||||
</data>
|
|
||||||
<data name="DockPanelFileList.Text" xml:space="preserve">
|
|
||||||
<value>Ergebnisse</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>DockPanelFileList.Name" xml:space="preserve">
|
|
||||||
<value>DockPanelFileList</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>DockPanelFileList.Type" xml:space="preserve">
|
|
||||||
<value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>DockPanelFileList.Parent" xml:space="preserve">
|
|
||||||
<value>$this</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>DockPanelFileList.ZOrder" xml:space="preserve">
|
|
||||||
<value>2</value>
|
<value>2</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblCurrentWorkspace.Caption" xml:space="preserve">
|
<data name="lblCurrentWorkspace.Caption" xml:space="preserve">
|
||||||
@@ -1192,6 +1191,12 @@
|
|||||||
<data name=">>lblCurrentWorkspace.Type" xml:space="preserve">
|
<data name=">>lblCurrentWorkspace.Type" xml:space="preserve">
|
||||||
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name=">>BarButtonItem6.Name" xml:space="preserve">
|
||||||
|
<value>BarButtonItem6</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BarButtonItem6.Type" xml:space="preserve">
|
||||||
|
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
|
</data>
|
||||||
<data name=">>RibbonPageStart.Name" xml:space="preserve">
|
<data name=">>RibbonPageStart.Name" xml:space="preserve">
|
||||||
<value>RibbonPageStart</value>
|
<value>RibbonPageStart</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1384,6 +1389,26 @@
|
|||||||
<data name="btnSaveAsMySearch.Caption" xml:space="preserve">
|
<data name="btnSaveAsMySearch.Caption" xml:space="preserve">
|
||||||
<value>Als meine Suche speichern</value>
|
<value>Als meine Suche speichern</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="BarButtonItem6.Caption" xml:space="preserve">
|
||||||
|
<value>Export</value>
|
||||||
|
</data>
|
||||||
|
<data name="BarButtonItem6.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>
|
||||||
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
|
||||||
|
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
|
||||||
|
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/
|
||||||
|
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
|
||||||
|
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
|
||||||
|
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
|
||||||
|
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
|
||||||
|
MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
|
||||||
|
R3JlZW57ZmlsbDojMDM5QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IkV4cG9ydCI+DQogICAgPHBhdGgg
|
||||||
|
ZD0iTTEwLDEySDZWNmg0VjEyeiBNMjIsMTJ2NnY5YzAsMC42LTAuNCwxLTEsMUgxYy0wLjYsMC0xLTAu
|
||||||
|
NC0xLTFWN2MwLTAuNiwwLjQtMSwxLTFoM3Y4aDE0di0ySDIyeiBNMTgsMThINCAgIHY2aDE0VjE4eiIg
|
||||||
|
Y2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iMTYsMTAgMjQsMTAgMjQsMTQgMzIs
|
||||||
|
OCAyNCwyIDI0LDYgMTYsNiAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
<data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>0, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ Public Class frmDocumentResultList
|
|||||||
|
|
||||||
' Interface implementations
|
' Interface implementations
|
||||||
Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig
|
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
|
Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm
|
||||||
|
|
||||||
' Helper Classes
|
' Helper Classes
|
||||||
@@ -50,6 +50,11 @@ Public Class frmDocumentResultList
|
|||||||
Private ReadOnly Workspace As Workspace(Of Config)
|
Private ReadOnly Workspace As Workspace(Of Config)
|
||||||
Private WithEvents Watcher As Watcher
|
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
|
' Runtime variables
|
||||||
Private Property ResultLists As List(Of DocumentResult)
|
Private Property ResultLists As List(Of DocumentResult)
|
||||||
|
|
||||||
@@ -79,6 +84,7 @@ Public Class frmDocumentResultList
|
|||||||
Private Property GridList As List(Of GridControl)
|
Private Property GridList As List(Of GridControl)
|
||||||
Private Property ViewList As List(Of BandedGridView)
|
Private Property ViewList As List(Of BandedGridView)
|
||||||
Private Property OperationMode As OperationMode Implements IResultForm.OperationMode
|
Private Property OperationMode As OperationMode Implements IResultForm.OperationMode
|
||||||
|
Private _documentPathHandler As DocumentPathHandler
|
||||||
|
|
||||||
Public ReadOnly Property Config1 As ConfigManager(Of Config)
|
Public ReadOnly Property Config1 As ConfigManager(Of Config)
|
||||||
Get
|
Get
|
||||||
@@ -112,12 +118,13 @@ Public Class frmDocumentResultList
|
|||||||
ResultLists = pParams.Results
|
ResultLists = pParams.Results
|
||||||
|
|
||||||
LogConfig = pLogConfig
|
LogConfig = pLogConfig
|
||||||
Logger = pLogConfig.GetLogger()
|
_Logger = pLogConfig.GetLogger()
|
||||||
FormHelper = New FormHelper(pLogConfig, Me)
|
FormHelper = New FormHelper(pLogConfig, Me)
|
||||||
|
_documentPathHandler = New DocumentPathHandler(pLogConfig)
|
||||||
|
|
||||||
UserLanguage = ObjectEx.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)
|
UserLanguage = ObjectEx.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)
|
||||||
LanguageEx.LogApplicationLanguage(Logger)
|
LanguageEx.LogApplicationLanguage(_Logger)
|
||||||
LanguageEx.SetApplicationLanguage(Logger, UserLanguage)
|
LanguageEx.SetApplicationLanguage(_Logger, UserLanguage)
|
||||||
|
|
||||||
Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath, oConfigPath)
|
Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath, oConfigPath)
|
||||||
Helpers = New DocumentResultList.Helpers(pLogConfig)
|
Helpers = New DocumentResultList.Helpers(pLogConfig)
|
||||||
@@ -126,7 +133,6 @@ Public Class frmDocumentResultList
|
|||||||
FileEx = New Modules.Windows.File(pLogConfig)
|
FileEx = New Modules.Windows.File(pLogConfig)
|
||||||
LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}, pEnvironment)
|
LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}, pEnvironment)
|
||||||
Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1, UserLanguage)
|
Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1, UserLanguage)
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Function GetOperationMode() As OperationMode
|
Private Function GetOperationMode() As OperationMode
|
||||||
@@ -139,18 +145,18 @@ Public Class frmDocumentResultList
|
|||||||
oOperationMode = OperationMode.NoAppServer
|
oOperationMode = OperationMode.NoAppServer
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Logger.Debug("OperationMode set to [{0}]", oOperationMode)
|
_Logger.Debug("OperationMode set to [{0}]", oOperationMode)
|
||||||
|
|
||||||
If Params.OperationModeOverride <> OperationMode.None Then
|
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
|
oOperationMode = Params.OperationModeOverride
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Logger.Debug("OperationMode is now [{0}]", oOperationMode)
|
_Logger.Debug("OperationMode is now [{0}]", oOperationMode)
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Logger.Warn("Error while determining OperationMode. Setting to [{0}]", oOperationMode)
|
_Logger.Warn("Error while determining OperationMode. Setting to [{0}]", oOperationMode)
|
||||||
End Try
|
End Try
|
||||||
|
|
||||||
Return oOperationMode
|
Return oOperationMode
|
||||||
@@ -166,7 +172,7 @@ Public Class frmDocumentResultList
|
|||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
LanguageEx.LogApplicationLanguage(Logger)
|
LanguageEx.LogApplicationLanguage(_Logger)
|
||||||
|
|
||||||
Documentloader = New Loader(LogConfig, OperationMode, EDMI_API_Client, Environment.User)
|
Documentloader = New Loader(LogConfig, OperationMode, EDMI_API_Client, Environment.User)
|
||||||
|
|
||||||
@@ -263,7 +269,8 @@ Public Class frmDocumentResultList
|
|||||||
|
|
||||||
' This loads the default workspace, for now
|
' This loads the default workspace, for now
|
||||||
Workspace.LoadWorkspace(Config.Config.SelectedWorkspace)
|
Workspace.LoadWorkspace(Config.Config.SelectedWorkspace)
|
||||||
|
' Selektion zuverlässig setzen
|
||||||
|
SelectFirstRowInGrid1()
|
||||||
|
|
||||||
' This needs to done be after loading the grid
|
' This needs to done be after loading the grid
|
||||||
' so we can set the row handle and start loading the (only) file
|
' so we can set the row handle and start loading the (only) file
|
||||||
@@ -298,7 +305,13 @@ Public Class frmDocumentResultList
|
|||||||
|
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
Private Sub SelectFirstRowInGrid1()
|
||||||
|
If GridView1.RowCount > 0 Then
|
||||||
|
GridView1.FocusedRowHandle = 0
|
||||||
|
Else
|
||||||
|
GridView1.FocusedRowHandle = GridControl.InvalidRowHandle
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
Private Sub Workspace_WorkspaceLoaded(sender As Object, e As String)
|
Private Sub Workspace_WorkspaceLoaded(sender As Object, e As String)
|
||||||
lblCurrentWorkspace.Caption = String.Format(lblCurrentWorkspace.Tag, e)
|
lblCurrentWorkspace.Caption = String.Format(lblCurrentWorkspace.Tag, e)
|
||||||
End Sub
|
End Sub
|
||||||
@@ -316,8 +329,11 @@ Public Class frmDocumentResultList
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
DocumentViewer1.Done()
|
DocumentViewer1.Done()
|
||||||
|
If _documentPathHandler IsNot Nothing Then
|
||||||
|
_documentPathHandler.Cleanup()
|
||||||
|
End If
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -341,19 +357,37 @@ Public Class frmDocumentResultList
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
UpdateRibbonActions(oDocument)
|
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
|
' Save reference to current document
|
||||||
_CurrentDocument = oDocument
|
_CurrentDocument = oDocument
|
||||||
|
|
||||||
' Load Document in Document Viewer
|
' Load Document in Document Viewer
|
||||||
Dim oFileName = $"{oObjectId}.{oDocument.Extension}"
|
Dim oFileName = $"{oObjectId}.{oDocument.Extension}"
|
||||||
DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents))
|
'If CopyWMFile2Temp = True Then
|
||||||
If IsNothing(oDocument) 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)
|
||||||
DocumentViewer1.CloseDocument()
|
' ' Optionen konfigurieren
|
||||||
FormHelper.ShowErrorMessage(New IOException("File could not be loaded!"), "GridView_FocusedRowChanged")
|
' Dim options As New DocumentPathHandler.DocumentPathOptions With {
|
||||||
|
' .EnableMapping = True,
|
||||||
Exit Sub
|
' .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 (LoadFile_FromStream). ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath)
|
||||||
|
DocumentViewer1.LoadFile_FromStream(oFileName, New MemoryStream(oDocument.Contents))
|
||||||
|
Else
|
||||||
|
_Logger.Debug("Loading document into viewer from filepath (LoadFile_FromPath). ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath)
|
||||||
|
DocumentViewer1.LoadFile_FromPath(oFullPath)
|
||||||
End If
|
End If
|
||||||
|
'End If
|
||||||
|
|
||||||
If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then
|
If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then
|
||||||
Await CtrlObjectPropertyDialog.LoadObject(oObjectId)
|
Await CtrlObjectPropertyDialog.LoadObject(oObjectId)
|
||||||
@@ -416,7 +450,7 @@ Public Class frmDocumentResultList
|
|||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
@@ -531,7 +565,7 @@ Public Class frmDocumentResultList
|
|||||||
CheckoutManager = New CheckInOut(LogConfig, EDMI_API_Client)
|
CheckoutManager = New CheckInOut(LogConfig, EDMI_API_Client)
|
||||||
|
|
||||||
If Not EDMI_API_Client.Connect() Then
|
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
|
Return False
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -562,13 +596,18 @@ Public Class frmDocumentResultList
|
|||||||
UpdateTotalResults()
|
UpdateTotalResults()
|
||||||
LoadGridDataAndLayout()
|
LoadGridDataAndLayout()
|
||||||
|
|
||||||
' After the new results are loaded, set the old row handle
|
' Restore old selection only if still valid; otherwise select first row
|
||||||
' to trigger the row change events and load object properties
|
If GridView1.IsValidRowHandle(oCurrentRowHandle) Then
|
||||||
GridView1.FocusedRowHandle = oCurrentRowHandle
|
GridView1.FocusedRowHandle = oCurrentRowHandle
|
||||||
|
ElseIf GridView1.RowCount > 0 Then
|
||||||
|
GridView1.FocusedRowHandle = 0
|
||||||
|
Else
|
||||||
|
GridView1.FocusedRowHandle = GridControl.InvalidRowHandle
|
||||||
|
End If
|
||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
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)
|
MessageBox.Show("Error while refreshing results:" & vbNewLine & vbNewLine & ex.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error)
|
||||||
Return False
|
Return False
|
||||||
@@ -580,12 +619,12 @@ Public Class frmDocumentResultList
|
|||||||
|
|
||||||
Private Sub LoadGridData(View As GridView, Result As DocumentResultList.DocumentResult)
|
Private Sub LoadGridData(View As GridView, Result As DocumentResultList.DocumentResult)
|
||||||
If Result.Datatable.Columns.Contains(ColumnDocumentId) = False Then
|
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}!")
|
'Throw New ApplicationException($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!")
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If OperationMode = OperationMode.NoAppServer And Result.Datatable.Columns.Contains(ColumnFilepath) = False Then
|
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}!")
|
'Throw New ApplicationException($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!")
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -781,9 +820,9 @@ Public Class frmDocumentResultList
|
|||||||
GridView.BestFitColumns()
|
GridView.BestFitColumns()
|
||||||
Catch ex As ApplicationException
|
Catch ex As ApplicationException
|
||||||
MsgBox($"Error while loading grid data for search {Result.Title}: {vbNewLine}{vbNewLine}{ex.Message}", MsgBoxStyle.Critical, Text)
|
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
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -882,7 +921,7 @@ Public Class frmDocumentResultList
|
|||||||
Await Watcher.OpenDocument(_CurrentDocument)
|
Await Watcher.OpenDocument(_CurrentDocument)
|
||||||
End If
|
End If
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -948,7 +987,7 @@ Public Class frmDocumentResultList
|
|||||||
Try
|
Try
|
||||||
Await Watcher.OpenDocument(_CurrentDocument)
|
Await Watcher.OpenDocument(_CurrentDocument)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -1056,7 +1095,7 @@ Public Class frmDocumentResultList
|
|||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
End Try
|
End Try
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
@@ -1172,7 +1211,4 @@ Public Class frmDocumentResultList
|
|||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub GridView_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridView3.FocusedRowChanged, GridView2.FocusedRowChanged, GridView1.FocusedRowChanged
|
|
||||||
|
|
||||||
End Sub
|
|
||||||
End Class
|
End Class
|
||||||
@@ -2,5 +2,5 @@
|
|||||||
|
|
||||||
Public Interface IBaseForm
|
Public Interface IBaseForm
|
||||||
ReadOnly Property LogConfig As LogConfig
|
ReadOnly Property LogConfig As LogConfig
|
||||||
ReadOnly Property Logger As Logger
|
ReadOnly Property _Logger As Logger
|
||||||
End Interface
|
End Interface
|
||||||
|
|||||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("2.7.1.0")>
|
<Assembly: AssemblyVersion("2.7.2.0")>
|
||||||
<Assembly: AssemblyFileVersion("2.7.1.0")>
|
<Assembly: AssemblyFileVersion("2.7.2.0")>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ Public Class ctrlObjectPropertyDialog
|
|||||||
Implements IBaseForm
|
Implements IBaseForm
|
||||||
|
|
||||||
Private Property LogConfig As LogConfig Implements IBaseForm.LogConfig
|
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 ControlManager As AttributeControls
|
||||||
Private Property GridBuilder As GridBuilder
|
Private Property GridBuilder As GridBuilder
|
||||||
Private Property Client As Client
|
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)
|
Public Sub Initialize(pLogConfig As LogConfig, pHostForm As Form, pClient As Client, pEnv As Environment)
|
||||||
LogConfig = pLogConfig
|
LogConfig = pLogConfig
|
||||||
Logger = pLogConfig.GetLogger()
|
_Logger = pLogConfig.GetLogger()
|
||||||
HostForm = pHostForm
|
HostForm = pHostForm
|
||||||
ControlManager = New AttributeControls(pLogConfig, pEnv, pClient)
|
ControlManager = New AttributeControls(pLogConfig, pEnv, pClient)
|
||||||
Helper = New FormHelper(pLogConfig, pHostForm)
|
Helper = New FormHelper(pLogConfig, pHostForm)
|
||||||
@@ -58,7 +58,7 @@ Public Class ctrlObjectPropertyDialog
|
|||||||
Public Async Function SaveChanges() As Task(Of Boolean)
|
Public Async Function SaveChanges() As Task(Of Boolean)
|
||||||
Try
|
Try
|
||||||
For Each oChange As KeyValuePair(Of String, Object) In Changes
|
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 {
|
Await Client.SetAttributeValueAsync(ObjectId, oChange.Key, oChange.Value, New Options.SetAttributeValueOptions With {
|
||||||
.Language = Environment.User.Language,
|
.Language = Environment.User.Language,
|
||||||
.Username = Environment.User.UserName
|
.Username = Environment.User.UserName
|
||||||
@@ -131,7 +131,7 @@ Public Class ctrlObjectPropertyDialog
|
|||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Return False
|
Return False
|
||||||
Finally
|
Finally
|
||||||
Enabled = True
|
Enabled = True
|
||||||
@@ -145,7 +145,7 @@ Public Class ctrlObjectPropertyDialog
|
|||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
@@ -156,7 +156,7 @@ Public Class ctrlObjectPropertyDialog
|
|||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
@@ -176,14 +176,14 @@ Public Class ctrlObjectPropertyDialog
|
|||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long))
|
Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long))
|
||||||
Try
|
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)
|
Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
|
||||||
|
|
||||||
If oResult.OK = False Then
|
If oResult.OK = False Then
|
||||||
@@ -202,7 +202,7 @@ Public Class ctrlObjectPropertyDialog
|
|||||||
Return oEntities
|
Return oEntities
|
||||||
End If
|
End If
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Return New List(Of Long)
|
Return New List(Of Long)
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
@@ -230,7 +230,7 @@ Public Class ctrlObjectPropertyDialog
|
|||||||
End Function
|
End Function
|
||||||
|
|
||||||
Private Async Function GetPropertiesForObjectId(ObjectId As Long) As Task(Of DataTable)
|
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)
|
Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
|
||||||
|
|
||||||
Return oResult.Table
|
Return oResult.Table
|
||||||
@@ -246,7 +246,7 @@ Public Class ctrlObjectPropertyDialog
|
|||||||
ControlManager.LoadControlsForAttributes(oAttributes, Root)
|
ControlManager.LoadControlsForAttributes(oAttributes, Root)
|
||||||
Await ControlManager.LoadControlValuesForAttributes(pObjectId, Root)
|
Await ControlManager.LoadControlValuesForAttributes(pObjectId, Root)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ Public Class frmObjectPropertyDialog
|
|||||||
Private Property FormHelper As FormHelper
|
Private Property FormHelper As FormHelper
|
||||||
|
|
||||||
Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig
|
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)
|
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.
|
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
|
||||||
LogConfig = pLogConfig
|
LogConfig = pLogConfig
|
||||||
Logger = pLogConfig.GetLogger()
|
_Logger = pLogConfig.GetLogger()
|
||||||
Environment = pEnvironment
|
Environment = pEnvironment
|
||||||
Client = pClient
|
Client = pClient
|
||||||
ObjectId = pObjectId
|
ObjectId = pObjectId
|
||||||
@@ -75,7 +75,7 @@ Public Class frmObjectPropertyDialog
|
|||||||
|
|
||||||
Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long))
|
Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long))
|
||||||
Try
|
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)
|
Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
|
||||||
|
|
||||||
If oResult.OK = False Then
|
If oResult.OK = False Then
|
||||||
@@ -94,7 +94,7 @@ Public Class frmObjectPropertyDialog
|
|||||||
Return oEntities
|
Return oEntities
|
||||||
End If
|
End If
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Return New List(Of Long)
|
Return New List(Of Long)
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
@@ -122,7 +122,7 @@ Public Class frmObjectPropertyDialog
|
|||||||
End Function
|
End Function
|
||||||
|
|
||||||
Private Async Function GetPropertiesForObjectId(ObjectId As Long) As Task(Of DataTable)
|
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)
|
Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
|
||||||
|
|
||||||
Return oResult.Table
|
Return oResult.Table
|
||||||
@@ -136,7 +136,7 @@ Public Class frmObjectPropertyDialog
|
|||||||
Dim oEntityId As Long
|
Dim oEntityId As Long
|
||||||
|
|
||||||
If Long.TryParse(cmbBusinessEntity.EditValue, oEntityId) = False Then
|
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
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -149,7 +149,7 @@ Public Class frmObjectPropertyDialog
|
|||||||
ControlManager.LoadControlsForAttributes(oAttributes, AttributeLayout)
|
ControlManager.LoadControlsForAttributes(oAttributes, AttributeLayout)
|
||||||
Await ControlManager.LoadControlValuesForAttributes(ObjectId, AttributeLayout)
|
Await ControlManager.LoadControlValuesForAttributes(ObjectId, AttributeLayout)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -173,7 +173,7 @@ Public Class frmObjectPropertyDialog
|
|||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
@@ -184,7 +184,7 @@ Public Class frmObjectPropertyDialog
|
|||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
@@ -204,7 +204,7 @@ Public Class frmObjectPropertyDialog
|
|||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
End Function
|
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
|
Private Async Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick
|
||||||
Try
|
Try
|
||||||
For Each oChange As KeyValuePair(Of String, Object) In Changes
|
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 {
|
Await Client.SetAttributeValueAsync(ObjectId, oChange.Key, oChange.Value, New Options.SetAttributeValueOptions With {
|
||||||
.Language = Environment.User.Language,
|
.Language = Environment.User.Language,
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ Public Class frmSQLEditor
|
|||||||
|
|
||||||
Private Function LoadConnections() As GalleryItemGroup
|
Private Function LoadConnections() As GalleryItemGroup
|
||||||
Try
|
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 oTable = Database.GetDatatable(oSql)
|
||||||
Dim oConnections = New List(Of Connection)
|
Dim oConnections = New List(Of Connection)
|
||||||
|
|
||||||
|
|||||||
@@ -11,10 +11,10 @@ Public Class frmObjectProperties
|
|||||||
|
|
||||||
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
|
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
|
||||||
LogConfig = pLogConfig
|
LogConfig = pLogConfig
|
||||||
Logger = pLogConfig.GetLogger()
|
_Logger = pLogConfig.GetLogger()
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Public ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig
|
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
|
End Class
|
||||||
Reference in New Issue
Block a user