From 5c3474dc0ef522a87f0d678f57eddc236ff28aef Mon Sep 17 00:00:00 2001 From: Xjph Date: Wed, 4 Jan 2023 09:26:48 -0330 Subject: [PATCH] Initial overhaul work --- ObservatoryCore/UI/MainApplication.axaml | 4 +- .../UI/ViewModels/BasicUIViewModel.cs | 55 +++++++++++++++---- .../UI/ViewModels/CoreViewModel.cs | 12 ++-- ObservatoryCore/UI/Views/BasicUIView.axaml.cs | 35 ++++++++---- ObservatoryFramework/PluginUI.cs | 17 +++++- 5 files changed, 93 insertions(+), 30 deletions(-) diff --git a/ObservatoryCore/UI/MainApplication.axaml b/ObservatoryCore/UI/MainApplication.axaml index d83efaa..f5a24df 100644 --- a/ObservatoryCore/UI/MainApplication.axaml +++ b/ObservatoryCore/UI/MainApplication.axaml @@ -7,9 +7,9 @@ - + - + \ No newline at end of file diff --git a/ObservatoryCore/UI/ViewModels/BasicUIViewModel.cs b/ObservatoryCore/UI/ViewModels/BasicUIViewModel.cs index 3bfdf93..a2fd62c 100644 --- a/ObservatoryCore/UI/ViewModels/BasicUIViewModel.cs +++ b/ObservatoryCore/UI/ViewModels/BasicUIViewModel.cs @@ -9,38 +9,73 @@ using Observatory.UI.Models; using ReactiveUI; using System.Reactive.Linq; using Observatory.Framework; +using System.Collections.Specialized; namespace Observatory.UI.ViewModels { public class BasicUIViewModel : ViewModelBase { - private ObservableCollection basicUIGrid; + private ObservableCollection _headers; + private ObservableCollection _formats; + private ObservableCollection> _items; public System.Collections.IList SelectedItems { get; set; } - public ObservableCollection BasicUIGrid + + public ObservableCollection Headers { - get => basicUIGrid; + get => _headers; set { - basicUIGrid = value; - this.RaisePropertyChanged(nameof(BasicUIGrid)); + _headers = value; + _headers.CollectionChanged += (o, e) => this.RaisePropertyChanged(nameof(Headers)); + this.RaisePropertyChanged(nameof(Headers)); } } - public BasicUIViewModel(ObservableCollection BasicUIGrid) + public ObservableCollection Formats { - this.BasicUIGrid = BasicUIGrid; + get => _formats; + set + { + _formats = value; + _formats.CollectionChanged += (o, e) => this.RaisePropertyChanged(nameof(Formats)); + this.RaisePropertyChanged(nameof(Formats)); + } } - private PluginUI.UIType uiType; + public ObservableCollection> Items + { + get => _items; + set + { + void raiseItemChanged(object o, NotifyCollectionChangedEventArgs e) { this.RaisePropertyChanged(nameof(Items)); } + + _items = value; + _items.CollectionChanged += raiseItemChanged; + this.RaisePropertyChanged(nameof(Items)); + foreach (var itemColumn in value) + { + itemColumn.CollectionChanged += raiseItemChanged; + } + } + } + + + public BasicUIViewModel(ObservableCollection headers, ObservableCollection formats) + { + Headers = headers; + Formats = formats; + } + + private PluginUI.UIType _uiType; public PluginUI.UIType UIType { - get => uiType; + get => _uiType; set { - uiType = value; + _uiType = value; this.RaisePropertyChanged(nameof(UIType)); } } diff --git a/ObservatoryCore/UI/ViewModels/CoreViewModel.cs b/ObservatoryCore/UI/ViewModels/CoreViewModel.cs index e6027d6..dfd8557 100644 --- a/ObservatoryCore/UI/ViewModels/CoreViewModel.cs +++ b/ObservatoryCore/UI/ViewModels/CoreViewModel.cs @@ -47,8 +47,8 @@ namespace Observatory.UI.ViewModels foreach(var notifier in notifiers.Select(p => p.plugin)) { - Panel notifierPanel = new Panel(); - TextBlock notifierTextBlock = new TextBlock(); + Panel notifierPanel = new(); + TextBlock notifierTextBlock = new(); notifierTextBlock.Text = notifier.Name; notifierPanel.Children.Add(notifierTextBlock); //tabs.Add(new CoreModel() { Name = notifier.ShortName, UI = (ViewModelBase)notifier.UI }); @@ -65,7 +65,7 @@ namespace Observatory.UI.ViewModels } - public void ReadAll() + public static void ReadAll() { LogMonitor.GetInstance.ReadAllJournals(); } @@ -86,21 +86,21 @@ namespace Observatory.UI.ViewModels } } - public void OpenGithub() + public static void OpenGithub() { ProcessStartInfo githubOpen = new("https://github.com/Xjph/ObservatoryCore"); githubOpen.UseShellExecute = true; Process.Start(githubOpen); } - public void OpenDonate() + public static void OpenDonate() { ProcessStartInfo donateOpen = new("https://paypal.me/eliteobservatory"); donateOpen.UseShellExecute = true; Process.Start(donateOpen); } - public void GetUpdate() + public static void GetUpdate() { ProcessStartInfo githubOpen = new("https://github.com/Xjph/ObservatoryCore/releases"); githubOpen.UseShellExecute = true; diff --git a/ObservatoryCore/UI/Views/BasicUIView.axaml.cs b/ObservatoryCore/UI/Views/BasicUIView.axaml.cs index 3b9d239..403b61d 100644 --- a/ObservatoryCore/UI/Views/BasicUIView.axaml.cs +++ b/ObservatoryCore/UI/Views/BasicUIView.axaml.cs @@ -15,6 +15,7 @@ using Avalonia.Media; using Avalonia.Controls.ApplicationLifetimes; using System.Runtime.InteropServices; using System.IO; +using Avalonia.Platform.Storage; namespace Observatory.UI.Views { @@ -71,6 +72,7 @@ namespace Observatory.UI.Views e.Column.CanUserResize = true; e.Column.CanUserSort = true; } + private void UITypeChange() { var uiPanel = this.Find("UIPanel"); @@ -83,10 +85,9 @@ namespace Observatory.UI.Views case PluginUI.UIType.Basic: dataGrid = new() { - [!DataGrid.ItemsProperty] = new Binding("BasicUIGrid"), + [!DataGrid.ItemsProperty] = new Binding("Items"), SelectionMode = DataGridSelectionMode.Extended, GridLinesVisibility = DataGridGridLinesVisibility.Vertical, - AutoGenerateColumns = true, IsReadOnly = true }; dataGrid.AutoGeneratingColumn += ColumnGeneration; @@ -1028,21 +1029,33 @@ namespace Observatory.UI.Views settingBrowse.Click += (object source, RoutedEventArgs e) => { - OpenFileDialog openFileDialog = new() + var currentFolder = new Avalonia.Platform.Storage.FileIO.BclStorageFolder(fileSetting.DirectoryName); + var fileOptions = new FilePickerOpenOptions() { - Directory = fileSetting.DirectoryName, - AllowMultiple = false + AllowMultiple = false, + SuggestedStartLocation = currentFolder }; - var browseTask = openFileDialog.ShowAsync((Window)((Button)source).GetVisualRoot()); + + var browseTask = ((Window)settingBrowse.FindAncestorOfType()).StorageProvider.OpenFilePickerAsync(fileOptions); + + //OpenFileDialog openFileDialog = new() + //{ + // Directory = fileSetting.DirectoryName, + // AllowMultiple = false + //}; + + // = openFileDialog.ShowAsync((Window)((Button)source).GetVisualRoot()); + browseTask.ContinueWith((task) => { if (task.Result?.Count() > 0) { - string path = browseTask.Result[0]; - Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => { settingPath.Text = path; }); - setting.Key.SetValue(plugin.Settings, new FileInfo(path)); - PluginManagement.PluginManager.GetInstance.SaveSettings(plugin, plugin.Settings); - + if (browseTask.Result[0].TryGetUri(out Uri path)) + { + Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => { settingPath.Text = path.AbsolutePath; }); + setting.Key.SetValue(plugin.Settings, new FileInfo(path.AbsolutePath)); + PluginManagement.PluginManager.GetInstance.SaveSettings(plugin, plugin.Settings); + } } }); diff --git a/ObservatoryFramework/PluginUI.cs b/ObservatoryFramework/PluginUI.cs index e924fb7..0a8e718 100644 --- a/ObservatoryFramework/PluginUI.cs +++ b/ObservatoryFramework/PluginUI.cs @@ -23,11 +23,26 @@ namespace Observatory.Framework public object UI; /// - /// Collection bound to DataGrid used byu plugins with UIType.Basic. + /// Collection bound to DataGrid used by plugins with UIType.Basic. /// Objects in collection should be of a class defined within the plugin consisting of string properties.
Each object is a single row, and the property names are used as column headers. /// public ObservableCollection DataGrid; + /// + /// Collection bound to DataGrid headers used by plugins with UIType.Basic. + /// + public ObservableCollection Headers; + + /// + /// Collection used to specify formatting of items in respective columns. + /// + public ObservableCollection Formats; + + /// + /// Two-dimensional collection of items to display in UI grid. + /// + public ObservableCollection> Items; + /// /// Instantiate PluginUI of UIType.Basic. ///