Add Synchronic SAM-SE Plugin version v1.2.0

Corrections : - Negative margins are removed - Hard coded color are removed - GetAll is placed where it should have been from the beginning - Better translations - Removed capital letters where those shouldn't be - Removed Synchronic terms
leosac · Apr 2, 2024 · 399fe27 · 399fe27
1 parent b7c43b5
commit 399fe27
Show file tree

Hide file tree

Showing 11 changed files with 218 additions and 150 deletions.
diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/Properties/Resources.Designer.cs b/KeyManager.Library.KeyStore.SAM_SE.UI/Properties/Resources.Designer.cs
diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/Properties/Resources.fr.resx b/KeyManager.Library.KeyStore.SAM_SE.UI/Properties/Resources.fr.resx
@@ -158,15 +158,15 @@
  <comment>Used</comment>
  </data>
  <data name="DESFireModeIdp" xml:space="preserve">
- <value>ID Privé</value>
+ <value>ID privé</value>
  <comment>Used</comment>
  </data>
  <data name="DESFireModeUid" xml:space="preserve">
  <value>UID</value>
  <comment>Unused, keep</comment>
  </data>
  <data name="KeyEntryDESFireAdvancedSecurity" xml:space="preserve">
- <value>Sécurité Avancée</value>
+ <value>Sécurité avancée</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireAuthEv2" xml:space="preserve">
@@ -190,15 +190,15 @@
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireDivAid" xml:space="preserve">
- <value>AID Inversé</value>
+ <value>AID inversé</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireDivKeyNum" xml:space="preserve">
- <value>Num. clé inclus</value>
+ <value>Numéro de clé inclus</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireDivSi" xml:space="preserve">
- <value>Système d'Identification</value>
+ <value>Système d'identification</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireEncryption" xml:space="preserve">
@@ -250,7 +250,7 @@
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireProximityCheck" xml:space="preserve">
- <value>Proximity Check</value>
+ <value>Contrôle de proximité</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireReadingMode" xml:space="preserve">
@@ -306,11 +306,11 @@
  <comment>Used</comment>
  </data>
  <data name="KeyEntryPoliciesAuthDESFire" xml:space="preserve">
- <value>Autoriser cet objet à effectuer des Authentification DESFire</value>
+ <value>Autoriser cet objet à effectuer des authentifications DESFire</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryPoliciesDecrypt" xml:space="preserve">
- <value>Autoriser le dechiffrement</value>
+ <value>Autoriser le déchiffrement</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryPoliciesEncrypt" xml:space="preserve">
@@ -326,7 +326,7 @@
  <comment>Used</comment>
  </data>
  <data name="KeyEntryPoliciesSessionKeyDESFire" xml:space="preserve">
- <value>Autoriser le dump à l'hôte de la clé de session DESFire</value>
+ <value>Autoriser le transfert de la clé de session DESFire à l'hôte</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryPoliciesWrap" xml:space="preserve">
@@ -362,13 +362,17 @@
  <comment>Used</comment>
  </data>
  <data name="KeyStoreReadersProvider" xml:space="preserve">
- <value>Liste des SAM-SE accesibles</value>
+ <value>Liste des SAM-SE accessibles</value>
  <comment>Used</comment>
  </data>
  <data name="Password" xml:space="preserve">
  <value>Mot de passe</value>
  <comment>Used</comment>
  </data>
+ <data name="ProximityCheckExplanation" xml:space="preserve">
+ <value>Active la protection contre les attaques relais</value>
+ <comment>Used</comment>
+ </data>
  <data name="SAM_SEKeyEntryAuthenticate" xml:space="preserve">
  <value>Authentification</value>
  <comment>Used</comment>
@@ -381,6 +385,10 @@
  <value>DESFire UID</value>
  <comment>Used</comment>
  </data>
+ <data name="StoreSecret" xml:space="preserve">
+ <value>Sauvegarde des informations de connexion</value>
+ <comment>Used</comment>
+ </data>
  <data name="Tools" xml:space="preserve">
  <value>Outils</value>
  <comment>Used</comment>

diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/Properties/Resources.resx b/KeyManager.Library.KeyStore.SAM_SE.UI/Properties/Resources.resx
@@ -190,15 +190,15 @@
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireDivAid" xml:space="preserve">
- <value>AID Inverted</value>
+ <value>AID inverted</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireDivKeyNum" xml:space="preserve">
- <value>Key n° included</value>
+ <value>Key number included</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireDivSi" xml:space="preserve">
- <value>System Identifier</value>
+ <value>System identifier</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireEncryption" xml:space="preserve">
@@ -250,7 +250,7 @@
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireProximityCheck" xml:space="preserve">
- <value>Proximity Check</value>
+ <value>Proximity check</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireReadingMode" xml:space="preserve">
@@ -278,7 +278,7 @@
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireUidKeyNum" xml:space="preserve">
- <value>Reading Key Number</value>
+ <value>Reading key number</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryDESFireWarningSizeId" xml:space="preserve">
@@ -306,7 +306,7 @@
  <comment>Used</comment>
  </data>
  <data name="KeyEntryPoliciesAuthDESFire" xml:space="preserve">
