AlgoTemplateToolBar/AlgoStudioView - consolidate/share favorites-toggle-tooltips

This commit is contained in:
John Colvin committed 2018-12-12 16:20:13 -06:00
1 parent 16d5e687b0
commit 32bccacc0e
3 files changed
+19 -29

No files matched your search

@@ -6,7 +6,9 @@
xmlns:sp="clr-namespace:mbts.spark"
xmlns:u="clr-namespace:mbts.ui"
xmlns:c="clr-namespace:mbts.ui.controls"
xmlns:cv="clr-namespace:mbts.ui.converters"
xmlns:usp="clr-namespace:mbts.ui.spark"
xmlns:uag="clr-namespace:mbts.ui.spark.algo"
xmlns:uspcv="clr-namespace:mbts.ui.spark.converters"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
Background="{StaticResource CommonBackground}"
@@ -27,6 +29,9 @@
<Thickness x:Key="Margin.LP1" Left="{StaticResource HorizontalPush1}"/>
<Thickness x:Key="Margin.LP3" Left="{StaticResource HorizontalPush3}"/>
<Thickness x:Key="Margin.TP1" Top="{StaticResource VerticalPush1}"/>
<cv:ValueMap x:Key="AlgoTemplateFavoriteToggleButtonToolTipConverter" Default="Add to Favorites">
<cv:KeyValue Key="{u:True}" Value="Remove from Favorites"/>
</cv:ValueMap>
<uspcv:OrderTypeBrushConverter x:Key="OrderTypeBrushConverter" DefaultBrush="Transparent"/>
<Style TargetType="GroupBox">
<Setter Property="Padding" Value="8"/>
@@ -97,6 +102,7 @@
<Setter Property="UseLayoutRounding" Value="True"/>
<Setter Property="Width" Value="16"/>
<Setter Property="Height" Value="16"/>
<Setter Property="ToolTip" Value="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static uag:AlgoTemplateToolBar.FavoriteToggleButtonToolTipConverter}}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ToggleButton">
@@ -196,7 +202,6 @@
</Grid.ColumnDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
@@ -207,18 +212,7 @@
ToolTip="Set as Default"
VerticalAlignment="Center"
/>
<!--<Border Width="14">
<Image x:Name="_favorite_image" Source="{u:Icon Star, Brush=Transparent, Pen={u:Pen Black, Thickness=3}}" Stretch="Uniform"/>
</Border>-->
<!--<ToggleButton x:Name="favorite_toggle" Grid.Column="1" Margin="4,0,0,0" Style="{StaticResource AlgoTemplateFavoriteToggleButtonStyle}" Opacity="0.6"/>-->
<ToggleButton x:Name="favorite_toggle" Grid.Column="1" Margin="4,0,0,0" Style="{StaticResource AlgoTemplateFavoriteToggleButtonStyle}"/>
<Border Grid.Column="2" Margin="4,0,0,0" Width="16" HorizontalAlignment="Right" VerticalAlignment="Stretch" BorderThickness="0" Background="Transparent" Visibility="Collapsed">
<Image x:Name="icon" Source="{x:Static u:Icons.DocumentEmpty}" Width="12" Opacity="0.5" HorizontalAlignment="Left">
<Image.RenderTransform>
<ScaleTransform ScaleX="-1" ScaleY="1" CenterX="6" CenterY="0"/>
</Image.RenderTransform>
</Image>
</Border>
</Grid>
<c:EditableTextBlock x:Name="text_view" Grid.Column="1" Margin="{StaticResource Margin.LP1}" Text="{Binding name}" EndEditOnLostKeyboardFocus="True">
<c:EditableTextBlock.CommandBindings>
@@ -232,22 +226,7 @@
<DataTrigger Binding="{Binding is_dirty}" Value="{u:True}">
<Setter TargetName="text_view" Property="FontWeight" Value="{u:FontWeight Bold}"/>
<Setter TargetName="text_view" Property="Foreground" Value="{u:BTSColor UI.input_dirty_border}"/>
<Setter TargetName="icon" Property="Source" Value="{x:Static u:Icons.DocumentBroken}"/>
<Setter TargetName="icon" Property="Width" Value="16"/>
<Setter TargetName="icon" Property="RenderTransform" Value="{x:Null}"/>
</DataTrigger>
<!--<DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=TreeViewItem}}" Value="{u:True}">
<Setter TargetName="default_toggle" Property="Opacity" Value="1.0"/>
<Setter TargetName="favorite_toggle" Property="Opacity" Value="1.0"/>
</DataTrigger>
<DataTrigger Binding="{Binding is_default}" Value="{u:True}">
<Setter TargetName="default_toggle" Property="Opacity" Value="1.0"/>
<Setter TargetName="favorite_toggle" Property="Opacity" Value="1.0"/>
</DataTrigger>-->
<!--<DataTrigger Binding="{Binding is_favorite}" Value="{u:True}">
<Setter TargetName="_favorite_image" Property="Source" Value="{u:Icon Star, Brush=Gold, Pen={u:Pen Black, Thickness=3}}"/>
<Setter TargetName="PART_IsFavorite_MenuItem" Property="ToolTip" Value="Remove from Favorites"/>
</DataTrigger>-->
</DataTemplate.Triggers>
</DataTemplate>
</TreeView.Resources>
@@ -122,7 +122,7 @@
CommandParameter="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"
Style="{StaticResource AlgoMenuItem}"
ToolTip="Add to Favorites"
ToolTip="{x:Static uag:AlgoTemplateToolBar.AddToFavoritesToolTip}"
>
<MenuItem.Header>
<Image x:Name="_favorite_image" Source="{u:Icon Star, Brush=Transparent, Pen={u:Pen Black, Thickness=3}}" Stretch="Uniform"/>
@@ -149,7 +149,7 @@
</Trigger>
<DataTrigger Binding="{Binding SelectedItem.is_favorite, RelativeSource={RelativeSource Self}, FallbackValue={u:False}}" Value="{u:True}">
<Setter TargetName="_favorite_image" Property="Source" Value="{u:Icon Star, Brush=Gold, Pen={u:Pen Black, Thickness=3}}"/>
<Setter TargetName="PART_IsFavorite_MenuItem" Property="ToolTip" Value="Remove from Favorites"/>
<Setter TargetName="PART_IsFavorite_MenuItem" Property="ToolTip" Value="{x:Static uag:AlgoTemplateToolBar.RemoveFromFavoritesToolTip}"/>
</DataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
@@ -1,4 +1,5 @@
using mbts.spark;
using mbts.ui.converters;
using mbts.ui.extensions;
using System;
using System.Collections.Generic;
@@ -7,6 +8,7 @@ using System.ComponentModel;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Input;
namespace mbts.ui.spark.algo {
@@ -14,6 +16,15 @@ namespace mbts.ui.spark.algo {
/// Interaction logic for AlgoTemplateToolBar.xaml
/// </summary>
class AlgoTemplateToolBar : HeaderedItemsControl {
// The Favorites toggle button exists in 2 forms: as a MenuItem in AlgoTemplateToolBar, and as a ToggleButton in AlgoStudioView
// The const strings below are used to store this text in 1 place.
public const string
AddToFavoritesToolTip = "Add to Favorites",
RemoveFromFavoritesToolTip = "Remove from Favorites";
public static readonly IValueConverter FavoriteToggleButtonToolTipConverter =
ValueConverter.create<bool, string>(is_checked => is_checked ? AddToFavoritesToolTip : RemoveFromFavoritesToolTip);
public static readonly RoutedUICommand
BeginAddNewCommand = new RoutedUICommand("Add New Template", "Add New", typeof(AlgoTemplateToolBar)),
BeginSaveCommand = new RoutedUICommand("Save Template", "Save", typeof(AlgoTemplateToolBar)),