Add design time data for ConversionJobControl

This commit is contained in:
Adrien Allard committed 2018-09-25 19:28:31 +02:00
1 parent 71494a4e26
commit ab1be1b4cf
8 files changed
+119 -100

No files matched your search

@@ -15,6 +15,15 @@
<generic:BoolToVisibility/>
</generic:ValueConverterGroup>
<generic:ValueConverterGroup x:Key="EnumEqualsToVisibility">
<generic:ValueToString/>
<generic:EqualsConverter/>
<generic:BoolToVisibility/>
</generic:ValueConverterGroup>
<valueConverters:ConversionStateToBrush x:Key="ConversionStateToBrush" />
<valueConverters:ConversionJobToEstimatedRemainingDuration x:Key="ConversionJobToEstimatedRemainingDuration" />
<!-- Markdown style -->
<Style TargetType="FlowDocument" x:Key="DocumentStyle">
<Setter Property="FontFamily" Value="Segoe UI" />
@@ -1,62 +0,0 @@
<UserControl x:Class="FileConverter.Controls.ConversionJob"
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:project="clr-namespace:FileConverter.Properties"
xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
xmlns:conversionJobs="clr-namespace:FileConverter.ConversionJobs"
xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
mc:Ignorable="d"
d:DesignHeight="100" d:DesignWidth="800"
d:DataContext="{d:DesignInstance Type=conversionJobs:ConversionJob, IsDesignTimeCreatable=True}">
<UserControl.Resources>
<valueConverters:ConversionStateToBrush x:Key="ConversionStateToBrush" />
<generic:ValueConverterGroup x:Key="EnumEqualsToVisibility">
<generic:ValueToString/>
<generic:EqualsConverter/>
<generic:BoolToVisibility/>
</generic:ValueConverterGroup>
</UserControl.Resources>
<Grid Background="{Binding State, ConverterParameter=Background, Converter={StaticResource ConversionStateToBrush}}" Margin="0,4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="70"/>
</Grid.ColumnDefinitions>
<Grid Margin="10" Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="20" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2.5*" MinWidth="300" />
<ColumnDefinition Width="*" MinWidth="100" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding OutputFilePath}" FontWeight="Bold" />
<StackPanel Grid.Row="1" Grid.Column="0" Margin="10,0,0,0">
<WrapPanel>
<TextBlock Text="{x:Static project:Resources.ConvertedFrom}" FontSize="11" FontStyle="Italic" Margin="0,0,5,0" />
<TextBlock Text="{Binding InputFilePath}" FontSize="11" FontStyle="Italic" />
</WrapPanel>
<TextBlock Text="{Binding ErrorMessage}" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToBrush}}" />
</StackPanel>
<TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding UserState}" FontWeight="Bold" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToBrush}}" />
<ProgressBar Grid.Row="1" Grid.Column="1" Height="18" Width="Auto" Minimum="0" Maximum="1" SmallChange="0.001" Value="{Binding Progress, Mode=OneWay}" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToBrush}}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" MinWidth="100" LargeChange="0.1" />
</Grid>
<Button Margin="5" Grid.Column="1" Background="WhiteSmoke" Foreground="#FF3E3E3E" Visibility="{Binding State, Converter={StaticResource EnumEqualsToVisibility}, ConverterParameter=|InProgress|Collapsed}" Command="{Binding CancelCommand}" ToolTip="Cancel">
<Button.Content>
<Image Source="/FileConverter;component/Resources/CancelIcon.png" Width="48" Height="48" />
</Button.Content>
</Button>
<Image Margin="5" Grid.Column="1" Source="/FileConverter;component/Resources/SuccessIcon.png" Width="48" Height="48" Visibility="{Binding State, Converter={StaticResource EnumEqualsToVisibility}, ConverterParameter=|Done|Collapsed}"/>
<Image Margin="5" Grid.Column="1" Source="/FileConverter;component/Resources/FailIcon.png" Width="48" Height="48" Visibility="{Binding State, Converter={StaticResource EnumEqualsToVisibility}, ConverterParameter=|Failed|Collapsed}"/>
</Grid>
</UserControl>
@@ -1,28 +0,0 @@
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 FileConverter.Controls
{
/// <summary>
/// Interaction logic for ConversionJob.xaml
/// </summary>
public partial class ConversionJob : UserControl
{
public ConversionJob()
{
this.InitializeComponent();
}
}
}
@@ -0,0 +1,59 @@
<UserControl
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:project="clr-namespace:FileConverter.Properties"
x:Class="FileConverter.Controls.ConversionJobControl"
mc:Ignorable="d"
d:DesignHeight="100" d:DesignWidth="800"
d:DataContext="{d:DesignData /SampleData/ConversionJobSampleData.xaml}">
<Grid Background="{Binding State, Converter={StaticResource ConversionStateToBrush}, ConverterParameter=Background}" Margin="0,4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="70"/>
</Grid.ColumnDefinitions>
<Grid Margin="10" Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="20" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2.5*" MinWidth="300" />
<ColumnDefinition Width="*" MinWidth="100" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding OutputFilePath}" FontWeight="Bold" />
<StackPanel Grid.Row="1" Grid.Column="0" Margin="10,0,0,0">
<WrapPanel>
<TextBlock Text="{x:Static project:Resources.ConvertedFrom}" FontSize="11" FontStyle="Italic" Margin="0,0,5,0" />
<TextBlock Text="{Binding InputFilePath}" FontSize="11" FontStyle="Italic" />
</WrapPanel>
<TextBlock Text="{Binding ErrorMessage}" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToBrush}}" />
</StackPanel>
<TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding UserState}" FontWeight="Bold" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToBrush}}" />
<StackPanel Grid.Row="1" Grid.Column="1">
<ProgressBar Grid.Row="1" Grid.Column="1" Height="18" Width="Auto" Minimum="0" Maximum="1" SmallChange="0.001" Value="{Binding Progress, Mode=OneWay}" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToBrush}, Mode=OneWay}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" MinWidth="100" LargeChange="0.1" />
<TextBlock>
<TextBlock.Text>
<MultiBinding Converter="{StaticResource ConversionJobToEstimatedRemainingDuration}" Mode="OneWay">
<Binding Path="State" Mode="OneWay"/>
<Binding Path="StartTime" Mode="OneWay"/>
<Binding Path="Progress" Mode="OneWay"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</StackPanel>
</Grid>
<Button Margin="5" Grid.Column="1" Background="WhiteSmoke" Foreground="#FF3E3E3E" Visibility="{Binding State, ConverterParameter=|InProgress|Collapsed, Converter={StaticResource EnumEqualsToVisibility}}" Command="{Binding CancelCommand}" ToolTip="Cancel">
<Image Source="/FileConverter;component/Resources/CancelIcon.png" Width="48" Height="48" />
</Button>
<Image Margin="5" Grid.Column="1" Source="/FileConverter;component/Resources/SuccessIcon.png" Width="48" Height="48" Visibility="{Binding State, ConverterParameter=|Done|Collapsed, Converter={StaticResource EnumEqualsToVisibility}}"/>
<Image Margin="5" Grid.Column="1" Source="/FileConverter;component/Resources/FailIcon.png" Width="48" Height="48" Visibility="{Binding State, ConverterParameter=|Failed|Collapsed, Converter={StaticResource EnumEqualsToVisibility}}"/>
</Grid>
</UserControl>
@@ -0,0 +1,17 @@
// <copyright file="ConversionJobControl.xaml.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.Controls
{
using System.Windows.Controls;
/// <summary>
/// Interaction logic for ConversionJobControl.xaml
/// </summary>
public partial class ConversionJobControl : UserControl
{
public ConversionJobControl()
{
this.InitializeComponent();
}
}
}
@@ -21,16 +21,8 @@ namespace FileConverter.ConversionJobs
private string initialInputPath = string.Empty;
private int currentOuputFilePathIndex;
public ConversionJob()
{
this.State = ConversionState.Unknown;
this.ConversionPreset = null;
this.initialInputPath = string.Empty;
this.InputFilePath = string.Empty;
}
public ConversionJob(ConversionPreset conversionPreset, string inputFilePath) : this()
public ConversionJob(ConversionPreset conversionPreset, string inputFilePath)
{
if (conversionPreset == null)
{
@@ -42,12 +34,22 @@ namespace FileConverter.ConversionJobs
throw new ArgumentNullException(nameof(inputFilePath));
}
this.State = ConversionState.Unknown;
this.initialInputPath = inputFilePath;
this.InputFilePath = inputFilePath;
this.ConversionPreset = conversionPreset;
this.UserState = Properties.Resources.ConversionStatePrepareConversion;
}
public ConversionJob()
{
this.State = ConversionState.InProgress;
this.ConversionPreset = null;
this.initialInputPath = string.Empty;
this.InputFilePath = "C:\\My file.png";
this.UserState = "DesignMode";
}
public event PropertyChangedEventHandler PropertyChanged;
public enum ConversionState
@@ -218,6 +218,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<DesignData Include="SampleData\ConversionJobSampleData.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</DesignData>
<Page Include="Windows\ApplicationStartHelp.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -338,6 +342,9 @@
<ItemGroup>
<Resource Include="Resources\SayThanks-Icon.png" />
</ItemGroup>
<ItemGroup>
<Folder Include="SampleData\ConversionPreset\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy /Y "$(SolutionDir)Middleware\ffmpeg\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
@@ -0,0 +1,15 @@
<conversionJobs:ConversionJob
xmlns:conversionJobs="clr-namespace:FileConverter.ConversionJobs"
ErrorMessage="There is no error for now"
InputFilePath="C:\Path\To\AVery\Long\Location\WithAVeryNiceFile.png"
OutputFilePath="C:\Path\To\AVery\Long\Location\WithAVeryNiceFile.jpg"
IsCancelable="False"
StartTime="08/07/2018 22:10:55"
State="InProgress"
StateFlags="None"
UserState="In Progress">
<conversionJobs:ConversionJob.Progress>
0.6
</conversionJobs:ConversionJob.Progress>
</conversionJobs:ConversionJob>