- <value>Allow this object to perform DESFire Authentication</value>
+ <value>Allow this object to perform DESFire authentication</value>
  <comment>Used</comment>
  </data>
  <data name="KeyEntryPoliciesDecrypt" xml:space="preserve">
@@ -342,7 +342,7 @@
  <comment>Used</comment>
  </data>
  <data name="KeyEntryTypeHelper" xml:space="preserve">
- <value>SAM-SE Key Entry Type</value>
+ <value>SAM-SE key entry type</value>
  <comment>Used</comment>
  </data>
  <data name="KeyStoreDefaultKey" xml:space="preserve">
@@ -369,6 +369,10 @@
  <value>Password</value>
  <comment>Used</comment>
  </data>
+ <data name="ProximityCheckExplanation" xml:space="preserve">
+ <value>Enables protection against relay attacks</value>
+ <comment>Used</comment>
+ </data>
  <data name="SAM_SEKeyEntryAuthenticate" xml:space="preserve">
  <value>Authenticate</value>
  <comment>Used</comment>
@@ -381,6 +385,10 @@
  <value>DESFire UID</value>
  <comment>Used</comment>
  </data>
+ <data name="StoreSecret" xml:space="preserve">
+ <value>Save connection informations</value>
+ <comment>Used</comment>
+ </data>
  <data name="Tools" xml:space="preserve">
  <value>Tools</value>
  <comment>Used</comment>

diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SEKeyStorePropertiesControl.xaml b/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SEKeyStorePropertiesControl.xaml
@@ -22,24 +22,50 @@
  Foreground="OrangeRed" TextWrapping="WrapWithOverflow"/>
  <Grid>
  <Grid.ColumnDefinitions>
- <ColumnDefinition MinWidth="460"/>
- <ColumnDefinition MinWidth="40"/>
+ <ColumnDefinition/>
+ <ColumnDefinition Width="Auto"/>
  </Grid.ColumnDefinitions>
- <ComboBox Grid.Column="0" Margin="5,5,5,5"
+ <ComboBox Grid.Column="0" Margin="5,5,5,5" HorizontalContentAlignment="Stretch" HorizontalAlignment="Stretch"
  ItemsSource="{Binding SAM_SEReaders}" SelectedItem="{Binding ProgrammingStation}"
  SelectedIndex="{Binding SAM_SEStationIndex}"
  materialDesign:HintAssist.HelperText="{x:Static properties:Resources.KeyStoreReadersHelper}"
  materialDesign:HintAssist.Hint="{x:Static properties:Resources.KeyStoreReadersProvider}"
  Loaded="RefreshReaderUnitsComboBox"/>
- <Button Grid.Column="1" Width="24" Height="24" Margin="0,0,0,0" IsEnabled="{Binding RefreshList}"
+ <Button Grid.Column="1" HorizontalAlignment="Right" Margin="5,5,5,5"
+ Width="24" Height="24" IsEnabled="{Binding RefreshList}"
  Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
  Click="RefreshReaderUnitsButton">
  <materialDesign:PackIcon Kind="Refresh" Height="16" Width="16"/>
  </Button>
  </Grid>
- <CheckBox HorizontalAlignment="Left" Margin="5,20,0,0" VerticalAlignment="Center" Name="Default_Key"
+ <Grid Margin="0,20,0,5">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition/>
+ </Grid.ColumnDefinitions>
+ <CheckBox Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
+ Margin="5,0,0,0" Name="Default_Key"
  Content="{x:Static properties:Resources.KeyStoreDefaultKey}"
  IsChecked="{Binding SAM_SEProperties.DefaultKey}"/>
+ <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,8,0,0">
+ <TextBlock Margin="0,0,10,0" HorizontalAlignment="Left"
+ Text="{x:Static properties:Resources.StoreSecret}"/>
+ <ToggleButton HorizontalAlignment="Right"
+ IsChecked="{Binding Properties.StoreSecret, Mode=TwoWay}"
+ Style="{StaticResource MaterialDesignSwitchToggleButton}"
+ ToolTip="{x:Static properties:Resources.StoreSecret}"
+ Width="40">
+ <materialDesign:PackIcon Kind="ContentSave" RenderTransformOrigin=".5,.5">
+ <materialDesign:PackIcon.RenderTransform>
+ <RotateTransform Angle="45" />
+ </materialDesign:PackIcon.RenderTransform>
+ </materialDesign:PackIcon>
+ <materialDesign:ToggleButtonAssist.OnContent>
+ <materialDesign:PackIcon Kind="ContentSave" />
+ </materialDesign:ToggleButtonAssist.OnContent>
+ </ToggleButton>
+ </StackPanel>
+ </Grid>
  <PasswordBox Margin="5,5,5,5"
  materialDesign:HintAssist.HelperText="{x:Static properties:Resources.KeyStorePasswordHelper}"
  materialDesign:HintAssist.Hint="{x:Static properties:Resources.Password}"

diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SEKeyStoreToolsControl.xaml b/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SEKeyStoreToolsControl.xaml
@@ -70,22 +70,32 @@
  IsExpanded="{Binding LockedLevelExpanded}"
  Header="{x:Static properties:Resources.ToolsLockUnlock}">
  <WrapPanel Orientation="Vertical" TextBlock.Foreground="{DynamicResource MaterialDesignBody}" Margin="24,8,24,16">
- <Grid Margin="-120,0,-120,10">
+ <Grid Margin="0,0,0,10">
  <Grid.ColumnDefinitions>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition Width="*"/>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition Width="*"/>
+ <ColumnDefinition Width="Auto"/>
  </Grid.ColumnDefinitions>
- <TextBlock Text="{x:Static properties:Resources.ToolsLockKeyShort}" Grid.Column="0" HorizontalAlignment="Center"/>
- <TextBlock Text="{x:Static properties:Resources.ToolsLockDefaultShort}" Grid.Column="1" HorizontalAlignment="Center"/>
- <TextBlock Text="{x:Static properties:Resources.ToolsLockAdvancedShort}" Grid.Column="2" HorizontalAlignment="Center"/>
- </Grid>
- <Slider Value="{Binding SAM_SEKeyStore.Properties.Locked, Mode=TwoWay}" Width="500"
- Minimum="{Binding LockedMin}" 
+ <Grid.RowDefinitions>
+ <RowDefinition/>
+ <RowDefinition MinHeight="50"/>
+ <RowDefinition/>
+ </Grid.RowDefinitions>
+ <TextBlock Text="{x:Static properties:Resources.ToolsLockKeyShort}" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Center"/>
+ <TextBlock Text="{x:Static properties:Resources.ToolsLockDefaultShort}" Grid.Row="0" Grid.Column="2" HorizontalAlignment="Center"/>
+ <TextBlock Text="{x:Static properties:Resources.ToolsLockAdvancedShort}" Grid.Row="0" Grid.Column="4" HorizontalAlignment="Center"/>
+ <Slider Value="{Binding SAM_SEKeyStore.Properties.Locked, Mode=TwoWay}"
+ Grid.Row="1" Grid.ColumnSpan="5" 
+ MinWidth="600" Margin="30,10,30,0"
+ IsSnapToTickEnabled="True"
+ Minimum="{Binding LockedMin}"
  Maximum="{Binding LockedMax}"
  SmallChange="1" TickFrequency="1" TickPlacement="TopLeft">
- </Slider>
- <TextBlock Text="{Binding SAM_SEKeyStore.Properties.LockedLevelString}" Margin="0,15,0,5"/>
+ </Slider>
+ <TextBlock Text="{Binding SAM_SEKeyStore.Properties.LockedLevelString}" Grid.Row="2" Grid.ColumnSpan="5" Margin="0,10,0,5"/>
+ </Grid>
  <WrapPanel HorizontalAlignment="Center" Margin="0,5,0,0">
  <Button Content="{x:Static properties:Resources.Update}"
  Command="{Binding SAM_SELockCommand}"

diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SESymmetricKeyEntryPropertiesControl.xaml b/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SESymmetricKeyEntryPropertiesControl.xaml
@@ -229,7 +229,11 @@
  <CheckBox Grid.Column="2" Margin="0,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center"
  Content="{x:Static properties:Resources.KeyEntryDESFireProximityCheck}"
  IsChecked="{Binding SAM_SEProperties.DESFire.ProximityCheck}"
- IsEnabled="{Binding SAM_SEProperties.DESFire.ProximityCheckEnable}"/>
+ IsEnabled="{Binding SAM_SEProperties.DESFire.ProximityCheckEnable}">
+ <CheckBox.ToolTip>
+ <ToolTip Content="{x:Static properties:Resources.ProximityCheckExplanation}"/>
+ </CheckBox.ToolTip>
+ </CheckBox>
  </Grid>
  <Grid Grid.Row="3" Margin="0,5,0,5" IsEnabled="{Binding SAM_SEProperties.DESFire.ParamEnable}">
  <Grid.ColumnDefinitions>
@@ -244,12 +248,11 @@
  </Grid.RowDefinitions>
  <TextBlock Grid.Row="0" Margin="0,3,0,0"
  Text="{x:Static properties:Resources.DESFireAid}"
