Skip to content

Commit

Permalink
tooltips
Browse files Browse the repository at this point in the history 
- fixed tooltips and styles
  • Loading branch information
@dnenov
dnenov committed Nov 7, 2023
1 parent 88ed74a commit 0487df0
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 97 deletions.
12 changes: 10 additions & 2 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs
View file

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

8 changes: 5 additions & 3 deletions src/DynamoCoreWpf/Properties/Resources.en-US.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3191,12 +3191,14 @@ To install the latest version of a package, click Install. \n
<data name="PublishPackageViewNodeLibrary" xml:space="preserve">
<value>Node Library</value>
</data>
<data name="PublishPackageRetainFolderStructureTooltip" xml:space="preserve">
<data name="PublishPackageRetainFolderStructureTooltip" xml:space="preserve">
<value>When this setting is enabled, the folder structure of uploaded files will be retained. Otherwise, files will be placed into predefined folders.

Note: Incorrect folder structure may affect the functionality of packages that rely on the correct file organization. When in doubt, leave this setting off.
15 words or less that describe or define what the tool does.
Learn more</value>
</value>
</data>
<data name="PublishPackageNodeLibraryTooltip" xml:space="preserve">
<value>DLL file containing types and methods that Dynamo imports as nodes. Mark ZeroTouch, NodeModel, or NodeViewCustomization DLLs and types you want to import into Dynamo as node libraries.</value>
</data>
<data name="NodeTooltipRenamed" xml:space="preserve">
<value>Renamed from {0}</value>
Expand Down
6 changes: 4 additions & 2 deletions src/DynamoCoreWpf/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1716,8 +1716,10 @@ If the toggle is off custom packages that are not already loaded will load once
<value>When this setting is enabled, the folder structure of uploaded files will be retained. Otherwise, files will be placed into predefined folders.

Note: Incorrect folder structure may affect the functionality of packages that rely on the correct file organization. When in doubt, leave this setting off.
15 words or less that describe or define what the tool does.
Learn more</value>
</value>
</data>
<data name="PublishPackageNodeLibraryTooltip" xml:space="preserve">
<value>DLL file containing types and methods that Dynamo imports as nodes. Mark ZeroTouch, NodeModel, or NodeViewCustomization DLLs and types you want to import into Dynamo as node libraries.</value>
</data>
<data name="ShowClassicNodeLibrary" xml:space="preserve">
<value>Show Classic Node Library</value>
Expand Down
41 changes: 41 additions & 0 deletions src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6021,4 +6021,45 @@
</Setter.Value>
</Setter>
</Style>

<!-- Package Manager DataGrid Header style -->
<Style x:Key="DataGridColumnHeaderText" TargetType="DataGridColumnHeader">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="DataGridColumnHeader">
<Grid>
<TextBlock Name="DataGridColumnHeader"
Height="32"
Padding="10,7,10,0"
VerticalAlignment="Center"
Background="#434343"
FontFamily="{StaticResource ArtifaktElementRegular}"
FontSize="14px"
FontWeight="Regular"
Foreground="{StaticResource PrimaryCharcoal200Brush}"
Text="{TemplateBinding Content}" >
<TextBlock.ToolTip>
<ToolTip Content="{x:Static p:Resources.PublishPackageNodeLibraryTooltip}"
Style="{StaticResource GenericToolTipLight}" />
</TextBlock.ToolTip>
</TextBlock>
<Thumb x:Name="PART_RightHeaderGripper"
Width="1"
HorizontalAlignment="Right"
BorderBrush="Transparent"
BorderThickness="1,0,0,0"
Cursor="SizeWE" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver"
Value="True">
<Setter TargetName="DataGridColumnHeader"
Property="Background"
Value="#666666" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
30 changes: 21 additions & 9 deletions src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,18 +310,30 @@
Click="RemoveButton_Click"
Cursor="Hand">
<Button.ToolTip>
<ToolTip Content="{x:Static p:Resources.PublishPackageViewAddFileButtonTooltip}"
<ToolTip Content="{x:Static p:Resources.PublishPackageRemoveFromPacakgeTooltip}"
Style="{StaticResource GenericToolTipLight}" />
</Button.ToolTip>
<Button.Template>
<ControlTemplate>
<Grid>
<Rectangle Width="12" Height="12">
<Rectangle.Fill>
<ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/remove-pk-16px.png" />
</Rectangle.Fill>
</Rectangle>
</Grid>
<ControlTemplate TargetType="Button">
<Border Background="Transparent">
<Viewbox Width="14"
Height="14"
VerticalAlignment="Center">
<Path x:Name="Folder"
Fill="#999999"
Data="M5 2H2V4H14V2H11V0H5V2ZM10 2H6V1.5C6 1.22386 6.22386 1 6.5 1H9.5C9.77614 1 10 1.22386 10 1.5V2ZM13 5H3V16H13V5Z"
StrokeThickness="0">
</Path>
</Viewbox>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver"
Value="True">
<Setter TargetName="Folder"
Property="Fill"
Value="#6AC0E7" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Button.Template>
</Button>
Expand Down
34 changes: 0 additions & 34 deletions src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePreviewPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,40 +122,6 @@
</Setter.Value>
</Setter>
</Style>
<Style x:Key="DataGridColumnHeaderText" TargetType="DataGridColumnHeader">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="DataGridColumnHeader">
<Grid>
<TextBlock Name="DataGridColumnHeader"
Height="32"
Padding="10,7,10,0"
VerticalAlignment="Center"
Background="#434343"
FontFamily="{StaticResource ArtifaktElementRegular}"
FontSize="14px"
FontWeight="Regular"
Foreground="{StaticResource PrimaryCharcoal200Brush}"
Text="{TemplateBinding Content}" />
<Thumb x:Name="PART_RightHeaderGripper"
Width="1"
HorizontalAlignment="Right"
BorderBrush="Transparent"
BorderThickness="1,0,0,0"
Cursor="SizeWE" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver"
Value="True">
<Setter TargetName="DataGridColumnHeader"
Property="Background"
Value="#666666" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="DataGrid" TargetType="{x:Type DataGrid}">
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="Transparent" />
Expand Down
71 changes: 24 additions & 47 deletions src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageSelectPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,23 +218,34 @@
Path=ItemSelection.Count,
UpdateSourceTrigger=PropertyChanged,
Converter={StaticResource ZeroToVisibilityCollapsedConverter}}">
<Button Width="16"
Height="16"
Margin="10 0"
<Button Width="14"
Height="14"
Margin="10 -2 10 0"
BorderThickness="0"
Background="Transparent"
Click="DeselectButton_Click"
Cursor="Hand">
<Button.Template>
<ControlTemplate>
<Grid>
<Rectangle Width="12"
Height="12">
<Rectangle.Fill>
<ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/close_16px.png" />
</Rectangle.Fill>
</Rectangle>
</Grid>
<ControlTemplate TargetType="Button">
<Border Background="Transparent">
<Viewbox Width="14"
Height="14"
VerticalAlignment="Center">
<Path x:Name="Folder"
Fill="#999999"
Data="M13.3996 3.39998L12.5996 2.59998L7.99961 7.29998L3.39961 2.59998L2.59961 3.39998L7.29961 7.99998L2.59961 12.6L3.39961 13.4L7.99961 8.69998L12.5996 13.4L13.3996 12.6L8.69961 7.99998L13.3996 3.39998Z"
StrokeThickness="0">
</Path>
</Viewbox>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver"
Value="True">
<Setter TargetName="Folder"
Property="Fill"
Value="#6AC0E7" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Button.Template>
</Button>
Expand All @@ -250,7 +261,7 @@
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<Button Margin="10 0"
<Button Margin="10 -2 10 0"
x:Name="RemoveButton"
BorderThickness="0"
HorizontalAlignment="Right"
Expand Down Expand Up @@ -309,40 +320,6 @@
</Setter>
</Style>

<Style x:Key="DataGridColumnHeaderText" TargetType="DataGridColumnHeader">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="DataGridColumnHeader">
<Grid>
<TextBlock Name="DataGridColumnHeader"
Height="32"
Padding="10,7,10,0"
VerticalAlignment="Center"
Background="#434343"
FontFamily="{StaticResource ArtifaktElementRegular}"
FontSize="14px"
FontWeight="Regular"
Foreground="{StaticResource TextColorBrush}"
Text="{TemplateBinding Content}" />
<Thumb x:Name="PART_RightHeaderGripper"
Width="1"
HorizontalAlignment="Right"
BorderBrush="Transparent"
BorderThickness="1,0,0,0"
Cursor="SizeWE" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver"
Value="True">
<Setter TargetName="DataGridColumnHeader"
Property="Background"
Value="#666666" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="DataGridColumnHeaderLast"
TargetType="DataGridColumnHeader">
<Setter Property="Template">
Expand Down

0 comments on commit 0487df0

Please sign in to comment.