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

Dyn 4556 alignment tool icons #12858

Merged
merged 25 commits into from
May 9, 2022
Merged

Dyn 4556 alignment tool icons #12858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
98dfeda
Merge pull request #1 from DynamoDS/master
jesusalvino Jan 18, 2022
8a8e4bb
Merge branch 'DynamoDS:master' into master
jesusalvino Jan 26, 2022
c214c77
Merge branch 'DynamoDS:master' into master
jesusalvino Jan 28, 2022
422cee9
Merge branch 'DynamoDS:master' into master
jesusalvino Feb 6, 2022
f815528
Merge branch 'DynamoDS:master' into master
jesusalvino Feb 8, 2022
d48c72a
Merge branch 'DynamoDS:master' into master
jesusalvino Feb 12, 2022
3671b95
Merge branch 'DynamoDS:master' into master
jesusalvino Feb 15, 2022
36ea946
Merge branch 'DynamoDS:master' into master
jesusalvino Feb 22, 2022
d7bb37b
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 1, 2022
32befba
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 7, 2022
2f2b375
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 7, 2022
6ed0cb8
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 8, 2022
76b40f5
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 11, 2022
b9505de
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 14, 2022
150f432
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 16, 2022
c088daf
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 17, 2022
2493ac0
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 22, 2022
4c6041e
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 24, 2022
4f6b37c
Merge branch 'DynamoDS:master' into master
jesusalvino Mar 31, 2022
e095a69
Merge branch 'DynamoDS:master' into master
jesusalvino Apr 11, 2022
5b37482
Merge branch 'DynamoDS:master' into master
jesusalvino Apr 21, 2022
af7ee2d
Merge branch 'DynamoDS:master' into master
jesusalvino May 3, 2022
d8bd1fe
Merge branch 'DynamoDS:master' into master
jesusalvino May 4, 2022
7dbc668
Adding Alignment Icons
jesusalvino May 5, 2022
a977457
Adding Alignment Icons to the main Menu
jesusalvino May 5, 2022
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
16 changes: 16 additions & 0 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
<EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
</PropertyGroup>
<ItemGroup>
<None Remove="UI\Images\Alignment\align_bottom.png" />
<None Remove="UI\Images\Alignment\align_left.png" />
<None Remove="UI\Images\Alignment\align_right.png" />
<None Remove="UI\Images\Alignment\align_top.png" />
<None Remove="UI\Images\Alignment\align_x_average.png" />
<None Remove="UI\Images\Alignment\align_x_distribute.png" />
<None Remove="UI\Images\Alignment\align_y_average.png" />
<None Remove="UI\Images\Alignment\align_y_distribute.png" />
<None Remove="UI\Images\NodeStates\alert-64px.png" />
<None Remove="UI\Images\NodeStates\error-64px.png" />
<None Remove="UI\Images\NodeStates\frozen-64px.png" />
Expand Down Expand Up @@ -626,6 +634,14 @@
<EmbeddedResource Include="UI\GuidedTour\DynamoOnboardingGuide_HouseCreationDS.dyn">
</EmbeddedResource>
<None Include="ViewModels\Watch3D\shaderSource\CompileShaders.bat" />
<Resource Include="UI\Images\Alignment\align_bottom.png" />
<Resource Include="UI\Images\Alignment\align_left.png" />
<Resource Include="UI\Images\Alignment\align_right.png" />
<Resource Include="UI\Images\Alignment\align_top.png" />
<Resource Include="UI\Images\Alignment\align_x_average.png" />
<Resource Include="UI\Images\Alignment\align_x_distribute.png" />
<Resource Include="UI\Images\Alignment\align_y_average.png" />
<Resource Include="UI\Images\Alignment\align_y_distribute.png" />
<Resource Include="UI\Images\caret_up.png" />
<EmbeddedResource Include="Views\GuidedTour\HtmlPages\Resources\ArtifaktElement-Regular.woff" />
<Resource Include="UI\Images\cursors.psd" />
Expand Down
Binary file added src/DynamoCoreWpf/UI/Images/Alignment/align_bottom.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/Alignment/align_left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/Alignment/align_right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/Alignment/align_top.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/Alignment/align_x_average.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/Alignment/align_x_distribute.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/Alignment/align_y_average.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/Alignment/align_y_distribute.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
97 changes: 72 additions & 25 deletions src/DynamoCoreWpf/Views/Core/DynamoView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,31 +432,78 @@
<!--<MenuItem Focusable="False" Header="{x:Static p:Resources.DynamoViewEditMenuSelectNeighbours}" Command="{Binding Path=ExpandSelectionCommand}" Name="expandSelect" InputGestureText="Tab"/>-->
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlignSelection}"
Name="Align">
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlignXAverage}"
Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalCenter"/>
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlignLeft}"
Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalLeft"
Focusable="False" />
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlignRight}"
Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalRight"/>
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlignYAverage}"
Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalCenter"/>
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlignTop}"
Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalTop"/>
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlighBottom}"
Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalBottom"/>
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlignYDistribute}"
Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalDistribute"/>
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuAlignXDistribute}"
Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalDistribute"/>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalCenter">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_x_average.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignXAverage}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalLeft">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_left.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignLeft}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalRight">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_right.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignRight}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalCenter">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_y_average.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignYAverage}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalTop">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_top.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignTop}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalBottom">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_bottom.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlighBottom}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalDistribute">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_y_distribute.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignYDistribute}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalDistribute">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_X_distribute.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignXDistribute}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
</MenuItem>
<Separator />
<MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuCleanupLayout}"
Expand Down
80 changes: 64 additions & 16 deletions src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,29 +607,77 @@
<!-- Align Menu -->
<controls:ParentMenuItem x:Name="Align" Header="{x:Static p:Resources.DynamoViewEditMenuAlignSelection}">
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalCenter"
Header="{x:Static p:Resources.DynamoViewEditMenuAlignXAverage}" />
CommandParameter="HorizontalCenter">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_x_average.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignXAverage}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalLeft"
Header="{x:Static p:Resources.DynamoViewEditMenuAlignLeft}" />
CommandParameter="HorizontalLeft">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_left.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignLeft}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalRight"
Header="{x:Static p:Resources.DynamoViewEditMenuAlignRight}" />
CommandParameter="HorizontalRight">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_right.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignRight}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalCenter"
Header="{x:Static p:Resources.DynamoViewEditMenuAlignYAverage}" />
CommandParameter="VerticalCenter">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_y_average.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignYAverage}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalTop"
Header="{x:Static p:Resources.DynamoViewEditMenuAlignTop}" />
CommandParameter="VerticalTop">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_top.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignTop}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalBottom"
Header="{x:Static p:Resources.DynamoViewEditMenuAlighBottom}" />
CommandParameter="VerticalBottom">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_bottom.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlighBottom}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="VerticalDistribute"
Header="{x:Static p:Resources.DynamoViewEditMenuAlignYDistribute}" />
CommandParameter="VerticalDistribute">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_y_distribute.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignYDistribute}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Command="{Binding AlignSelectedCommand}"
CommandParameter="HorizontalDistribute"
Header="{x:Static p:Resources.DynamoViewEditMenuAlignXDistribute}" />
CommandParameter="HorizontalDistribute">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_X_distribute.png" />
<Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignXDistribute}" Foreground="White"/>
</StackPanel>
</MenuItem.Header>
</MenuItem>
</controls:ParentMenuItem>

<!-- Create Custom Node -->
Expand Down