From dd7cfaea00a30a38bbcb453fcdeb272c6791fb5d Mon Sep 17 00:00:00 2001 From: Yishan Zhao Date: Fri, 25 Sep 2020 23:27:50 -0400 Subject: [PATCH] Corresponding changes --- .../ViewModels/MainPageViewModel.cs | 4 ++-- .../Views/AdvancedView.xaml | 18 +++++++++++++++--- UIEngine.Avalonia/Views/UIPanel.xaml | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CourseScheduler.Avalonia/ViewModels/MainPageViewModel.cs b/CourseScheduler.Avalonia/ViewModels/MainPageViewModel.cs index ed55081..49ad7b2 100644 --- a/CourseScheduler.Avalonia/ViewModels/MainPageViewModel.cs +++ b/CourseScheduler.Avalonia/ViewModels/MainPageViewModel.cs @@ -66,8 +66,8 @@ public MainPageViewModel() }; #if DEBUG - AddCourseToCourseSetAndCache("cmsc216"); - AddCourseToCourseSetAndCache("cmsc430"); + //AddCourseToCourseSetAndCache("cmsc216"); + //AddCourseToCourseSetAndCache("cmsc430"); #endif } diff --git a/CourseScheduler.Avalonia/Views/AdvancedView.xaml b/CourseScheduler.Avalonia/Views/AdvancedView.xaml index 643b596..20c1103 100644 --- a/CourseScheduler.Avalonia/Views/AdvancedView.xaml +++ b/CourseScheduler.Avalonia/Views/AdvancedView.xaml @@ -5,7 +5,19 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:box="clr-namespace:UIEngine.Avalonia.Views;assembly=UIEngine.Avalonia" x:Class="CourseScheduler.Avalonia.Views.AdvancedView"> - - - + + + + + + + diff --git a/UIEngine.Avalonia/Views/UIPanel.xaml b/UIEngine.Avalonia/Views/UIPanel.xaml index 12507df..2a87170 100644 --- a/UIEngine.Avalonia/Views/UIPanel.xaml +++ b/UIEngine.Avalonia/Views/UIPanel.xaml @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:local="clr-namespace:Avalonia.UIEngine.Views;assembly=Avalonia.UIEngine" + xmlns:local="clr-namespace:UIEngine.Avalonia.Views;assembly=UIEngine.Avalonia" xmlns:node="clr-namespace:UIEngine.Nodes;assembly=UIEngine" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Avalonia.UIEngine.Views.UIPanel" Name="Me">