From ab357ff88dd6df78f6a4fd12d785fbcc16f3ca24 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 17 Jun 2022 09:02:59 +0200
Subject: [PATCH] Importdialog geradegezogen

---
 ENI2/ENI2.csproj                             |   2 ++
 ENI2/EditControls/CompareExcelDialog.xaml    |  20 +++++++----
 ENI2/EditControls/CompareExcelDialog.xaml.cs |  33 +++++++++++++++----
 ENI2/Properties/Resources.Designer.cs        |  20 +++++++++++
 ENI2/Properties/Resources.resx               |   6 ++++
 ENI2/Resources/import1.png                   | Bin 0 -> 1785 bytes
 ENI2/Resources/import2.png                   | Bin 0 -> 1810 bytes
 7 files changed, 68 insertions(+), 13 deletions(-)
 create mode 100644 ENI2/Resources/import1.png
 create mode 100644 ENI2/Resources/import2.png

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index ec89f23c..1af7785f 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -821,6 +821,8 @@
     <Resource Include="Resources\Logo.gif" />
     <Resource Include="Resources\excel.png" />
     <Resource Include="Resources\logo_eni.png" />
+    <Resource Include="Resources\import1.png" />
+    <Resource Include="Resources\import2.png" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/ENI2/EditControls/CompareExcelDialog.xaml b/ENI2/EditControls/CompareExcelDialog.xaml
index e8096095..ba0eb3dc 100644
--- a/ENI2/EditControls/CompareExcelDialog.xaml
+++ b/ENI2/EditControls/CompareExcelDialog.xaml
@@ -8,28 +8,36 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textCompareExcel}" Height="200" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_grey.ico">
+        Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_grey.ico">
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition Height="32" />
             <RowDefinition Height="60" />
             <RowDefinition Height="60" />
+            <RowDefinition Height="28" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="80" />
-            <ColumnDefinition Width="60" />
+            <ColumnDefinition Width="80" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <Label VerticalAlignment="Center" Grid.Row="0" Grid.Column="0">
+        <TextBlock Grid.Row="0" Grid.Column="1" TextWrapping="Wrap" HorizontalAlignment="Center" TextAlignment="Center">Drop your Excel file here</TextBlock>
+        <Label VerticalAlignment="Center" Grid.Row="1" Grid.Column="0">
             <AccessText TextWrapping="Wrap">
                 First (original) sheet
             </AccessText>
         </Label>
-        <Image x:Name="imageSource" Grid.Row="0" Grid.Column="1" Margin="2" Source="../Resources/trafficlight_off.png" AllowDrop="True" Drop="imageSource_Drop" DragEnter="imageSource_DragEnter"/>
-        <Label VerticalAlignment="Center" Grid.Row="1" Grid.Column="0">
+        <Image x:Name="imageSource" Grid.Row="1" Grid.Column="1" Margin="4" Source="../Resources/import2.png" AllowDrop="True" Drop="imageSource_Drop" DragEnter="imageSource_DragEnter"/>
+        <TextBox TextWrapping="Wrap" x:Name="textBoxSource" Grid.Row="1" Grid.Column="2" IsReadOnly="True" Margin="2" Drop="imageSource_Drop" AllowDrop="True" DragEnter="imageSource_DragEnter"/>
+
+        <Label VerticalAlignment="Center" Grid.Row="2" Grid.Column="0">
             <AccessText TextWrapping="Wrap">
                 Second (updated) sheet
             </AccessText>
         </Label>
