From 9566c9a719102d5812afd9e21935f973b6567378 Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Tue, 5 Jun 2018 18:40:23 +0200
Subject: [PATCH] Open databases errors are cleaner WIP SemanticView ListView
 Width issue

---
 ModernKeePass/Strings/en-US/CodeBehind.resw     | 17 +++++++----------
 ModernKeePass/Strings/fr-FR/CodeBehind.resw     | 14 ++++----------
 ModernKeePass/ViewModels/CompositeKeyVm.cs      | 11 +++++------
 ModernKeePass/Views/GroupDetailPage.xaml        |  1 +
 .../UserControls/CompositeKeyUserControl.xaml   |  4 ++--
 ModernKeePassLib/Keys/CompositeKey.cs           |  6 +++---
 6 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/ModernKeePass/Strings/en-US/CodeBehind.resw b/ModernKeePass/Strings/en-US/CodeBehind.resw
index 20df5e0..17a2a0a 100644
--- a/ModernKeePass/Strings/en-US/CodeBehind.resw
+++ b/ModernKeePass/Strings/en-US/CodeBehind.resw
@@ -121,19 +121,13 @@
     <value>Select key file from disk...</value>
   </data>
   <data name="CompositeKeyErrorOpen" xml:space="preserve">
-    <value>Error</value>
+    <value>Error: </value>
   </data>
   <data name="CompositeKeyErrorUserKeyFile" xml:space="preserve">
-    <value>key file</value>
-  </data>
-  <data name="CompositeKeyErrorUserOr" xml:space="preserve">
-    <value> or </value>
+    <value>- wrong key file</value>
   </data>
   <data name="CompositeKeyErrorUserPassword" xml:space="preserve">
-    <value>password</value>
-  </data>
-  <data name="CompositeKeyErrorUserStart" xml:space="preserve">
-    <value>Error: wrong </value>
+    <value>- password incorrect</value>
   </data>
   <data name="CompositeKeyOpening" xml:space="preserve">
     <value>Opening...</value>
@@ -265,7 +259,7 @@
     <value>Security</value>
   </data>
   <data name="CompositeKeyErrorUserAccount" xml:space="preserve">
-    <value>user account</value>
+    <value>- user account</value>
   </data>
   <data name="SettingsMenuItemSave" xml:space="preserve">
     <value>Saving</value>
@@ -273,4 +267,7 @@
   <data name="RecycleBinTitle" xml:space="preserve">
     <value>Recycle Bin</value>
   </data>
+  <data name="String" xml:space="preserve">
+    <value>##</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ModernKeePass/Strings/fr-FR/CodeBehind.resw b/ModernKeePass/Strings/fr-FR/CodeBehind.resw
index 3259e52..e8e76d4 100644
--- a/ModernKeePass/Strings/fr-FR/CodeBehind.resw
+++ b/ModernKeePass/Strings/fr-FR/CodeBehind.resw
@@ -121,19 +121,13 @@
     <value>Choisissez un fichier...</value>
   </data>
   <data name="CompositeKeyErrorOpen" xml:space="preserve">
-    <value>Erreur</value>
+    <value>Erreur: </value>
   </data>
   <data name="CompositeKeyErrorUserKeyFile" xml:space="preserve">
-    <value>fichier de clé</value>
-  </data>
-  <data name="CompositeKeyErrorUserOr" xml:space="preserve">
-    <value> ou </value>
+    <value>- mauvais fichier de clé</value>
   </data>
   <data name="CompositeKeyErrorUserPassword" xml:space="preserve">
-    <value>mot de passe</value>
-  </data>
-  <data name="CompositeKeyErrorUserStart" xml:space="preserve">
-    <value>Erreur: mauvais </value>
+    <value>- mot de passe incorrect</value>
   </data>
   <data name="CompositeKeyOpening" xml:space="preserve">
     <value>Ouverture...</value>
@@ -265,7 +259,7 @@
     <value>Sécurité</value>
   </data>
   <data name="CompositeKeyErrorUserAccount" xml:space="preserve">
-    <value>compte utilisateur</value>
+    <value>- compte utilisateur</value>
   </data>
   <data name="SettingsMenuItemSave" xml:space="preserve">
     <value>Sauvegardes</value>
