diff --git a/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj b/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj index cb7c3c77..81729d70 100644 --- a/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj +++ b/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj @@ -128,7 +128,6 @@ - @@ -183,10 +182,6 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - Designer MSBuild:Compile diff --git a/Dapplo.CaliburnMicro.Demo/Startup.cs b/Dapplo.CaliburnMicro.Demo/Startup.cs index 05c406e2..3e694f80 100644 --- a/Dapplo.CaliburnMicro.Demo/Startup.cs +++ b/Dapplo.CaliburnMicro.Demo/Startup.cs @@ -26,8 +26,10 @@ #region Usings using System; +using System.ComponentModel.Composition; using System.Diagnostics; using System.Windows; +using Dapplo.CaliburnMicro.Metro; using Dapplo.Log.Facade; using Dapplo.Log.Loggers; @@ -38,8 +40,17 @@ namespace Dapplo.CaliburnMicro.Demo /// /// This takes care or starting the Application /// + [Export] public class Startup { + /// + /// Example to show how to change the theme, change the following 2 values + /// + [Export] + public Themes Theme { get; } = Themes.BaseLight; + [Export] + public ThemeAccents ThemeAccent { get; } = ThemeAccents.Orange; + /// /// Start the application /// diff --git a/Dapplo.CaliburnMicro.Demo/ViewModels/CredentialsViewModel.cs b/Dapplo.CaliburnMicro.Demo/ViewModels/CredentialsViewModel.cs index 38745b7e..b0c17ce2 100644 --- a/Dapplo.CaliburnMicro.Demo/ViewModels/CredentialsViewModel.cs +++ b/Dapplo.CaliburnMicro.Demo/ViewModels/CredentialsViewModel.cs @@ -53,9 +53,6 @@ public class CredentialsViewModel : Screen [Import] public ICredentialsTranslations CredentialsTranslations { get; set; } - [Import] - public DummyViewModel DummyVm { get; set; } - /// /// Password for a login /// diff --git a/Dapplo.CaliburnMicro.Demo/ViewModels/DummyViewModel.cs b/Dapplo.CaliburnMicro.Demo/ViewModels/DummyViewModel.cs deleted file mode 100644 index 8dc5e97b..00000000 --- a/Dapplo.CaliburnMicro.Demo/ViewModels/DummyViewModel.cs +++ /dev/null @@ -1,39 +0,0 @@ -#region Dapplo 2016 - GNU Lesser General Public License - -// Dapplo - building blocks for .NET applications -// Copyright (C) 2016 Dapplo -// -// For more information see: http://dapplo.net/ -// Dapplo repositories are hosted on GitHub: https://github.com/dapplo -// -// This file is part of Dapplo.CaliburnMicro -// -// Dapplo.CaliburnMicro is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Dapplo.CaliburnMicro is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have a copy of the GNU Lesser General Public License -// along with Dapplo.CaliburnMicro. If not, see . - -#endregion - -#region Usings - -using System.ComponentModel.Composition; -using Caliburn.Micro; - -#endregion - -namespace Dapplo.CaliburnMicro.Demo.ViewModels -{ - [Export] - public class DummyViewModel : Screen - { - } -} \ No newline at end of file diff --git a/Dapplo.CaliburnMicro.Demo/Views/CredentialsView.xaml b/Dapplo.CaliburnMicro.Demo/Views/CredentialsView.xaml index 97a52439..1963a5e1 100644 --- a/Dapplo.CaliburnMicro.Demo/Views/CredentialsView.xaml +++ b/Dapplo.CaliburnMicro.Demo/Views/CredentialsView.xaml @@ -18,6 +18,5 @@