This commit is contained in:
SchreiberM 2022-04-07 10:07:51 +02:00
commit 059ac03a50
41 changed files with 961 additions and 586 deletions

View File

@ -69,14 +69,19 @@ Public Class DocumentViewer
''' Terminate Viewer, freeing up resources and deleting temp files
''' </summary>
Public Sub Done()
_logger.Debug("Done: Deleting Temp Files")
DeleteTempFiles()
Try
_logger.Debug("Done: Deleting Temp Files")
DeleteTempFiles()
_logger.Debug("Done: Closing Documents")
FreeFile()
_logger.Debug("Done: Closing Documents")
FreeFile()
_logger.Debug("Done: Triggering GC")
GC.Collect()
_logger.Debug("Done: Triggering GC")
GC.Collect()
Catch ex As Exception
_logger.Warn("Error while cleaning up DocumentViewer")
_logger.Error(ex)
End Try
End Sub
''' <summary>
@ -125,8 +130,12 @@ Public Class DocumentViewer
End Sub
Public Sub CloseDocument()
GdViewer.CloseDocument()
UpdateMainUi()
Try
GdViewer.CloseDocument()
UpdateMainUi()
Catch ex As Exception
_logger.Error(ex)
End Try
End Sub
Public Sub DeleteTempFiles()
@ -162,13 +171,16 @@ Public Class DocumentViewer
Dim oExtension As String = _Fileinfo.Extension.ToUpper
Select Case _ViewerMode
Case ViewerMode.RichText
_logger.Debug("Closing RichText Editor")
RichEditControl1.CreateNewDocument()
Case ViewerMode.Excel
_logger.Debug("Closing Excel Editor")
SpreadsheetControl1.CreateNewDocument()
Case Else
GdViewer.CloseDocument()
_logger.Debug("Closing GDPicture Viewer")
GdViewer.Dispose()
End Select
Catch ex As Exception

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.6.7.0")>
<Assembly: AssemblyFileVersion("1.6.7.0")>
<Assembly: AssemblyVersion("1.6.8.0")>
<Assembly: AssemblyFileVersion("1.6.8.0")>

View File

@ -257,13 +257,26 @@ Public Class RepositoryItemLookupControl3
.PreventDuplicates = PreventDuplicates,
.DataSource = DataSource,
.SelectedValues = SelectedValues,
.StartPosition = FormStartPosition.Manual,
.Location = OwnerEdit.PointToScreen(New Point(OwnerEdit.Width, 0))
.StartPosition = FormStartPosition.Manual
}
Dim oScreen = Screen.FromControl(oForm)
oForm.Location = GetFormLocation(oForm.Height, oForm.Width, oScreen)
Return oForm
End Function
Private Function GetFormLocation(pFormHeight As Integer, pFormWidth As Integer, pScreen As Screen) As Point
' This is the location on the same height like the Lookup Control
Dim oDefaultLocation = OwnerEdit.PointToScreen(New Point(OwnerEdit.Width, 0))
Dim oScreenheight = pScreen.Bounds.Height
If oScreenheight < (oDefaultLocation.Y + pFormHeight) Then
Return OwnerEdit.PointToScreen(New Point(OwnerEdit.Width, -pFormHeight + OwnerEdit.Height))
End If
Return oDefaultLocation
End Function
Protected Overrides Sub RaiseButtonClick(e As ButtonPressedEventArgs)
MyBase.RaiseButtonClick(e)

View File

@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("LookupGrid")>
<Assembly: AssemblyCopyright("Copyright © 2022")>
<Assembly: AssemblyTrademark("3.2.5.0")>
<Assembly: AssemblyTrademark("3.3.0.0")>
<Assembly: ComVisible(False)>
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.2.5.0")>
<Assembly: AssemblyFileVersion("3.2.5.0")>
<Assembly: AssemblyVersion("3.3.0.0")>
<Assembly: AssemblyFileVersion("3.3.0.0")>

View File

@ -94,9 +94,9 @@ Namespace My.Resources
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen oder mehrere Werte aus: ähnelt.
'''</summary>
Friend Shared ReadOnly Property PopupForm_TextMultiLine() As String
Friend Shared ReadOnly Property PopupForm_TextMultiselect() As String
Get
Return ResourceManager.GetString("PopupForm_TextMultiLine", resourceCulture)
Return ResourceManager.GetString("PopupForm_TextMultiselect", resourceCulture)
End Get
End Property
End Class

View File

@ -126,7 +126,7 @@
<data name="PopupForm_Text" xml:space="preserve">
<value>Please choose a value:</value>
</data>
<data name="PopupForm_TextMultiLine" xml:space="preserve">
<data name="PopupForm_TextMultiselect" xml:space="preserve">
<value>Please choose one or more values:</value>
</data>
</root>

View File

@ -126,7 +126,7 @@
<data name="PopupForm_Text" xml:space="preserve">
<value>Bitte wählen Sie einen Wert aus:</value>
</data>
<data name="PopupForm_TextMultiLine" xml:space="preserve">
<data name="PopupForm_TextMultiselect" xml:space="preserve">
<value>Bitte wählen Sie einen oder mehrere Werte aus:</value>
</data>
</root>

View File

@ -65,10 +65,10 @@ Public Class frmLookupGrid
oCheckboxColumn.OptionsColumn.AllowFocus = False
Text = _R.GetString("PopupForm_Text")
Text = _R.GetString("PopupForm_TextMultiselect")
_DataColumn = 1
Else
Text = _R.GetString("PopupForm_TextMultiLine")
Text = _R.GetString("PopupForm_Text")
_DataColumn = 0
End If

View File

@ -27,7 +27,7 @@ Namespace Base
Public Sub ShowErrorMessage(Exception As Exception, Origin As String, Message As String)
_Logger.Error(Exception)
MessageBox.Show(Message, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Error)
MessageBox.Show(Message & vbNewLine & Exception?.Message, _Form.Text & Origin, MessageBoxButtons.OK, MessageBoxIcon.Error)
End Sub
Public Sub ShowErrorMessage(Text As String)

View File

@ -374,5 +374,8 @@
<ItemGroup>
<None Include="Resources\insertpagecount.svg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\business_world.svg" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project>

View File

@ -22,13 +22,32 @@ Namespace DocumentResultList
End Sub
#Region "Saving and Restoring layout"
Public Sub Workspace_Save(pWorkspaceManager As WorkspaceManager)
Try
Dim oFileName = GetWorkspace_LayoutName()
pWorkspaceManager.SaveWorkspaces(oFileName)
Catch ex As Exception
Logger.Error(ex)
Logger.Info("Error while restoring Workspaces: " & ex.Message)
End Try
End Sub
Public Sub Workspace_Restore(pWorkspaceManager As WorkspaceManager)
Try
Dim oFileName = GetWorkspace_LayoutName()
If IO.File.Exists(oFileName) Then
pWorkspaceManager.LoadWorkspaces(oFileName)
End If
Catch ex As Exception
Logger.Error(ex)
Logger.Info("Error while restoring Workspaces: " & ex.Message)
End Try
End Sub
Public Sub DockManager_SaveLayout(pDockManager As DockManager)
Try
Dim oXml As String = GetDockmanager_LayoutName()
pDockManager.SaveLayoutToXml(oXml)
Dim oFileName As String = GetDockmanager_LayoutName()
pDockManager.SaveLayoutToXml(oFileName)
Catch ex As Exception
Logger.Error(ex)
Logger.Info("Error while saving GridLayout: " & ex.Message)
@ -37,8 +56,10 @@ Namespace DocumentResultList
Public Sub DockManager_RestoreLayout(pDockManager As DockManager)
Try
Dim oXml As String = GetDockmanager_LayoutName()
pDockManager.RestoreLayoutFromXml(oXml)
Dim oFilename As String = GetDockmanager_LayoutName()
If IO.File.Exists(oFilename) Then
pDockManager.RestoreLayoutFromXml(oFilename)
End If
Catch ex As Exception
Logger.Error(ex)
Logger.Info("Error while restoring GridLayout: " & ex.Message)
@ -59,8 +80,8 @@ Namespace DocumentResultList
Public Sub GridView_SaveLayout(pGridView As GridView)
Try
Dim oXml As String = GetGrid_LayoutName(pGridView)
pGridView.SaveLayoutToXml(oXml, OptionsLayoutBase.FullLayout)
Dim oFileName As String = GetGrid_LayoutName(pGridView)
pGridView.SaveLayoutToXml(oFileName, OptionsLayoutBase.FullLayout)
Catch ex As Exception
Logger.Error(ex)
Logger.Info("Error while saving GridLayout: " & ex.Message)
@ -79,6 +100,12 @@ Namespace DocumentResultList
Return IO.Path.Combine(oDirectory, Filename)
End Function
Public Function GetWorkspace_LayoutName() As String
Dim Filename As String = $"Workspace_UserLayout.xml"
Dim oDirectory As String = IO.Path.GetDirectoryName(Config.UserConfigPath)
Return IO.Path.Combine(oDirectory, Filename)
End Function
Public Sub LoadWindowLocationAndSize(ByRef pForm As Form)
If Utils.IsVisibleOnAnyScreen(Config.Config.WindowLocation) Then
If Utils.LocationIsVisible(Config.Config.WindowLocation) Then

View File

@ -11,6 +11,7 @@ Namespace DocumentResultList
Private WithEvents FileOpenTimer As New Timer
Private FileEx As Modules.Filesystem.File
Private EnableWatching As Boolean = True
' TODO: Hashes for checking if the opened file was modified externally
Private HashOriginalFile As String = Nothing
@ -47,16 +48,20 @@ Namespace DocumentResultList
End Class
Public Sub New(pLogConfig As LogConfig)
MyClass.New(pLogConfig, True)
End Sub
Public Sub New(pLogConfig As LogConfig, pEnableWatching As Boolean)
MyBase.New(pLogConfig)
FileEx = New Modules.Filesystem.File(pLogConfig)
EnableWatching = pEnableWatching
End Sub
Public Async Function OpenDocument(pDocument As Document) As Task(Of Boolean)
Dim oResult As Tuple(Of Integer, String) = Nothing
If pDocument.FullPath IsNot Nothing AndAlso pDocument.FullPath.Trim <> String.Empty Then
' TODO: DONT put into openfiles
oResult = Await OpenFileFromPath(pDocument)
oResult = OpenFileFromPath(pDocument)
ElseIf pDocument.Extension IsNot Nothing AndAlso pDocument.Contents IsNot Nothing Then
oResult = Await OpenFileFromByteArray(pDocument)
@ -68,6 +73,11 @@ Namespace DocumentResultList
Return False
End If
If EnableWatching = False Then
Logger.Debug("File was opened. Watching and Events are disabled.")
Return True
End If
Dim oProcessId = oResult.Item1
Dim oFilePath = oResult.Item2
@ -122,10 +132,11 @@ Namespace DocumentResultList
End Try
End Function
Private Async Function OpenFileFromPath(pDocument As Document) As Task(Of Tuple(Of Integer, String))
Private Function OpenFileFromPath(pDocument As Document) As Tuple(Of Integer, String)
Try
Dim oProcessId = DoOpenFile(pDocument.FullPath)
Return New Tuple(Of Integer, String)(oProcessId, pDocument.FullPath)
Dim oResult = New Tuple(Of Integer, String)(oProcessId, pDocument.FullPath)
Return oResult
Catch ex As Exception
Logger.Error(ex)
@ -134,19 +145,26 @@ Namespace DocumentResultList
End Function
Private Function DoOpenFile(pFilePath As String) As Integer
Dim _Process = New Process
_Process.StartInfo.FileName = pFilePath
_Process.EnableRaisingEvents = True
Try
Dim _Process = New Process
_Process.StartInfo.FileName = pFilePath
_Process.EnableRaisingEvents = True
AddHandler _Process.Exited, AddressOf Process_Exited
If EnableWatching = True Then
AddHandler _Process.Exited, AddressOf Process_Exited
End If
_Process.Start()
_Process.Start()
Return _Process.Id
Return _Process.Id
Catch ex As Exception
Logger.Error(ex)
Return Nothing
End Try
End Function
Private Function Process_Exited(sender As Object, e As EventArgs) As Boolean
Debug.WriteLine("Process is exited")
Logger.Debug("Process is exited")
Dim oProcess As Process = sender
Dim oOpenFile = OpenFiles.
@ -164,7 +182,7 @@ Namespace DocumentResultList
' All files that are currently processe/updated on the outside,
' will not be checked again.
Dim oFileIsProcessed = ProcessedFiles.Contains(oOpenFile)
Debug.WriteLine($"File is processed: [{oFileIsProcessed}]")
Logger.Debug($"File is processed: [{oFileIsProcessed}]")
If oFileIsProcessed = True Then
Continue For
@ -173,8 +191,8 @@ Namespace DocumentResultList
' Check if the file is currently in use, and skip if it is.
Dim oIsLocked = FileEx.TestFileIsLocked(oOpenFile.FilePath)
Dim oIsExited = oOpenFile.Exited
Debug.WriteLine($"File is locked: [{oIsLocked}]")
Debug.WriteLine($"File is exited: [{oIsExited}]")
Logger.Debug($"File is locked: [{oIsLocked}]")
Logger.Debug($"File is exited: [{oIsExited}]")
If oIsLocked Or oIsExited = False Then
Continue For
@ -183,15 +201,15 @@ Namespace DocumentResultList
' If this point is reached, we assume the file was closed again after opening it.
' ------
Debug.WriteLine($"File Closed")
Logger.Debug($"File Closed")
' Compute the current hash of the file and compare it with the one
' in the database.
Dim oOldHash = oOpenFile.Document.FileHash
Dim oNewHash = FileEx.GetChecksum(oOpenFile.FilePath)
Debug.WriteLine($"Old Hash: [{oOldHash}]")
Debug.WriteLine($"New Hash: [{oNewHash}]")
Logger.Debug($"Old Hash: [{oOldHash}]")
Logger.Debug($"New Hash: [{oNewHash}]")
' If the the file did not change, remove it from the watch list
If oNewHash.Equals(oOldHash) Then
@ -203,7 +221,7 @@ Namespace DocumentResultList
' If this point is reached, we assume the file changed.
' ------
Debug.WriteLine($"File Changed")
Logger.Debug($"File Changed")
' The File changed, so mark the file as being processed/updated
' and notify any listeners of the FileChanged event

