-
Notifications
You must be signed in to change notification settings - Fork 638
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
Add and update icons and Update icon automation (debug mode) #14942
Merged
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
3897597
add
zeusongit ddabb04
tspline icon update
zeusongit 80c936b
comments
zeusongit a1c0dc2
Merge branch 'master' into icons
zeusongit 1df16dd
optimizations
zeusongit ce336f6
remove dmode
zeusongit 440323f
Update DynamoView.xaml
zeusongit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
5,300 changes: 4,900 additions & 400 deletions
5,300
src/DynamoCore/BuiltInAndOperators/OperatorsImages.resx
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
using System; | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Windows; | ||
using Dynamo.Utilities; | ||
|
114 changes: 114 additions & 0 deletions
114
src/DynamoCoreWpf/Views/Debug/UpdateNodeIconsWindow.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
<Window x:Class="Dynamo.Wpf.Views.Debug.UpdateNodeIconsWindow" | ||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
xmlns:p="clr-namespace:Dynamo.Wpf.Properties" | ||
Title="Update Node Icons" | ||
ResizeMode="NoResize" Width="750" Height="600" | ||
xmlns:local="clr-namespace:Dynamo.Controls" | ||
> | ||
<Window.Resources> | ||
<local:Base64ToImageConverter x:Key="Base64ToImageConverter"/> | ||
</Window.Resources> | ||
<StackPanel Orientation="Vertical" Margin="10 0 10 0"> | ||
<Grid> | ||
<Grid.RowDefinitions> | ||
<RowDefinition Height="Auto" SharedSizeGroup="Label"/> | ||
<RowDefinition Height="*"/> | ||
<RowDefinition Height="*"/> | ||
</Grid.RowDefinitions> | ||
<Label Grid.Row="0">Enter New Icon Sources:</Label> | ||
<TextBox Grid.Row="1" | ||
TextWrapping="Wrap" | ||
AcceptsTab="True" | ||
MinLines="3" | ||
MinHeight="25" | ||
MaxHeight="60" | ||
Padding="3" | ||
Text ="{Binding NewIconPaths}"></TextBox> | ||
<TextBox Grid.Row="2" IsReadOnly="True" Margin="0 10" | ||
Background="AliceBlue" | ||
Name="OutputText" BorderThickness="0" | ||
MaxHeight="105" Text ="{Binding Output, Mode=TwoWay}"></TextBox> | ||
</Grid> | ||
<Grid> | ||
<ScrollViewer Margin="10,5,10,0" Height="320"> | ||
<DataGrid ItemsSource="{Binding UpdatedIconList}" | ||
AutoGenerateColumns="False" | ||
Name="IconGrid" | ||
CanUserAddRows="False" | ||
CanUserDeleteRows="False" | ||
CanUserReorderColumns="False" | ||
CanUserResizeColumns="False" | ||
CanUserResizeRows="False" | ||
CanUserSortColumns="False" | ||
SelectionMode="Single" | ||
SelectionUnit="FullRow" | ||
IsReadOnly="True" | ||
RowHeaderWidth="0" | ||
HorizontalScrollBarVisibility="Auto" | ||
VerticalScrollBarVisibility="Auto"> | ||
<DataGrid.Resources> | ||
<Style TargetType="{x:Type DataGridRow}"> | ||
<Setter Property="Background" Value="#434343"/> | ||
<Setter Property="Foreground" Value="#ccc"/> | ||
</Style> | ||
<Style TargetType="{x:Type DataGridColumnHeader}"> | ||
<Setter Property="Background" Value="#535353"/> | ||
<Setter Property="Foreground" Value="#ccc"/> | ||
</Style> | ||
</DataGrid.Resources> | ||
|
||
<DataGrid.Columns> | ||
<DataGridTemplateColumn Header="Node Name" Width="*"> | ||
<DataGridTemplateColumn.CellTemplate> | ||
<DataTemplate> | ||
<TextBlock> | ||
<Run Text="{Binding NodeName}" /> | ||
<LineBreak/> | ||
<Run Text="(" /> | ||
<Run Text="{Binding IconSuffix}" /> | ||
<Run Text=")" /> | ||
</TextBlock> | ||
</DataTemplate> | ||
</DataGridTemplateColumn.CellTemplate> | ||
</DataGridTemplateColumn> | ||
|
||
<DataGridTemplateColumn Header="Old Icon" Width="*"> | ||
<DataGridTemplateColumn.CellTemplate> | ||
<DataTemplate> | ||
<Image Source="{Binding OldData, Converter={StaticResource Base64ToImageConverter}}" Width="40" Height="40"/> | ||
</DataTemplate> | ||
</DataGridTemplateColumn.CellTemplate> | ||
</DataGridTemplateColumn> | ||
<DataGridTemplateColumn Header="New Icon" Width="*"> | ||
<DataGridTemplateColumn.CellTemplate> | ||
<DataTemplate> | ||
<Image Source="{Binding Icon_Base64String, Converter={StaticResource Base64ToImageConverter}}" Width="40" Height="40"/> | ||
</DataTemplate> | ||
</DataGridTemplateColumn.CellTemplate> | ||
</DataGridTemplateColumn> | ||
</DataGrid.Columns> | ||
</DataGrid> | ||
|
||
</ScrollViewer> | ||
</Grid> | ||
|
||
|
||
<Grid HorizontalAlignment="Right"> | ||
<Grid.ColumnDefinitions> | ||
<ColumnDefinition Width="Auto" SharedSizeGroup="Label"/> | ||
<ColumnDefinition Width="*"/> | ||
<ColumnDefinition Width="*"/> | ||
</Grid.ColumnDefinitions> | ||
<Button Grid.Column="0" Content="Review" | ||
Height="25" Margin="10,10,10,10" Width="75" x:Name="btnOK" TabIndex="1600" IsDefault="True" Click="OnOkClick" | ||
VerticalContentAlignment="Center" HorizontalContentAlignment="Center" /> | ||
<Button Grid.Column="1" Content="Update" | ||
Height="25" Margin="10,10,10,10" Width="75" x:Name="btnUpdate" TabIndex="1600" Click="OnUpdateClick" | ||
VerticalContentAlignment="Center" HorizontalContentAlignment="Center" IsEnabled="{Binding IsUpdateEnabled}"/> | ||
<Button Grid.Column="2" Content="Cancel" | ||
Height="25" Margin="10,10,10,10" Width="75" x:Name="btnCancel" TabIndex="1700" IsCancel="True" | ||
VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Click="OnCancelClick" /> | ||
</Grid> | ||
</StackPanel> | ||
</Window> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zeusongit I think you need to carefully examine if this code leaks. You never dispose this stream.