From 3a5aeedd81120e548ac00e31cd7534af00cfa9d1 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Tue, 30 Aug 2016 13:47:59 +0000 Subject: [PATCH] =?UTF-8?q?EgtCAM5=20:=20-=20Separazione=20GridView=20in?= =?UTF-8?q?=20pi=C3=B9=20pannelli.=20-=20Cambio=20colori=20della=20grafica?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application.xaml.vb | 1 - EgtCAM5.vbproj | 52 +- EgtCAM5Resources.xaml | 137 +- MainWindow/MainWindow.xaml | 12 +- MainWindow/MainWindow.xaml.vb | 7 + MainWindow/MainWindowViewModel.vb | 4 - ProjectPage/DoorsPanel/DoorsPanelView.xaml | 11 + ProjectPage/DoorsPanel/DoorsPanelView.xaml.vb | 3 + ProjectPage/DoorsPanel/DoorsPanelViewModel.vb | 76 ++ ProjectPage/DrawPanel/DrawPanelView.xaml | 10 +- .../ExecutePanel/ExecutePanelView.xaml | 11 + .../ExecutePanel/ExecutePanelView.xaml.vb | 3 + .../ExecutePanel/ExecutePanelViewModel.vb | 61 + ProjectPage/GridPanel/GridPanelView.xaml | 47 + ProjectPage/GridPanel/GridPanelView.xaml.vb | 3 + ProjectPage/GridPanel/GridPanelViewModel.vb | 493 +++++++ .../GridViewPanel/GridViewPanelView.xaml | 107 -- .../GridViewPanel/GridViewPanelViewModel.vb | 1171 ----------------- .../InstrumentPanel/InstrumentPanelView.xaml | 14 + .../InstrumentPanelView.xaml.vb | 3 + .../InstrumentPanelViewModel.vb | 69 + ProjectPage/OptionPanel/OptionPanelView.xaml | 2 +- ProjectPage/ProjectView.xaml | 24 +- ProjectPage/ProjectView.xaml.vb | 34 +- ProjectPage/ProjectViewModel.vb | 40 - ProjectPage/ShowPanel/ShowPanelView.xaml | 20 + ProjectPage/ShowPanel/ShowPanelView.xaml.vb | 3 + ProjectPage/ShowPanel/ShowPanelViewModel.vb | 148 +++ ProjectPage/ViewPanel/ViewPanelView.xaml | 49 + .../ViewPanelView.xaml.vb} | 0 ProjectPage/ViewPanel/ViewPanelViewModel.vb | 505 +++++++ Resources/Fonts/gothic.ttf | Bin 0 -> 137568 bytes StatusBar/StatusBarView.xaml | 6 +- TopCommandBar/TopCommandBarView.xaml | 7 - TopCommandBar/TopCommandBarViewModel.vb | 100 +- Utility.vb | 1 + 36 files changed, 1757 insertions(+), 1477 deletions(-) create mode 100644 ProjectPage/DoorsPanel/DoorsPanelView.xaml create mode 100644 ProjectPage/DoorsPanel/DoorsPanelView.xaml.vb create mode 100644 ProjectPage/DoorsPanel/DoorsPanelViewModel.vb create mode 100644 ProjectPage/ExecutePanel/ExecutePanelView.xaml create mode 100644 ProjectPage/ExecutePanel/ExecutePanelView.xaml.vb create mode 100644 ProjectPage/ExecutePanel/ExecutePanelViewModel.vb create mode 100644 ProjectPage/GridPanel/GridPanelView.xaml create mode 100644 ProjectPage/GridPanel/GridPanelView.xaml.vb create mode 100644 ProjectPage/GridPanel/GridPanelViewModel.vb delete mode 100644 ProjectPage/GridViewPanel/GridViewPanelView.xaml delete mode 100644 ProjectPage/GridViewPanel/GridViewPanelViewModel.vb create mode 100644 ProjectPage/InstrumentPanel/InstrumentPanelView.xaml create mode 100644 ProjectPage/InstrumentPanel/InstrumentPanelView.xaml.vb create mode 100644 ProjectPage/InstrumentPanel/InstrumentPanelViewModel.vb create mode 100644 ProjectPage/ShowPanel/ShowPanelView.xaml create mode 100644 ProjectPage/ShowPanel/ShowPanelView.xaml.vb create mode 100644 ProjectPage/ShowPanel/ShowPanelViewModel.vb create mode 100644 ProjectPage/ViewPanel/ViewPanelView.xaml rename ProjectPage/{GridViewPanel/GridViewPanelView.xaml.vb => ViewPanel/ViewPanelView.xaml.vb} (100%) create mode 100644 ProjectPage/ViewPanel/ViewPanelViewModel.vb create mode 100644 Resources/Fonts/gothic.ttf 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 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +