diff --git a/Application.xaml.vb b/Application.xaml.vb index 0c8babb..9a724d1 100644 --- a/Application.xaml.vb +++ b/Application.xaml.vb @@ -14,7 +14,6 @@ Class Application Dim MainWndViewModel As New MainWindowViewModel ' Assegno il ViewModel alla View MainWndView.DataContext = MainWndViewModel - Dim x = MainWndView.IsInitialized ' Mostro la View principale MainWndView.Show() End Sub diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj index a8dc87a..58b1758 100644 --- a/EgtCAM5.vbproj +++ b/EgtCAM5.vbproj @@ -118,9 +118,6 @@ AboutBoxView.xaml - - BaseWindowView.xaml - @@ -129,6 +126,10 @@ + + DoorsPanelView.xaml + + MachiningsDbView.xaml @@ -141,11 +142,23 @@ DrawPanelView.xaml - - GridViewPanelView.xaml + + ExecutePanelView.xaml - + + + GridPanelView.xaml + + + + ViewPanelView.xaml + + + + InstrumentPanelView.xaml + + OptionPanelView.xaml @@ -178,6 +191,10 @@ ProjectView.xaml + + ShowPanelView.xaml + + StatusBarView.xaml @@ -200,9 +217,9 @@ Designer MSBuild:Compile - - MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -228,7 +245,19 @@ Designer MSBuild:Compile - + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + Designer MSBuild:Compile @@ -264,6 +293,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -324,6 +357,7 @@ Settings.Designer.vb + diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml index a0d1eb3..074ba8f 100644 --- a/EgtCAM5Resources.xaml +++ b/EgtCAM5Resources.xaml @@ -32,25 +32,21 @@ - - - + Assign a Key to every Panel ViewModel to use + it in xaml file(ProjectView.xaml). + --> + - - + + + + + + @@ -60,14 +56,117 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +