From 0304338dfe5cb5e2a24ddbde3d4c3003f81e51f9 Mon Sep 17 00:00:00 2001 From: Deyan Nenov Date: Sat, 4 Nov 2023 05:55:11 +0000 Subject: [PATCH 01/73] single New Package Download Path (#14559) * single New Package Download Path - just shows the currently selected package download path * null check, typos --------- Co-authored-by: Aaron (Qilong) <173288704@qq.com> --- .../PackageManager/PackageManagerViewModel.cs | 10 +++++-- .../PackageManager/PackageManagerView.xaml | 27 +++++++++++++------ 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs index 6844339f966..b5cf8ca24d8 100644 --- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs @@ -1,7 +1,7 @@ -using Dynamo.Controls; +using System; +using System.Collections.ObjectModel; using Dynamo.ViewModels; using NotificationObject = Dynamo.Core.NotificationObject; -using System.Collections.ObjectModel; namespace Dynamo.PackageManager { @@ -53,6 +53,12 @@ public PackageManagerViewModel(DynamoViewModel dynamoViewModel, PackageManagerSe PkgSearchVM.RegisterTransientHandlers(); LocalPackages.CollectionChanged += LocalPackages_CollectionChanged; + + // We are forced to make the update ourselves if the Preferences ViewModel has not been initialized yet + if (String.IsNullOrEmpty(PreferencesViewModel?.SelectedPackagePathForInstall)) + { + PreferencesViewModel.SelectedPackagePathForInstall = dynamoViewModel.PreferenceSettings.SelectedPackagePathForInstall; + } } private void LocalPackages_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml index 239bed5d29e..91e5ed4e768 100644 --- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml +++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml @@ -33,6 +33,18 @@ + - @@ -485,7 +472,7 @@ @@ -92,21 +97,20 @@ ItemsPresenter can't be wider then visible part of the window.--> + IsExpanded="{Binding Path=Model.TypesVisibleInManager}" + Style="{StaticResource InstalledPackagesExpanderStyle}"> - + + + + - + MaxWidth="150" + Margin="10 0"> + @@ -133,14 +142,13 @@ TextTrimming="CharacterEllipsis" FontSize="10" FontFamily="Artifakt Element" + FontWeight="Medium" TextAlignment="Left" HorizontalAlignment="Center" - Margin="0,3,0,0" - Foreground="{StaticResource PrimaryCharcoal100Brush}"/> + Margin="0,2,0,0" + Foreground="{StaticResource PackageManagerTabBackgroundColor}"/> - -