tentative numero 2 pour repair la navbar

la navbar ne fonctionne toujours pas jpp
ABCraft19 · Aug 25, 2024 · 2b24884 · 2b24884
1 parent 6de601f
commit 2b24884
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -33,12 +33,12 @@
       FontWeight="DemiBold" />
             </ui:NavigationView.Header>
             <ui:NavigationView.MenuItems>
-                <ui:NavigationViewItem Content="Dashboard" TargetPageType="{x:Type pages:DashWindow}">
+                <ui:NavigationViewItem Content="Dashboard">
                     <ui:NavigationViewItem.Icon>
                         <ui:SymbolIcon Symbol="Home24" />
                     </ui:NavigationViewItem.Icon>
                 </ui:NavigationViewItem>
-                <ui:NavigationViewItem Content="Installer" TargetPageType="{x:Type pages:Installation}">
+                <ui:NavigationViewItem Content="Installer">
                     <ui:NavigationViewItem.Icon>
                         <ui:SymbolIcon Symbol="DataHistogram24" />
                     </ui:NavigationViewItem.Icon>

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -6,12 +6,12 @@ namespace MultiTools
 {
     public partial class MainWindow : Window
     {
-        public MainWindow()
+        public MainWindow(NavigationPageModel model)
         {
-            InitializeComponent(NavigationPageModel model);
+            InitializeComponent();
 
             DataContext = model;
-            Loaded += (_, _) => Dash.Navigate(type(MyDashboardClass));
+            Loaded += (_, _) => Dash.Navigate(typeof(DashWindow));
             // Ensure navigationView (Dash) is properly initialized before attaching the event handler
             this.Loaded += (s, e) =>
             {
@@ -42,8 +42,5 @@ private void OnNavigationViewSelectionChanged(object sender, RoutedEventArgs e)
                 }
             }
         }
-
-        // Remove this property as it is not needed
-        // public NavigationView navigationView { get; set; }
     }
 }
diff --git a/MultiTools.csproj b/MultiTools.csproj
@@ -10,6 +10,13 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="NewFolder\**" />
+    <EmbeddedResource Remove="NewFolder\**" />
+    <None Remove="NewFolder\**" />
+    <Page Remove="NewFolder\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="multi-tools.ico" />
   </ItemGroup>
@@ -30,8 +37,4 @@
     <Resource Include="Assets\wpfui-icon-1024.png" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="NewFolder\" />
-  </ItemGroup>
-
 </Project>
diff --git a/Pages/installation.xaml b/Pages/installation.xaml
@@ -1,5 +1,5 @@
 <Window
-    x:Class="MultiTools.Pages.InstallationWindow"
+    x:Class="MultiTools.Pages.Installation.InstallationWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

diff --git a/Pages/installation.xaml.cs b/Pages/installation.xaml.cs
@@ -20,6 +20,10 @@ public void Install()
 
     public partial class InstallationWindow : Window
     {
+        public InstallationWindow()
+        {
+            InitializeComponent();
+        }
 
         public void Button_PopupWebcam_Click(object sender, RoutedEventArgs e)
         {