diff --git a/DynamicMenu/App.xaml b/DynamicMenu/App.xaml index bdf3bb5..f1a96f9 100644 --- a/DynamicMenu/App.xaml +++ b/DynamicMenu/App.xaml @@ -1,8 +1,8 @@ - + xmlns:local="clr-namespace:DynamicMenu"> diff --git a/DynamicMenu/App.xaml.cs b/DynamicMenu/App.xaml.cs index ef64b7a..68c101e 100644 --- a/DynamicMenu/App.xaml.cs +++ b/DynamicMenu/App.xaml.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; -namespace Company.WpfApplication1 +namespace DynamicMenu { /// /// Interaction logic for App.xaml diff --git a/DynamicMenu/Bootstrapper.cs b/DynamicMenu/Bootstrapper.cs index 670d57d..d1fb1e8 100644 --- a/DynamicMenu/Bootstrapper.cs +++ b/DynamicMenu/Bootstrapper.cs @@ -1,8 +1,8 @@ -using Company.WpfApplication1.Pages; +using DynamicMenu.Pages; using Stylet; using StyletIoC; -namespace Company.WpfApplication1 +namespace DynamicMenu { public class Bootstrapper : Bootstrapper { diff --git a/DynamicMenu/DynamicMenu.csproj b/DynamicMenu/DynamicMenu.csproj index 6786ddd..520e829 100644 --- a/DynamicMenu/DynamicMenu.csproj +++ b/DynamicMenu/DynamicMenu.csproj @@ -2,7 +2,7 @@ WinExe - netcoreapp3.0 + netcoreapp3.1 DynamicMenu true diff --git a/DynamicMenu/Models/MainMenuItem.cs b/DynamicMenu/Models/MainMenuItem.cs new file mode 100644 index 0000000..4d402fd --- /dev/null +++ b/DynamicMenu/Models/MainMenuItem.cs @@ -0,0 +1,15 @@ +using Stylet; +using System; +using System.Collections.Generic; +using System.Text; + +namespace DynamicMenu.Models +{ + public class MainMenuItem + { + public string Title { get; set; } + public string Description { get; set; } + public Screen ViewModel { get; set; } + public Action Method { get; set; } + } +} diff --git a/DynamicMenu/Pages/Function1ViewModel.cs b/DynamicMenu/Pages/Function1ViewModel.cs deleted file mode 100644 index 4d86d66..0000000 --- a/DynamicMenu/Pages/Function1ViewModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using Stylet; - -namespace DynamicMenu.Pages -{ - public class Function1ViewModel : Conductor.Collection.OneActive - { - } -} diff --git a/DynamicMenu/Pages/MainMenuView.xaml b/DynamicMenu/Pages/MainMenuView.xaml new file mode 100644 index 0000000..0619944 --- /dev/null +++ b/DynamicMenu/Pages/MainMenuView.xaml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + +