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.

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

pm-update-ui-cherrypick #14704

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 15 additions & 9 deletions src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,12 @@
GroupName="PackageFilters"
IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
Style="{StaticResource {x:Type ToggleButton}}"
FontSize="10"
FontSize="11"
FontFamily="Artifakt Element"
FontWeight="Medium"
HorizontalAlignment="Center"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
BorderThickness="1"
BorderBrush="Transparent"
UseLayoutRounding="True"
Expand Down Expand Up @@ -121,7 +123,7 @@
</TextBlock>
<TextBlock Text="{Binding Path=Model.VersionName}"
MinWidth="70"
FontSize="11"
FontSize="12"
VerticalAlignment="Center"
Foreground="{StaticResource PreferencesWindowFontColor}"></TextBlock>

Expand Down Expand Up @@ -255,7 +257,8 @@
<DataTemplate>
<TextBlock Text="{Binding Path=Name}"
Foreground="{StaticResource PreferencesWindowFontColor}"
FontSize="9"
FontSize="11"
FontWeight="Regular"
TextTrimming="CharacterEllipsis" />
</DataTemplate>
</ItemsControl.ItemTemplate>
Expand All @@ -279,7 +282,8 @@
<TextBlock Name="Label"
Text="{Binding Path=Name}"
Foreground="{StaticResource PreferencesWindowFontColor}"
FontSize="9"
FontSize="11"
FontWeight="Regular"
TextTrimming="CharacterEllipsis" />

<DataTemplate.Triggers>
Expand Down Expand Up @@ -312,7 +316,8 @@
<TextBlock Name="Label"
Text="{Binding Path=Name}"
Foreground="{StaticResource PreferencesWindowFontColor}"
FontSize="9"
FontSize="11"
FontWeight="Regular"
TextTrimming="CharacterEllipsis" />

<DataTemplate.Triggers>
Expand All @@ -334,7 +339,7 @@
Margin="0,0,0,5">

<Label Content="{x:Static p:Resources.InstalledPackageViewAdditionalFileLabel}"
FontSize="11"
FontSize="12"
Padding="0,5,5,5"
Foreground="{StaticResource PreferencesWindowFontColor}"></Label>
<ItemsControl Name="AdditionalFiles"
Expand All @@ -344,9 +349,10 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=RelativePath}"
Foreground="{StaticResource PreferencesWindowFontColor}"
FontSize="9"
TextTrimming="CharacterEllipsis" />
Foreground="{StaticResource PreferencesWindowFontColor}"
FontSize="12"
FontWeight="Regular"
TextTrimming="CharacterEllipsis" />
</DataTemplate>
</ItemsControl.ItemTemplate>

Expand Down
9 changes: 9 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs

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
Original file line number Diff line number Diff line change
Expand Up @@ -3612,6 +3612,9 @@ You can manage this in Preferences -&gt; Security.</value>
<data name="PackageDeprecatedTooltip" xml:space="preserve">
<value>This package is outdated and cannot be installed.</value>
</data>
<data name="PackageManagerMyPackagesPublishVersion" xml:space="preserve">
<value>Publish Version</value>
</data>
<data name="SplashScreenViewExtensions" xml:space="preserve">
<value>Loading View Extensions...</value>
</data>
Expand Down
5 changes: 4 additions & 1 deletion src/DynamoCoreWpf/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -3599,6 +3599,9 @@ You can manage this in Preferences -&gt; Security.</value>
<data name="PackageDeprecatedTooltip" xml:space="preserve">
<value>This package is outdated and cannot be installed.</value>
</data>
<data name="PackageManagerMyPackagesPublishVersion" xml:space="preserve">
<value>Publish Version</value>
</data>
<data name="SplashScreenViewExtensions" xml:space="preserve">
<value>Loading View Extensions...</value>
</data>
Expand Down Expand Up @@ -3842,4 +3845,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
<data name="NotificationToAgreeMLNodeautocompleteTOU" xml:space="preserve">
<value>To access the Recommended Nodes feature, please read and accept Dynamo &gt; Agreement and Terms of Use.</value>
</data>
</root>
</root>
19 changes: 14 additions & 5 deletions src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<Color x:Key="DefaultBorderBrushDarkColor">Black</Color>
<Color x:Key="GenericMouseOverBackgroundColor">#808080</Color>

<SolidColorBrush x:Key="BorderPressedColorBrush" Color="{DynamicResource BorderPressedColor}"/>
<SolidColorBrush x:Key="GenericBorderBackgroundColorBrush" Color="#3c3c3c"/>
<SolidColorBrush x:Key="GenericMouseOverBackgroundColorBrush" Color="{DynamicResource GenericMouseOverBackgroundColor}"/>

Expand Down Expand Up @@ -1022,7 +1023,7 @@
<Setter Property="CaretBrush" Value="{StaticResource PrimaryCharcoal200Brush}" />
<Setter Property="Padding" Value="10,12,10,8"/>
<Setter Property="FontFamily" Value="{StaticResource ArtifaktElementRegular}"/>
<Setter Property="FontSize" Value="12px" />
<Setter Property="FontSize" Value="14px" />
<Setter Property="Foreground" Value="{StaticResource PrimaryCharcoal200Brush}"/>
<Setter Property="TextWrapping" Value="Wrap"/>

Expand Down Expand Up @@ -3421,11 +3422,19 @@
<Setter.Value>
<ControlTemplate TargetType="Button">
<Grid>
<Image Name="menuIcon" Width="16" Height="16" Source="pack://application:,,,/DynamoCoreWpf;component/UI/Images/menu_16_16.png"/>
<Border Width="16" Height="16" Background="Transparent" BorderThickness="0">
<Path Name="menuIcon"
Width="16"
Height="16"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Fill="{DynamicResource MidGreyBrush}"
Data="M7.5 3C8.32843 3 9 2.32843 9 1.5C9 0.671573 8.32843 0 7.5 0C6.67157 0 6 0.671573 6 1.5C6 2.32843 6.67157 3 7.5 3ZM7.5 9C8.32843 9 9 8.32843 9 7.5C9 6.67157 8.32843 6 7.5 6C6.67157 6 6 6.67157 6 7.5C6 8.32843 6.67157 9 7.5 9ZM9 13.5C9 14.3284 8.32843 15 7.5 15C6.67157 15 6 14.3284 6 13.5C6 12.6716 6.67157 12 7.5 12C8.32843 12 9 12.6716 9 13.5Z"/>
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="menuIcon" Property="Source" Value="pack://application:,,,/DynamoCoreWpf;component/UI/Images/menu-hover-16px.png" />
<Setter TargetName="menuIcon" Property="Fill" Value="{DynamicResource BorderPressedColorBrush}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value=".5" />
Expand All @@ -3434,7 +3443,7 @@
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</Style>

<Style x:Key="CtaButtonStyle" TargetType="Button">
<Setter Property="HorizontalAlignment" Value="Right" />
Expand Down Expand Up @@ -4242,7 +4251,7 @@

<Style x:Key="PackageManagerTab" TargetType="{x:Type TabItem}">
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="FontSize" Value="15" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TabItem}">
Expand Down
Loading
Loading