diff --git a/ConstIni.vb b/ConstIni.vb index 2e480c5..def39ee 100644 --- a/ConstIni.vb +++ b/ConstIni.vb @@ -79,9 +79,11 @@ Module ConstIni Public Const K_PROCESSOR As String = "Processor" Public Const K_OFFSETX As String = "OffsetX" Public Const K_OFFSETY As String = "OffsetY" + Public Const K_OFFSETGLUE As String = "OffsetGlue" + Public Const K_ONADVANCE As String = "OnAdvance" + Public Const K_OFFADVANCE As String = "OffAdvance" Public Const K_PLANKX As String = "PlankX" Public Const K_PLANKNUMINLAYER As String = "PlankNumInLayer" - Public Const K_OFFSETGLUE As String = "OffsetGlue" Public Const K_MINDIST As String = "MinDist" Public Const K_STEP As String = "Step" Public Const K_ENABLEDRAG As String = "EnableDrag" diff --git a/MainWindow.xaml b/MainWindow.xaml index b56fc4c..4c1eaa2 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -25,7 +25,8 @@ - + + @@ -42,9 +43,14 @@ - - + + diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 3277b10..dce9437 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -153,7 +153,6 @@ Class MainWindow m_OptionsPageUC = New OptionsPageUC m_OpenPageUC = New OpenPageUC m_NumericKeyboardWD = New NumericKeyboardWD - m_AboutBoxWD = New AboutBoxWD 'Posizionemento nella griglia delle Page UserControl m_ImportPageUC.SetValue(Grid.ColumnProperty, 0) @@ -223,9 +222,8 @@ Class MainWindow Private Sub MainWindow_Loaded(sender As Object, e As RoutedEventArgs) - 'Assegno NumericKeyboardWD e AboutBoxWD come child della MainWindow + 'Assegno NumericKeyboardWD come child della MainWindow m_NumericKeyboardWD.Owner = Me - m_AboutBoxWD.Owner = Me 'Seleziono la Tab e la Page di apertura MainWindowGrid.Children.Add(m_PlacePageUC) @@ -235,6 +233,8 @@ Class MainWindow End Sub Private Sub Border_MouseDown(sender As Object, e As MouseButtonEventArgs) + m_AboutBoxWD = New AboutBoxWD + m_AboutBoxWD.Owner = Me m_AboutBoxWD.Top = Me.Top + (Me.Height / 2 - m_AboutBoxWD.Height / 2) m_AboutBoxWD.Left = Me.Left + (Me.Width / 2 - m_AboutBoxWD.Width / 2) m_AboutBoxWD.Show() @@ -354,6 +354,10 @@ Class MainWindow End If End Sub + Private Sub MinimizeBtn_Click(sender As Object, e As RoutedEventArgs) + Me.WindowState = Windows.WindowState.Minimized + End Sub + Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) ' Recupero flag di modificato, per salvarlo nel progetto Dim bModif As Boolean = EgtGetModified() diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index f2ebac9..4d9c56b 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -60,5 +60,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OptionsPageUC.xaml b/OptionsPageUC.xaml index 9762e56..e2526e7 100644 --- a/OptionsPageUC.xaml +++ b/OptionsPageUC.xaml @@ -14,8 +14,8 @@ - - + + @@ -31,14 +31,14 @@ - + @@ -155,8 +167,6 @@ - -