View File

@ -82,6 +82,25 @@ Public Class GridBuilder
Return Me
End Function
Public Function WithFontSizeDelta(pFontSizeDelta As Integer) As GridBuilder
For Each oGridView In Views
WithFontSizeDelta(oGridView, pFontSizeDelta)
Next
Return Me
End Function
Public Function WithFontSizeDelta(pGridView As GridView, pFontSizeDelta As Integer) As GridBuilder
pGridView.Appearance.Row.FontSizeDelta = pFontSizeDelta
pGridView.Appearance.GroupRow.FontSizeDelta = pFontSizeDelta
pGridView.Appearance.GroupPanel.FontSizeDelta = pFontSizeDelta
pGridView.Appearance.GroupFooter.FontSizeDelta = pFontSizeDelta
pGridView.Appearance.FilterPanel.FontSizeDelta = pFontSizeDelta
pGridView.Appearance.HeaderPanel.FontSizeDelta = pFontSizeDelta
Return Me
End Function
Public Function WithClipboardHandler() As GridBuilder
For Each oGridView In Views
WithClipboardHandler(oGridView)

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.9.1.0")>
<Assembly: AssemblyFileVersion("1.9.1.0")>
<Assembly: AssemblyVersion("1.10.0.0")>
<Assembly: AssemblyFileVersion("1.10.0.0")>

View File

@ -130,6 +130,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
Friend ReadOnly Property business_world() As DevExpress.Utils.Svg.SvgImage
Get
Dim obj As Object = ResourceManager.GetObject("business_world", resourceCulture)
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>

View File

@ -145,6 +145,9 @@
<data name="ZooFlow-Vergroessern" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="Open_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -157,8 +160,8 @@
<data name="jpg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="editcolors" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="ppt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -166,14 +169,11 @@
<data name="copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="zoom_more" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="refreshallpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="columnheaders" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="insertpagecount" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="enablescrolling" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@ -181,9 +181,6 @@
<data name="title" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\title.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="clearpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="singlepageview1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\singlepageview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
@ -196,8 +193,8 @@
<data name="singlepageview" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="clearpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="categorize" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\categorize.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@ -205,11 +202,17 @@
<data name="tiff" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="editcolors" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="columnheaders" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -229,13 +232,13 @@
<data name="save1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="zoom_more" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Article_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="insertpagecount" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="business_world" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\business_world.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
</root>

View File