- FontSize="9" Foreground="DarkGray"/>
+ FontSize="9.5" Foreground="{DynamicResource MaterialDesignFlatButtonRipple}"/>
  <TextBox Grid.Row="1" Margin="0,0,5,0" MaxLength="6"
  PreviewTextInput="NumberValidationTextBox"
  Text="{Binding SAM_SEProperties.DESFire.AidString, Mode=TwoWay}"
- materialDesign:HintAssist.Hint="{x:Static properties:Resources.DESFireAid}"
- ContextMenu="{x:Null}"/>
+ materialDesign:HintAssist.Hint="{x:Static properties:Resources.DESFireAid}"/>
  <materialDesign:PackIcon Width="20" Height="20" Grid.Row="1" Margin="0,0,5,0"
  Kind="Alert" Foreground="OrangeRed" Background="Transparent"
  Visibility="{Binding SAM_SEProperties.DESFire.WarningAid, Converter={StaticResource BooleanToVisibilityConverter}}"
@@ -296,10 +299,10 @@
  </Grid.ColumnDefinitions>
  <TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,0,0"
  Text="{x:Static properties:Resources.KeyEntryDESFireEncryption}"
- FontSize="9" Foreground="DarkGray"/>
+ FontSize="9.5" Foreground="{DynamicResource MaterialDesignFlatButtonRipple}"/>
  <TextBlock Grid.Row="0" Grid.Column="1" Margin="5,0,0,0"
  Text="{x:Static properties:Resources.KeyEntryDESFireCommunication}"
- FontSize="9" Foreground="DarkGray"/>
+ FontSize="9.5" Foreground="{DynamicResource MaterialDesignFlatButtonRipple}"/>
  <ComboBox Grid.Row="1" Grid.Column="0" Margin="0,0,5,0"
  ItemsSource="{Binding SAM_SE_DESFire_Encrypt}"
  DisplayMemberPath="Value" SelectedValuePath="Key"

diff --git a/KeyManager.Library.KeyStore.SAM_SE/Properties/Resources.Designer.cs b/KeyManager.Library.KeyStore.SAM_SE/Properties/Resources.Designer.cs
diff --git a/KeyManager.Library.KeyStore.SAM_SE/Properties/Resources.fr.resx b/KeyManager.Library.KeyStore.SAM_SE/Properties/Resources.fr.resx
@@ -172,7 +172,7 @@
  <value>Verouillage minimal : seules les clés secrètes sont verrouillées</value>
  </data>
  <data name="LockReadOnly" xml:space="preserve">
- <value>Verouillage avancé : clés et fichiers verrouillés dans les UTPs et lecture seule via Secur'Evolution</value>
+ <value>Verouillage avancé : clés et fichiers verrouillés dans les UTPs et lecture seule via les logiciels Synchronic</value>
  </data>
  <data name="PasswordErrorDigit" xml:space="preserve">
  <value>Le mot de passe ne contient pas de chiffre</value>
@@ -187,7 +187,7 @@
  <value>Aucune station de programmation sélectionnée</value>
  </data>
  <data name="SAM_SEErrorBadConditions" xml:space="preserve">
- <value>La communication avec le SAM-SE est mauvaise</value>
+ <value>La communication avec le SAM-SE est perturbée</value>
  </data>
  <data name="SAM_SEErrorDone" xml:space="preserve">
  <value>L'action du SAM-SE est effectuée</value>

diff --git a/KeyManager.Library.KeyStore.SAM_SE/Properties/Resources.resx b/KeyManager.Library.KeyStore.SAM_SE/Properties/Resources.resx
@@ -172,7 +172,7 @@
  <value>Minimal lock : only the secrets keys are locked</value>
  </data>
  <data name="LockReadOnly" xml:space="preserve">
- <value>Advanced lock : keys and files are locked inside UTPs and readonly by Secur'Evolution</value>
+ <value>Advanced lock : keys and files are locked inside UTPs and readonly by Synchronic softwares</value>
  </data>
  <data name="PasswordErrorDigit" xml:space="preserve">
  <value>Password do not contains a digit</value>
@@ -187,7 +187,7 @@
  <value>No programming station is selected</value>
  </data>
  <data name="SAM_SEErrorBadConditions" xml:space="preserve">
- <value>Communication with SAM-SE is bad</value>
+ <value>Communication with SAM-SE is disturbed</value>
  </data>
  <data name="SAM_SEErrorDone" xml:space="preserve">
  <value>SAM-SE action done</value>
@@ -220,7 +220,7 @@
  <value>SAM-SE function size argument is wrong</value>
  </data>
  <data name="SAM_SEUnknownError" xml:space="preserve">
- <value>SAM-SE Error is unknown : </value>
+ <value>SAM-SE error is unknown : </value>
  </data>
  <data name="SiNotValid" xml:space="preserve">
  <value>The SI cannot have an odd length</value>