Skip to content

Commit

Permalink
added pages
Browse files Browse the repository at this point in the history 
- added pages for the wizard-like experience when publishing a package
  • Loading branch information
@dnenov
dnenov committed Oct 2, 2023
1 parent 0a0c1a6 commit 32fa036
Show file tree
Hide file tree
Showing 15 changed files with 1,518 additions and 811 deletions.
47 changes: 47 additions & 0 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<None Remove="UI\Images\caret_drop_down.png" />
<None Remove="UI\Images\NodeStates\package-64px.png" />
<None Remove="UI\Images\PackageManager\empty-state-first-use-light-gray.png" />
<None Remove="UI\Images\remove-pk-16px.png" />
<None Remove="UI\Images\search_icon_20px.png" />
<None Remove="UI\Images\TitleBarButtons\close-darktheme-disabled-16px.png" />
<None Remove="UI\Prompts\PortPropertiesEditPrompt.xaml" />
Expand All @@ -76,6 +77,11 @@
<None Remove="Views\PackageManager\Controls\PackageManagerPackagesControl.xaml" />
<None Remove="Views\PackageManager\Controls\PackageManagerSearchControl.xaml" />
<None Remove="Views\PackageManager\Controls\SearchBoxControl.xaml" />
<None Remove="Views\PackageManager\Pages\PublishPackageFinishPage.xaml" />
<None Remove="Views\PackageManager\Pages\PublishPackagePreviewPage.xaml" />
<None Remove="Views\PackageManager\Pages\PublishPackagePublishPage.xaml" />
<None Remove="Views\PackageManager\Pages\PublishPackageReadyToPublishPage.xaml" />
<None Remove="Views\PackageManager\Pages\PublishPackageSelectPage.xaml" />
<None Remove="Views\SplashScreen\WebApp\splashScreenBackground.png" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -450,6 +456,11 @@
<Compile Include="Views\PackageManager\PackagePathView.xaml.cs">
<DependentUpon>PackagePathView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\PackageManager\Pages\PublishPackageFinishPage.xaml.cs" />
<Compile Include="Views\PackageManager\Pages\PublishPackagePreviewPage.xaml.cs" />
<Compile Include="Views\PackageManager\Pages\PublishPackagePublishPage.xaml.cs" />
<Compile Include="Views\PackageManager\Pages\PublishPackageReadyToPublishPage.xaml.cs" />
<Compile Include="Views\PackageManager\Pages\PublishPackageSelectPage.xaml.cs" />
<Compile Include="Views\PackageManager\TermsOfUseView.xaml.cs">
<DependentUpon>TermsOfUseView.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -683,6 +694,26 @@
<Page Include="Windows\ExtensionWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\PackageManager\Pages\PublishPackageFinishPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\PackageManager\Pages\PublishPackagePreviewPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\PackageManager\Pages\PublishPackagePublishPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\PackageManager\Pages\PublishPackageReadyToPublishPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\PackageManager\Pages\PublishPackageSelectPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -947,6 +978,7 @@
<Resource Include="UI\Images\NodeStates\package-64px.png" />
<Resource Include="UI\Images\PackageManager\empty-state-first-use-light-gray.png" />
<Resource Include="UI\Images\question-hover-blue-16px.png" />
<Resource Include="UI\Images\remove-pk-16px.png" />
<Resource Include="UI\Images\search_icon_20px.png" />
<Resource Include="UI\Images\TitleBarButtons\close-darktheme-default-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\close-darktheme-disabled-16px.png" />
Expand Down Expand Up @@ -1738,6 +1770,21 @@
<None Update="Views\PackageManager\Controls\NumericUpDownControl.xaml">
<Generator>MSBuild:Compile</Generator>
</None>
<None Update="Views\PackageManager\Pages\PublishPackageFinishPage.xaml">
<Generator>MSBuild:Compile</Generator>
</None>
<None Update="Views\PackageManager\Pages\PublishPackagePreviewPage.xaml">
<Generator>MSBuild:Compile</Generator>
</None>
<None Update="Views\PackageManager\Pages\PublishPackagePublishPage.xaml">
<Generator>MSBuild:Compile</Generator>
</None>
<None Update="Views\PackageManager\Pages\PublishPackageReadyToPublishPage.xaml">
<Generator>MSBuild:Compile</Generator>
</None>
<None Update="Views\PackageManager\Pages\PublishPackageSelectPage.xaml">
<Generator>MSBuild:Compile</Generator>
</None>
</ItemGroup>
<Target Name="AfterBuildOps" AfterTargets="Build">
<MakeDir Directories="$(OutputPath)\viewExtensions\" />
Expand Down
Binary file added src/DynamoCoreWpf/UI/Images/remove-pk-16px.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 37 additions & 19 deletions src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Dynamo.PackageManager.UI"
xmlns:ui="clr-namespace:Dynamo.UI"
xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
Expand Down Expand Up @@ -393,7 +394,7 @@
<!--Tree view style-->
<SolidColorBrush x:Key="ListBorder" Color="#828790"/>
<Style x:Key="TreeViewStyle" TargetType="{x:Type TreeView}">
<Setter Property="Background" Value="#2F2E30"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="{StaticResource ListBorder}"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Padding" Value="1"/>
Expand All @@ -403,6 +404,7 @@
<Setter Property="ScrollViewer.PanningMode" Value="Both"/>
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="UseLayoutRounding" Value="True"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TreeView}">
Expand Down Expand Up @@ -541,7 +543,6 @@
<ControlTemplate x:Key="TreeViewItemControlTemplate1" TargetType="{x:Type TreeViewItem}">
<Grid x:Name="tvGrid">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition MinWidth="19" Width="Auto"/>
<ColumnDefinition Width="Auto"/>
Expand All @@ -554,9 +555,9 @@
</Grid.RowDefinitions>