@ -0,0 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Blue{fill:#1177D7;}
.Green{fill:#039C23;}
.Yellow{fill:#FFB115;}
.Black{fill:#727272;}
.White{fill:#FFFFFF;}
.Red{fill:#D11C1C;}
.st0{opacity:0.75;}
</style>
<g id="World_1_">
<path d="M15.8,2c-7.7,0-14,6.3-14,14s6.3,14,14,14s14-6.3,14-14S23.6,2,15.8,2z M20.1,19.1c-0.5,0.1-0.5-0.3-0.1-0.4 C20.1,18.9,20.2,18.8,20.1,19.1z M8.4,13.3c0-0.1,0-0.1,0-0.2C8.4,13.2,8.4,13.3,8.4,13.3z M22.1,21.9c0-0.1-0.1-0.1-0.1-0.1 c0.1,0.3-0.1,0.9-0.1,1.2c-0.1,0.4-0.4,1.3-0.7,1.3c0,0.2-0.4,0-0.3,0.2c-0.5,0.1-0.8,0.5-0.8,0.8c0,0.1-0.3,1.1-0.4,1.1 c0-0.1,0.1-0.2,0.1-0.3c0,0.1-0.1,0.1-0.1,0c0,0.2-0.3,0.8-0.4,0.9c-0.1,0.1-0.3,0.3-0.5,0.2c-0.1,0-0.3-0.2-0.3-0.4 c0,0.3,0.2,0.6,0.2,0.8c-0.9,0.2-1.8,0.3-2.7,0.3c-0.1,0-0.2,0-0.3,0c0.1-0.3,0.1-0.5,0.2-0.8c0.2-0.7,0.2-1.5,0.3-2.2 c0.1-0.4,0.3-1.5,0.1-1.9c-0.1-0.2-0.3-0.2-0.5-0.4c-0.6-0.4-0.6-0.7-0.8-1.3c-0.1-0.4-0.3-0.5-0.5-0.9c-0.1-0.2-0.2-0.2-0.2-0.5 c0-0.2,0.2-0.4,0.2-0.6c0,0-0.1,0.1-0.1,0.1c0,0-0.1-0.1-0.1-0.1c0-0.1,0-0.4,0.1-0.4c0-0.2,0.1-0.7,0.3-0.7c0-0.3,0.2-0.3,0.1-0.5 c0.3-0.2,0-0.9,0-1c-0.2,0-0.1-0.1-0.3-0.2c0,0.1-0.2,0.1-0.2,0.2c0,0.1,0.1,0,0.1,0.1c-0.3,0-0.4-0.2-0.6-0.3 c0,0.2-0.1-0.2-0.3-0.3c0.1,0.2-0.2-0.2-0.2-0.3c-0.1-0.2-0.2-0.3-0.2-0.5c-0.5,0-0.6-0.1-1-0.4c-0.4-0.3-0.7-0.1-1.2-0.3 c-0.3-0.1-0.7-0.3-0.9-0.5c-0.4-0.3-0.3-0.6-0.5-1c-0.1-0.3-0.7-0.7-0.6-1c-0.6,0-0.5-1.3-1.1-1.3c0,0.2,0.6,1.5,0.8,2 c-0.2-0.4-0.8-0.6-0.9-1c0.5,0-0.2-0.8-0.4-1c-0.2-0.3-0.2-0.6-0.7-0.6c0-0.2-0.2-0.4-0.2-0.7c-0.1,0-0.2-0.1-0.2-0.2 c0,0,0.1,0,0.1,0c0-0.1-0.1-0.1,0-0.2c-0.1,0,0,0-0.1,0c0,0,0,0,0,0.1C6,9.5,5.9,9.3,5.8,9.2c1.1-1.6,2.6-3,4.4-3.9 c0.1,0.1,0.1,0.3,0.2,0.3c0-0.1,0-0.2,0-0.3c0.7-0.4,1.5-0.7,2.4-0.9c0.1,0,0.1,0.1,0.2,0.1c0.2,0.1,0.4,0.1,0.6,0.2 c0.2,0.1,0.1,0.1,0.2,0.4c0,0.1,0.1,0.2,0.1,0.3c0.1,0,0.1,0,0.2,0c0,0.1-0.1,0.1-0.1,0C14,5.7,14.2,6,14.4,5.6 c0.1-0.2-0.2-0.4-0.1-0.7c0.1-0.2,0.5-0.4,0.5-0.6c0,0,0,0,0,0c0-0.1,0-0.2-0.1-0.3C15,4,15.4,4,15.7,4c0.7,0,1.3,0.1,2,0.2 c0,0,0,0,0,0.1c0,0-0.1,0-0.2,0c0,0,0,0.2,0,0.1c0.1,0,0.4,0.2,0.3,0.4c0.1,0,0.1,0.1,0.2,0.1c0-0.2,0.3,0.3,0.3,0 c-0.1,0,0.1,0.1,0.1,0.1c0,0.1-0.5,0.3-0.6,0.3c0,0.3,0.8-0.5,0.8,0c0,0,0,0,0.1-0.1c0,0.6-0.8,0.9-1.1,0.9c-0.2,0-0.6,0-0.8,0 c-0.2,0.1-0.4,0.6-0.7,0.6c0,0.3-0.1,0.3-0.2,0.4c0,0,1.3-1.3,1.3-0.6c0,0-0.1,0.2-0.3,0.3c0,0,0-0.1,0-0.1c-0.1,0.1,0,0.1,0,0.2 c0.1,0,0.2-0.1,0.2-0.1c0,0.1,0,0.2-0.1,0.2c0,0,0.1,0,0.1,0c0,0.1-0.1,0.3,0.1,0.3c0,0,0,0,0,0c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0 c0.2,0,0.2,0,0.4,0c0,0.3,0,0,0.1,0.2c-0.1,0-0.4,0.3-0.4,0.3c0,0,0-0.1-0.1-0.1c0,0-0.2,0.3-0.2,0.3c0,0,0,0,0-0.1 c-0.7,0,0.3-0.5,0.3-0.5c-0.5,0-0.2,0.1-0.2-0.2c0,0-0.1,0-0.1,0c0,0.1-0.1,0.2-0.2,0.2c0,0,0-0.1,0-0.1c-0.1,0.1-0.1,0.1,0,0.1 c-0.1,0.1-0.1,0-0.2,0c-0.1,0.1,0.1,0.4-0.2,0.2c0,0.1,0,0,0,0.1c-0.1,0,0-0.1-0.1-0.1c0,0.3-0.6,0.2-0.3,0.7c-0.1,0-0.1,0-0.2,0 c0,0.1,0,0.1,0,0.1c-0.1,0-0.2,0.1-0.3,0.2c0.1,0,0.3,0,0.2,0c0,0.1-0.2,0.1-0.3,0.1C15.3,9,15.2,9.2,15,9.1c0,0.2,0.1,0.3-0.1,0.5 c0,0.1,0-0.4,0-0.5c-0.1,0.1-0.3,0.4-0.2,0.4c0,0.2,0.1,0.1,0.1,0.2c-0.2,0,0,0.2,0.1,0.3c-0.1,0-0.1,0-0.1,0.1 c0.1,0,0.2,0.1,0.2,0.1c-0.1,0-0.1,0-0.2,0c0,0.5-0.9,0.7-0.8,1.4c0,0.3,0.4,1,0.1,1.2c0-0.3-0.3-0.4-0.3-0.7c-0.1,0,0,0.1-0.1,0.1 c-0.1-0.1,0-0.3-0.1-0.5c-0.1-0.1-0.2,0-0.4-0.1c-0.1,0-0.5-0.2-0.5-0.2c-0.1,0-0.3,0-0.4,0.1c0.1,0.2,0.2,0,0.1,0.2 c0.1,0,0.1,0,0.1,0.1c-0.1,0-0.2-0.1-0.3-0.2c0,0.1,0,0.1,0,0.1c-0.1,0-0.1,0-0.2,0c0-0.1,0-0.1,0-0.1c0,0-0.7,0-0.7,0 c0,0.2-0.4,0.5-0.5,0.8c-0.1,0.3,0,0.9,0,1.3c0.1,0,0.2,0.4,0.4,0.6c0.2,0.1,0.7,0.2,0.9,0.1c0.2-0.2,0.2-0.8,0.6-0.8 c0.4,0,0,0.5,0.1,0.9c-0.1,0-0.1-0.1-0.1-0.1c0,0.2-0.1,0.5-0.1,0.7c0.4,0,0.9-0.2,1.1,0.2c0.1,0.2-0.2,0.5-0.1,0.8 c0,0.2,0.2,0.5,0.4,0.5c0.2,0.1,0.2-0.1,0.3-0.1c0.2,0,0.2,0.1,0.4,0.1c0.1,0,0.1,0.2,0.2,0.2c0.1-0.5,0.3-0.7,0.7-0.9 c0.3-0.1,0.2-0.3,0.1,0.1c0.2,0-0.1,0.5,0.1,0.5c0-0.2,0-0.5,0.3-0.6c0-0.1-0.1,0-0.1-0.1c0.1-0.1,0.5,0.3,0.4,0.3 c0,0.1,0.9,0.1,0.9,0c0,0,0.3,0,0.3,0c0,0.1,0,0-0.1,0.1c0,0.1,0.3,0.2,0.3,0.1c-0.1,0.3-0.1,0.1-0.3,0.4c0.6,0,0.6-0.2,0.7,0.4 c0.1,0,0,0,0.1,0c0-0.3,0.3-0.1,0.3,0.1c0,0,0.5-0.2,0.5,0c0.6,0,0.4,0.7,0.7,0.9c0.1,0-0.1,0,0.1,0c0,0-0.1,0.3-0.1,0.3 c0.1,0,0-0.1,0.1-0.1c0,0.1,0,0.1,0,0.1c0,0,0,0,0,0.1c0,0,0,0,0,0c-0.2,0-0.1,0-0.1-0.1c0,0-0.5,0.5-0.8,0.7 c0.2-0.1,0.3-0.2,0.6-0.2c0,0.3,0,0.1,0,0.3c0.1,0,0-0.3,0.2-0.3c0,0.4,0.4,0.1,0.5,0.1c0,0,0.6-0.3,0.5,0.1c0.2,0,0.1,0.3,0.3,0.3 c0.3-0.3,1.2,0.3,1.5,0.5C23.2,20.7,22.4,21.1,22.1,21.9z M17.5,7.3l-0.1-0.1c-0.1,0-0.4-0.1-0.1-0.2l0.1,0.2c0,0,0.1,0,0.1,0 C17.4,7.3,17.4,7.3,17.5,7.3z M17.1,6.2c0.1,0,0.4,0.1,0.5,0.2c0,0,0,0,0,0.1C17.5,6.5,17.1,6.3,17.1,6.2z M12.3,11.8 C12.2,11.8,12.2,11.7,12.3,11.8C12.3,11.7,12.3,11.7,12.3,11.8z M19.6,18.9C19.6,18.9,19.5,19,19.6,18.9L19.6,18.9z M19.5,19 C19.6,19,19.5,19.1,19.5,19L19.5,19z" class="Blue" />
</g>
</svg>

View File

@ -21,7 +21,7 @@ Partial Class frmDocumentResultList
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocumentResultList))
Dim FadeTransition1 As DevExpress.Utils.Animation.FadeTransition = New DevExpress.Utils.Animation.FadeTransition()
Dim FadeTransition2 As DevExpress.Utils.Animation.FadeTransition = New DevExpress.Utils.Animation.FadeTransition()
Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
Me.GridView1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView()
@ -82,6 +82,7 @@ Partial Class frmDocumentResultList
Me.RibbonPageGroup_Layout = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
Me.RepositoryItemTextEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
Me.RepositoryItemSearchControl1 = New DevExpress.XtraEditors.Repository.RepositoryItemSearchControl()
Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl()
Me.GridControl2 = New DevExpress.XtraGrid.GridControl()
@ -96,7 +97,7 @@ Partial Class frmDocumentResultList
Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components)
Me.DockPanelFileList = New DevExpress.XtraBars.Docking.DockPanel()
Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer()
Me.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel()
Me.panelContainerStatus = New DevExpress.XtraBars.Docking.DockPanel()
Me.DockPanelStatus = New DevExpress.XtraBars.Docking.DockPanel()
Me.ControlContainer1 = New DevExpress.XtraBars.Docking.ControlContainer()
Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
@ -124,6 +125,7 @@ Partial Class frmDocumentResultList
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RepositoryItemSearchControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerControl2.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl2.Panel1.SuspendLayout()
@ -137,7 +139,7 @@ Partial Class frmDocumentResultList
CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.DockPanelFileList.SuspendLayout()
Me.DockPanel2_Container.SuspendLayout()
Me.panelContainer1.SuspendLayout()
Me.panelContainerStatus.SuspendLayout()
Me.DockPanelStatus.SuspendLayout()
Me.ControlContainer1.SuspendLayout()
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -216,12 +218,12 @@ Partial Class frmDocumentResultList
Me.RibbonControl.ExpandCollapseItem.Id = 0
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.BarButtonResetLayout, 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.BarButtonItem6, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarWorkspaceMenuItem1})
resources.ApplyResources(Me.RibbonControl, "RibbonControl")
Me.RibbonControl.MaxItemId = 48
Me.RibbonControl.MaxItemId = 49
Me.RibbonControl.Name = "RibbonControl"
Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryFile, Me.RibbonPageCategoryAttribute})
Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1)
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.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemSearchControl1})
Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl.ShowToolbarCustomizeItem = False
Me.RibbonControl.StatusBar = Me.RibbonStatusBar
@ -471,15 +473,17 @@ Partial Class frmDocumentResultList
'
'BarWorkspaceMenuItem1
'
resources.ApplyResources(Me.BarWorkspaceMenuItem1, "BarWorkspaceMenuItem1")
Me.BarWorkspaceMenuItem1.Id = 45
Me.BarWorkspaceMenuItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.business_world
Me.BarWorkspaceMenuItem1.Name = "BarWorkspaceMenuItem1"
Me.BarWorkspaceMenuItem1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
Me.BarWorkspaceMenuItem1.WorkspaceManager = Me.WorkspaceManager1
Me.BarWorkspaceMenuItem1.WorkspacesSortMode = DevExpress.XtraBars.WorspacesSortMode.Usage
'
'WorkspaceManager1
'
Me.WorkspaceManager1.TargetControl = Me
Me.WorkspaceManager1.TransitionType = FadeTransition1
Me.WorkspaceManager1.TransitionType = FadeTransition2
'
'RibbonPageCategoryFile
'
@ -616,6 +620,12 @@ Partial Class frmDocumentResultList
resources.ApplyResources(Me.RepositoryItemTextEdit2, "RepositoryItemTextEdit2")
Me.RepositoryItemTextEdit2.Name = "RepositoryItemTextEdit2"
'
'RepositoryItemSearchControl1
'
resources.ApplyResources(Me.RepositoryItemSearchControl1, "RepositoryItemSearchControl1")
Me.RepositoryItemSearchControl1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Repository.ClearButton(), New DevExpress.XtraEditors.Repository.SearchButton()})
Me.RepositoryItemSearchControl1.Name = "RepositoryItemSearchControl1"
'
'RibbonStatusBar
'
Me.RibbonStatusBar.ItemLinks.Add(Me.labelResultCount)
@ -719,7 +729,7 @@ Partial Class frmDocumentResultList
'DockManager1
'
Me.DockManager1.Form = Me
Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanelFileList, Me.panelContainer1, Me.DockPanelDocViewer})
Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanelFileList, Me.panelContainerStatus, Me.DockPanelDocViewer})
Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"})
'
'DockPanelFileList
@ -738,17 +748,17 @@ Partial Class frmDocumentResultList
resources.ApplyResources(Me.DockPanel2_Container, "DockPanel2_Container")
Me.DockPanel2_Container.Name = "DockPanel2_Container"
'
'panelContainer1
'panelContainerStatus
'
Me.panelContainer1.ActiveChild = Me.DockPanelStatus
Me.panelContainer1.Controls.Add(Me.DockPanelStatus)
Me.panelContainer1.Controls.Add(Me.DockPanelMetadata)
Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right
Me.panelContainer1.ID = New System.Guid("3d77391e-21ef-4574-8521-d9f3b7468ebe")
resources.ApplyResources(Me.panelContainer1, "panelContainer1")
Me.panelContainer1.Name = "panelContainer1"
Me.panelContainer1.OriginalSize = New System.Drawing.Size(275, 200)
Me.panelContainer1.Tabbed = True
Me.panelContainerStatus.ActiveChild = Me.DockPanelStatus
Me.panelContainerStatus.Controls.Add(Me.DockPanelStatus)
Me.panelContainerStatus.Controls.Add(Me.DockPanelMetadata)
Me.panelContainerStatus.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right
Me.panelContainerStatus.ID = New System.Guid("3d77391e-21ef-4574-8521-d9f3b7468ebe")
resources.ApplyResources(Me.panelContainerStatus, "panelContainerStatus")
Me.panelContainerStatus.Name = "panelContainerStatus"
Me.panelContainerStatus.OriginalSize = New System.Drawing.Size(275, 200)
Me.panelContainerStatus.Tabbed = True
'
'DockPanelStatus
'
@ -759,7 +769,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
'
@ -800,7 +810,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
@ -818,7 +828,7 @@ Partial Class frmDocumentResultList
Me.LayoutControlItem1.Name = "LayoutControlItem1"
Me.LayoutControlItem1.Size = New System.Drawing.Size(224, 24)
resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1")
Me.LayoutControlItem1.TextSize = New System.Drawing.Size(126, 13)
Me.LayoutControlItem1.TextSize = New System.Drawing.Size(137, 13)
'
'LayoutControlItem2
'
@ -827,14 +837,14 @@ Partial Class frmDocumentResultList
Me.LayoutControlItem2.Name = "LayoutControlItem2"
Me.LayoutControlItem2.Size = New System.Drawing.Size(224, 24)
resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2")
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(126, 13)
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(137, 13)
'
'EmptySpaceItem1
'
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)
'
'DockPanelMetadata
@ -845,7 +855,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
'
@ -883,9 +893,9 @@ Partial Class 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.DockPanelDocViewer)
Me.Controls.Add(Me.panelContainer1)
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)
@ -904,6 +914,7 @@ Partial Class frmDocumentResultList
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.RepositoryItemSearchControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.SplitContainerControl2.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl2.Panel1.ResumeLayout(False)
CType(Me.SplitContainerControl2.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
@ -917,7 +928,7 @@ Partial Class frmDocumentResultList
CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit()
Me.DockPanelFileList.ResumeLayout(False)
Me.DockPanel2_Container.ResumeLayout(False)
Me.panelContainer1.ResumeLayout(False)
Me.panelContainerStatus.ResumeLayout(False)
Me.DockPanelStatus.ResumeLayout(False)
Me.ControlContainer1.ResumeLayout(False)
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
@ -1022,7 +1033,7 @@ Partial Class frmDocumentResultList
Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents DockPanelStatus As DevExpress.XtraBars.Docking.DockPanel
Friend WithEvents ControlContainer1 As DevExpress.XtraBars.Docking.ControlContainer
Friend WithEvents panelContainer1 As DevExpress.XtraBars.Docking.DockPanel
Friend WithEvents panelContainerStatus As DevExpress.XtraBars.Docking.DockPanel
Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl
Friend WithEvents txtCheckedOutWho As DevExpress.XtraEditors.TextEdit
Friend WithEvents dateCheckedOutWhen As DevExpress.XtraEditors.DateEdit
@ -1031,4 +1042,5 @@ Partial Class frmDocumentResultList
Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem
Friend WithEvents RepositoryItemSearchControl1 As DevExpress.XtraEditors.Repository.RepositoryItemSearchControl
End Class

View File

@ -474,9 +474,6 @@
<data name="BarButtonItem11.Caption" xml:space="preserve">
<value>Spaltenauswahl</value>
</data>
<data name="BarWorkspaceMenuItem1.Caption" xml:space="preserve">
<value>BarWorkspaceMenuItem1</value>
</data>
<metadata name="WorkspaceManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>456, 22</value>
</metadata>
@ -489,82 +486,6 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1189, 671</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>578, 442</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.Name" xml:space="preserve">
<value>DockPanel2_Container</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;DockPanel2_Container.Parent" xml:space="preserve">
<value>DockPanelFileList</value>
</data>
<data name="&gt;&gt;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>585, 491</value>
</data>
<data name="DockPanelFileList.Text" xml:space="preserve">
<value>Ergebnisse</value>
</data>
<data name="&gt;&gt;DockPanelFileList.Name" xml:space="preserve">
<value>DockPanelFileList</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;DockPanelFileList.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;DockPanelFileList.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DocumentViewer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="DocumentViewer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>323, 441</value>
</data>
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Name" xml:space="preserve">
<value>DocumentViewer1</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.7.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
<value>DockPanel1_Container</value>
</data>
<data name="&gt;&gt;DocumentViewer1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DockPanel1_Container.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 46</value>
</data>
<data name="DockPanel1_Container.Size" type="System.Drawing.Size, System.Drawing">
<value>323, 441</value>
</data>
<data name="DockPanel1_Container.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DockPanel1_Container.Name" xml:space="preserve">
<value>DockPanel1_Container</value>
</data>
@ -581,7 +502,7 @@
<value>585, 158</value>
</data>
<data name="DockPanelDocViewer.Size" type="System.Drawing.Size, System.Drawing">
<value>329, 491</value>
<value>329, 489</value>
</data>
<data name="DockPanelDocViewer.Text" xml:space="preserve">
<value>Vorschau</value>
@ -596,103 +517,6 @@
<value>$this</value>
</data>
<data name="&gt;&gt;DockPanelDocViewer.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="txtCheckedOutWho.Location" type="System.Drawing.Point, System.Drawing">
<value>162, 45</value>
</data>
<data name="txtCheckedOutWho.Size" type="System.Drawing.Size, System.Drawing">
<value>82, 20</value>
</data>
<data name="txtCheckedOutWho.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;txtCheckedOutWho.Name" xml:space="preserve">
<value>txtCheckedOutWho</value>
</data>
<data name="&gt;&gt;txtCheckedOutWho.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;txtCheckedOutWho.Parent" xml:space="preserve">
<value>LayoutControl1</value>
</data>
<data name="&gt;&gt;txtCheckedOutWho.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="dateCheckedOutWhen.EditValue" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="dateCheckedOutWhen.Location" type="System.Drawing.Point, System.Drawing">
<value>162, 69</value>
</data>
<assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="dateCheckedOutWhen.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
<value>Combo</value>
</data>
<data name="dateCheckedOutWhen.Properties.CalendarTimeProperties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
<value>Combo</value>
</data>
<data name="dateCheckedOutWhen.Size" type="System.Drawing.Size, System.Drawing">
<value>82, 20</value>
</data>
<data name="dateCheckedOutWhen.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="&gt;&gt;dateCheckedOutWhen.Name" xml:space="preserve">
<value>dateCheckedOutWhen</value>
</data>
<data name="&gt;&gt;dateCheckedOutWhen.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;dateCheckedOutWhen.Parent" xml:space="preserve">
<value>LayoutControl1</value>
</data>
<data name="&gt;&gt;dateCheckedOutWhen.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="LayoutControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="LayoutControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="LayoutControlItem1.Text" xml:space="preserve">
<value>Bearbeitet von</value>
</data>
<data name="LayoutControlItem2.Text" xml:space="preserve">
<value>In Bearbeitung genommen</value>
</data>
<data name="LayoutControlGroup1.Text" xml:space="preserve">
<value>In Bearbeitung</value>
</data>
<data name="LayoutControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 413</value>
</data>
<data name="LayoutControl1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="LayoutControl1.Text" xml:space="preserve">
<value>LayoutControl1</value>
</data>
<data name="&gt;&gt;LayoutControl1.Name" xml:space="preserve">
<value>LayoutControl1</value>
</data>
<data name="&gt;&gt;LayoutControl1.Type" xml:space="preserve">
<value>DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;LayoutControl1.Parent" xml:space="preserve">
<value>ControlContainer1</value>
</data>
<data name="&gt;&gt;LayoutControl1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="ControlContainer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="ControlContainer1.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 413</value>
</data>
<data name="ControlContainer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;ControlContainer1.Name" xml:space="preserve">
@ -708,10 +532,10 @@
<value>0</value>
</data>
<data name="DockPanelStatus.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 46</value>
<value>4, 26</value>
</data>
<data name="DockPanelStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 413</value>
<value>268, 434</value>
</data>
<data name="DockPanelStatus.Text" xml:space="preserve">
<value>Status</value>
@ -723,44 +547,11 @@
<value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;DockPanelStatus.Parent" xml:space="preserve">
<value>panelContainer1</value>
<value>panelContainerStatus</value>
</data>
<data name="&gt;&gt;DockPanelStatus.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="CtrlObjectPropertyDialog.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="CtrlObjectPropertyDialog.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="CtrlObjectPropertyDialog.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 413</value>
</data>
<data name="CtrlObjectPropertyDialog.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Name" xml:space="preserve">
<value>CtrlObjectPropertyDialog</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve">
<value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.9.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve">
<value>DockPanel3_Container</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DockPanel3_Container.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="DockPanel3_Container.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 413</value>
</data>
<data name="DockPanel3_Container.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DockPanel3_Container.Name" xml:space="preserve">
<value>DockPanel3_Container</value>
</data>
@ -774,10 +565,10 @@
<value>0</value>
</data>
<data name="DockPanelMetadata.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 46</value>
<value>4, 26</value>
</data>
<data name="DockPanelMetadata.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 413</value>
<value>268, 434</value>
</data>
<data name="DockPanelMetadata.Text" xml:space="preserve">
<value>Eigenschaften</value>
@ -789,37 +580,70 @@
<value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;DockPanelMetadata.Parent" xml:space="preserve">
<value>panelContainer1</value>
<value>panelContainerStatus</value>
</data>
<data name="&gt;&gt;DockPanelMetadata.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="panelContainer1.Location" type="System.Drawing.Point, System.Drawing">
<data name="panelContainerStatus.Location" type="System.Drawing.Point, System.Drawing">
<value>914, 158</value>
</data>
<data name="panelContainer1.Size" type="System.Drawing.Size, System.Drawing">
<value>275, 491</value>
<data name="panelContainerStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>275, 489</value>
</data>
<data name="panelContainer1.Text" xml:space="preserve">
<data name="panelContainerStatus.Text" xml:space="preserve">
<value>panelContainer1</value>
</data>
<data name="&gt;&gt;panelContainer1.Name" xml:space="preserve">
<value>panelContainer1</value>
<data name="&gt;&gt;panelContainerStatus.Name" xml:space="preserve">
<value>panelContainerStatus</value>
</data>
<data name="&gt;&gt;panelContainer1.Type" xml:space="preserve">
<data name="&gt;&gt;panelContainerStatus.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="&gt;&gt;panelContainer1.Parent" xml:space="preserve">
<data name="&gt;&gt;panelContainerStatus.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;panelContainer1.ZOrder" xml:space="preserve">
<data name="&gt;&gt;panelContainerStatus.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.Name" xml:space="preserve">
<value>DockPanel2_Container</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;DockPanel2_Container.Parent" xml:space="preserve">
<value>DockPanelFileList</value>
</data>
<data name="&gt;&gt;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>585, 489</value>
</data>
<data name="DockPanelFileList.Text" xml:space="preserve">
<value>Ergebnisse</value>
</data>
<data name="&gt;&gt;DockPanelFileList.Name" xml:space="preserve">
<value>DockPanelFileList</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;DockPanelFileList.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;DockPanelFileList.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="RibbonStatusBar.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 649</value>
<value>0, 647</value>
</data>
<data name="RibbonStatusBar.Size" type="System.Drawing.Size, System.Drawing">
<value>1189, 22</value>
<value>1189, 24</value>
</data>
<data name="&gt;&gt;RibbonStatusBar.Name" xml:space="preserve">
<value>RibbonStatusBar</value>
@ -1258,6 +1082,12 @@
<data name="&gt;&gt;RepositoryItemTextEdit2.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RepositoryItemSearchControl1.Name" xml:space="preserve">
<value>RepositoryItemSearchControl1</value>
</data>
<data name="&gt;&gt;RepositoryItemSearchControl1.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.Repository.RepositoryItemSearchControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;GridView2.Name" xml:space="preserve">
<value>GridView2</value>
</data>
@ -1345,66 +1175,28 @@
<data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="RibbonPageGroup3.Text" xml:space="preserve">
<value>Dokument</value>
</data>
<data name="RibbonPageGroupFilesystem.Text" xml:space="preserve">
<value>Dateien und Ordner</value>
</data>
<data name="RibbonPageActions1.Text" xml:space="preserve">
<value>Aktionen 1</value>
</data>
<data name="RibbonPageGroup4.Text" xml:space="preserve">
<value>Workflow</value>
</data>
<data name="RibbonPageGroup8.Text" xml:space="preserve">
<value>Bearbeiten</value>
</data>
<data name="RibbonPageActions2.Text" xml:space="preserve">
<value>Aktionen 2</value>
</data>
<data name="RibbonPageCategoryFile.Text" xml:space="preserve">
<value>Datei</value>
</data>
<data name="RibbonPageGroup2.Text" xml:space="preserve">
<value>Attribute</value>
</data>
<data name="RibbonPageAttribute.Text" xml:space="preserve">
<value>Aktionen</value>
</data>
<data name="RibbonPageCategoryAttribute.Text" xml:space="preserve">
<value>Attribute</value>
</data>
<data name="RibbonPageGroup_Navigation.Text" xml:space="preserve">
<value>Navigation</value>
</data>
<data name="RibbonPageGroupExport.Text" xml:space="preserve">
<value>Export</value>
</data>
<data name="RibbonPageGroup5.Text" xml:space="preserve">
<value>Aktualisieren</value>
</data>
<data name="RibbonPageStart.Text" xml:space="preserve">
<value>Start</value>
</data>
<data name="RibbonPageGroup9.Text" xml:space="preserve">
<value>Tabellen Einstellungen</value>
</data>
<data name="RibbonPageGroup1.Text" xml:space="preserve">
<value>RibbonPageGroup1</value>
</data>
<data name="RibbonPageGroup_Layout.Text" xml:space="preserve">
<value>Layout</value>
</data>
<data name="RibbonPage2.Text" xml:space="preserve">
<value>Layout</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="RepositoryItemTextEdit1.AutoHeight" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="RepositoryItemTextEdit2.AutoHeight" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="RepositoryItemSearchControl1.AutoHeight" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="RibbonControl.Size" type="System.Drawing.Size, System.Drawing">
<value>1189, 158</value>
</data>
@ -1421,7 +1213,7 @@
<value>4</value>
</data>
<data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>568, 442</value>
<value>568, 460</value>
</data>
<data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -1592,7 +1384,7 @@
<value>1</value>
</data>
<data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>578, 442</value>
<value>578, 460</value>
</data>
<data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -1612,6 +1404,72 @@
<data name="&gt;&gt;SplitContainerControl1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="RibbonPageActions1.Text" xml:space="preserve">
<value>Aktionen 1</value>
</data>
<data name="RibbonPageGroup3.Text" xml:space="preserve">
<value>Dokument</value>
</data>
<data name="RibbonPageGroupFilesystem.Text" xml:space="preserve">
<value>Dateien und Ordner</value>
</data>
<data name="RibbonPageActions2.Text" xml:space="preserve">
<value>Aktionen 2</value>
</data>
<data name="RibbonPageGroup4.Text" xml:space="preserve">
<value>Workflow</value>
</data>
<data name="RibbonPageGroup8.Text" xml:space="preserve">
<value>Bearbeiten</value>
</data>
<data name="RibbonPageAttribute.Text" xml:space="preserve">
<value>Aktionen</value>
</data>
<data name="RibbonPageGroup2.Text" xml:space="preserve">
<value>Attribute</value>
</data>
<data name="RibbonPageGroup_Navigation.Text" xml:space="preserve">
<value>Navigation</value>
</data>
<data name="RibbonPageGroupExport.Text" xml:space="preserve">
<value>Export</value>
</data>
<data name="RibbonPageGroup5.Text" xml:space="preserve">
<value>Aktualisieren</value>
</data>
<data name="RibbonPageGroup9.Text" xml:space="preserve">
<value>Tabellen Einstellungen</value>
</data>
<data name="RibbonPageGroup1.Text" xml:space="preserve">
<value>RibbonPageGroup1</value>
</data>
<data name="RibbonPageGroup_Layout.Text" xml:space="preserve">
<value>Layout</value>
</data>
<data name="DocumentViewer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="DocumentViewer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>323, 459</value>
</data>
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Name" xml:space="preserve">
<value>DocumentViewer1</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.8.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
<value>DockPanel1_Container</value>
</data>
<data name="&gt;&gt;DocumentViewer1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="XtraSaveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>12, 27</value>
</metadata>
@ -1621,6 +1479,238 @@
<metadata name="DockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>155, 22</value>
</metadata>
<data name="DockPanel2_Container.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 26</value>
</data>
<data name="DockPanel2_Container.Size" type="System.Drawing.Size, System.Drawing">
<value>578, 460</value>
</data>
<data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.Name" xml:space="preserve">
<value>DockPanel2_Container</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;DockPanel2_Container.Parent" xml:space="preserve">
<value>DockPanelFileList</value>
</data>
<data name="&gt;&gt;DockPanel2_Container.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;LayoutControl1.Name" xml:space="preserve">
<value>LayoutControl1</value>
</data>
<data name="&gt;&gt;LayoutControl1.Type" xml:space="preserve">
<value>DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;LayoutControl1.Parent" xml:space="preserve">
<value>ControlContainer1</value>
</data>
<data name="&gt;&gt;LayoutControl1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="ControlContainer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="ControlContainer1.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 434</value>
</data>
<data name="ControlContainer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;ControlContainer1.Name" xml:space="preserve">
<value>ControlContainer1</value>
</data>
<data name="&gt;&gt;ControlContainer1.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="&gt;&gt;ControlContainer1.Parent" xml:space="preserve">
<value>DockPanelStatus</value>
</data>
<data name="&gt;&gt;ControlContainer1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="txtCheckedOutWho.Location" type="System.Drawing.Point, System.Drawing">
<value>173, 45</value>
</data>
<data name="txtCheckedOutWho.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 20</value>
</data>
<data name="txtCheckedOutWho.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;txtCheckedOutWho.Name" xml:space="preserve">
<value>txtCheckedOutWho</value>
</data>
<data name="&gt;&gt;txtCheckedOutWho.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;txtCheckedOutWho.Parent" xml:space="preserve">
<value>LayoutControl1</value>
</data>
<data name="&gt;&gt;txtCheckedOutWho.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="dateCheckedOutWhen.EditValue" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="dateCheckedOutWhen.Location" type="System.Drawing.Point, System.Drawing">
<value>173, 69</value>
</data>
<assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="dateCheckedOutWhen.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
<value>Combo</value>
</data>
<data name="dateCheckedOutWhen.Properties.CalendarTimeProperties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
<value>Combo</value>
</data>
<data name="dateCheckedOutWhen.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 20</value>
</data>
<data name="dateCheckedOutWhen.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="&gt;&gt;dateCheckedOutWhen.Name" xml:space="preserve">
<value>dateCheckedOutWhen</value>
</data>
<data name="&gt;&gt;dateCheckedOutWhen.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;dateCheckedOutWhen.Parent" xml:space="preserve">
<value>LayoutControl1</value>
</data>
<data name="&gt;&gt;dateCheckedOutWhen.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="LayoutControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="LayoutControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="LayoutControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 434</value>
</data>
<data name="LayoutControl1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="LayoutControl1.Text" xml:space="preserve">
<value>LayoutControl1</value>
</data>
<data name="&gt;&gt;LayoutControl1.Name" xml:space="preserve">
<value>LayoutControl1</value>
</data>
<data name="&gt;&gt;LayoutControl1.Type" xml:space="preserve">
<value>DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;LayoutControl1.Parent" xml:space="preserve">
<value>ControlContainer1</value>
</data>
<data name="&gt;&gt;LayoutControl1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="LayoutControlGroup1.Text" xml:space="preserve">
<value>In Bearbeitung</value>
</data>
<data name="LayoutControlItem1.Text" xml:space="preserve">
<value>Bearbeitet von</value>
</data>
<data name="LayoutControlItem2.Text" xml:space="preserve">
<value>In Bearbeitung genommen</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Name" xml:space="preserve">
<value>CtrlObjectPropertyDialog</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve">
<value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.10.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve">
<value>DockPanel3_Container</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DockPanel3_Container.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="DockPanel3_Container.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 434</value>
</data>
<data name="DockPanel3_Container.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DockPanel3_Container.Name" xml:space="preserve">
<value>DockPanel3_Container</value>
</data>
<data name="&gt;&gt;DockPanel3_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="&gt;&gt;DockPanel3_Container.Parent" xml:space="preserve">
<value>DockPanelMetadata</value>
</data>
<data name="&gt;&gt;DockPanel3_Container.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="CtrlObjectPropertyDialog.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="CtrlObjectPropertyDialog.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="CtrlObjectPropertyDialog.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 434</value>
</data>
<data name="CtrlObjectPropertyDialog.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Name" xml:space="preserve">
<value>CtrlObjectPropertyDialog</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve">
<value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.10.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve">
<value>DockPanel3_Container</value>
</data>
<data name="&gt;&gt;CtrlObjectPropertyDialog.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Name" xml:space="preserve">
<value>DocumentViewer1</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.8.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
<value>DockPanel1_Container</value>
</data>
<data name="&gt;&gt;DocumentViewer1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DockPanel1_Container.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 26</value>
</data>
<data name="DockPanel1_Container.Size" type="System.Drawing.Size, System.Drawing">
<value>323, 459</value>
</data>
<data name="DockPanel1_Container.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DockPanel1_Container.Name" xml:space="preserve">
<value>DockPanel1_Container</value>
</data>
<data name="&gt;&gt;DockPanel1_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="&gt;&gt;DockPanel1_Container.Parent" xml:space="preserve">
<value>DockPanelDocViewer</value>
</data>
<data name="&gt;&gt;DockPanel1_Container.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>290, 22</value>
</metadata>

View File

@ -37,22 +37,22 @@ Public Class frmDocumentResultList
' Helper Classes
Private Client As Client
Private Documentloader As DocumentResultList.Loader
Private Documentloader As Loader
Private ControlManager As AttributeControls
Private CheckoutManager As CheckInOut
Private ReadOnly Config As ConfigManager(Of DocumentResultList.Config)
Private ReadOnly Config As ConfigManager(Of Config)
Private ReadOnly Environment As Environment
Private ReadOnly Filesystem As Modules.Filesystem.File
Private ReadOnly GridBuilder As GridBuilder
Private ReadOnly FileEx As Modules.Windows.File
Private ReadOnly Helpers As DocumentResultList.Helpers
Private ReadOnly Params As DocumentResultList.Params
Private ReadOnly LayoutManager As DocumentResultList.Layout
Private WithEvents Watcher As DocumentResultList.Watcher
Private ReadOnly Params As Params
Private ReadOnly LayoutManager As Layout
Private WithEvents Watcher As Watcher
' Runtime variables
Private Property ResultLists As List(Of DocumentResultList.DocumentResult)
Private Property ResultLists As List(Of DocumentResult)
Private IsLoading As Boolean = True
Private _DragBoxFromMouseDown As Rectangle
@ -72,7 +72,11 @@ Public Class frmDocumentResultList
Private Property ViewList As List(Of BandedGridView)
Private Property OperationMode As OperationMode Implements IResultForm.OperationMode
Public ReadOnly Property Config1 As ConfigManager(Of Config)
Get
Return Config
End Get
End Property
Public Event NeedsRefresh As EventHandler(Of Integer) Implements IResultForm.NeedsRefresh
Public Event ResultsRefreshed As EventHandler(Of List(Of DocumentResultList.DocumentResult))
@ -105,7 +109,6 @@ Public Class frmDocumentResultList
Filesystem = New Modules.Filesystem.File(pLogConfig)
GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3})
FileEx = New Modules.Windows.File(pLogConfig)
Watcher = New Watcher(pLogConfig)
LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3})
UserLanguage = Utils.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)
@ -137,7 +140,13 @@ Public Class frmDocumentResultList
End If
Documentloader = New DocumentResultList.Loader(LogConfig, OperationMode, Client, Environment.User)
Documentloader = New Loader(LogConfig, OperationMode, Client, Environment.User)
If OperationMode = OperationMode.NoAppServer Then
Watcher = New Watcher(LogConfig, pEnableWatching:=False)
Else
Watcher = New Watcher(LogConfig)
End If
If Params.WindowTitle <> "" Then
Text = $"{Text} - {Params.WindowTitle}"
@ -151,29 +160,34 @@ Public Class frmDocumentResultList
'Load config
LayoutManager.LoadWindowLocationAndSize(Me)
LayoutManager.DockManager_RestoreLayout(DockManager1)
SplitContainerControl1.SplitterPosition = Config.Config.SplitContainer1Distance
SwitchMainContainerHorizontal.Checked = Config.Config.SplitContainer1Horizontal
SplitContainerControl2.SplitterPosition = Config.Config.SplitContainer2Distance
SwitchDetailContainerHorizontal.Checked = Config.Config.SplitContainer2Horizontal
LayoutManager.Workspace_Restore(WorkspaceManager1)
SplitContainerControl1.SplitterPosition = Config1.Config.SplitContainer1Distance
SwitchMainContainerHorizontal.Checked = Config1.Config.SplitContainer1Horizontal
SplitContainerControl2.SplitterPosition = Config1.Config.SplitContainer2Distance
SwitchDetailContainerHorizontal.Checked = Config1.Config.SplitContainer2Horizontal
' Hide options relating to a filepath for zooflow
If OperationMode = OperationMode.ZooFlow Then
RibbonPageGroupFilesystem.Visible = False
Else
RibbonPageGroupFilesystem.Visible = False
End If
If OperationMode = OperationMode.NoAppServer Then
DockPanelMetadata.Visibility = Docking.DockVisibility.Hidden
RibbonPageCategoryAttribute.Visible = False
RibbonPageActions2.Visible = False
End If
If OperationMode <> OperationMode.NoAppServer Then
If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then
CtrlObjectPropertyDialog.Initialize(LogConfig, Me, Client, Environment)
SwitchMainContainerHorizontal.Visibility = BarItemVisibility.Never
SwitchDetailContainerHorizontal.Visibility = BarItemVisibility.Never
End If
If OperationMode = OperationMode.NoAppServer Then
panelContainerStatus.Visibility = Docking.DockVisibility.Hidden
End If
UpdateTotalResults()
LoadGridDataAndLayout()
@ -184,7 +198,7 @@ Public Class frmDocumentResultList
chkGridShowTitle.Checked = LayoutManager.GetBandTitleVisible()
Catch ex As Exception
ErrorHandler.ShowErrorMessage(ex, "Error while loading results", "Form Load")
ErrorHandler.ShowErrorMessage(ex, "Form Load", "Error while loading results")
Finally
IsLoading = False
@ -195,6 +209,7 @@ Public Class frmDocumentResultList
Private Sub frmDocumentResultList_Closing(sender As Object, e As CancelEventArgs) Handles Me.FormClosing
Try
LayoutManager.GridView_SaveLayout(_ActiveGrid.MainView)
LayoutManager.Workspace_Save(WorkspaceManager1)
LayoutManager.DockManager_SaveLayout(DockManager1)
LayoutManager.SaveWindowLocationAndSize(Me)
@ -214,7 +229,7 @@ Public Class frmDocumentResultList
Dim oRow = sender.GetDataRow(Helpers.ActiveRowHandle)
Dim oObjectId = oRow.ItemEx(Of Long)(ColumnDocumentId, 0)
Dim oFullPath = oRow.ItemEx(ColumnFilepath, "")
Dim oDocumentInfo As DocumentResultList.Document = Nothing
Dim oDocument As DocumentResultList.Document = Nothing
' Show Ribbon Category
If RibbonPageCategoryFile.Visible = False Then
@ -223,41 +238,31 @@ Public Class frmDocumentResultList
End If
' Load DocumentInfo
oDocumentInfo = Documentloader.Load(oObjectId, oFullPath)
If IsNothing(oDocumentInfo) Then
DocumentViewer1.CloseDocument()
ErrorHandler.ShowErrorMessage("File could not be loaded!")
oDocument = Documentloader.Load(oObjectId, oFullPath)
If oDocument Is Nothing Then
Exit Sub
End If
UpdateRibbonActions(oDocument)
' Save reference to current document
_CurrentDocument = oDocumentInfo
_CurrentDocument = oDocument
' Load Document in Document Viewer
Dim oFileName = $"{oObjectId}.{oDocumentInfo.Extension}"
DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocumentInfo.Contents))
Dim oFileName = $"{oObjectId}.{oDocument.Extension}"
DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents))
If IsNothing(oDocument) Then
DocumentViewer1.CloseDocument()
ErrorHandler.ShowErrorMessage("File could not be loaded!")
' Hide Export and filesystem options for view only right
If oDocumentInfo.AccessRight = Rights.AccessRight.VIEW_ONLY Then
DocumentViewer1.SetViewOnly(True)
RibbonPageGroupExport.Visible = False
RibbonPageGroupFilesystem.Visible = False
Else
DocumentViewer1.SetViewOnly(False)
RibbonPageGroupExport.Visible = True
RibbonPageGroupFilesystem.Visible = True
Exit Sub
End If
If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then
'Dim oEntityId = 1
'Dim oAttributes = Await ControlManager.GetAttributesForBusinessEntity(oEntityId)
'If oAttributes.Count = 0 Then
' MsgBox($"Es konnten keine Attribute für das Objekt '{oObjectId}' geladen werden!", MsgBoxStyle.Critical, Text)
'End If
Await CtrlObjectPropertyDialog.LoadObject(oObjectId)
Dim oCheckoutState = Await CheckOutManager.GetCheckoutState(oObjectId)
Dim oCheckoutState = Await CheckoutManager.GetCheckoutState(oObjectId)
If oCheckoutState IsNot Nothing Then
txtCheckedOutWho.EditValue = oCheckoutState.CheckedOutWho
dateCheckedOutWhen.EditValue = oCheckoutState.CheckedOutWhen
@ -266,9 +271,9 @@ Public Class frmDocumentResultList
dateCheckedOutWhen.EditValue = Nothing
End If
End If
Else
RibbonPageCategoryFile.Visible = False
RibbonControl.SelectedPage = RibbonPageStart
UpdateRibbonActions(Nothing)
End If
Catch ex As Exception
ErrorHandler.ShowErrorMessage(ex, "GridView_FocusedRowChanged")
@ -277,6 +282,40 @@ Public Class frmDocumentResultList
End Try
End Sub
Private Function UpdateRibbonActions(pDocument As DocumentResultList.Document) As Boolean
Try
If pDocument Is Nothing Then
RibbonPageCategoryFile.Visible = False
RibbonControl.SelectedPage = RibbonPageStart
Return True
End If
' Hide Export and filesystem options for view only right
If pDocument.AccessRight = Rights.AccessRight.VIEW_ONLY Then
DocumentViewer1.SetViewOnly(True)
RibbonPageGroupExport.Visible = False
If OperationMode = OperationMode.NoAppServer Then
RibbonPageGroupFilesystem.Visible = False
MenuItemProperties.Visibility = BarItemVisibility.Never
End If
Else
DocumentViewer1.SetViewOnly(False)
RibbonPageGroupExport.Visible = True
If OperationMode = OperationMode.NoAppServer Then
RibbonPageGroupFilesystem.Visible = True
MenuItemProperties.Visibility = BarItemVisibility.Always
End If
End If
Return True
Catch ex As Exception
Logger.Error(ex)
Return False
End Try
End Function
#Region "Watcher"
Public Async Sub Watcher_FileOpened(sender As Object, e As DocumentResultList.Watcher.FileOpenedArgs) Handles Watcher.FileOpened
@ -762,9 +801,13 @@ Public Class frmDocumentResultList
End Sub
Private Async Sub GridControl_DoubleClick(sender As Object, e As EventArgs) Handles GridControl1.DoubleClick, GridControl2.DoubleClick, GridControl3.DoubleClick
If _CurrentDocument IsNot Nothing AndAlso _CurrentDocument.AccessRight > Rights.AccessRight.VIEW_ONLY Then
Await Watcher.OpenDocument(_CurrentDocument)
End If
Try
If _CurrentDocument IsNot Nothing AndAlso _CurrentDocument.AccessRight > Rights.AccessRight.VIEW_ONLY Then
Await Watcher.OpenDocument(_CurrentDocument)
End If
Catch ex As Exception
Logger.Error(ex)
End Try
End Sub
Private Sub BarButtonResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonResetLayout.ItemClick
@ -940,29 +983,29 @@ Public Class frmDocumentResultList
#Region "Layout"
Private Sub SplitContainerControl1_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl1.SplitterPositionChanged
If IsLoading = False Then
Config.Config.SplitContainer1Distance = SplitContainerControl1.SplitterPosition
Config1.Config.SplitContainer1Distance = SplitContainerControl1.SplitterPosition
End If
End Sub
Private Sub SplitContainerControl2_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl2.SplitterPositionChanged
If IsLoading = False Then
Config.Config.SplitContainer2Distance = SplitContainerControl2.SplitterPosition
Config1.Config.SplitContainer2Distance = SplitContainerControl2.SplitterPosition
End If
End Sub
Private Sub SwitchMainContainerHorizontal_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SwitchMainContainerHorizontal.CheckedChanged
SplitContainerControl1.Horizontal = SwitchMainContainerHorizontal.Checked
If Config IsNot Nothing And IsLoading = False Then
Config.Config.SplitContainer1Horizontal = SwitchMainContainerHorizontal.Checked
If Config1 IsNot Nothing And IsLoading = False Then
Config1.Config.SplitContainer1Horizontal = SwitchMainContainerHorizontal.Checked
End If
End Sub
Private Sub SwitchDetailContainerHorizontal2_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SwitchDetailContainerHorizontal.CheckedChanged
SplitContainerControl2.Horizontal = SwitchDetailContainerHorizontal.Checked
If Config IsNot Nothing And IsLoading = False Then
Config.Config.SplitContainer2Horizontal = SwitchDetailContainerHorizontal.Checked
If Config1 IsNot Nothing And IsLoading = False Then
Config1.Config.SplitContainer2Horizontal = SwitchDetailContainerHorizontal.Checked
End If
End Sub
#End Region
@ -1021,8 +1064,14 @@ Public Class frmDocumentResultList
Dim oGridView As BandedGridView = sender
Dim oRow As DataRowView = oGridView.GetRow(e.RowHandle)
If oRow IsNot Nothing AndAlso oRow.Row.Item(ColumnCheckedOut) IsNot Nothing AndAlso oRow.Row.Item(ColumnCheckedOut) = True Then
e.Appearance.BackColor = Color.LightSalmon
If OperationMode = OperationMode.WithAppServer Or OperationMode = OperationMode.ZooFlow Then
Try
If oRow IsNot Nothing AndAlso oRow.Row.ItemEx(ColumnCheckedOut, False) = True Then
e.Appearance.BackColor = Color.LightSalmon
End If
Catch ex As Exception
End Try
End If
End Sub
End Class

