Common/DocResult fix
This commit is contained in:
Jonathan Jenne
parent
66003aee94
commit
57bb377b3a
11
GUIs.Common/frmDocumentResultList.Designer.vb
generated
11
GUIs.Common/frmDocumentResultList.Designer.vb
generated
@ -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)
|
||||
|
||||
@ -506,6 +506,48 @@
|
||||
<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>583, 442</value>
|
||||
</data>
|
||||
<data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>DockPanel2_Container.Name" xml:space="preserve">
|
||||
<value>DockPanel2_Container</value>
|
||||
</data>
|
||||
<data name=">>DockPanel2_Container.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>DockPanel2_Container.Parent" xml:space="preserve">
|
||||
<value>DockPanelFileList</value>
|
||||
</data>
|
||||
<data name=">>DockPanel2_Container.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="DockPanelFileList.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 158</value>
|
||||
</data>
|
||||
<data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>590, 491</value>
|
||||
</data>
|
||||
<data name="DockPanelFileList.Text" xml:space="preserve">
|
||||
<value>Ergebnisse</value>
|
||||
</data>
|
||||
<data name=">>DockPanelFileList.Name" xml:space="preserve">
|
||||
<value>DockPanelFileList</value>
|
||||
</data>
|
||||
<data name=">>DockPanelFileList.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>DockPanelFileList.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>DockPanelFileList.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="DocumentViewer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
@ -513,7 +555,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>318, 459</value>
|
||||
<value>318, 441</value>
|
||||
</data>
|
||||
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -531,10 +573,10 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="DockPanel1_Container.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 26</value>
|
||||
<value>3, 46</value>
|
||||
</data>
|
||||
<data name="DockPanel1_Container.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>318, 459</value>
|
||||
<value>318, 441</value>
|
||||
</data>
|
||||
<data name="DockPanel1_Container.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -555,7 +597,7 @@
|
||||
<value>590, 158</value>
|
||||
</data>
|
||||
<data name="DockPanelPreview.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>324, 489</value>
|
||||
<value>324, 491</value>
|
||||
</data>
|
||||
<data name="DockPanelPreview.Text" xml:space="preserve">
|
||||
<value>Vorschau</value>
|
||||
@ -570,7 +612,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>DockPanelPreview.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="CtrlObjectPropertyDialog.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
@ -579,7 +621,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="CtrlObjectPropertyDialog.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>268, 434</value>
|
||||
<value>268, 413</value>
|
||||
</data>
|
||||
<data name="CtrlObjectPropertyDialog.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -588,7 +630,7 @@
|
||||
<value>CtrlObjectPropertyDialog</value>
|
||||
</data>
|
||||
<data name=">>CtrlObjectPropertyDialog.Type" xml:space="preserve">
|
||||
<value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.13.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.1.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>CtrlObjectPropertyDialog.Parent" xml:space="preserve">
|
||||
<value>DockPanel3_Container</value>
|
||||
@ -600,7 +642,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="DockPanel3_Container.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>268, 434</value>
|
||||
<value>268, 413</value>
|
||||
</data>
|
||||
<data name="DockPanel3_Container.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -618,10 +660,10 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="DockPanelMetadata.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>4, 26</value>
|
||||
<value>4, 46</value>
|
||||
</data>
|
||||
<data name="DockPanelMetadata.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>268, 434</value>
|
||||
<value>268, 413</value>
|
||||
</data>
|
||||
<data name="DockPanelMetadata.Text" xml:space="preserve">
|
||||
<value>Eigenschaften</value>
|
||||
@ -705,7 +747,7 @@
|
||||
<value>In Bearbeitung</value>
|
||||
</data>
|
||||
<data name="LayoutControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>268, 434</value>
|
||||
<value>268, 413</value>
|
||||
</data>
|
||||
<data name="LayoutControl1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -729,7 +771,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="ControlContainer1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>268, 434</value>
|
||||
<value>268, 413</value>
|
||||
</data>
|
||||
<data name="ControlContainer1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -747,10 +789,10 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="DockPanelStatus.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>4, 26</value>
|
||||
<value>4, 46</value>
|
||||
</data>
|
||||
<data name="DockPanelStatus.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>268, 434</value>
|
||||
<value>268, 413</value>
|
||||
</data>
|
||||
<data name="DockPanelStatus.Text" xml:space="preserve">
|
||||
<value>Status</value>
|
||||
@ -771,7 +813,7 @@
|
||||
<value>914, 158</value>
|
||||
</data>
|
||||
<data name="panelContainerStatus.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>275, 489</value>
|
||||
<value>275, 491</value>
|
||||
</data>
|
||||
<data name="panelContainerStatus.Text" xml:space="preserve">
|
||||
<value>panelContainer1</value>
|
||||
@ -786,58 +828,16 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>panelContainerStatus.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<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>583, 460</value>
|
||||
</data>
|
||||
<data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>DockPanel2_Container.Name" xml:space="preserve">
|
||||
<value>DockPanel2_Container</value>
|
||||
</data>
|
||||
<data name=">>DockPanel2_Container.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>DockPanel2_Container.Parent" xml:space="preserve">
|
||||
<value>DockPanelFileList</value>
|
||||
</data>
|
||||
<data name=">>DockPanel2_Container.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="DockPanelFileList.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 158</value>
|
||||
</data>
|
||||
<data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>590, 489</value>
|
||||
</data>
|
||||
<data name="DockPanelFileList.Text" xml:space="preserve">
|
||||
<value>Ergebnisse</value>
|
||||
</data>
|
||||
<data name=">>DockPanelFileList.Name" xml:space="preserve">
|
||||
<value>DockPanelFileList</value>
|
||||
</data>
|
||||
<data name=">>DockPanelFileList.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>DockPanelFileList.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>DockPanelFileList.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="lblCurrentWorkspace.Caption" xml:space="preserve">
|
||||
<value>Arbeitsbereich: {0}</value>
|
||||
</data>
|
||||
<data name="RibbonStatusBar.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 647</value>
|
||||
<value>0, 649</value>
|
||||
</data>
|
||||
<data name="RibbonStatusBar.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1189, 24</value>
|
||||
<value>1189, 22</value>
|
||||
</data>
|
||||
<data name=">>RibbonStatusBar.Name" xml:space="preserve">
|
||||
<value>RibbonStatusBar</value>
|
||||
@ -1457,7 +1457,7 @@
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>573, 460</value>
|
||||
<value>573, 442</value>
|
||||
</data>
|
||||
<data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -1628,7 +1628,7 @@
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>583, 460</value>
|
||||
<value>583, 442</value>
|
||||
</data>
|
||||
<data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user