From 9b9206d3e447f81801c1f184884319243777f99f Mon Sep 17 00:00:00 2001 From: amaitland Date: Tue, 5 Aug 2014 14:52:11 +1000 Subject: [PATCH 1/3] Remove unused references --- CefSharp.MinimalExample.Wpf/MainWindow.xaml.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CefSharp.MinimalExample.Wpf/MainWindow.xaml.cs b/CefSharp.MinimalExample.Wpf/MainWindow.xaml.cs index f5c8c6c..bc19c9c 100644 --- a/CefSharp.MinimalExample.Wpf/MainWindow.xaml.cs +++ b/CefSharp.MinimalExample.Wpf/MainWindow.xaml.cs @@ -1,7 +1,4 @@ -using CefSharp.MinimalExample.Wpf.Mvvm; -using CefSharp.Wpf; -using System.ComponentModel; -using System.Windows; +using System.Windows; namespace CefSharp.MinimalExample.Wpf { From ce262257f487a115054166605d6ad0402f7b2a34 Mon Sep 17 00:00:00 2001 From: amaitland Date: Tue, 5 Aug 2014 14:53:07 +1000 Subject: [PATCH 2/3] Update ApplicationIcon to chromium-256.ico --- CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj index 5ed50e4..f0e9378 100644 --- a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj +++ b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj @@ -56,8 +56,7 @@ MinimumRecommendedRules.ruleset - - + chromium-256.ico From 37c43f171076096979b4347f458245257ff296c0 Mon Sep 17 00:00:00 2001 From: amaitland Date: Tue, 5 Aug 2014 14:57:24 +1000 Subject: [PATCH 3/3] Restructure View/ViewModels into their own distinct folders --- .../CefSharp.MinimalExample.Wpf.csproj | 6 +++--- CefSharp.MinimalExample.Wpf/MainWindow.xaml | 2 +- .../{Views/Main => ViewModels}/MainViewModel.cs | 2 +- CefSharp.MinimalExample.Wpf/Views/{Main => }/MainView.xaml | 2 +- .../Views/{Main => }/MainView.xaml.cs | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) rename CefSharp.MinimalExample.Wpf/{Views/Main => ViewModels}/MainViewModel.cs (95%) rename CefSharp.MinimalExample.Wpf/Views/{Main => }/MainView.xaml (94%) rename CefSharp.MinimalExample.Wpf/Views/{Main => }/MainView.xaml.cs (71%) diff --git a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj index f0e9378..5576d07 100644 --- a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj +++ b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj @@ -78,10 +78,10 @@ MSBuild:Compile Designer - + MainView.xaml - + MSBuild:Compile Designer @@ -94,7 +94,7 @@ MainWindow.xaml Code - + MSBuild:Compile Designer diff --git a/CefSharp.MinimalExample.Wpf/MainWindow.xaml b/CefSharp.MinimalExample.Wpf/MainWindow.xaml index d8e3ed1..a02a076 100644 --- a/CefSharp.MinimalExample.Wpf/MainWindow.xaml +++ b/CefSharp.MinimalExample.Wpf/MainWindow.xaml @@ -1,7 +1,7 @@  diff --git a/CefSharp.MinimalExample.Wpf/Views/Main/MainViewModel.cs b/CefSharp.MinimalExample.Wpf/ViewModels/MainViewModel.cs similarity index 95% rename from CefSharp.MinimalExample.Wpf/Views/Main/MainViewModel.cs rename to CefSharp.MinimalExample.Wpf/ViewModels/MainViewModel.cs index 86cb910..74e99cd 100644 --- a/CefSharp.MinimalExample.Wpf/Views/Main/MainViewModel.cs +++ b/CefSharp.MinimalExample.Wpf/ViewModels/MainViewModel.cs @@ -3,7 +3,7 @@ using CefSharp.Wpf; using System.ComponentModel; using System.Windows; -namespace CefSharp.MinimalExample.Wpf.Views.Main +namespace CefSharp.MinimalExample.Wpf.ViewModels { public class MainViewModel { diff --git a/CefSharp.MinimalExample.Wpf/Views/Main/MainView.xaml b/CefSharp.MinimalExample.Wpf/Views/MainView.xaml similarity index 94% rename from CefSharp.MinimalExample.Wpf/Views/Main/MainView.xaml rename to CefSharp.MinimalExample.Wpf/Views/MainView.xaml index 4d443a4..f376536 100644 --- a/CefSharp.MinimalExample.Wpf/Views/Main/MainView.xaml +++ b/CefSharp.MinimalExample.Wpf/Views/MainView.xaml @@ -1,4 +1,4 @@ -