View File

@ -60,6 +60,7 @@ Partial Class frmAdmin_Start
Me.btnEditRecord = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem()
Me.btnDatabaseConnection = New DevExpress.XtraBars.BarButtonItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@ -134,9 +135,9 @@ Partial Class frmAdmin_Start
'RibbonControl1
'
Me.RibbonControl1.ExpandCollapseItem.Id = 0
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.btnAddRecord, Me.btnEditRecord, Me.BarButtonItem26, Me.BarButtonItem27})
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.btnAddRecord, Me.btnEditRecord, Me.BarButtonItem26, Me.BarButtonItem27, Me.btnDatabaseConnection})
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl1.MaxItemId = 37
Me.RibbonControl1.MaxItemId = 38
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@ -372,6 +373,13 @@ Partial Class frmAdmin_Start
Me.BarButtonItem27.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.text1
Me.BarButtonItem27.Name = "BarButtonItem27"
'
'btnDatabaseConnection
'
Me.btnDatabaseConnection.Caption = "Datenbank konfigurieren"
Me.btnDatabaseConnection.Id = 37
Me.btnDatabaseConnection.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.managedatasource3
Me.btnDatabaseConnection.Name = "btnDatabaseConnection"
'
'RibbonPage1
'
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1})
@ -383,6 +391,7 @@ Partial Class frmAdmin_Start
Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem27)
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem9)
Me.RibbonPageGroup2.ItemLinks.Add(Me.btnDatabaseConnection)
Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
Me.RibbonPageGroup2.Text = "Daten"
'
@ -941,4 +950,5 @@ Partial Class frmAdmin_Start
Friend WithEvents RibbonPage_ClipboardWatcher As DevExpress.XtraBars.Ribbon.RibbonPage
Friend WithEvents BarButtonItem26 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem27 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents btnDatabaseConnection As DevExpress.XtraBars.BarButtonItem
End Class

