|
@@ -1,5 +1,6 @@
|
|
|
-<UserControl x:Class="PDF_Master.Views.Dialog.ConverterDialogs.OCRDownloadProgress"
|
|
|
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
|
+<UserControl
|
|
|
+ x:Class="PDF_Master.Views.Dialog.ConverterDialogs.OCRDownloadProgress"
|
|
|
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
|
xmlns:cus="clr-namespace:PDF_Master.CustomControl"
|
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
@@ -7,97 +8,149 @@
|
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
|
xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
|
|
|
xmlns:prism="http://prismlibrary.com/"
|
|
|
- Background="Transparent" Width="374"
|
|
|
- Height="120" d:DesignHeight="120"
|
|
|
+ Width="374"
|
|
|
+ Height="120"
|
|
|
+ d:DesignHeight="120"
|
|
|
d:DesignWidth="374"
|
|
|
prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
|
|
|
- Loaded="UserControl_Loaded"
|
|
|
prism:ViewModelLocator.AutoWireViewModel="True"
|
|
|
+ Background="Transparent"
|
|
|
+ Loaded="UserControl_Loaded"
|
|
|
mc:Ignorable="d">
|
|
|
<Grid>
|
|
|
<Border
|
|
|
- Name="ProgressVisible" Panel.ZIndex="1" Background="Transparent" Visibility="Visible">
|
|
|
- <Border
|
|
|
+ Name="ProgressVisible"
|
|
|
+ Panel.ZIndex="1"
|
|
|
+ Background="Transparent"
|
|
|
+ Visibility="Visible">
|
|
|
+ <Border
|
|
|
Width="374"
|
|
|
Height="120"
|
|
|
Background="#FFFFFF"
|
|
|
BorderBrush="Gray"
|
|
|
BorderThickness="1"
|
|
|
- CornerRadius="4"
|
|
|
- >
|
|
|
+ CornerRadius="4">
|
|
|
<Grid>
|
|
|
- <Grid Margin="16,18,16,0"
|
|
|
- Height="54" Background="Transparent" VerticalAlignment="Top">
|
|
|
+ <Grid
|
|
|
+ Height="54"
|
|
|
+ Margin="16,18,16,0"
|
|
|
+ VerticalAlignment="Top"
|
|
|
+ Background="Transparent">
|
|
|
<StackPanel Orientation="Horizontal">
|
|
|
- <TextBlock Name="ProgressBarName" Foreground="#000000" Text="{Binding T_ProgressBarName}" />
|
|
|
<TextBlock
|
|
|
- Margin="16,0,0,0"
|
|
|
- Text="("
|
|
|
- Foreground="#000000"
|
|
|
- Visibility="Visible" />
|
|
|
+ Name="ProgressBarName"
|
|
|
+ Foreground="#000000"
|
|
|
+ Text="{Binding T_ProgressBarName}" />
|
|
|
+ <TextBlock
|
|
|
+ Margin="16,0,0,0"
|
|
|
+ Foreground="#000000"
|
|
|
+ Text="("
|
|
|
+ Visibility="Visible" />
|
|
|
<TextBlock
|
|
|
- Name="ProgressBarCurrentSize"
|
|
|
- Foreground="#000000"
|
|
|
- Visibility="Visible" Text="{Binding ProgressBarCurrentSizeValue}" />
|
|
|
+ Name="ProgressBarCurrentSize"
|
|
|
+ Foreground="#000000"
|
|
|
+ Text="{Binding ProgressBarCurrentSizeValue}"
|
|
|
+ Visibility="Visible" />
|
|
|
<TextBlock
|
|
|
- Text="/"
|
|
|
- Foreground="#000000"
|
|
|
- Visibility="Visible" />
|
|
|
+ Foreground="#000000"
|
|
|
+ Text="/"
|
|
|
+ Visibility="Visible" />
|
|
|
<TextBlock
|
|
|
- Name="ProgressBarSize"
|
|
|
- Foreground="#000000"
|
|
|
- Visibility="Visible" Text="{Binding ProgressBarFileSize}"/>
|
|
|
+ Name="ProgressBarSize"
|
|
|
+ Foreground="#000000"
|
|
|
+ Text="{Binding ProgressBarFileSize}"
|
|
|
+ Visibility="Visible" />
|
|
|
<TextBlock
|
|
|
- Text=")"
|
|
|
- Foreground="#000000"
|
|
|
- Visibility="Visible" />
|
|
|
+ Foreground="#000000"
|
|
|
+ Text=")"
|
|
|
+ Visibility="Visible" />
|
|
|
</StackPanel>
|
|
|
<Button
|
|
|
- Width="12"
|
|
|
- Height="12"
|
|
|
- Padding="0,0,1,1"
|
|
|
- Margin="0,0,0,0"
|
|
|
- HorizontalAlignment="Right"
|
|
|
- VerticalAlignment="Top"
|
|
|
- BorderThickness="0"
|
|
|
- Background="Transparent"
|
|
|
- Command="{Binding CancelCommand}"
|
|
|
- Visibility="Collapsed">
|
|
|
+ Width="12"
|
|
|
+ Height="12"
|
|
|
+ Margin="0,0,0,0"
|
|
|
+ Padding="0,0,1,1"
|
|
|
+ HorizontalAlignment="Right"
|
|
|
+ VerticalAlignment="Top"
|
|
|
+ Background="Transparent"
|
|
|
+ BorderThickness="0"
|
|
|
+ Command="{Binding CancelCommand}"
|
|
|
+ Visibility="Collapsed">
|
|
|
<Path Data="M6.00006 7.06072L9.46973 10.5304L10.5304 9.46973L7.06072 6.00006L10.5304 2.53039L9.46973 1.46973L6.00006 4.9394L2.53039 1.46973L1.46973 2.53039L4.9394 6.00006L1.46973 9.46973L2.53039 10.5304L6.00006 7.06072Z" Fill="#CED0D4" />
|
|
|
</Button>
|
|
|
- <StackPanel Orientation="Horizontal"
|
|
|
- Margin="0,0,0,0"
|
|
|
- VerticalAlignment="Bottom" Background="Transparent">
|
|
|
+ <StackPanel
|
|
|
+ Margin="0,0,0,0"
|
|
|
+ VerticalAlignment="Bottom"
|
|
|
+ Background="Transparent"
|
|
|
+ Orientation="Horizontal">
|
|
|
<ProgressBar
|
|
|
- Margin="0,0,18,0"
|
|
|
- Name="ProgressBar"
|
|
|
- Height="5"
|
|
|
- Width="280"
|
|
|
- BorderThickness="0"
|
|
|
- Foreground="Green"
|
|
|
- Maximum="100"
|
|
|
- Value="{Binding ProgressBarCurrentValue}" />
|
|
|
+ Name="ProgressBar"
|
|
|
+ Width="280"
|
|
|
+ Height="5"
|
|
|
+ Margin="0,0,18,0"
|
|
|
+ BorderThickness="0"
|
|
|
+ Foreground="Green"
|
|
|
+ Maximum="100"
|
|
|
+ Value="{Binding ProgressBarCurrentValue}" />
|
|
|
<TextBlock
|
|
|
- FontSize="12"
|
|
|
- Foreground="#666666"
|
|
|
- Text="{Binding ElementName=ProgressBar,Path=Value, StringFormat={}{0}%}"
|
|
|
- />
|
|
|
+ FontSize="12"
|
|
|
+ Foreground="#666666"
|
|
|
+ Text="{Binding ElementName=ProgressBar, Path=Value, StringFormat={}{0}%}" />
|
|
|
</StackPanel>
|
|
|
-
|
|
|
</Grid>
|
|
|
- <StackPanel Name="errorStackPanel" Orientation="Horizontal" VerticalAlignment="Bottom" Visibility="{Binding ErrorStackPanelVisible}" Margin="16,18">
|
|
|
- <Grid Width="14" Height="14" Margin="4,0,8,0" VerticalAlignment="Center">
|
|
|
- <Ellipse Width="12" Height="12" Fill="#F3465B"></Ellipse>
|
|
|
- <Path Data="M7.25 4V9H8.75V4H7.25ZM7.25 10.5V12H8.75L8.75 10.5H7.25Z" Fill="white" Margin="-1,-1,1,1" />
|
|
|
+ <StackPanel
|
|
|
+ Name="errorStackPanel"
|
|
|
+ Margin="16,18"
|
|
|
+ VerticalAlignment="Bottom"
|
|
|
+ Orientation="Horizontal"
|
|
|
+ Visibility="{Binding ErrorStackPanelVisible}">
|
|
|
+ <Grid
|
|
|
+ Width="14"
|
|
|
+ Height="14"
|
|
|
+ Margin="4,0,8,0"
|
|
|
+ VerticalAlignment="Center">
|
|
|
+ <Ellipse
|
|
|
+ Width="12"
|
|
|
+ Height="12"
|
|
|
+ Fill="#F3465B" />
|
|
|
+ <Path
|
|
|
+ Margin="-1,-1,1,1"
|
|
|
+ Data="M7.25 4V9H8.75V4H7.25ZM7.25 10.5V12H8.75L8.75 10.5H7.25Z"
|
|
|
+ Fill="white" />
|
|
|
</Grid>
|
|
|
- <TextBlock Name="ErrorTextBlock" Text="{Binding T_ErrorTextBlock}" Foreground="#F3465B" FontSize="11" VerticalAlignment="Center"></TextBlock>
|
|
|
+ <TextBlock
|
|
|
+ Name="ErrorTextBlock"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ FontSize="11"
|
|
|
+ Foreground="#F3465B"
|
|
|
+ Text="{Binding T_ErrorTextBlock}" />
|
|
|
</StackPanel>
|
|
|
- <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Visibility="Visible" HorizontalAlignment="Right" Margin="16,13">
|
|
|
- <Button Name="tryAgainBtn" Width="60" Height="24" Margin="0,0,8,0" Content="{Binding T_TryAgainBtn}" Style="{StaticResource Btn.cta}" Command="{Binding TryAgainCommnad}" Visibility="{Binding TryAgainBtnVisible}"></Button>
|
|
|
- <Button Name="CancelBtn" Width="60" Height="24" Content="{Binding T_CancelBtn}" Style="{StaticResource btn.sec}" Command="{Binding CancelCommand}" BorderThickness="1" ></Button>
|
|
|
+ <StackPanel
|
|
|
+ Margin="16,13"
|
|
|
+ HorizontalAlignment="Right"
|
|
|
+ VerticalAlignment="Bottom"
|
|
|
+ Orientation="Horizontal"
|
|
|
+ Visibility="Visible">
|
|
|
+ <Button
|
|
|
+ Name="tryAgainBtn"
|
|
|
+ Width="80"
|
|
|
+ Height="30"
|
|
|
+ Margin="0,0,8,0"
|
|
|
+ Command="{Binding TryAgainCommnad}"
|
|
|
+ Content="{Binding T_TryAgainBtn}"
|
|
|
+ Style="{StaticResource Btn.cta}"
|
|
|
+ Visibility="{Binding TryAgainBtnVisible}" />
|
|
|
+ <Button
|
|
|
+ Name="CancelBtn"
|
|
|
+ Width="60"
|
|
|
+ Height="24"
|
|
|
+ BorderThickness="1"
|
|
|
+ Command="{Binding CancelCommand}"
|
|
|
+ Content="{Binding T_CancelBtn}"
|
|
|
+ Style="{StaticResource btn.sec}" />
|
|
|
</StackPanel>
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
</Border>
|
|
|
</Grid>
|
|
|
-</UserControl>
|
|
|
+</UserControl>
|