Added Collapsed mode, Changes in converters CMYK.

6 files changed, 49 insertions, 5 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
index e322b6faa..df917b20e 100644
--- a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
@@ -7,6 +7,7 @@
 
 
     <sys:Double x:Key="TangoSmallerFontSize">9</sys:Double>
+    <sys:Double x:Key="TangoSmallFontSizeBar">12</sys:Double>
     <sys:Double x:Key="TangoSmallFontSize">14</sys:Double>
     <sys:Double x:Key="TangoDefaultFontSize">16</sys:Double>
     <sys:Double x:Key="TangoDataGridHeaderFontSize">16</sys:Double>
diff --git a/Software/Visual_Studio/Tango.Touch/Styles/TouchCheckBox.xaml b/Software/Visual_Studio/Tango.Touch/Styles/TouchCheckBox.xaml
new file mode 100644
index 000000000..eff9fbcf3
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Touch/Styles/TouchCheckBox.xaml
@@ -0,0 +1,41 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Tango.Touch.Controls"
+                    xmlns:components="clr-namespace:Tango.Touch.Components"
+                    xmlns:local="clr-namespace:Tango.Touch.Styles">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../Resources/Colors.xaml" />
+        <ResourceDictionary Source="../Resources/Fonts.xaml" />
+        <ResourceDictionary>
+            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+        </ResourceDictionary>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="TouchRoundCheckBox" TargetType="{x:Type controls:TouchCheckBox}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:TouchCheckBox}">
+                    <Border Padding="{TemplateBinding Padding}" Background="Transparent">
+                        <components:Ripple RippleBrush="{StaticResource TangoRippleDarkBrush}" RippleFactor="20" >
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="1*"/>
+                                </Grid.ColumnDefinitions>
+                                <Ellipse x:Name="borderCheckBox" Stroke="{TemplateBinding Property=BorderBrush}" Fill="{TemplateBinding Background}" Width="22" Height="22" StrokeThickness="1"></Ellipse>
+                                <controls:TouchIcon x:Name="checkMark" Padding="2" Width="18" Height="18" Icon="Check" Visibility="{Binding RelativeSource={RelativeSource AncestorType=controls:TouchCheckBox},Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}" Foreground="White"/>
+                                <ContentPresenter  Grid.Column="1"  TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}" Margin="10 0 0 0" VerticalAlignment="Center" Content="{TemplateBinding Content}"></ContentPresenter>
+                            </Grid>
+                        </components:Ripple>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="borderCheckBox" Property="Fill" Value="{StaticResource TangoMidAccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
index af282ca14..d7a25aeff 100644
--- a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
+++ b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
@@ -143,6 +143,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\TouchCheckBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="TouchColorPickerControls\MultiRangeSlider.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -476,7 +480,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml b/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml
index 703ff4520..132082d81 100644
--- a/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml
@@ -59,6 +59,7 @@
         <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchButton.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchIconButton.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchListBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchCheckBox.xaml" />
         
         <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Controls/TouchPanel.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/TouchColorPickerControls/TouchColorPickerSlider.xaml"/>
diff --git a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.xaml b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.xaml
index 8829ba4f7..d9ae06be9 100644
--- a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.xaml
+++ b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.xaml
@@ -18,9 +18,6 @@
                         <local:TouchDropShadowBorder  CornerRadius="16" Width="31" Height="31" Background="#15C1C1C1">
                             <local:TouchIcon Grid.Column="1" Grid.Row="1" Foreground="{StaticResource TangoMidAccentBrush}" Width="13" Height="13" Icon="Triangle" Angle="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </local:TouchDropShadowBorder>
-                        <Grid.Effect>
-                            <DropShadowEffect BlurRadius="10" RenderingBias="Quality" ShadowDepth="1" Color="{StaticResource TangoDropShadowColor}"/>
-                        </Grid.Effect>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchSliderThreeThumbs.cs b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchSliderThreeThumbs.cs
index 8842e1fef..dbc36acfb 100644
--- a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchSliderThreeThumbs.cs
+++ b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchSliderThreeThumbs.cs
@@ -300,7 +300,7 @@ namespace Tango.Touch.Controls
 
         private void OnLengthChanged(double? oldValue, double? newValue)
         {
-            if (oldValue != newValue)
+            if (oldValue != newValue && _lowerSlider != null && _middleSlider != null && _upperSlider != null)
             {
                 _lowerSlider.Value = Minimum;
                 _lowerSlider.LeftValue = Minimum;