Skip to content

Commit 58f34e4

Browse files
authored
[DYN-5087] Update package details view to include all info (#14851)
* Fix PostDiff job * Update ShortcutToolbar.xaml.cs * Add details * Revert "Update ShortcutToolbar.xaml.cs" This reverts commit 0a671b2. * Update ShortcutToolbar.xaml.cs
1 parent b8d7aaf commit 58f34e4

File tree

8 files changed

+257
-68
lines changed

8 files changed

+257
-68
lines changed

src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public ShortcutToolbar(DynamoViewModel dynamoViewModel)
6161
authManager.LoginStateChanged += AuthChangeHandler;
6262
if (authManager.LoginState == LoginState.LoggedIn)
6363
{
64-
if(loginMenu.Items.Count == 0)
64+
if (loginMenu.Items.Count == 0)
6565
{
6666
loginMenu.Items.Add(logoutOption);
6767
}

src/DynamoCoreWpf/Properties/Resources.Designer.cs

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3885,7 +3885,19 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
38853885
<data name="SignOutConfirmationDialogTitle" xml:space="preserve">
38863886
<value>Sign out of Dynamo</value>
38873887
</data>
3888+
<data name="PackageDetailsGroup" xml:space="preserve">
3889+
<value>GROUP</value>
3890+
</data>
3891+
<data name="PackageDetailsKeywords" xml:space="preserve">
3892+
<value>KEYWORDS</value>
3893+
</data>
3894+
<data name="PackageDetailsSize" xml:space="preserve">
3895+
<value>Size</value>
3896+
</data>
3897+
<data name="PackageDetailsLinks" xml:space="preserve">
3898+
<value>LINKS</value>
3899+
</data>
38883900
<data name="ResetChangesWarningPopupMessage" xml:space="preserve">
38893901
<value>Your changes will be lost if you proceed.</value>
38903902
</data>
3891-
</root>
3903+
</root>

src/DynamoCoreWpf/Properties/Resources.resx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3872,6 +3872,18 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
38723872
<data name="SignOutConfirmationDialogTitle" xml:space="preserve">
38733873
<value>Sign out of Dynamo</value>
38743874
</data>
3875+
<data name="PackageDetailsGroup" xml:space="preserve">
3876+
<value>GROUP</value>
3877+
</data>
3878+
<data name="PackageDetailsKeywords" xml:space="preserve">
3879+
<value>KEYWORDS</value>
3880+
</data>
3881+
<data name="PackageDetailsSize" xml:space="preserve">
3882+
<value>Size</value>
3883+
</data>
3884+
<data name="PackageDetailsLinks" xml:space="preserve">
3885+
<value>LINKS</value>
3886+
</data>
38753887
<data name="ResetChangesWarningPopupMessage" xml:space="preserve">
38763888
<value>Your changes will be lost if you proceed.</value>
38773889
</data>

src/DynamoCoreWpf/UI/Converters.cs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2076,6 +2076,53 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
20762076
}
20772077
}
20782078

2079+
public class CopyrightInfoTooltipConverter : IMultiValueConverter
2080+
{
2081+
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
2082+
{
2083+
if (values[0] == DependencyProperty.UnsetValue || values[1] == DependencyProperty.UnsetValue)
2084+
{
2085+
return null;
2086+
}
2087+
if (values != null && values.Count() > 0)
2088+
{
2089+
var cph = string.IsNullOrEmpty((string)values[0]) ? "N/A" : (string)values[0];
2090+
var cpy = string.IsNullOrEmpty((string)values[1]) ? "N/A" : (string)values[1];
2091+
var tooltip = Resources.PackageDetailsCopyRightHolder + ": " + cph + Environment.NewLine +
2092+
Resources.PackageDetailsCopyRightYear + ": " + cpy;
2093+
return tooltip;
2094+
}
2095+
return "";
2096+
}
2097+
2098+
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
2099+
{
2100+
throw new NotImplementedException();
2101+
}
2102+
}
2103+
2104+
public class PackageDetailsLinkCollapseOnEmpty : IMultiValueConverter
2105+
{
2106+
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
2107+
{
2108+
if (values[0] == DependencyProperty.UnsetValue || values[1] == DependencyProperty.UnsetValue)
2109+
{
2110+
return null;
2111+
}
2112+
if (values != null && values.Count() > 0)
2113+
{
2114+
if (!string.IsNullOrEmpty((string)values[0]) || !string.IsNullOrEmpty((string)values[1]))
2115+
return Visibility.Visible; ;
2116+
}
2117+
return Visibility.Collapsed;
2118+
}
2119+
2120+
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
2121+
{
2122+
throw new NotImplementedException();
2123+
}
2124+
}
2125+
20792126
public sealed class WarningLevelToColorConverter : IValueConverter
20802127
{
20812128
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)

src/PackageDetailsViewExtension/PackageDetailItem.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class PackageDetailItem : NotificationObject
2525
private bool canInstall;
2626
private bool isEnabledForInstall;
2727
private string packageName;
28+
private string packageSize;
2829
private PackageLoader PackageLoader { get; }
2930

3031
#endregion
@@ -135,6 +136,20 @@ public List<string> Packages
135136
}
136137
}
137138

139+
/// <summary>
140+
/// The size of the current package version.
141+
/// //TODO: Point this property to the package version size after it has been added to the db.
142+
/// </summary>
143+
public string PackageSize
144+
{
145+
get => packageSize;
146+
set
147+
{
148+
packageSize = value;
149+
RaisePropertyChanged(nameof(PackageSize));
150+
}
151+
}
152+
138153
/// <summary>
139154
/// Returs true if package version is not already installed,
140155
/// false if already installed.
@@ -181,6 +196,8 @@ public PackageDetailItem(string packageName, PackageVersion packageVersion, bool
181196
this.CopyRightYear = PackageVersion.copyright_year;
182197
this.CanInstall = canInstall;
183198
this.IsEnabledForInstall = isEnabledForInstall && canInstall;
199+
//TODO: point this property to the package version size after it has been added to the db.
200+
this.PackageSize = Dynamo.Properties.Resources.NoneString;
184201

185202

186203
// To avoid displaying package self-dependencies.

0 commit comments

Comments
 (0)