diff --git a/DirectCuts/CopyTemplateUC.xaml b/DirectCuts/CopyTemplateUC.xaml
index 986fa90..4552d9c 100644
--- a/DirectCuts/CopyTemplateUC.xaml
+++ b/DirectCuts/CopyTemplateUC.xaml
@@ -36,7 +36,7 @@
diff --git a/DirectCuts/FlatteningCut.xaml b/DirectCuts/FlatteningCut.xaml
index 6287921..622cb37 100644
--- a/DirectCuts/FlatteningCut.xaml
+++ b/DirectCuts/FlatteningCut.xaml
@@ -38,12 +38,17 @@
-
-
+
+
+
-
+
+
+
+
+
@@ -125,12 +130,16 @@
-
-
-
-
+
+
+
+
diff --git a/DirectCuts/FlatteningCut.xaml.vb b/DirectCuts/FlatteningCut.xaml.vb
index 17b2a69..eccbd23 100644
--- a/DirectCuts/FlatteningCut.xaml.vb
+++ b/DirectCuts/FlatteningCut.xaml.vb
@@ -79,8 +79,8 @@ Public Class FlatteningCut
' la associo alla combobox
TypeCmBx.ItemsSource = m_TypeArray
' assegno messaggi
- Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
- Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+ Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+ Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
@@ -89,8 +89,8 @@ Public Class FlatteningCut
ZReleasedTxBl.Text = "Z Svincolo"
SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
RotLockTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 29)
- SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
- OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+ SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+ OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
' Carico i dati dell'ultimo taglio
m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_ANGH, m_dAngO, m_MainWindow.GetIniFile())
diff --git a/DirectCuts/GridCut.xaml b/DirectCuts/GridCut.xaml
index 6b973e0..a453d08 100644
--- a/DirectCuts/GridCut.xaml
+++ b/DirectCuts/GridCut.xaml
@@ -34,12 +34,16 @@
-
-
+
+
+
-
+
+
+
+
@@ -131,12 +135,16 @@
-
-
-
-
+
+
+
+
diff --git a/DirectCuts/GridCut.xaml.vb b/DirectCuts/GridCut.xaml.vb
index 3ce6bf2..c5f37db 100644
--- a/DirectCuts/GridCut.xaml.vb
+++ b/DirectCuts/GridCut.xaml.vb
@@ -63,8 +63,8 @@ Public Class GridCut
' la associo alla combobox
PointModeCmBx.ItemsSource = m_PointsModeArray
' assegno messaggi
- Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
- Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+ Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+ Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16)
@@ -73,8 +73,8 @@ Public Class GridCut
NumPzYTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 21)
DimPzYTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 22)
SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
- SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
- OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+ SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+ OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
' Carico i dati dell'ultimo taglio
m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_ANGH, m_dAngO, m_MainWindow.GetIniFile())
diff --git a/DirectCuts/MultipleCut.xaml b/DirectCuts/MultipleCut.xaml
index e944030..dc330b9 100644
--- a/DirectCuts/MultipleCut.xaml
+++ b/DirectCuts/MultipleCut.xaml
@@ -35,12 +35,17 @@
-
-
+
+
+
-
+
+
+
+
+
@@ -256,12 +261,16 @@
-
-
-
-
+
+
+
+
diff --git a/DirectCuts/MultipleCut.xaml.vb b/DirectCuts/MultipleCut.xaml.vb
index 19392a2..0c65b45 100644
--- a/DirectCuts/MultipleCut.xaml.vb
+++ b/DirectCuts/MultipleCut.xaml.vb
@@ -63,8 +63,8 @@ Public Class MultipleCut
' la associo alla combobox
PointModeCmBx.ItemsSource = m_PointsModeArray
' assegno messaggi
- Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
- Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+ Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+ Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
@@ -72,8 +72,8 @@ Public Class MultipleCut
NumPzTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 17)
DimPzTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 18)
SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
- SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
- OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+ SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+ OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
Num1TxBl.Text = "1"
Num2TxBl.Text = "2"
Num3TxBl.Text = "3"
diff --git a/DirectCuts/Polishing.xaml b/DirectCuts/Polishing.xaml
index 84240fd..79a631d 100644
--- a/DirectCuts/Polishing.xaml
+++ b/DirectCuts/Polishing.xaml
@@ -63,12 +63,16 @@
-
-
-
-
+
+
+
+
diff --git a/DirectCuts/Polishing.xaml.vb b/DirectCuts/Polishing.xaml.vb
index fd80210..2227923 100644
--- a/DirectCuts/Polishing.xaml.vb
+++ b/DirectCuts/Polishing.xaml.vb
@@ -23,8 +23,8 @@ Public Class Polishing
Private Sub Polishing_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
' assegno messaggi
- SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
- OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+ SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+ OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
End Sub
Private Sub Polishing_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
diff --git a/DirectCuts/SingleDrillUC.xaml b/DirectCuts/SingleDrillUC.xaml
index 3e6e925..8a72019 100644
--- a/DirectCuts/SingleDrillUC.xaml
+++ b/DirectCuts/SingleDrillUC.xaml
@@ -38,8 +38,10 @@
-
+ Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+
+
+
@@ -77,8 +79,12 @@
-
-
+
+
diff --git a/DirectCuts/SingleDrillUC.xaml.vb b/DirectCuts/SingleDrillUC.xaml.vb
index 597c2e9..693bf3e 100644
--- a/DirectCuts/SingleDrillUC.xaml.vb
+++ b/DirectCuts/SingleDrillUC.xaml.vb
@@ -61,9 +61,9 @@ Public Class SingleDrillUC
PointModeCmBx.ItemsSource = m_PointsModeArray
' Assegno messaggi
- Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
- SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
- OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+ Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+ SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+ OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
End Sub
Private Sub SingleDrill_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
diff --git a/OmagCUT.vbproj b/OmagCUT.vbproj
index ed88ba5..0d0f8b3 100644
--- a/OmagCUT.vbproj
+++ b/OmagCUT.vbproj
@@ -1220,6 +1220,9 @@
+
+
+
IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe
diff --git a/OmagCUTDarkDictionary.xaml b/OmagCUTDarkDictionary.xaml
index f9c95b7..11b8327 100644
--- a/OmagCUTDarkDictionary.xaml
+++ b/OmagCUTDarkDictionary.xaml
@@ -124,6 +124,7 @@
+
diff --git a/Resources/NewIcons/Acquisisci-P.png b/Resources/NewIcons/Acquisisci-P.png
new file mode 100644
index 0000000..8fa0c1a
Binary files /dev/null and b/Resources/NewIcons/Acquisisci-P.png differ