From 315aa97e88ccfdfd0851884459344f38315b5bc8 Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Tue, 2 Jun 2015 16:56:32 +0400
Subject: [PATCH] (WidgetDPK): update key fields in code-behind.

---
 ArcFormats/Strings/arcStrings.Designer.cs |  9 ++++++++
 ArcFormats/Strings/arcStrings.resx        |  3 +++
 ArcFormats/Strings/arcStrings.ru-RU.resx  |  3 +++
 ArcFormats/WidgetDPK.xaml                 | 24 +++------------------
 ArcFormats/WidgetDPK.xaml.cs              | 26 +++++++++++++++++++++--
 5 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/ArcFormats/Strings/arcStrings.Designer.cs b/ArcFormats/Strings/arcStrings.Designer.cs
index 8ebef624..4ba844ff 100644
--- a/ArcFormats/Strings/arcStrings.Designer.cs
+++ b/ArcFormats/Strings/arcStrings.Designer.cs
@@ -124,6 +124,15 @@ namespace GameRes.Formats.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 32-bit hex number.
+        /// </summary>
+        public static string ArcHex32Bit {
+            get {
+                return ResourceManager.GetString("ArcHex32Bit", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to no encryption.
         /// </summary>
diff --git a/ArcFormats/Strings/arcStrings.resx b/ArcFormats/Strings/arcStrings.resx
index 2327ad49..1d26a4d3 100644
--- a/ArcFormats/Strings/arcStrings.resx
+++ b/ArcFormats/Strings/arcStrings.resx
@@ -312,6 +312,9 @@ Enter archive encryption key.</value>
   <data name="ArcDefault" xml:space="preserve">
     <value>Default</value>
   </data>
+  <data name="ArcHex32Bit" xml:space="preserve">
+    <value>32-bit hex number</value>
+  </data>
   <data name="KCAPDefault" xml:space="preserve">
     <value>Default</value>
   </data>
diff --git a/ArcFormats/Strings/arcStrings.ru-RU.resx b/ArcFormats/Strings/arcStrings.ru-RU.resx
index 4c95c452..02a5194c 100644
--- a/ArcFormats/Strings/arcStrings.ru-RU.resx
+++ b/ArcFormats/Strings/arcStrings.ru-RU.resx
@@ -136,6 +136,9 @@
     <value>Содержимое архива зашифровано.
 Выберите алгоритм шифрования.</value>
   </data>
+  <data name="ArcHex32Bit" xml:space="preserve">
+    <value>32-битное шестнадцатеричное число</value>
+  </data>
   <data name="ArcNoEncryption" xml:space="preserve">
     <value>без шифрования</value>
   </data>
diff --git a/ArcFormats/WidgetDPK.xaml b/ArcFormats/WidgetDPK.xaml
index 234e0fa7..12a0bdc9 100644
--- a/ArcFormats/WidgetDPK.xaml
+++ b/ArcFormats/WidgetDPK.xaml
@@ -5,17 +5,6 @@
       xmlns:p="clr-namespace:GameRes.Formats.Properties"
       xmlns:dac="clr-namespace:GameRes.Formats.Dac"
       xmlns:local="clr-namespace:GameRes.Formats.GUI">
-    <Grid.Resources>
-        <local:KeyConverter x:Key="keyConverter"/>
-        <Style TargetType="{x:Type TextBox}">
-            <Style.Triggers>
-                <Trigger Property="Validation.HasError" Value="true">
-                    <Setter Property="ToolTip"
-                            Value="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}"/>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
-    </Grid.Resources>
     <Grid.ColumnDefinitions>
         <ColumnDefinition Width="Auto"/>
         <ColumnDefinition MinWidth="130" Width="*"/>
@@ -36,17 +25,10 @@
              IsReadOnly="True" TextWrapping="NoWrap" Grid.Column="1" Grid.Row="1" Margin="0,3,0,3"
              DataContext="{Binding ElementName=EncScheme, Path=SelectedItem}"/>
     <Label Content="{x:Static s:arcStrings.DPKKeys}" Target="{Binding ElementName=Key1}"
+           ToolTip="{x:Static s:arcStrings.ArcHex32Bit}"
            Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right"/>
     <TextBox Name="Key1" Grid.Column="1" Grid.Row="2" Margin="0,3,0,3" Width="100" HorizontalAlignment="Left"
-             DataContext="{Binding ElementName=EncScheme, Path=SelectedItem}">
-        <TextBox.Text>
-            <Binding Path="Key1" Mode="OneWay" Converter="{StaticResource keyConverter}" UpdateSourceTrigger="PropertyChanged"/>
-        </TextBox.Text>
-    </TextBox>
+             ToolTip="{x:Static s:arcStrings.ArcHex32Bit}"/>
     <TextBox Name="Key2" Grid.Column="1" Grid.Row="3" Margin="0,3,0,3" Width="100" HorizontalAlignment="Left"
-             DataContext="{Binding ElementName=EncScheme, Path=SelectedItem}">
-        <TextBox.Text>
-            <Binding Path="Key2" Mode="OneWay" Converter="{StaticResource keyConverter}" UpdateSourceTrigger="PropertyChanged"/>
-        </TextBox.Text>
-    </TextBox>
+             ToolTip="{x:Static s:arcStrings.ArcHex32Bit}"/>
 </Grid>
diff --git a/ArcFormats/WidgetDPK.xaml.cs b/ArcFormats/WidgetDPK.xaml.cs
index c088c0ad..586f3ec4 100644
--- a/ArcFormats/WidgetDPK.xaml.cs
+++ b/ArcFormats/WidgetDPK.xaml.cs
@@ -1,4 +1,6 @@
 using System.Windows.Controls;
+using GameRes.Formats.Dac;
+using GameRes.Formats.Properties;
 
 namespace GameRes.Formats.GUI
 {
@@ -10,8 +12,28 @@ namespace GameRes.Formats.GUI
         public WidgetDPK ()
         {
             InitializeComponent ();
-            if (null == EncScheme.SelectedItem)
-                EncScheme.SelectedIndex = 0;
+            var last_scheme = EncScheme.SelectedItem as DpkScheme;
+            if (null == last_scheme)
+                last_scheme = DpkOpener.KnownSchemes[0];
+            uint key1 = Settings.Default.DPKKey1;
+            uint key2 = Settings.Default.DPKKey2; 
+            if (last_scheme.Key1 != key1 || last_scheme.Key2 != key2)
+                EncScheme.SelectedIndex = -1;
+            Key1.Text = key1.ToString ("X");
+            Key2.Text = key2.ToString ("X8");
+
+            EncScheme.SelectionChanged += OnSchemeChanged;
+        }
+
+        void OnSchemeChanged (object sender, SelectionChangedEventArgs e)
+        {
+            var widget = sender as ComboBox;
+            var scheme = widget.SelectedItem as DpkScheme;
+            if (null != scheme)
+            {
+                Key1.Text = scheme.Key1.ToString ("X");
+                Key2.Text = scheme.Key2.ToString ("X8");
+            }
         }
     }
 }