diff options
13 files changed, 70 insertions, 7 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Images/backup-restoreX4.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Images/backup-restoreX4.png Binary files differnew file mode 100644 index 000000000..65ebb2b1d --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Images/backup-restoreX4.png diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj index 99ac13ae4..b3fbdd624 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj @@ -237,6 +237,9 @@ <ItemGroup> <Resource Include="Images\restore.png" /> </ItemGroup> + <ItemGroup> + <Resource Include="Images\backup-restorex4.png" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml index 0caabd0e1..9aac37f7b 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml @@ -15,7 +15,18 @@ <DockPanel> <Grid DockPanel.Dock="Top"> <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0 20 0 0"> - <Image Source="/Images/backup-restore.png" Stretch="Fill" Width="700" /> + <Image Stretch="Fill" Width="700" > + <Image.Style> + <Style TargetType="{x:Type Image}"> + <Setter Property="Source" Value="../Images/backup-restorex4.png"/> + <Style.Triggers> + <DataTrigger Binding="{Binding BuildProvider.IsEureka}" Value="false"> + <Setter Property="Source" Value="/Images/backup-restore.png"/> + </DataTrigger> + </Style.Triggers> + </Style> + </Image.Style> + </Image> </StackPanel> </Grid> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/Guides/machine-image-X4.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/Guides/machine-image-X4.png Binary files differnew file mode 100644 index 000000000..5a6095e4c --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/Guides/machine-image-X4.png diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj index bebdd63c7..6ede5f25b 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj @@ -323,10 +323,13 @@ <ItemGroup> <Resource Include="Images\thread_loading.png" /> </ItemGroup> + <ItemGroup> + <Resource Include="Images\Guides\machine-image-X4.png" /> + </ItemGroup> <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/PPC/Modules/Tango.PPC.Power/Images/machine-X4.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine-X4.png Binary files differnew file mode 100644 index 000000000..25e4697fd --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine-X4.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-X4.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-X4.png Binary files differnew file mode 100644 index 000000000..25e4697fd --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-X4.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-image-X4.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-image-X4.png Binary files differnew file mode 100644 index 000000000..5a6095e4c --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-image-X4.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index 8f65f225b..a63c0fca2 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -648,6 +648,8 @@ <Resource Include="Images\Menu\AppPower_image.png" /> <Resource Include="Images\Menu\updateDB.png" /> <Resource Include="Images\Menu\updateVersion.png" /> + <Resource Include="Images\machine-X4.png" /> + <Resource Include="Images\machine-image-X4.png" /> <Content Include="Intro.wmv" /> <Content Include="Manifests\release.xml" /> <Content Include="Manifests\debug.xml" /> @@ -993,7 +995,7 @@ if $(ConfigurationName) == Eureka copy /Y "$(ProjectDir)Intro.wmv" "$(TargetDir) </PropertyGroup> <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> <Import Project="..\..\packages\WPFMediaKit.2.2.0\build\WPFMediaKit.targets" Condition="Exists('..\..\packages\WPFMediaKit.2.2.0\build\WPFMediaKit.targets')" /> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/EmergencyView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/EmergencyView.xaml index f2b018bfa..e4f55915c 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/EmergencyView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/EmergencyView.xaml @@ -20,7 +20,18 @@ <TextBlock Margin="0 8 0 0" FontSize="{StaticResource TangoTitleFontSize}">2. Release the emergency button.</TextBlock> <TextBlock Margin="0 8 0 0" FontSize="{StaticResource TangoTitleFontSize}">3. Press the power button to power up the system.</TextBlock> - <Image Source="../Images/machine-image.png" Width="500" HorizontalAlignment="Left" Margin="0 150 0 0" /> + <Image Width="500" HorizontalAlignment="Left" Margin="0 150 0 0" > + <Image.Style> + <Style TargetType="{x:Type Image}"> + <Setter Property="Source" Value="../Images/machine-image.png"/> + <Style.Triggers> + <DataTrigger Binding="{Binding BuildProvider.IsEureka}" Value="true"> + <Setter Property="Source" Value="../Images/machine-image-X4.png"/> + </DataTrigger> + </Style.Triggers> + </Style> + </Image.Style> + </Image> </StackPanel> </DockPanel> </Grid> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml index fddd15fe7..7276d7d4c 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml @@ -18,7 +18,18 @@ <localControls:MachineStatusControl Margin="0 0 0 -1" VerticalAlignment="Center" DataContext="{Binding MachineProvider.MachineOperator}" /> </Grid> <Grid HorizontalAlignment="Center" Margin="0 20 0 0"> - <Image Source="/Images/machine.png" Stretch="None" RenderOptions.BitmapScalingMode="Fant"></Image> + <Image Stretch="None" RenderOptions.BitmapScalingMode="Fant"> + <Image.Style> + <Style TargetType="{x:Type Image}"> + <Setter Property="Source" Value="/Images/machine.png"/> + <Style.Triggers> + <DataTrigger Binding="{Binding BuildProvider.IsEureka}" Value="true"> + <Setter Property="Source" Value="/Images/machine-X4.png"/> + </DataTrigger> + </Style.Triggers> + </Style> + </Image.Style> + </Image> <touch:TouchIcon Icon="Wifi" Foreground="{StaticResource TangoGreenBrush}" Width="30" Height="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 40 45"> <touch:TouchIcon.Style> <Style TargetType="touch:TouchIcon"> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingSystemView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingSystemView.xaml index dd4d2f5d5..abc2ce9c5 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingSystemView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingSystemView.xaml @@ -12,7 +12,18 @@ <Grid> <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <Grid Margin="0 100 0 0"> - <Image Source="/Images/machine.png" Stretch="Uniform" Width="250" RenderOptions.BitmapScalingMode="Fant"></Image> + <Image Stretch="Uniform" Width="250" RenderOptions.BitmapScalingMode="Fant"> + <Image.Style> + <Style TargetType="{x:Type Image}"> + <Setter Property="Source" Value="/Images/machine.png"/> + <Style.Triggers> + <DataTrigger Binding="{Binding BuildProvider.IsEureka}" Value="true"> + <Setter Property="Source" Value="/Images/machine-X4.png"/> + </DataTrigger> + </Style.Triggers> + </Style> + </Image.Style> + </Image> <touch:TouchBusyIndicator Foreground="{StaticResource TangoGrayBrush}" Width="350" Height="350" IsIndeterminate="{Binding IsVisible}" /> </Grid> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingView.xaml index 41017f629..9e7abdca2 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingView.xaml @@ -14,7 +14,18 @@ <Grid> <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <Grid Margin="0 100 0 0"> - <Image Source="/Images/machine.png" Stretch="Uniform" Width="250" RenderOptions.BitmapScalingMode="Fant"></Image> + <Image Stretch="Uniform" Width="250" RenderOptions.BitmapScalingMode="Fant"> + <Image.Style> + <Style TargetType="{x:Type Image}"> + <Setter Property="Source" Value="/Images/machine.png"/> + <Style.Triggers> + <DataTrigger Binding="{Binding BuildProvider.IsEureka}" Value="true"> + <Setter Property="Source" Value="/Images/machine-X4.png"/> + </DataTrigger> + </Style.Triggers> + </Style> + </Image.Style> + </Image> <touch:TouchBusyIndicator Foreground="{StaticResource TangoGrayBrush}" Width="350" Height="350" IsIndeterminate="{Binding IsVisible}" /> </Grid> |
