merge

5 files changed, 0 insertions, 86 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Colors.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Colors.xaml
index 5fdbcf5f8..03f4b6f36 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Colors.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Colors.xaml
@@ -2,17 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Tango.PPC.Common.Resources">
 
-    <BitmapImage x:Key="TangoImageLubricant" UriSource="../Images/lubricant2.png" />
-    <BitmapImage x:Key="TangoImageCleaner" UriSource="../Images/cl-full.png" />
 
-    <SolidColorBrush x:Key="TangoBlackInkBrush" Color="Black" />
-    <SolidColorBrush x:Key="TangoMagentaInkBrush" Color="#ED008C" />
-    <SolidColorBrush x:Key="TangoCyanInkBrush" Color="#1662EB" />
-    <SolidColorBrush x:Key="TangoYellowInkBrush" Color="#E8FF0C" />
-    <SolidColorBrush x:Key="TangoWasteBrush" Color="#2BA221" />
-    <SolidColorBrush x:Key="TangoTransparentInkBrush" Color="#E9E9E9" />
-    <SolidColorBrush x:Key="TangoLubricantBrush" Color="#DEDAC4" />
-    <SolidColorBrush x:Key="TangoCleanerBrush" Color="#8BEC83" />
-    
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
index 09762d7ce..730066b46 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
@@ -21,9 +21,6 @@
         <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Fonts.xaml"/>
         <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Styles.xaml"/>
 
-        <!--PPC Controls-->
-        <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Controls/ImageGalleryControl.xaml"/>
-
         <!--Converters-->
     </ResourceDictionary.MergedDictionaries>
 
@@ -54,13 +51,6 @@
     <converters:StringToLinesConverter x:Key="StringToLinesConverter" />
     <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" />
     <converters:StringEllipsisConverter x:Key="StringEllipsisConverter" />
-    <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
-    <converters:TimeSpanToMinutesConverter x:Key="TimeSpanToMinutesConverter" />
-    <converters:TimeSpanToSecondsConverter x:Key="TimeSpanToSecondsConverter" />
-    <converters:TimeSpanToDaysConverter x:Key="TimeSpanToDaysConverter" />
-    <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
-    <converters:IsEqualToVisibilityConverter x:Key="IsEqualToVisibilityConverter" />
-    <converters:IsToStringEqualToVisibilityConverter x:Key="IsToStringEqualToVisibilityConverter" />
 
     <Style TargetType="FrameworkElement">
         <Setter Property="TextElement.FontFamily" Value="{StaticResource TangoFlexoFontFamily}"></Setter>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Styles.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Styles.xaml
index 317b2f13f..426372688 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Styles.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Styles.xaml
@@ -44,69 +44,4 @@
         <Setter Property="ItemContainerStyle" Value="{StaticResource BlankListBoxItem}"></Setter>
     </Style>
 
-    <Style TargetType="touch:TouchSimpleDataGrid" x:Key="TechGrid" BasedOn="{StaticResource {x:Type touch:TouchSimpleDataGrid}}">
-        <Style.Resources>
-            <Style BasedOn="{StaticResource {x:Type DataGridColumnHeader}}" TargetType="{x:Type DataGridColumnHeader}">
-                <Setter Property="Background" Value="{StaticResource TangoDarkForegroundBrush}" />
-                <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}" />
-                <Setter Property="Padding" Value="5"></Setter>
-            </Style>
-        </Style.Resources>
-        <Setter Property="RowStyle">
-            <Setter.Value>
-                <Style TargetType="DataGridRow" BasedOn="{StaticResource {x:Type DataGridRow}}">
-                    <Style.Triggers>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Background" Value="Transparent"></Setter>
-                            <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter Property="Background" Value="Transparent"></Setter>
-                            <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}" />
-                        </Trigger>
-                    </Style.Triggers>
-                </Style>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="CellStyle">
-            <Setter.Value>
-                <Style TargetType="{x:Type DataGridCell}">
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type DataGridCell}">
-                                <Grid Background="{TemplateBinding Background}">
-                                    <ContentPresenter VerticalAlignment="Center" />
-                                </Grid>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                    <Style.Triggers>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Background" Value="Transparent"></Setter>
-                            <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}" />
-                        </Trigger>
-                    </Style.Triggers>
-                </Style>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="Background" Value="{StaticResource TangoPrimaryBackgroundBrush}"></Setter>
-        <Setter Property="AutoGenerateColumns" Value="False"></Setter>
-        <Setter Property="SelectionUnit" Value="FullRow"></Setter>
-        <Setter Property="SelectionMode" Value="Single"></Setter>
-        <Setter Property="BorderBrush" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
-        <Setter Property="BorderThickness" Value="1"></Setter>
-        <Setter Property="HeadersVisibility" Value="Column"></Setter>
-        <Setter Property="CanUserAddRows" Value="True"></Setter>
-        <Setter Property="CanUserDeleteRows" Value="False"></Setter>
-        <Setter Property="CanUserReorderColumns" Value="False"></Setter>
-        <Setter Property="CanUserResizeColumns" Value="False"></Setter>
-        <Setter Property="CanUserSortColumns" Value="False"></Setter>
-        <Setter Property="IsReadOnly" Value="True"></Setter>
-        <Setter Property="VerticalGridLinesBrush" Value="{x:Null}"></Setter>
-        <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource TangoGrayBrush}"></Setter>
-        <Setter Property="RowHeight" Value="50"></Setter>
-        <Setter Property="VerticalScrollBarVisibility" Value="Visible"></Setter>
-        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"></Setter>
-    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/finger3.png b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/finger3.png
deleted file mode 100644
index c0a6ce9cd..000000000
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/finger3.png
+++ /dev/null
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/tap.png b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/tap.png
deleted file mode 100644
index 4fa679b81..000000000
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/tap.png
+++ /dev/null