View File

@ -9,6 +9,7 @@ Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants
Imports DevExpress.XtraGrid
Imports DevExpress.XtraBars
Imports DigitalData.Modules.Language
Imports DigitalData.Controls.SQLConfig
Public Class frmAdmin_Start
Private CurrentModule As String
@ -29,6 +30,13 @@ Public Class frmAdmin_Start
DetailForm = New ClassDetailForm(My.LogConfig)
AddHandler DetailForm.DetailFormClosed, AddressOf DetailForm_Closed
If My.SystemConfig.ConnectionString = String.Empty Then
If ShowDatabaseSettings() = False Then
MsgBox("Die Datenbank verbindung wurde nicht konfiguriert. Die Administration kann nicht verwendet werden.", MsgBoxStyle.Critical, Text)
Exit Sub
End If
End If
DetailForm.LoadData()
TreeListMenu.ExpandAll()
End Sub
@ -283,7 +291,24 @@ Public Class frmAdmin_Start
oForm.ShowDialog()
End Sub
Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click
Private Sub btnDatabaseConnection_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnDatabaseConnection.ItemClick
ShowDatabaseSettings()
End Sub
Private Function ShowDatabaseSettings() As Boolean
Dim oForm As New frmSQLConfig(My.LogConfig) With {
.ConnectionString = My.SystemConfig.ConnectionString,
.FormTitle = "ECM Datenbank"
}
Dim oResult = oForm.ShowDialog()
If oResult = DialogResult.OK Then
My.SystemConfig.ConnectionString = oForm.ConnectionString
My.SystemConfigManager.Save()
Return True
Else
Return False
End If
End Function
End Class

