Skip to content

Commit 29ff5e5

Browse files
authored
Pm - files and folders counter - UI improvements (#15359)
1 parent b78b90e commit 29ff5e5

10 files changed

+452
-234
lines changed

src/DynamoCore/Properties/Resources.Designer.cs

+23-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/DynamoCore/Properties/Resources.en-US.resx

+7-1
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,12 @@ Parameter name: {0}</value>
740740
<value>The current user, '{0}', is not a maintainer of the package '{1}'.</value>
741741
<comment>{0} = user name (i.e. 'DynamoTeam'), {1} = package name (i.e. 'Clockwork for Dynamo 1.x')</comment>
742742
</data>
743+
<data name="PackageManagerPackagePreviewCounter" xml:space="preserve">
744+
<value>{0} files and {1} folders will be created.</value>
745+
</data>
746+
<data name="PackageManagerPackageSelectCounter" xml:space="preserve">
747+
<value>{0} files and {1} folders loaded.</value>
748+
</data>
743749
<data name="DuplicatedOlderPackage" xml:space="preserve">
744750
<value>An older version of the package called {0} version {2} was found at {1} with version {3}. The older version has been ignored.</value>
745751
</data>
@@ -914,4 +920,4 @@ This package likely contains an assembly that is blocked. You will need to load
914920
<data name="InputNodeRenameHint" xml:space="preserve">
915921
<value>default input name, rename me!</value>
916922
</data>
917-
</root>
923+
</root>

src/DynamoCore/Properties/Resources.resx

+7-1
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,12 @@ Parameter name: {0}</value>
742742
<value>The current user, '{0}', is not a maintainer of the package '{1}'.</value>
743743
<comment>{0} = user name (i.e. 'DynamoTeam'), {1} = package name (i.e. 'Clockwork for Dynamo 1.x')</comment>
744744
</data>
745+
<data name="PackageManagerPackagePreviewCounter" xml:space="preserve">
746+
<value>{0} files and {1} folders will be created.</value>
747+
</data>
748+
<data name="PackageManagerPackageSelectCounter" xml:space="preserve">
749+
<value>{0} files and {1} folders loaded.</value>
750+
</data>
745751
<data name="DuplicatedOlderPackage" xml:space="preserve">
746752
<value>An older version of the package called {0} version {2} was found at {1} with version {3}. The older version has been ignored.</value>
747753
</data>
@@ -917,4 +923,4 @@ This package likely contains an assembly that is blocked. You will need to load
917923
<data name="InputNodeRenameHint" xml:space="preserve">
918924
<value>default input name, rename me!</value>
919925
</data>
920-
</root>
926+
</root>

src/DynamoCore/PublicAPI.Unshipped.txt

+2
Original file line numberDiff line numberDiff line change
@@ -2894,6 +2894,8 @@ static Dynamo.Properties.Resources.OutputPortAlternativeName.get -> string
28942894
static Dynamo.Properties.Resources.PackageEmpty.get -> string
28952895
static Dynamo.Properties.Resources.PackageLoadFailureForBlockedAssembly.get -> string
28962896
static Dynamo.Properties.Resources.PackageManagerPackageAlreadyExists.get -> string
2897+
static Dynamo.Properties.Resources.PackageManagerPackagePreviewCounter.get -> string
2898+
static Dynamo.Properties.Resources.PackageManagerPackageSelectCounter.get -> string
28972899
static Dynamo.Properties.Resources.PackageManagerUserIsNotAMaintainer.get -> string
28982900
static Dynamo.Properties.Resources.PackageStateError.get -> string
28992901
static Dynamo.Properties.Resources.PackageStateErrorTooltip.get -> string

src/DynamoCoreWpf/PublicAPI.Unshipped.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,10 @@ Dynamo.PackageManager.UI.PackageNameLengthValidationRule
12491249
Dynamo.PackageManager.UI.PackageNameLengthValidationRule.PackageNameLengthValidationRule() -> void
12501250
Dynamo.PackageManager.UI.PublishPackagePreviewPage
12511251
Dynamo.PackageManager.UI.PublishPackagePreviewPage.Dispose() -> void
1252+
Dynamo.PackageManager.UI.PublishPackagePreviewPage.FilesAndFoldersCounterPreview.get -> string
1253+
Dynamo.PackageManager.UI.PublishPackagePreviewPage.FilesAndFoldersCounterPreview.set -> void
12521254
Dynamo.PackageManager.UI.PublishPackagePreviewPage.InitializeComponent() -> void
1255+
Dynamo.PackageManager.UI.PublishPackagePreviewPage.PropertyChanged -> System.ComponentModel.PropertyChangedEventHandler
12531256
Dynamo.PackageManager.UI.PublishPackagePreviewPage.PublishPackagePreviewPage() -> void
12541257
Dynamo.PackageManager.UI.PublishPackagePublishPage
12551258
Dynamo.PackageManager.UI.PublishPackagePublishPage.Dispose() -> void
@@ -1260,6 +1263,8 @@ Dynamo.PackageManager.UI.PublishPackageSelectPage
12601263
Dynamo.PackageManager.UI.PublishPackageSelectPage.AllItemsSelected.get -> bool
12611264
Dynamo.PackageManager.UI.PublishPackageSelectPage.AllItemsSelected.set -> void
12621265
Dynamo.PackageManager.UI.PublishPackageSelectPage.Dispose() -> void
1266+
Dynamo.PackageManager.UI.PublishPackageSelectPage.FilesAndFoldersCounterPreview.get -> string
1267+
Dynamo.PackageManager.UI.PublishPackageSelectPage.FilesAndFoldersCounterPreview.set -> void
12631268
Dynamo.PackageManager.UI.PublishPackageSelectPage.InitializeComponent() -> void
12641269
Dynamo.PackageManager.UI.PublishPackageSelectPage.ItemSelection.get -> System.Collections.ObjectModel.ObservableCollection<Dynamo.PackageManager.UI.PackageItemRootViewModel>
12651270
Dynamo.PackageManager.UI.PublishPackageSelectPage.ItemSelection.set -> void
@@ -5623,6 +5628,7 @@ virtual Dynamo.Controls.IntegerDisplay.Convert(object value, System.Type targetT
56235628
virtual Dynamo.Controls.IntegerDisplay.ConvertBack(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object
56245629
virtual Dynamo.PackageManager.PackageManagerSearchViewModel.OnRequestShowFileDialog(object sender, Dynamo.ViewModels.PackagePathEventArgs e) -> void
56255630
virtual Dynamo.PackageManager.PublishPackageViewModel.OnRequestShowFileDialog(object sender, Dynamo.ViewModels.PackagePathEventArgs e) -> void
5631+
virtual Dynamo.PackageManager.UI.PublishPackagePreviewPage.RaisePropertyChanged(string propertyName) -> void
56265632
virtual Dynamo.PackageManager.UI.PublishPackageSelectPage.RaisePropertyChanged(string propertyName) -> void
56275633
virtual Dynamo.PackageManager.ViewModels.PackageManagerSearchElementViewModel.OnRequestShowFileDialog(object sender, Dynamo.ViewModels.PackagePathEventArgs e) -> void
56285634
virtual Dynamo.UI.Controls.CodeCompletionEditor.OnCommitChange() -> void

src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageFinishPage.xaml.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ internal void LoadEvents()
3030

3131
var uploadType = PublishPackageViewModel.UploadType;
3232
var publishedFiles = PackageItemRootViewModel.GetFiles(PublishPackageViewModel.PackageContents.ToList());
33-
var count = publishedFiles.Count(x => x.DependencyType != DependencyType.Folder);
33+
var count = publishedFiles.Count(x => x.DependencyType != DependencyType.Folder
34+
|| x.DependencyType != DependencyType.CustomNodePreview);
3435
var message = uploadType.Equals(PackageUploadHandle.UploadType.Local) ?
3536
Dynamo.Wpf.Properties.Resources.PackageManagerFinishedPackageFilesPublishedMessage :
3637
Dynamo.Wpf.Properties.Resources.PackageManagerFinishedPackageFilesUploadedMessage;

0 commit comments

Comments
 (0)