-        <Image x:Name="imageTarget" Grid.Row="1" Grid.Column="1" Margin="2"  Source="../Resources/trafficlight_off.png" AllowDrop="True" Drop="imageTarget_Drop" DragEnter="imageSource_DragEnter"/>
+        <Image x:Name="imageTarget" Grid.Row="2" Grid.Column="1" Margin="4"  Source="../Resources/import1.png" AllowDrop="True" Drop="imageTarget_Drop" DragEnter="imageSource_DragEnter"/>
+        <TextBox TextWrapping="Wrap" x:Name="textBoxTarget" Grid.Row="2" Grid.Column="2" IsReadOnly="True" Margin="2" AllowDrop="True" Drop="imageTarget_Drop" DragEnter="imageSource_DragEnter"/>
+
+        <Button x:Name="buttonCompare" Margin="2" Grid.Row="3" Grid.Column="1" Content="Compare" IsEnabled="False" Click="buttonCompare_Click"/>
     </Grid>
 </enictrl:StatusWindowBase>
diff --git a/ENI2/EditControls/CompareExcelDialog.xaml.cs b/ENI2/EditControls/CompareExcelDialog.xaml.cs
index e60f774c..d36df072 100644
--- a/ENI2/EditControls/CompareExcelDialog.xaml.cs
+++ b/ENI2/EditControls/CompareExcelDialog.xaml.cs
@@ -30,17 +30,20 @@ namespace ENI2.EditControls
                     if(files[0].EndsWith("xls") || files[0].EndsWith("xlsx"))
                     {
                         _sourcePath = files[0];
-                        imageSource.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/trafficlight_green.png"));
+                        textBoxSource.Text = _sourcePath;
                     }
                     else
                     {
-                        imageSource.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/trafficlight_yellow.png"));
+                        textBoxSource.Text = null;
+                        _sourcePath = null;
                     }
                 } 
                 else
                 {
-                    imageSource.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/trafficlight_red.png"));
+                    textBoxSource.Text = null;
+                    _sourcePath = null;
                 }
+                EnableCompareButton();
             }
         }
 
@@ -56,23 +59,39 @@ namespace ENI2.EditControls
                     if (files[0].EndsWith("xls") || files[0].EndsWith("xlsx"))
                     {
                         _targetPath = files[0];
-                        imageTarget.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/trafficlight_green.png"));
+                        textBoxTarget.Text = _targetPath;
                     }
                     else
                     {
-                        imageTarget.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/trafficlight_yellow.png"));
+                        _targetPath = null;
+                        textBoxTarget.Text = null;
                     }
                 }
                 else
                 {
-                    imageTarget.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/trafficlight_red.png"));
+                    _targetPath = null;
+                    textBoxTarget.Text = null;
                 }
+                EnableCompareButton();
             }
         }
 
         private void imageSource_DragEnter(object sender, DragEventArgs e)
         {
-            if (e.Data.GetDataPresent(DataFormats.FileDrop)) e.Effects = DragDropEffects.Copy;
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                e.Effects = DragDropEffects.Copy;
+            }
+        }
+
+        private void EnableCompareButton()
+        {
+            this.buttonCompare.IsEnabled = (_targetPath != null) && (_sourcePath != null);
+        }
+
+        private void buttonCompare_Click(object sender, RoutedEventArgs e)
+        {
+
         }
     }
 }
diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index 6c73ca2f..e0f5ccba 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -500,6 +500,26 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap import1 {
+            get {
+                object obj = ResourceManager.GetObject("import1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap import2 {
+            get {
+                object obj = ResourceManager.GetObject("import2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index 692a6d10..445b547c 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -1843,4 +1843,10 @@
   <data name="textCompareExcel" xml:space="preserve">
     <value>Compare excel sheets</value>
   </data>
+  <data name="import1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\import1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="import2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\import2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI2/Resources/import1.png b/ENI2/Resources/import1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccde244dccbfd817a9589a983dd90dfff3f938d4
GIT binary patch
literal 1785
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
bGaY{e?F-u2k9>E*00000NkvXXu0mjf?$0Aw

literal 0
HcmV?d00001

diff --git a/ENI2/Resources/import2.png b/ENI2/Resources/import2.png
new file mode 100644
index 0000000000000000000000000000000000000000..51e2c05d76a36e3f2124e8b48ce49013a6010e77
GIT binary patch
literal 1810
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
AT>t<8

literal 0
HcmV?d00001