View File

@ -37,7 +37,7 @@ Public Class ClassInit
' === Init Schritte definieren
_Loader.AddStep("Initializing Base", AddressOf InitializeBase, True)
_Loader.AddStep("Initializing Database (1/2)", AddressOf InitializeDatabase, True)
'_Loader.AddStep("Initializing Database (1/2)", AddressOf InitializeDatabase, True)
_Loader.AddStep("Initializing EDMI Service", AddressOf InitializeService, True)
_Loader.AddStep("Initializing Database (2/2)", AddressOf InitializeDatabaseWithFallback, True)
_Loader.AddStep("Initializing User", AddressOf InitializeUser, True)
@ -59,55 +59,55 @@ Public Class ClassInit
End Sub
Private Sub InitializeDatabase(MyApplication As My.MyApplication)
Dim oConnectionString = MSSQLServer.DecryptConnectionString(My.SystemConfig.ConnectionString)
My.DatabaseECM = New MSSQLServer(My.LogConfig, oConnectionString)
'Dim oConnectionString = MSSQLServer.DecryptConnectionString(My.SystemConfig.ConnectionString)
'My.DatabaseECM = New MSSQLServer(My.LogConfig, oConnectionString)
If My.DatabaseECM.DBInitialized = False Then
Logger.Warn("Could not initialize DD_ECM-Database!")
Throw New InitException("Could not initialize ECM-Database!")
'If My.DatabaseECM.DBInitialized = False Then
' Logger.Warn("Could not initialize DD_ECM-Database!")
' Throw New InitException("Could not initialize ECM-Database!")
Else
Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB' AND AKTIV = 1"
Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSQl)
'Else
' Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB' AND AKTIV = 1"
' Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSQl)
If IsNothing(oDatatable) OrElse oDatatable.Rows.Count = 0 Then
' If IsNothing(oDatatable) OrElse oDatatable.Rows.Count = 0 Then
Dim oForm As New frmSQLConfig(My.LogConfig) With {.FormTitle = "IDB Datenbank"}
Dim oResult = oForm.ShowDialog()
' Dim oForm As New frmSQLConfig(My.LogConfig) With {.FormTitle = "IDB Datenbank"}
' Dim oResult = oForm.ShowDialog()
If oResult = DialogResult.OK Then
Dim oConnectionStringSaved = SaveConnectionString(oForm.ConnectionString)
' If oResult = DialogResult.OK Then
' Dim oConnectionStringSaved = SaveConnectionString(oForm.ConnectionString)
If oConnectionStringSaved = False Then
Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
End If
' If oConnectionStringSaved = False Then
' Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
' End If
oDatatable = My.Database.GetDatatableECM(oSQl)
End If
' oDatatable = My.Database.GetDatatableECM(oSQl)
' End If
End If
' End If
If oDatatable.Rows.Count > 1 Then
Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!")
Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
End If
' If oDatatable.Rows.Count > 1 Then
' Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!")
' Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
' End If
Dim oDataRow As DataRow = oDatatable.Rows.Item(0)
Dim oConString = My.DatabaseECM.GetConnectionString(
oDataRow.Item("SERVER").ToString,
oDataRow.Item("DATENBANK").ToString,
oDataRow.Item("USERNAME").ToString,
oDataRow.Item("PASSWORD").ToString
)
' Dim oDataRow As DataRow = oDatatable.Rows.Item(0)
' Dim oConString = My.DatabaseECM.GetConnectionString(
' oDataRow.Item("SERVER").ToString,
' oDataRow.Item("DATENBANK").ToString,
' oDataRow.Item("USERNAME").ToString,
' oDataRow.Item("PASSWORD").ToString
' )
Dim oDecryptedConnectionString = MSSQLServer.DecryptConnectionString(oConString)
My.DatabaseIDB = New MSSQLServer(My.LogConfig, oDecryptedConnectionString)
End If
' Dim oDecryptedConnectionString = MSSQLServer.DecryptConnectionString(oConString)
' My.DatabaseIDB = New MSSQLServer(My.LogConfig, oDecryptedConnectionString)
'End If
If My.DatabaseIDB.DBInitialized = False Then
Logger.Warn("Could not initialize IDB-Database!")
Throw New InitException("Could not initialize IDB-Database!")
End If
'If My.DatabaseIDB.DBInitialized = False Then
' Logger.Warn("Could not initialize IDB-Database!")
' Throw New InitException("Could not initialize IDB-Database!")
'End If
End Sub
Private Sub InitializeService(MyApplication As My.MyApplication)
Try
@ -137,6 +137,12 @@ Public Class ClassInit
End Sub
Private Sub InitializeDatabaseWithFallback(MyApplication As My.MyApplication)
Try
Dim oECMConnectionString = MyApplication.Service.Client.ClientConfig.ConnectionStringECM
My.DatabaseECM = New MSSQLServer(My.LogConfig, oECMConnectionString)
Dim oIDBConnectionString = MyApplication.Service.Client.ClientConfig.ConnectionStringIDB
My.DatabaseIDB = New MSSQLServer(My.LogConfig, oIDBConnectionString)
My.Database = New DatabaseWithFallback(LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB)
Catch ex As Exception
Logger.Error(ex)
@ -262,23 +268,23 @@ Public Class ClassInit
#End Region
Private Function SetupDatabase() As Boolean
If My.SystemConfig.ConnectionString = String.Empty Then
Dim oConnectionString = My.SystemConfig.ConnectionString
Dim oForm As New frmSQLConfig(My.LogConfig) With {
.ConnectionString = oConnectionString,
.FormTitle = "ECM Datenbank"
}
Dim oResult = oForm.ShowDialog()
'If My.SystemConfig.ConnectionString = String.Empty Then
' Dim oConnectionString = My.SystemConfig.ConnectionString
' Dim oForm As New frmSQLConfig(My.LogConfig) With {
' .ConnectionString = oConnectionString,
' .FormTitle = "ECM Datenbank"
' }
' Dim oResult = oForm.ShowDialog()
If oResult = DialogResult.OK Then
My.SystemConfig.ConnectionString = oForm.ConnectionString
My.SystemConfigManager.Save()
' If oResult = DialogResult.OK Then
' My.SystemConfig.ConnectionString = oForm.ConnectionString
' My.SystemConfigManager.Save()
Return True
Else
Return False
End If
End If
' Return True
' Else
' Return False
' End If
'End If
Return True
End Function

