Working on PPC.

9 files changed, 56 insertions, 3 deletions

diff --git a/Software/Graphics/Mobile/twine-catalog.png b/Software/Graphics/Mobile/twine-catalog.png
new file mode 100644
index 000000000..35d9b69cd
--- /dev/null
+++ b/Software/Graphics/Mobile/twine-catalog.png
diff --git a/Software/Graphics/Mobile/twine-catalog@2x.png b/Software/Graphics/Mobile/twine-catalog@2x.png
new file mode 100644
index 000000000..4d98c27b8
--- /dev/null
+++ b/Software/Graphics/Mobile/twine-catalog@2x.png
diff --git a/Software/Graphics/Mobile/twine-catalog@3x.png b/Software/Graphics/Mobile/twine-catalog@3x.png
new file mode 100644
index 000000000..46c234069
--- /dev/null
+++ b/Software/Graphics/Mobile/twine-catalog@3x.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogControl.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogControl.xaml
new file mode 100644
index 000000000..51917b594
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogControl.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="Tango.PPC.Jobs.Controls.TwineCatalogControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.PPC.Jobs.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogControl.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogControl.xaml.cs
new file mode 100644
index 000000000..b1a109a75
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogControl.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.PPC.Jobs.Controls
+{
+    /// <summary>
+    /// Interaction logic for TwineCatalogControl.xaml
+    /// </summary>
+    public partial class TwineCatalogControl : UserControl
+    {
+        public TwineCatalogControl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/AdvancedColorCorrectionView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/AdvancedColorCorrectionView.xaml
index d33b2220a..f707397a4 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/AdvancedColorCorrectionView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/AdvancedColorCorrectionView.xaml
@@ -20,7 +20,7 @@
             </Grid.RowDefinitions>
 
             <Grid>
-                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoMessageBoxTitleFontSize}" Foreground="{StaticResource TangoErrorBrush}">Color is out of gamut</TextBlock>
+                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoMessageBoxTitleFontSize}" Foreground="{StaticResource TangoErrorBrush}">Color is out of range</TextBlock>
 
                 <touch:TouchIconButton Command="{Binding CloseCommand}" HorizontalAlignment="Right" Icon="Close" CornerRadius="50" Foreground="{StaticResource TangoDarkForegroundBrush}" Padding="25" />
             </Grid>
@@ -102,7 +102,10 @@
 
             <DockPanel Grid.Row="3" Margin="40 10 20 0" LastChildFill="False">
                 <touch:TouchButton Command="{Binding MoreOptionsCommand}" VerticalAlignment="Top" Style="{StaticResource TangoLinkButton}" DockPanel.Dock="Left" Foreground="{StaticResource TangoPrimaryAccentBrush}">
-                    Twine Catalog
+                    <StackPanel Orientation="Horizontal">
+                        <Image Source="../Images/JobView/twine-catalog.png" Stretch="None" />
+                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Bottom">Twine Catalog</TextBlock>
+                    </StackPanel>
                 </touch:TouchButton>
 
                 <touch:TouchButton Command="{Binding OKCommand}" CornerRadius="25" Style="{StaticResource TangoHollowButton}" DockPanel.Dock="Right" Width="170" Height="50" VerticalAlignment="Bottom">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/BasicColorCorrectionView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/BasicColorCorrectionView.xaml
index 6df139cd8..32759d292 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/BasicColorCorrectionView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/BasicColorCorrectionView.xaml
@@ -19,7 +19,7 @@
             </Grid.RowDefinitions>
 
             <Grid>
-                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoMessageBoxTitleFontSize}" Foreground="{StaticResource TangoErrorBrush}">Color is out of gamut</TextBlock>
+                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoMessageBoxTitleFontSize}" Foreground="{StaticResource TangoErrorBrush}">Color is out of range</TextBlock>
 
                 <touch:TouchIconButton Command="{Binding CloseCommand}" HorizontalAlignment="Right" Icon="Close" CornerRadius="50" RippleBrush="{StaticResource TangoRippleDarkBrush}" Foreground="{StaticResource TangoDarkForegroundBrush}" Padding="22" />
             </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/twine-catalog.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/twine-catalog.png
new file mode 100644
index 000000000..35d9b69cd
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/twine-catalog.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
index 1212be08d..7e8dc94b3 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
@@ -72,6 +72,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\TwineCatalogControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\AdvancedColorCorrectionView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -108,6 +112,9 @@
     <Compile Include="Controls\JobSummeryViewer.xaml.cs">
       <DependentUpon>JobSummeryViewer.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\TwineCatalogControl.xaml.cs">
+      <DependentUpon>TwineCatalogControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Converters\JobCollectionToCategoryCountConverter.cs" />
     <Compile Include="Converters\JobToPieImageConverter.cs" />
     <Compile Include="Dialogs\AdvancedColorCorrectionView.xaml.cs">
@@ -258,5 +265,8 @@
   <ItemGroup>
     <Resource Include="Images\JobView\replace-color.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\JobView\twine-catalog.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file