diff --git a/DxfImportWindow/DxfImportWindowV.xaml b/DxfImportWindow/DxfImportWindowV.xaml
index 5ae581e..21a50a7 100644
--- a/DxfImportWindow/DxfImportWindowV.xaml
+++ b/DxfImportWindow/DxfImportWindowV.xaml
@@ -8,12 +8,12 @@
ShowInTaskbar="False"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" WindowStartupLocation="CenterOwner">
-
+
-
-
+
@@ -40,145 +40,154 @@
-
-
-
-
-
+
+
-
-
-
+
-
-
-
+
+
-
-
-
+
+
-
-
+
-
-
-
+
-
+
-
-
-
-
+
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
-
+
-
+
-
+
+
-
+
+
+
+
+
-
-
-
-
diff --git a/DxfImportWindow/DxfImportWindowVM.vb b/DxfImportWindow/DxfImportWindowVM.vb
index 45b6018..afb75e6 100644
--- a/DxfImportWindow/DxfImportWindowVM.vb
+++ b/DxfImportWindow/DxfImportWindowVM.vb
@@ -925,9 +925,9 @@ Public Class DxfImportWindowVM
Private Sub SetMsgColor(nMsgType As MSG_TYPE)
Select Case nMsgType
Case MSG_TYPE.INFO
- m_MsgColor = Brushes.Black
+ m_MsgColor = Brushes.White
Case MSG_TYPE.WARNING
- m_MsgColor = Brushes.SaddleBrown
+ m_MsgColor = Brushes.Gold
Case MSG_TYPE.ERROR_
m_MsgColor = Brushes.Red
End Select
diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb
index 374fc84..d2d4b61 100644
--- a/MachinePanel/MyMachinePanelVM.vb
+++ b/MachinePanel/MyMachinePanelVM.vb
@@ -451,7 +451,8 @@ Public Class MyMachinePanelVM
''' Execute the Exec. This method is invoked by the ExecCommand.
'''
Public Sub WaterjetDb(ByVal param As Object)
- Dim WaterjetDbWindow As New WaterjetDbWindowV(Application.Current.MainWindow, New WaterjetDbWindowVM(CurrentMachine.sMachDir))
+ ' Dim WaterjetDbWindow As New WaterjetDbWindowV(Application.Current.MainWindow, New WaterjetDbWindowVM(CurrentMachine.sMachDir))
+ Dim WaterjetDbWindow As New MyWaterjetDbWindowV(Application.Current.MainWindow, New WaterjetDbWindowVM(CurrentMachine.sMachDir))
WaterjetDbWindow.Height = 546
WaterjetDbWindow.Width = 846
WaterjetDbWindow.ShowDialog()
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index f790d27..8118fba 100644
--- a/My Project/AssemblyInfo.vb
+++ b/My Project/AssemblyInfo.vb
@@ -69,6 +69,6 @@ Imports System.Windows
' by using the '*' as shown below:
'
-
-
+
+
diff --git a/MyMachGroupPanel/MyMachGroupPanelV.xaml b/MyMachGroupPanel/MyMachGroupPanelV.xaml
new file mode 100644
index 0000000..a107553
--- /dev/null
+++ b/MyMachGroupPanel/MyMachGroupPanelV.xaml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MyMachGroupPanel/MyMachGroupPanelV.xaml.vb b/MyMachGroupPanel/MyMachGroupPanelV.xaml.vb
new file mode 100644
index 0000000..38ed845
--- /dev/null
+++ b/MyMachGroupPanel/MyMachGroupPanelV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class MyMachGroupPanelV
+
+End Class
diff --git a/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml b/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml
new file mode 100644
index 0000000..86a74c2
--- /dev/null
+++ b/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb b/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb
new file mode 100644
index 0000000..6c36591
--- /dev/null
+++ b/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb
@@ -0,0 +1,20 @@
+Imports EgtWPFLib5
+
+Public Class MyWaterjetDbWindowV
+
+ Private WithEvents m_WaterjetDbWindowVM As WaterjetDbWindowVM
+
+ Sub New(Owner As Window, WaterjetDbWindowVM As WaterjetDbWindowVM)
+ MyBase.New(Owner)
+ ' This call is required by the designer.
+ InitializeComponent()
+ Me.DataContext = WaterjetDbWindowVM
+ ' Assegno al riferimento locale al VM il VM preso dal DataContext
+ m_WaterjetDbWindowVM = WaterjetDbWindowVM
+ End Sub
+
+ Private Sub CloseWindow(bDialogResult As Boolean) Handles m_WaterjetDbWindowVM.m_CloseWindow
+ Me.DialogResult = bDialogResult
+ End Sub
+
+End Class
diff --git a/OmagOFFICE.vbproj b/OmagOFFICE.vbproj
index e78f9d7..e750610 100644
--- a/OmagOFFICE.vbproj
+++ b/OmagOFFICE.vbproj
@@ -238,6 +238,9 @@
+
+ MyMachGroupPanelV.xaml
+
MachinePanelV.xaml
@@ -261,6 +264,9 @@
MyToolDbWindowV.xaml
+
+ MyWaterjetDbWindowV.xaml
+
MachiningTabV.xaml
@@ -431,6 +437,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
@@ -459,6 +469,10 @@
MSBuild:Compile
Designer
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -906,6 +920,9 @@
+
+
+
IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe
diff --git a/OptionPanel/MachiningTab/SplitModeVM.vb b/OptionPanel/MachiningTab/SplitModeVM.vb
index 5ee9a9e..d4b1771 100644
--- a/OptionPanel/MachiningTab/SplitModeVM.vb
+++ b/OptionPanel/MachiningTab/SplitModeVM.vb
@@ -1984,6 +1984,9 @@ Public Class SplitModeVM
ModifStartWindow.DataContext = ModifStartWindowVM
ModifStartWindow.Owner = Application.Current.MainWindow
ModifStartWindowVM.SetVal(dOrigUsal)
+ ' Il posizionamento è forzato nel codice xaml: WindowStartupLocation="CenterOwner"
+ ModifStartWindow.Left = 190
+ ModifStartWindow.Top = 600
If Not ModifStartWindow.ShowDialog() Then Return
' Modifica della lavorazione
dUsal = ModifStartWindowVM.GetVal()
diff --git a/Project/ProjectV.xaml b/Project/ProjectV.xaml
index 06f8444..25e6a97 100644
--- a/Project/ProjectV.xaml
+++ b/Project/ProjectV.xaml
@@ -23,14 +23,15 @@
-
+
diff --git a/Resources/TopCommandBar/Modify.png b/Resources/TopCommandBar/Modify.png
new file mode 100644
index 0000000..597d993
Binary files /dev/null and b/Resources/TopCommandBar/Modify.png differ
diff --git a/Utility/OmagOFFICEDictionary.xaml b/Utility/OmagOFFICEDictionary.xaml
index 927a549..97483d1 100644
--- a/Utility/OmagOFFICEDictionary.xaml
+++ b/Utility/OmagOFFICEDictionary.xaml
@@ -28,6 +28,7 @@
+
@@ -220,6 +221,33 @@
+
+
+
+
+
-
+
-
+
-
-
+
+