Egalware/EgtWPFLib5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminato riferimento a EgtWPFLib

Browse Source
This commit is contained in:
NicolaP
2022-07-05 17:12:32 +02:00
parent a8ac8d5da1
commit d4f779d79e
3 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtWPFLib5.vbproj
-3
View File
@@ -48,9 +48,6 @@
<Reference Include="EgtUILib, Version=2.4.6.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\EgtUILib.2.4.6.1\lib\EgtUILib.dll</HintPath>
</Reference>
<Reference Include="EgtWPFLib, Version=2.4.5.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\EgtWPFLib.2.4.5.1\lib\EgtWPFLib.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
WaterjetDbWindow/WaterjetDbWindowVM.vb
+46 -46
View File
@@ -1,7 +1,7 @@
Imports System.Collections.ObjectModel
Imports System.IO
Imports EgtUILib
Imports EgtWPFLib
'Imports EgtWPFLib
Public Class WaterjetDbWindowVM
Inherits VMBase
@@ -658,51 +658,51 @@ Public Class WaterjetDbWindowVM
Next
End Sub
Public Function CloseWaterjetDb_OmagCut(MainWindow As Window) As SaveWndBtnEnum
If bIsModified Then
Dim SaveWjDbWnd As New EgtMsgBox(MainWindow, "", EgtMsg(31759), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
Select Case SaveWjDbWnd.m_nPressedBtn
Case 1 ' Yes
WriteWaterjetDb()
bIsModified = False
Return SaveWndBtnEnum.YES
Case 2 ' No
Return SaveWndBtnEnum.NO
Case Else ' Cancel
Return SaveWndBtnEnum.CANCEL
End Select
Else
Dim bExitFor As Boolean = False
For Each Material In MaterialList
If Not IsNothing(Material.SubMaterialList) Then
For Each SubMaterial In Material.SubMaterialList
If Not IsNothing(SubMaterial.ParamList) Then
For Each QParam In SubMaterial.ParamList
bExitFor = QParam.IsModified()
If bExitFor Then Exit For
Next
End If
If bExitFor Then Exit For
Next
End If
If bExitFor Then Exit For
Next
If bExitFor Then
Dim SaveWjDbWnd As New EgtMsgBox(MainWindow, "", EgtMsg(31759), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
Select Case SaveWjDbWnd.m_nPressedBtn
Case 1 ' Yes
WriteWaterjetDb()
bIsModified = False
Return SaveWndBtnEnum.YES
Case 2 ' No
Return SaveWndBtnEnum.NO
Case Else ' Cancel
Return SaveWndBtnEnum.CANCEL
End Select
End If
End If
Return SaveWndBtnEnum.YES
End Function
'Public Function CloseWaterjetDb_OmagCut(MainWindow As Window) As SaveWndBtnEnum
' If bIsModified Then
' Dim SaveWjDbWnd As New EgtMsgBox(MainWindow, "", EgtMsg(31759), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
' Select Case SaveWjDbWnd.m_nPressedBtn
' Case 1 ' Yes
' WriteWaterjetDb()
' bIsModified = False
' Return SaveWndBtnEnum.YES
' Case 2 ' No
' Return SaveWndBtnEnum.NO
' Case Else ' Cancel
' Return SaveWndBtnEnum.CANCEL
' End Select
' Else
' Dim bExitFor As Boolean = False
' For Each Material In MaterialList
' If Not IsNothing(Material.SubMaterialList) Then
' For Each SubMaterial In Material.SubMaterialList
' If Not IsNothing(SubMaterial.ParamList) Then
' For Each QParam In SubMaterial.ParamList
' bExitFor = QParam.IsModified()
' If bExitFor Then Exit For
' Next
' End If
' If bExitFor Then Exit For
' Next
' End If
' If bExitFor Then Exit For
' Next
' If bExitFor Then
' Dim SaveWjDbWnd As New EgtMsgBox(MainWindow, "", EgtMsg(31759), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
' Select Case SaveWjDbWnd.m_nPressedBtn
' Case 1 ' Yes
' WriteWaterjetDb()
' bIsModified = False
' Return SaveWndBtnEnum.YES
' Case 2 ' No
' Return SaveWndBtnEnum.NO
' Case Else ' Cancel
' Return SaveWndBtnEnum.CANCEL
' End Select
' End If
' End If
' Return SaveWndBtnEnum.YES
'End Function
#End Region ' Methods
packages.config
-1
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EgtUILib" version="2.4.6.1" targetFramework="net40-client" />
<package id="EgtWPFLib" version="2.4.5.1" targetFramework="net40-client" />
</packages>