<!-- Selection border -->
<Border Grid.ColumnSpan="6" Grid.Column="0" x:Name="SelectionBorder" Background="Transparent" Opacity="0.1"/>
<Border Grid.ColumnSpan="5" Grid.Column="0" x:Name="SelectionBorder" Background="Transparent" Opacity="0.1"/>

<Border Grid.Column="1"
<Border Grid.Column="0"
Width="{Binding Path=(local:TreeViewItemHelper.Indent).Value, Mode=OneWay, RelativeSource={RelativeSource AncestorType=ItemsPresenter}}">
<Grid>
<Rectangle Width="1" Height="1" Stroke="#DCDCDC" StrokeDashArray="3 3" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10 0 0 0"
Expand All @@ -566,9 +567,9 @@
</Grid>
</Border>

<ToggleButton x:Name="Expander" Grid.Column="2" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource FolderToggleStyle}"/>
<ToggleButton x:Name="Expander" Grid.Column="1" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource FolderToggleStyle}"/>

<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="3" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="2" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
<Grid>
<ContentPresenter x:Name="PART_Header"
ContentTemplate="{TemplateBinding HeaderTemplate}"
Expand All @@ -585,19 +586,35 @@
</Grid>
</Border>


<!-- Left buttons -->
<CheckBox Style="{DynamicResource CheckBoxStyle}" x:Name="FileCheckBox"
IsChecked="{Binding IsSelected}"
Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="6 2 12 2" />

<!-- Right buttons -->
<Grid Grid.Column="5" HorizontalAlignment="Right">
<CheckBox Margin="2 2 55 2" Style="{DynamicResource CheckBoxStyle}" x:Name="NodeLibraryCheckBox" Width="12" Height="12" HorizontalAlignment="Right" VerticalAlignment="Center" />
<Rectangle Margin="2 0 85 0" Width="1" Height="24" Fill="#FFFFFF" Opacity="0.1" />
<Grid Grid.Column="4" HorizontalAlignment="Right">
<Button Margin="2 2 55 2"
x:Name="RemoveButton"
BorderThickness="0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Visibility="Hidden"
Cursor="Hand">
<Button.ToolTip>
<ToolTip Content="{x:Static p:Resources.PublishPackageViewAddFileButtonTooltip}"
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>
</Button.Template>
</Button>
</Grid>

<ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="6" Grid.Column="0" Grid.Row="1"
<ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="5" Grid.Column="0" Grid.Row="1"
local:TreeViewItemHelper.Indent="{Binding Path=(local:TreeViewItemHelper.Indent), Mode=OneWay, RelativeSource={RelativeSource AncestorType=ItemsPresenter}, Converter={StaticResource IndentConverter}}" />
</Grid>
<ControlTemplate.Triggers>
Expand All @@ -617,10 +634,8 @@
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="local:MyTreeViewHelper.IsMouseDirectlyOverItem" Value="True"/>
<Condition Property="HasItems" Value="False"/>
</MultiTrigger.Conditions>
<Setter Property="Visibility" TargetName="FileCheckBox" Value="Visible"/>
<Setter Property="Visibility" TargetName="NodeLibraryCheckBox" Value="Visible"/>
<Setter Property="Visibility" TargetName="RemoveButton" Value="Visible"/>
<Setter Property="Background" TargetName="SelectionBorder" Value="#F5F5F5"/>
</MultiTrigger>
<MultiTrigger>
Expand Down Expand Up @@ -648,11 +663,14 @@
</Trigger>
</Style.Triggers>
</Style>

</ResourceDictionary>
</UserControl.Resources>
<Grid>
<!--Folders-->
<TreeView Style="{DynamicResource TreeViewStyle}"
x:Name="customTreeView"
Margin="5"
ItemContainerStyle="{StaticResource CustomTreeViewItem}"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=Root, Mode=TwoWay}">
<TreeView.ItemTemplate>
Expand Down
Loading

0 comments on commit 32fa036

Please sign in to comment.