Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherrypicks DYN-7778, DYN-7821 #15646

Merged
merged 4 commits into from
Nov 14, 2024
Merged

Cherrypicks DYN-7778, DYN-7821 #15646

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fe447c
DYN-7778 Package details compatible version tooltip (#15640)
reddyashish Nov 13, 2024
6cfc9b8
DYN-7778 Update message based on new suggestion (#15648)
reddyashish Nov 13, 2024
0e18426
DYN-7821:changed compatibility calculation algorithm (#15644)
dnenov Nov 13, 2024
eeeb244
Updated signed tuneup binaries (#15645)
reddyashish Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4102,4 +4102,7 @@ To make this file into a new template, save it to a different folder, then move
<data name="PackageIncompatibleFilterTooltip" xml:space="preserve">
<value>Versions maybe incompatible with the current setup</value>
</data>
<data name="PackageVersionTooltip" xml:space="preserve">
<value>Versions marked with .x include all versions in the specified major release</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4089,4 +4089,7 @@ To make this file into a new template, save it to a different folder, then move
<data name="PackageIncompatibleFilterTooltip" xml:space="preserve">
<value>Versions maybe incompatible with the current setup</value>
</data>
<data name="PackageVersionTooltip" xml:space="preserve">
<value>Versions marked with .x include all versions in the specified major release</value>
</data>
</root>
1 change: 1 addition & 0 deletions src/DynamoCoreWpf/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5388,6 +5388,7 @@ static Dynamo.Wpf.Properties.Resources.PublishPackageViewPackageHostDependencyTo
static Dynamo.Wpf.Properties.Resources.PublishPackageViewPackageKeywords.get -> string
static Dynamo.Wpf.Properties.Resources.PublishPackageViewPackageKeywordsTooltip.get -> string
static Dynamo.Wpf.Properties.Resources.PublishPackageViewPackageName.get -> string
static Dynamo.Wpf.Properties.Resources.PackageVersionTooltip.get -> string
static Dynamo.Wpf.Properties.Resources.PublishPackageViewPackageNameTooltip.get -> string
static Dynamo.Wpf.Properties.Resources.PublishPackageViewPackageNameWatermark.get -> string
static Dynamo.Wpf.Properties.Resources.PublishPackageViewPackageVersion.get -> string
Expand Down
29 changes: 23 additions & 6 deletions src/PackageDetailsViewExtension/PackageDetailsView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@
<Binding Path="CopyRightHolder" />
<Binding Path="CopyRightYear" />
</MultiBinding>
</ToolTip.Content>
</ToolTip.Content>
</ToolTip>
</Viewbox.ToolTip>
</Viewbox>
Expand Down Expand Up @@ -733,25 +733,42 @@
FontFamily="{StaticResource ArtifaktElementRegular}"
Foreground="#ffffff"
HeadersVisibility="Column"
IsHitTestVisible="False"
IsHitTestVisible="True"
IsReadOnly="True"
IsSynchronizedWithCurrentItem="True"
ItemsSource="{Binding VersionInformation}"
PreviewMouseDown="DataGrid_PreviewMouseDown"
RowBackground="{StaticResource PMDataGridBackgroundColorBrush}"
RowDetailsVisibilityMode="Collapsed"
ScrollViewer.CanContentScroll="True"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Auto"
Style="{StaticResource DataGridStyle1}"
ToolTipService.IsEnabled="True"
VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.VirtualizationMode="Recycling">
<DataGrid.Columns>
<DataGridTextColumn Width="*"
Binding="{Binding CompatibilityName}"
Header="" />
<DataGridTextColumn Width="3*"
Binding="{Binding Versions, Converter={StaticResource VersionStringAsteriskToXConverter}}"
Header="{x:Static p:Resources.PublishPackageViewPackageVersion}" />
Header="{x:Static p:Resources.PublishPackageViewPackageName}" />
<DataGridTextColumn Width="3*" Binding="{Binding Versions, Converter={StaticResource VersionStringAsteriskToXConverter}}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<StackPanel VerticalAlignment="Center" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="{x:Static p:Resources.PublishPackageViewPackageVersion}" />
<Image Width="14"
Height="14"
Margin="10,0,0,0"
VerticalAlignment="Center"
Source="pack://application:,,,/DynamoCoreWpf;component/UI/Images/whiteinfotab.png">
<Image.ToolTip>
<ToolTip Content="{x:Static p:Resources.PackageVersionTooltip}" />
</Image.ToolTip>
</Image>
</StackPanel>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
</StackPanel>
Expand Down
6 changes: 6 additions & 0 deletions src/PackageDetailsViewExtension/PackageDetailsView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ private void CloseButton_OnClick(object sender, RoutedEventArgs e)
{
Closed?.Invoke(this, EventArgs.Empty);
}

// Disables DataGrid interactions on mousedown (selection)
private void DataGrid_PreviewMouseDown(object sender, MouseButtonEventArgs e)
{
e.Handled = true;
}
}

}
Loading