diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-02 16:27:32 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-02 16:27:32 +0300 |
| commit | d866652d38d2366c333a1ff5092aff1cc4b85dfa (patch) | |
| tree | 0e004697f3971d03ecfb71dc7d0caf8aec6d01e3 /Software/Visual_Studio/PPC/Tango.PPC.Common | |
| parent | 58f612e03a9bb31c2ada4eb3c5989be458ec4ff5 (diff) | |
| download | Tango-d866652d38d2366c333a1ff5092aff1cc4b85dfa.tar.gz Tango-d866652d38d2366c333a1ff5092aff1cc4b85dfa.zip | |
Implemented Twine's catalog control, Twine's catalog viewer, Twines catalog color correction view.
Added INavigationResultProvider OnNavigationObjectReceived method..
Improved navigation system history.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common')
3 files changed, 9 insertions, 7 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml index cc28bfddb..66db7bc10 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml @@ -7,7 +7,7 @@ xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch" xmlns:catalog="clr-namespace:Tango.BL.Catalogs;assembly=Tango.BL" mc:Ignorable="d" - d:DesignHeight="300" Background="White" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=catalog:Catalog, IsDesignTimeCreatable=False}"> + d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=catalog:Catalog, IsDesignTimeCreatable=False}"> <Grid> <Grid> @@ -19,16 +19,16 @@ <touch:TouchListBox ItemsSource="{Binding Groups}" x:Name="list" DisableRipple="True" ScrollBarVisibility="Collapsed" SelectionMode="None"> <touch:TouchListBox.ItemTemplate> <DataTemplate> - <StackPanel> + <StackPanel Margin="0 0 10 0"> <TextBlock HorizontalAlignment="Center" Text="{Binding Name}"></TextBlock> - <touch:TouchStaticListBox ItemsSource="{Binding Items}" SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=SelectedItem}" Margin="0 20 0 40"> + <touch:TouchStaticListBox ItemsSource="{Binding Items}" SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=SelectedItem,Mode=TwoWay}" Margin="0 20 0 40"> <touch:TouchStaticListBox.ItemsPanel> <ItemsPanelTemplate> <WrapPanel Orientation="Horizontal" /> </ItemsPanelTemplate> </touch:TouchStaticListBox.ItemsPanel> <touch:TouchStaticListBox.ItemContainerStyle> - <Style TargetType="{x:Type touch:TouchListBoxItem}"> + <Style TargetType="{x:Type touch:TouchStaticListBoxItem}"> <Setter Property="RenderTransformOrigin" Value="0.5,0.5"></Setter> <Setter Property="RenderTransform"> <Setter.Value> @@ -79,7 +79,7 @@ </touch:TouchListBox> <Grid Grid.Column="1"> - <Rectangle Stroke="{StaticResource TangoDividerBrush}" HorizontalAlignment="Left" /> + <!--<Rectangle Stroke="{StaticResource TangoDividerBrush}" HorizontalAlignment="Left" />--> <Grid> <Grid.ColumnDefinitions> <ColumnDefinition/> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs index fd5ee8e31..dd2872fd5 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs @@ -72,7 +72,7 @@ namespace Tango.PPC.Common.Navigation /// The view must be of type INavigationResultProvider<TResult>. /// </summary> /// <param name="fullPath">The full path.</param> - Task<TResult> NavigateForResult<TModule,TView, TResult>(bool pushToHistory = true) + Task<TResult> NavigateForResult<TModule, TView, TResult, TObject>(TObject obj, bool pushToHistory = true) where TModule : IPPCModule; } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationResultProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationResultProvider.cs index 9d9c7ac35..71bdc01e0 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationResultProvider.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationResultProvider.cs @@ -6,8 +6,10 @@ using System.Threading.Tasks; namespace Tango.PPC.Common.Navigation { - public interface INavigationResultProvider<TResult> + public interface INavigationResultProvider<TResult, TObject> { TResult GetNavigationResult(); + + void OnNavigationObjectReceived(TObject obj); } } |