View File

@ -4,6 +4,11 @@
Public Id As Integer
Public IsAttachment As Boolean = False
Public HotfolderFile As Boolean = False
Public Sub New(pId As Integer)
Id = pId
End Sub
Public Overrides Function ToString() As String
Return FilePath
End Function

View File

@ -1120,6 +1120,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
Friend ReadOnly Property managedatasource3() As DevExpress.Utils.Svg.SvgImage
Get
Dim obj As Object = ResourceManager.GetObject("managedatasource3", resourceCulture)
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>

View File

@ -145,6 +145,9 @@
<data name="actions_deletecircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="action_add_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="StatusAnnotations_Stop_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\StatusAnnotations_Stop_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -196,9 +199,6 @@
<data name="2_ZOO_FLOW_Abo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ZooFlow_Sidebar_individuelle_suche" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="editquery" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
@ -283,6 +283,9 @@
<data name="actions_check3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="definednameuseinformula2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="save5" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
@ -316,8 +319,8 @@
<data name="actions_addcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="documentproperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="ZooFlow_G_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="1_LOGO_ZOO_FLOW" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -337,9 +340,6 @@
<data name="markcomplete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="ZooFlow_G_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="save6" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
@ -391,6 +391,9 @@
<data name="ZooFlow_drop_drag" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow_drop_drag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ZooFlow_Sidebar_TOP" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow_Sidebar_TOP.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="actions_deletecircled6" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
@ -421,9 +424,6 @@
<data name="del5" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\del5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="actions_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="ZooFlow_Sidebar_TOP_Drop" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow_Sidebar_TOP_Drop.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
@ -478,6 +478,9 @@
<data name="4_GLOBIX_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="documentproperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="actions_addcircled4" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
@ -496,11 +499,11 @@
<data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ZooFlow_Sidebar_TOP" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow_Sidebar_TOP.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="StatusAnnotations_Information_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="definednameuseinformula2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="ZooFlow_Sidebar_individuelle_suche" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="bo_appointment" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bo_appointment.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@ -514,8 +517,8 @@
<data name="about4" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="StatusAnnotations_Information_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="actions_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@ -562,7 +565,7 @@
<data name="del3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="action_add_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="managedatasource3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\managedatasource3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
</root>

View File

@ -0,0 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Manage_Data_Source" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Yellow{fill:#FFB115;}
.Blue{fill:#1177D7;}
</style>
<path d="M2,10V6c0-2.2,4.5-4,10-4s10,1.8,10,4v4c0,2.2-4.5,4-10,4S2,12.2,2,10z M12,20v-0.7l2.5-0.4L13,16.8l1-0.9 C13.3,16,12.7,16,12,16c-5.5,0-10-1.8-10-4v4C2,18.2,6.5,20,12,20z M14.5,25.1L12,24.7V22c-5.5,0-10-1.8-10-4v4c0,2.2,4.5,4,10,4 c0.7,0,1.3,0,1.9-0.1L14.5,25.1z" class="Yellow" />
<path d="M30,23v-2l-2.2-0.4c-0.2-0.6-0.4-1.3-0.7-1.8l1.3-1.8l-1.4-1.4l-1.8,1.3c-0.5-0.3-1.2-0.6-1.8-0.7L23,14h-2 l-0.4,2.2c-0.6,0.2-1.3,0.4-1.8,0.7l-1.8-1.3l-1.4,1.4l1.3,1.8c-0.3,0.5-0.6,1.2-0.7,1.8L14,21v2l2.2,0.4c0.2,0.6,0.4,1.3,0.7,1.8 l-1.3,1.8l1.4,1.4l1.8-1.3c0.5,0.3,1.2,0.6,1.8,0.7L21,30h2l0.4-2.2c0.6-0.2,1.3-0.4,1.8-0.7l1.8,1.3l1.4-1.4l-1.3-1.8 c0.3-0.5,0.6-1.2,0.7-1.8L30,23z M22,24c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2S23.1,24,22,24z" class="Blue" />
</svg>

View File

@ -1089,6 +1089,7 @@
<None Include="Resources\ZooFlow_drop_drag.png" />
<None Include="Resources\ZooFlow_Sidebar_individuelle_suche.svg" />
<None Include="Resources\action_add_16xMD.png" />
<None Include="Resources\managedatasource3.svg" />
<Content Include="Zooflow.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />

View File

@ -30,13 +30,13 @@ Partial Class frmFlowForm
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowForm))
Me.NotifyIcon = New System.Windows.Forms.NotifyIcon(Me.components)
Me.ContextMenuSystray = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.EinblendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
Me.VerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.EinblendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components)
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox()
@ -51,7 +51,6 @@ Partial Class frmFlowForm
Me.btnBasicConfig = New DevExpress.XtraBars.BarButtonItem()
Me.btnGlobixConfig = New DevExpress.XtraBars.BarButtonItem()
Me.btnServiceConfig = New DevExpress.XtraBars.BarButtonItem()
Me.btnDatabaseConfig = New DevExpress.XtraBars.BarButtonItem()
Me.btnRestartZooflow = New DevExpress.XtraBars.BarButtonItem()
Me.bbtnitmAusblenden = New DevExpress.XtraBars.BarButtonItem()
Me.btnExitZooflow = New DevExpress.XtraBars.BarButtonItem()
@ -98,50 +97,50 @@ Partial Class frmFlowForm
'
Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EinblendenToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem})
Me.ContextMenuSystray.Name = "ContextMenuSystray"
Me.ContextMenuSystray.Size = New System.Drawing.Size(181, 132)
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6)
'
'VerwaltungToolStripMenuItem
'
Me.VerwaltungToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.gear_32xLG
Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem"
Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.VerwaltungToolStripMenuItem.Text = "Verwaltung"
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6)
'
'TestToolStripMenuItem
'
Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
Me.TestToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.TestToolStripMenuItem.Text = "Test"
'
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
'
'ZooFlowBeendenToolStripMenuItem
'
Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem"
Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
Me.ContextMenuSystray.Size = New System.Drawing.Size(170, 110)
'
'EinblendenToolStripMenuItem
'
Me.EinblendenToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.action_add_16xMD
Me.EinblendenToolStripMenuItem.Name = "EinblendenToolStripMenuItem"
Me.EinblendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.EinblendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22)
Me.EinblendenToolStripMenuItem.Text = "Einblenden"
Me.EinblendenToolStripMenuItem.Visible = False
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
Me.ToolStripSeparator1.Size = New System.Drawing.Size(166, 6)
'
'VerwaltungToolStripMenuItem
'
Me.VerwaltungToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.gear_32xLG
Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem"
Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(169, 22)
Me.VerwaltungToolStripMenuItem.Text = "Verwaltung"
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
Me.ToolStripSeparator3.Size = New System.Drawing.Size(166, 6)
'
'TestToolStripMenuItem
'
Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
Me.TestToolStripMenuItem.Size = New System.Drawing.Size(169, 22)
Me.TestToolStripMenuItem.Text = "Test"
'
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
Me.ToolStripSeparator2.Size = New System.Drawing.Size(166, 6)
'
'ZooFlowBeendenToolStripMenuItem
'
Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem"
Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22)
Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
'
'PictureBoxPM
'
Me.PictureBoxPM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@ -224,7 +223,7 @@ Partial Class frmFlowForm
Me.BarManager1.DockControls.Add(Me.barDockControlLeft)
Me.BarManager1.DockControls.Add(Me.barDockControlRight)
Me.BarManager1.Form = Me
Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.btnExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.btnRestartZooflow, Me.btnServiceConfig, Me.btnDatabaseConfig, Me.btnBasicConfig, Me.btnGlobixConfig, Me.bbtnitmAusblenden})
Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.btnExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.btnRestartZooflow, Me.btnServiceConfig, Me.btnBasicConfig, Me.btnGlobixConfig, Me.bbtnitmAusblenden})
Me.BarManager1.MaxItemId = 12
Me.BarManager1.StatusBar = Me.Bar3
'
@ -247,7 +246,7 @@ Partial Class frmFlowForm
Me.BarSubItem1.Caption = "Menu"
Me.BarSubItem1.Id = 0
Me.BarSubItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarSubItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.btnBasicConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnGlobixConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnServiceConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnDatabaseConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnRestartZooflow), New DevExpress.XtraBars.LinkPersistInfo(Me.bbtnitmAusblenden), New DevExpress.XtraBars.LinkPersistInfo(Me.btnExitZooflow)})
Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.btnBasicConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnGlobixConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnServiceConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnRestartZooflow), New DevExpress.XtraBars.LinkPersistInfo(Me.bbtnitmAusblenden), New DevExpress.XtraBars.LinkPersistInfo(Me.btnExitZooflow)})
Me.BarSubItem1.Name = "BarSubItem1"
Me.BarSubItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
'
@ -272,13 +271,6 @@ Partial Class frmFlowForm
Me.btnServiceConfig.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.servermode
Me.btnServiceConfig.Name = "btnServiceConfig"
'
'btnDatabaseConfig
'
Me.btnDatabaseConfig.Caption = "Datenbankkonfiguration"
Me.btnDatabaseConfig.Id = 8
Me.btnDatabaseConfig.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.managedatasource2
Me.btnDatabaseConfig.Name = "btnDatabaseConfig"
'
'btnRestartZooflow
'
Me.btnRestartZooflow.Caption = "Zooflow neustarten"
@ -500,7 +492,6 @@ Partial Class frmFlowForm
Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents btnRestartZooflow As DevExpress.XtraBars.BarButtonItem
Friend WithEvents btnServiceConfig As DevExpress.XtraBars.BarButtonItem
Friend WithEvents btnDatabaseConfig As DevExpress.XtraBars.BarButtonItem
Friend WithEvents btnBasicConfig As DevExpress.XtraBars.BarButtonItem
Friend WithEvents Panel2 As Panel
Friend WithEvents btnGlobixConfig As DevExpress.XtraBars.BarButtonItem