diff --git a/ModernKeePass/ViewModels/CompositeKeyVm.cs b/ModernKeePass/ViewModels/CompositeKeyVm.cs
index 318da51..09711c0 100644
--- a/ModernKeePass/ViewModels/CompositeKeyVm.cs
+++ b/ModernKeePass/ViewModels/CompositeKeyVm.cs
@@ -132,16 +132,15 @@ namespace ModernKeePass.ViewModels
             }
             catch (ArgumentException)
             {
-                var errorMessage = new StringBuilder(_resource.GetResourceValue("CompositeKeyErrorUserStart"));
-                if (HasPassword) errorMessage.Append(_resource.GetResourceValue("CompositeKeyErrorUserPassword"));
-                if (HasPassword && HasKeyFile) errorMessage.Append(_resource.GetResourceValue("CompositeKeyErrorUserOr"));
-                if (HasKeyFile) errorMessage.Append(_resource.GetResourceValue("CompositeKeyErrorUserKeyFile"));
-                if (HasUserAccount) errorMessage.Append(_resource.GetResourceValue("CompositeKeyErrorUserAccount"));
+                var errorMessage = new StringBuilder($"{_resource.GetResourceValue("CompositeKeyErrorOpen")}\n");
+                if (HasPassword) errorMessage.AppendLine(_resource.GetResourceValue("CompositeKeyErrorUserPassword"));
+                if (HasKeyFile) errorMessage.AppendLine(_resource.GetResourceValue("CompositeKeyErrorUserKeyFile"));
+                if (HasUserAccount) errorMessage.AppendLine(_resource.GetResourceValue("CompositeKeyErrorUserAccount"));
                 UpdateStatus(errorMessage.ToString(), StatusTypes.Error);
             }
             catch (Exception e)
             {
-                var error = $"{_resource.GetResourceValue("CompositeKeyErrorOpen")}: {e.Message}";
+                var error = $"{_resource.GetResourceValue("CompositeKeyErrorOpen")}{e.Message}";
                 UpdateStatus(error, StatusTypes.Error);
             }
             finally
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml
index e8204a9..71b32e0 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -316,6 +316,7 @@
                 </SemanticZoom.ZoomedInView>
                 <SemanticZoom.ZoomedOutView>
                     <ListView
+                        Height="Auto" Width="Auto"
                         ItemsSource="{Binding Source={StaticResource EntriesZoomedOutViewSource}}"
                         SelectionChanged="groups_SelectionChanged"
                         SelectionMode="None"
diff --git a/ModernKeePass/Views/UserControls/CompositeKeyUserControl.xaml b/ModernKeePass/Views/UserControls/CompositeKeyUserControl.xaml
index f01fcce..34170eb 100644
--- a/ModernKeePass/Views/UserControls/CompositeKeyUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/CompositeKeyUserControl.xaml
@@ -29,7 +29,7 @@
             <RowDefinition Height="45" />
             <RowDefinition Height="40" />
             <RowDefinition Height="40" />
-            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <CheckBox Grid.Row="0" Grid.Column="0" IsChecked="{Binding HasPassword, Mode=TwoWay}" />
         <PasswordBox Grid.Row="0" Grid.Column="1" x:Uid="CompositeKeyPassword" Password="{Binding Password, Mode=TwoWay}" Height="30" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" BorderBrush="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" >
@@ -54,6 +54,6 @@
             </SymbolIcon>
         </HyperlinkButton>
         <Button Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" Content="{Binding ButtonLabel, ElementName=UserControl}" Click="OpenButton_OnClick" Background="{ThemeResource ListViewItemSelectedPointerOverBorderThemeBrush}" Foreground="{ThemeResource TextBoxBackgroundThemeBrush}" IsEnabled="{Binding IsValid}" />
-        <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" Height="28" FontSize="14" FontWeight="Light" Text="{Binding Status}" Foreground="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" Visibility="{Binding Status, Converter={StaticResource EmptyStringToVisibilityConverter}}" />
+        <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" Height="Auto" FontSize="14" FontWeight="Light" Text="{Binding Status}" Foreground="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" Visibility="{Binding Status, Converter={StaticResource EmptyStringToVisibilityConverter}}" />
     </Grid>
 </UserControl>
diff --git a/ModernKeePassLib/Keys/CompositeKey.cs b/ModernKeePassLib/Keys/CompositeKey.cs
index bad3077..4159ad7 100644
--- a/ModernKeePassLib/Keys/CompositeKey.cs
+++ b/ModernKeePassLib/Keys/CompositeKey.cs
@@ -237,8 +237,8 @@ namespace ModernKeePassLib.Keys
 
 			KdfEngine kdf = KdfPool.Get(p.KdfUuid);
 			if(kdf == null) // CryptographicExceptions are translated to "file corrupted"
-				throw new Exception(KLRes.UnknownKdf + Environment.NewLine +
-					KLRes.FileNewVerOrPlgReq + Environment.NewLine +
+				throw new Exception(KLRes.UnknownKdf + MessageService.NewParagraph +
+					KLRes.FileNewVerOrPlgReq + MessageService.NewParagraph +
 					"UUID: " + p.KdfUuid.ToHexString() + ".");
 
 			byte[] pbTrf32 = kdf.Transform(pbRaw32, p);
@@ -280,7 +280,7 @@ namespace ModernKeePassLib.Keys
 		{
 			get
 			{
-				return KLRes.InvalidCompositeKey + Environment.NewLine +
+				return KLRes.InvalidCompositeKey + MessageService.NewParagraph +
 					KLRes.InvalidCompositeKeyHint;
 			}
 		}