diff --git a/GUIs.Common/frmDocumentResultList.Designer.vb b/GUIs.Common/frmDocumentResultList.Designer.vb
index 4a922551..a671c111 100644
--- a/GUIs.Common/frmDocumentResultList.Designer.vb
+++ b/GUIs.Common/frmDocumentResultList.Designer.vb
@@ -526,6 +526,7 @@ Partial Class frmDocumentResultList
Me.lblCurrentWorkspace.Id = 60
Me.lblCurrentWorkspace.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.business_world2
Me.lblCurrentWorkspace.Name = "lblCurrentWorkspace"
+ Me.lblCurrentWorkspace.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
Me.lblCurrentWorkspace.Tag = "Arbeitsbereich: {0}"
'
'RibbonPageStart
@@ -791,7 +792,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, 413)
+ Me.DockPanelMetadata.OriginalSize = New System.Drawing.Size(268, 434)
'
'DockPanel3_Container
'
@@ -813,7 +814,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, 413)
+ Me.DockPanelStatus.OriginalSize = New System.Drawing.Size(268, 434)
'
'ControlContainer1
'
@@ -854,7 +855,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, 434)
+ Me.Root.Size = New System.Drawing.Size(268, 413)
Me.Root.TextVisible = False
'
'LayoutControlGroup1
@@ -888,7 +889,7 @@ Partial Class frmDocumentResultList
Me.EmptySpaceItem1.AllowHotTrack = False
Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 93)
Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
- Me.EmptySpaceItem1.Size = New System.Drawing.Size(248, 321)
+ Me.EmptySpaceItem1.Size = New System.Drawing.Size(248, 300)
Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
'
'DockPanelPreview
@@ -912,9 +913,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.DockPanelPreview)
Me.Controls.Add(Me.panelContainerStatus)
- Me.Controls.Add(Me.DockPanelFileList)
Me.Controls.Add(Me.RibbonStatusBar)
Me.Controls.Add(Me.RibbonControl)
Me.IconOptions.Icon = CType(resources.GetObject("frmDocumentResultList.IconOptions.Icon"), System.Drawing.Icon)
diff --git a/GUIs.Common/frmDocumentResultList.resx b/GUIs.Common/frmDocumentResultList.resx
index aa78b385..29aa83aa 100644
--- a/GUIs.Common/frmDocumentResultList.resx
+++ b/GUIs.Common/frmDocumentResultList.resx
@@ -506,6 +506,48 @@
1189, 671
+
+ 3, 46
+
+
+ 583, 442
+
+
+ 0
+
+
+ DockPanel2_Container
+
+
+ DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ DockPanelFileList
+
+
+ 0
+
+
+ 0, 158
+
+
+ 590, 491
+
+
+ Ergebnisse
+
+
+ DockPanelFileList
+
+
+ DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ $this
+
+
+ 0
+
Fill
@@ -513,7 +555,7 @@
0, 0
- 318, 459
+ 318, 441
0
@@ -531,10 +573,10 @@
0
- 3, 26
+ 3, 46
- 318, 459
+ 318, 441
0
@@ -555,7 +597,7 @@
590, 158
- 324, 489
+ 324, 491
Vorschau
@@ -570,7 +612,7 @@
$this
- 0
+ 1
Fill
@@ -579,7 +621,7 @@
0, 0
- 268, 434
+ 268, 413
0
@@ -588,7 +630,7 @@
CtrlObjectPropertyDialog
- DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.13.2.0, Culture=neutral, PublicKeyToken=null
+ DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.1.0.0, Culture=neutral, PublicKeyToken=null
DockPanel3_Container
@@ -600,7 +642,7 @@
0, 0
- 268, 434
+ 268, 413
0
@@ -618,10 +660,10 @@
0
- 4, 26
+ 4, 46
- 268, 434
+ 268, 413
Eigenschaften
@@ -705,7 +747,7 @@
In Bearbeitung
- 268, 434
+ 268, 413
0
@@ -729,7 +771,7 @@
0, 0
- 268, 434
+ 268, 413
0
@@ -747,10 +789,10 @@
0
- 4, 26
+ 4, 46
- 268, 434
+ 268, 413
Status
@@ -771,7 +813,7 @@
914, 158
- 275, 489
+ 275, 491
panelContainer1
@@ -786,58 +828,16 @@
$this
- 1
-
-
- 3, 26
-
-
- 583, 460
-
-
- 0
-
-
- DockPanel2_Container
-
-
- DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
-
- DockPanelFileList
-
-
- 0
-
-
- 0, 158
-
-
- 590, 489
-
-
- Ergebnisse
-
-
- DockPanelFileList
-
-
- DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
-
- $this
-
-
2
Arbeitsbereich: {0}
- 0, 647
+ 0, 649
- 1189, 24
+ 1189, 22
RibbonStatusBar
@@ -1457,7 +1457,7 @@
4
- 573, 460
+ 573, 442
0
@@ -1628,7 +1628,7 @@
1
- 583, 460
+ 583, 442
2
diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb
index e3f14d03..df1c7287 100644
--- a/GUIs.Common/frmDocumentResultList.vb
+++ b/GUIs.Common/frmDocumentResultList.vb
@@ -465,19 +465,20 @@ Public Class frmDocumentResultList
Private Async Function Watcher_Ask(pFile As DocumentResultList.Watcher.OpenFile) As Task
Dim oFileInfo = New FileInfo(pFile.FilePath)
Dim oDisplayName = pFile.Document.DisplayFileName
- Dim oMessage = $"Die Datei '{oDisplayName}' wurde außerhalb des Systems verändert. Wollen Sie diese Änderung als neue Version in das System übernehmen oder überschreiben?"
+ Dim oMessage = $"Die Datei '{oDisplayName}' wurde außerhalb des Systems verändert. Wollen Sie diese Änderung als neue Version in das System übernehmen?{vbNewLine}{vbNewLine}Wenn Sie 'Nein' wählen, wird die bestehende Datei überschrieben."
+ Dim oResult = FormHelper.ShowQuestionMessage(oMessage, "Datei verändert")
- Dim oMessageBox As New NNMsgBoxEx(oMessage, "Datei verändert", MessageBoxIcon.Question)
- oMessageBox.SetButtons("Überschreiben", "Neue Version", "Abbrechen")
- oMessageBox.ShowDialog()
+ 'Dim oMessageBox As New NNMsgBoxEx(oMessage, "Datei verändert", MessageBoxIcon.Question)
+ 'oMessageBox.SetButtons("Überschreiben", "Neue Version", "Abbrechen")
+ 'oMessageBox.ShowDialog()
- Select Case oMessageBox.Result
- Case NNMsgBoxEx.DialogBoxResult.Button1
- Await Watcher_OverwriteFile(pFile)
-
- Case NNMsgBoxEx.DialogBoxResult.Button2
+ Select Case oResult
+ Case DialogResult.Yes
Await Watcher_VersionFile(pFile)
+ Case DialogResult.No
+ Await Watcher_OverwriteFile(pFile)
+
Case Else
' Cancel, do nothing