View File

@ -2042,6 +2042,6 @@
</value>
</data>
<metadata name="AdornerUIManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
<value>990, 17</value>
</metadata>
</root>

View File

@ -647,12 +647,14 @@ Public Class frmFlowForm
Exit Function
End If
PictureEdit2.Image = My.Resources.ZooFlow_drop
'Erstmal alles löschen
My.Database.ExecuteNonQueryECM("DELETE FROM TBGI_FILES_USER WHERE USER@WORK = '" & My.Application.User.UserName & "'")
Dim oDroppedFiles = FileDropNew.GetFiles(e)
If oDroppedFiles.Count > 0 Then
Await Globix_Check_Dropped_Files(oDroppedFiles)
Await Globix_CheckDroppedFiles(oDroppedFiles)
End If
End Function
@ -660,7 +662,7 @@ Public Class frmFlowForm
Await DragDropForm(e)
End Sub
Private Async Function Globix_Check_Dropped_Files(pDroppedFiles As List(Of FileDrop.DroppedFile)) As Threading.Tasks.Task
Private Async Function Globix_CheckDroppedFiles(pDroppedFiles As List(Of FileDrop.DroppedFile)) As Threading.Tasks.Task
Try
Await My.Database.ExecuteNonQueryECMAsync($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND USER@WORK = '{My.Application.User.UserName}'")
@ -697,8 +699,7 @@ Public Class frmFlowForm
Dim oFilePath As String = oRow.Item("FILENAME2WORK").ToString
Dim oFileId As Integer = oRow.Item("GUID")
My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile With {
.Id = oFileId,
My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile(oFileId) With {
.FilePath = oFilePath
}
@ -706,8 +707,6 @@ Public Class frmFlowForm
If IO.File.Exists(My.Application.Globix.CurrentWorkfile.FilePath) = True And
My.Application.Globix.DTACTUAL_FILES.Rows.Count > 0 Then
Globix_Open_IndexDialog()
PictureEdit2.Image = My.Resources.ZooFlow_drop_drag
End If
Next
Catch ex As Exception
@ -907,11 +906,10 @@ Public Class frmFlowForm
handleType = "|FW_SIMPLEINDEXER|"
End If
If FileHandle.CheckDuplicateFiles(FileForWork, "FolderWatch") Then
My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile With {
.Id = DirectCast(row.Item("GUID"), Integer),
.FilePath = FileForWork,
.HotfolderFile = True
}
My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile(row.Item("GUID")) With {
.FilePath = FileForWork,
.HotfolderFile = True
}
Globix_Open_IndexDialog()
Else
My.Database.ExecuteNonQueryECM(oDel)
@ -1231,7 +1229,7 @@ Public Class frmFlowForm
frmServiceConfig.ShowDialog()
End Sub
Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDatabaseConfig.ItemClick
Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
Dim oForm As New frmSQLConfig(My.LogConfig) With {
.ConnectionString = My.SystemConfig.ConnectionString,
.FormTitle = "ECM Datenbank"
@ -1286,10 +1284,6 @@ Public Class frmFlowForm
Await CheckRunSearch1()
End Sub
Private Sub PictureEditQuicksearch1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEditQuicksearch1.EditValueChanged
End Sub
Private Sub bbtnitmAusblenden_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmAusblenden.ItemClick
UnregisterBar()
EinblendenToolStripMenuItem.Visible = True

View File

@ -32,6 +32,7 @@ Public Class frmServiceConfig
My.SystemConfig.AppServerConfig = $"{oIPAddress}:{oPort.ToString}"
My.SystemConfigManager.Save()
lblStatus.Text = "Successfully Connected to service"
Else
lblStatus.Text = "Connection not successful."
' TODO: Make a connection test that is as elaborate as this one :D
@ -46,8 +47,6 @@ Public Class frmServiceConfig
' lblStatus.Text = "Unbekannter Fehler."
'End Select
End If
DialogResult = DialogResult.OK
Catch ex As Exception
Logger.Error(ex)
MsgBox("Fehler beim Verbindungsaufbau", MsgBoxStyle.Critical, Text)

View File

@ -13,6 +13,8 @@
Public Const OBJECT_STATE_FILE_DELETED = "File deleted"
Public Const OBJECT_STATE_METADATA_CHANGED = "Metadata changed"
Public Const OBJECT_STATE_ATTRIBUTEVALUE_DELETED = "Attributevalue deleted"
Public Const OBJECT_STATE_FILE_CHECKED_OUT = "File Checked Out"
Public Const OBJECT_STATE_FILE_CHECKED_IN = "File Checked In"
End Class
End Namespace

View File

@ -87,12 +87,8 @@ Public Class Client
Try
ServerAddress = oAddressArray(0)
ServerPort = oAddressArray(1)
Dim oBinding = API.Channel.GetBinding()
Dim oAddress = New EndpointAddress($"net.tcp://{ServerAddress}:{ServerPort}/DigitalData/Services/Main")
Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
ChannelFactory = oFactory
Logger.Debug("Connecting to Service at: [{0}]", ServerAddress)
ChannelFactory = GetChannelFactory(ServerAddress, ServerPort)
Catch ex As Exception
Logger.Error(ex)
End Try
@ -109,20 +105,24 @@ Public Class Client
Logger = LogConfig.GetLogger()
FileEx = New Filesystem.File(LogConfig)
UpdateTimer.Interval = 60 * 1000 * UPDATE_INTERVAL_IN_MINUTES
UpdateTimer.Start()
Try
ServerAddress = IPAddress
Dim oBinding = API.Channel.GetBinding()
Dim oAddress = New EndpointAddress($"net.tcp://{IPAddress}:{PortNumber}/DigitalData/Services/Main")
Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
Logger.Debug("Connecting to Service at: [{0}]", oAddress)
ChannelFactory = oFactory
Logger.Debug("Connecting to Service at: [{0}]", IPAddress)
ChannelFactory = GetChannelFactory(IPAddress, PortNumber)
Catch ex As Exception
Logger.Error(ex)
End Try
End Sub
Private Function GetChannelFactory(pIPAddress As String, pPortNumber As Integer) As ChannelFactory(Of IEDMIServiceChannel)
Dim oBinding = API.Channel.GetBinding()
Dim oAddress = New EndpointAddress($"net.tcp://{pIPAddress}:{pPortNumber}/DigitalData/Services/Main")
Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
Return oFactory
End Function
''' <summary>
''' Connect to the service
''' </summary>

View File

@ -2,6 +2,8 @@
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:complexType name="GlobalState.ClientConfiguration">
<xs:sequence>
<xs:element minOccurs="0" name="ConnectionStringECM" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="ConnectionStringIDB" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="DocumentTypes" nillable="true" type="tns:ArrayOfGlobalState.Doctype" />
<xs:element minOccurs="0" name="ForceDirectDatabaseAccess" type="xs:boolean" />
</xs:sequence>

View File

@ -638,6 +638,12 @@ Namespace EDMIServiceReference
<System.NonSerializedAttribute()> _
Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private ConnectionStringECMField As String
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private ConnectionStringIDBField As String
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private DocumentTypesField() As EDMIServiceReference.GlobalStateDoctype
@ -654,6 +660,32 @@ Namespace EDMIServiceReference
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property ConnectionStringECM() As String
Get
Return Me.ConnectionStringECMField
End Get
Set
If (Object.ReferenceEquals(Me.ConnectionStringECMField, value) <> true) Then
Me.ConnectionStringECMField = value
Me.RaisePropertyChanged("ConnectionStringECM")
End If
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property ConnectionStringIDB() As String
Get
Return Me.ConnectionStringIDBField
End Get
Set
If (Object.ReferenceEquals(Me.ConnectionStringIDBField, value) <> true) Then
Me.ConnectionStringIDBField = value
Me.RaisePropertyChanged("ConnectionStringIDB")
End If
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property DocumentTypes() As EDMIServiceReference.GlobalStateDoctype()
Get

View File

@ -53,8 +53,12 @@ Public Class DatabaseWithFallback
_DatabaseECM = DatabaseECM
_DatabaseIDB = DatabaseIDB
_Logger.Debug("Client exists: [{0}]", Not IsNothing(Client))
_Logger.Debug("DatabaseECM exists: [{0}]", Not IsNothing(DatabaseECM))
_Logger.Debug("DatabaseIDB exists: [{0}]", Not IsNothing(DatabaseIDB))
' Load client config, will throw if client is not yet connected to service
_ClientConfig = Client.ClientConfig
_ClientConfig = Client?.ClientConfig
End Sub
''' <summary>

View File

@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("EDMIAPI")>
<Assembly: AssemblyCopyright("Copyright © 2022")>
<Assembly: AssemblyTrademark("1.5.2.0")>
<Assembly: AssemblyTrademark("1.5.3.0")>
<Assembly: ComVisible(False)>
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.5.2.0")>
<Assembly: AssemblyFileVersion("1.5.2.0")>
<Assembly: AssemblyVersion("1.5.3.0")>
<Assembly: AssemblyFileVersion("1.5.3.0")>

View File

@ -156,6 +156,8 @@ Public Class GlobalState
_Logger.Debug("ForceDirectDatabaseAccess: {0}", pConfig.ClientConfig.ForceDirectDatabaseAccess)
ClientConfig.ForceDirectDatabaseAccess = pConfig.ClientConfig.ForceDirectDatabaseAccess
ClientConfig.DocumentTypes = Doctypes
ClientConfig.ConnectionStringECM = _MSSQL_ECM.CurrentSQLConnectionString
ClientConfig.ConnectionStringIDB = _MSSQL_IDB.CurrentSQLConnectionString
End Sub
Public Class ObjectStore
@ -180,6 +182,9 @@ Public Class GlobalState
Public Class ClientConfiguration
Public Property ForceDirectDatabaseAccess As Boolean = False
Public Property DocumentTypes As New List(Of Doctype)
Public Property ConnectionStringECM As String
Public Property ConnectionStringIDB As String
End Class
<DataContract>

View File

@ -202,13 +202,15 @@ Namespace IDB
Public Function SetObjectState(pObjectId As Long, pState As String, pWho As String) As Boolean
Try
Logger.Debug("Setting object state for [{0}]: [{1}]")
Dim oSql As String = $"EXEC PRIDB_OBJECT_SET_STATE {pObjectId}, '{pState}', '{pWho}'"
Dim oResult = Database.ExecuteNonQuery(oSql)
If oResult = False Then
Return False
End If
Logger.Info("Object state for [{0}] created: [{1}]", pObjectId, pState)
Logger.Info("Object state for [{0}] set: [{1}]", pObjectId, pState)
Return True
Catch ex As Exception

View File

@ -101,7 +101,9 @@ Namespace Methods.IDB.CheckInOutFile
VALUES ({pObjectId}, GETDATE(), '{pComment}', '{pUsername}')"
If DatabaseIDB.ExecuteNonQuery(oSQL) = True Then
Helpers.SetObjectState(pObjectId, FileStore.OBJECT_STATE_FILE_CHECKED_OUT, pUsername)
Logger.Info("File [{0}] checked out successfully!", pObjectId)
Return CheckOutResult.CheckoutSuccessful
Else
Logger.Warn("File [{0}] could not be checked out because of an internal error!", pObjectId)
@ -134,7 +136,9 @@ Namespace Methods.IDB.CheckInOutFile
WHERE IDB_OBJ_ID = {pObjectId} AND ADDED_WHO = '{pUsername}' AND CHECKED_IN_WHEN IS NULL"
If DatabaseIDB.ExecuteNonQuery(oSQL) = True Then
Helpers.SetObjectState(pObjectId, FileStore.OBJECT_STATE_FILE_CHECKED_IN, pUsername)
Logger.Info("File [{0}] checked in successfully!", pObjectId)
Return CheckInResult.CheckinSuccessful
Else
Logger.Warn("File [{0}] could not be checked in because of an internal error!", pObjectId)