|
|
@@ -2,11 +2,10 @@
|
|
|
x:Class="PDF_Master.Views.Dialog.ServiceDialog.PasswordUpdataRegion"
|
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
|
+ xmlns:convert="clr-namespace:PDF_Master.DataConvert"
|
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
|
xmlns:help="clr-namespace:PDF_Master.Helper"
|
|
|
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
|
|
|
- xmlns:convert="clr-namespace:PDF_Master.DataConvert"
|
|
|
-
|
|
|
xmlns:local="clr-namespace:PDF_Master.Views.Dialog.ServiceDialog"
|
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
|
xmlns:prism="http://prismlibrary.com/"
|
|
|
@@ -74,6 +73,7 @@
|
|
|
<TextBlock
|
|
|
Name="markText"
|
|
|
Grid.Column="1"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
FontSize="12"
|
|
|
Foreground="#BBB"
|
|
|
@@ -82,6 +82,7 @@
|
|
|
<ScrollViewer
|
|
|
x:Name="PART_ContentHost"
|
|
|
MinHeight="20"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
Focusable="false"
|
|
|
HorizontalScrollBarVisibility="Hidden"
|
|
|
@@ -131,6 +132,7 @@
|
|
|
<TextBlock
|
|
|
Name="markText"
|
|
|
Grid.Column="1"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
FontSize="12"
|
|
|
Foreground="#BBB"
|
|
|
@@ -139,6 +141,7 @@
|
|
|
<ScrollViewer
|
|
|
x:Name="PART_ContentHost"
|
|
|
MinHeight="20"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
Focusable="false"
|
|
|
HorizontalScrollBarVisibility="Hidden"
|
|
|
@@ -188,6 +191,7 @@
|
|
|
<TextBlock
|
|
|
Name="markText"
|
|
|
Grid.Column="1"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
FontSize="12"
|
|
|
Foreground="#BBB"
|
|
|
@@ -196,6 +200,7 @@
|
|
|
<ScrollViewer
|
|
|
x:Name="PART_ContentHost"
|
|
|
MinHeight="20"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
Focusable="false"
|
|
|
HorizontalScrollBarVisibility="Hidden"
|
|
|
@@ -245,6 +250,7 @@
|
|
|
<TextBlock
|
|
|
Name="markText"
|
|
|
Grid.Column="1"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
FontSize="12"
|
|
|
Foreground="#BBB"
|
|
|
@@ -253,6 +259,7 @@
|
|
|
<ScrollViewer
|
|
|
x:Name="PART_ContentHost"
|
|
|
MinHeight="20"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
Focusable="false"
|
|
|
HorizontalScrollBarVisibility="Hidden"
|
|
|
@@ -302,6 +309,7 @@
|
|
|
<TextBlock
|
|
|
Name="markText"
|
|
|
Grid.Column="1"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
FontSize="12"
|
|
|
Foreground="#BBB"
|
|
|
@@ -310,6 +318,7 @@
|
|
|
<ScrollViewer
|
|
|
x:Name="PART_ContentHost"
|
|
|
MinHeight="20"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
Focusable="false"
|
|
|
HorizontalScrollBarVisibility="Hidden"
|
|
|
@@ -359,6 +368,7 @@
|
|
|
<TextBlock
|
|
|
Name="markText"
|
|
|
Grid.Column="1"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
FontSize="12"
|
|
|
Foreground="#BBB"
|
|
|
@@ -367,6 +377,7 @@
|
|
|
<ScrollViewer
|
|
|
x:Name="PART_ContentHost"
|
|
|
MinHeight="20"
|
|
|
+ Margin="8,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
|
Focusable="false"
|
|
|
HorizontalScrollBarVisibility="Hidden"
|
|
|
@@ -419,8 +430,8 @@
|
|
|
VerticalAlignment="Top">
|
|
|
<StackPanel>
|
|
|
<TextBlock
|
|
|
- Height="28"
|
|
|
Width="Auto"
|
|
|
+ Height="28"
|
|
|
HorizontalAlignment="Left"
|
|
|
VerticalAlignment="Top"
|
|
|
FontFamily="Segoe UI"
|
|
|
@@ -428,34 +439,32 @@
|
|
|
FontStyle="Normal"
|
|
|
FontWeight="SemiBold"
|
|
|
Text="{Binding Text_passuodata}" />
|
|
|
- <Grid Margin="0,32,0,0">
|
|
|
+ <Grid Margin="0,32,0,0">
|
|
|
<Grid
|
|
|
- Width="262"
|
|
|
- Height="32"
|
|
|
-
|
|
|
- VerticalAlignment="Center">
|
|
|
+ Width="262"
|
|
|
+ Height="32"
|
|
|
+ VerticalAlignment="Center">
|
|
|
<Grid.ColumnDefinitions>
|
|
|
<ColumnDefinition />
|
|
|
<ColumnDefinition Width="24" />
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<PasswordBox
|
|
|
- x:Name="Text_RePassword2"
|
|
|
- Grid.ColumnSpan="2"
|
|
|
- help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
|
|
|
- help:PasswordBoxHelper.Password="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
- InputMethod.IsInputMethodEnabled="False"
|
|
|
- PreviewTextInput="TextBox_PreviewTextInput"
|
|
|
- Style="{StaticResource LoginPasswordBoxStyle2}"
|
|
|
- Visibility="{Binding LoginPasswordVisibility2, Mode=TwoWay}" />
|
|
|
+ x:Name="Text_RePassword2"
|
|
|
+ Grid.ColumnSpan="2"
|
|
|
+ help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
|
|
|
+ help:PasswordBoxHelper.Password="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
+ InputMethod.IsInputMethodEnabled="False"
|
|
|
+ PreviewTextInput="TextBox_PreviewTextInput"
|
|
|
+ Style="{StaticResource LoginPasswordBoxStyle2}"
|
|
|
+ Visibility="{Binding LoginPasswordVisibility2, Mode=TwoWay}" />
|
|
|
<TextBox
|
|
|
-
|
|
|
- Grid.ColumnSpan="2"
|
|
|
- help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
|
|
|
- InputMethod.IsInputMethodEnabled="False"
|
|
|
- PreviewTextInput="TextBox_PreviewTextInput"
|
|
|
- Style="{StaticResource LoginPasswordTextBoxStyle2}"
|
|
|
- Text="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
- Visibility="{Binding LoginTextVisibility2, Mode=TwoWay}">
|
|
|
+ Grid.ColumnSpan="2"
|
|
|
+ help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
|
|
|
+ InputMethod.IsInputMethodEnabled="False"
|
|
|
+ PreviewTextInput="TextBox_PreviewTextInput"
|
|
|
+ Style="{StaticResource LoginPasswordTextBoxStyle2}"
|
|
|
+ Text="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
+ Visibility="{Binding LoginTextVisibility2, Mode=TwoWay}">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="TextChanged">
|
|
|
<i:InvokeCommandAction Command="{Binding LoginPasswordChanged2Command}" />
|
|
|
@@ -464,15 +473,15 @@
|
|
|
</TextBox>
|
|
|
|
|
|
<CheckBox
|
|
|
- x:Name="DisplayLoginPasswordChk2"
|
|
|
- Grid.Column="1"
|
|
|
- Height="16"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- Panel.ZIndex="1"
|
|
|
- Command="{Binding DisplayPasswordCommand2}"
|
|
|
- CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
|
|
|
- Style="{StaticResource EyeCheckbox}"
|
|
|
- Visibility="{Binding ChkVis2}" />
|
|
|
+ x:Name="DisplayLoginPasswordChk2"
|
|
|
+ Grid.Column="1"
|
|
|
+ Height="16"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ Panel.ZIndex="1"
|
|
|
+ Command="{Binding DisplayPasswordCommand2}"
|
|
|
+ CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
|
|
|
+ Style="{StaticResource EyeCheckbox}"
|
|
|
+ Visibility="{Binding ChkVis2}" />
|
|
|
|
|
|
</Grid>
|
|
|
<Border
|
|
|
@@ -482,7 +491,7 @@
|
|
|
Effect="{StaticResource shadow.red-0-4}"
|
|
|
Visibility="{Binding ElementName=Textbl_pass1, Path=Text, Converter={StaticResource LoginBordVis}}" />
|
|
|
</Grid>
|
|
|
-
|
|
|
+
|
|
|
|
|
|
<TextBlock
|
|
|
x:Name="Textbl_pass1"
|
|
|
@@ -492,31 +501,28 @@
|
|
|
Margin="0,2,0,0"
|
|
|
Foreground="#F3465B"
|
|
|
Text="{Binding LoginPasswordlook2, Mode=TwoWay}" />
|
|
|
- <Grid Margin="0,8,0,0">
|
|
|
- <Grid
|
|
|
- Width="262"
|
|
|
- Height="32"
|
|
|
- >
|
|
|
+ <Grid Margin="0,8,0,0">
|
|
|
+ <Grid Width="262" Height="32">
|
|
|
<Grid.ColumnDefinitions>
|
|
|
<ColumnDefinition />
|
|
|
<ColumnDefinition Width="24" />
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<PasswordBox
|
|
|
- Grid.ColumnSpan="2"
|
|
|
- help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
|
|
|
- help:PasswordBoxHelper.Password="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
- InputMethod.IsInputMethodEnabled="False"
|
|
|
- PreviewTextInput="TextBox_PreviewTextInput"
|
|
|
- Style="{StaticResource LoginPasswordBoxStyle}"
|
|
|
- Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
|
|
|
+ Grid.ColumnSpan="2"
|
|
|
+ help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
|
|
|
+ help:PasswordBoxHelper.Password="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
+ InputMethod.IsInputMethodEnabled="False"
|
|
|
+ PreviewTextInput="TextBox_PreviewTextInput"
|
|
|
+ Style="{StaticResource LoginPasswordBoxStyle}"
|
|
|
+ Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
|
|
|
<TextBox
|
|
|
- Grid.ColumnSpan="2"
|
|
|
- help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
|
|
|
- InputMethod.IsInputMethodEnabled="False"
|
|
|
- PreviewTextInput="TextBox_PreviewTextInput"
|
|
|
- Style="{StaticResource LoginPasswordTextBoxStyle}"
|
|
|
- Text="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
- Visibility="{Binding LoginTextVisibility, Mode=TwoWay}">
|
|
|
+ Grid.ColumnSpan="2"
|
|
|
+ help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
|
|
|
+ InputMethod.IsInputMethodEnabled="False"
|
|
|
+ PreviewTextInput="TextBox_PreviewTextInput"
|
|
|
+ Style="{StaticResource LoginPasswordTextBoxStyle}"
|
|
|
+ Text="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
+ Visibility="{Binding LoginTextVisibility, Mode=TwoWay}">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="TextChanged">
|
|
|
<i:InvokeCommandAction Command="{Binding LoginPasswordChangedCommand}" />
|
|
|
@@ -524,15 +530,15 @@
|
|
|
</i:Interaction.Triggers>
|
|
|
</TextBox>
|
|
|
<CheckBox
|
|
|
- x:Name="DisplayLoginPasswordChk"
|
|
|
- Grid.Column="1"
|
|
|
- Height="16"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- Panel.ZIndex="1"
|
|
|
- Command="{Binding DisplayPasswordCommand}"
|
|
|
- CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
|
|
|
- Style="{StaticResource EyeCheckbox}"
|
|
|
- Visibility="{Binding ChkVis}" />
|
|
|
+ x:Name="DisplayLoginPasswordChk"
|
|
|
+ Grid.Column="1"
|
|
|
+ Height="16"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ Panel.ZIndex="1"
|
|
|
+ Command="{Binding DisplayPasswordCommand}"
|
|
|
+ CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
|
|
|
+ Style="{StaticResource EyeCheckbox}"
|
|
|
+ Visibility="{Binding ChkVis}" />
|
|
|
</Grid>
|
|
|
<Border
|
|
|
BorderBrush="#F3465B"
|
|
|
@@ -541,7 +547,7 @@
|
|
|
Effect="{StaticResource shadow.red-0-4}"
|
|
|
Visibility="{Binding ElementName=Textbl_pass2, Path=Text, Converter={StaticResource LoginBordVis}}" />
|
|
|
</Grid>
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
<TextBlock
|
|
|
@@ -562,15 +568,18 @@
|
|
|
Style="{StaticResource Btn.cta}" />
|
|
|
</StackPanel>
|
|
|
</Grid>
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
<Grid
|
|
|
Width="326"
|
|
|
Height="82"
|
|
|
VerticalAlignment="Bottom"
|
|
|
Background="#FDC7C6"
|
|
|
Visibility="{Binding PasswordUpdatalookVis}">
|
|
|
- <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Center" Margin="9,0,0,0">
|
|
|
+ <WrapPanel
|
|
|
+ Margin="9,0,0,0"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ VerticalAlignment="Center">
|
|
|
<Border
|
|
|
Width="14"
|
|
|
Height="14"
|
