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 @@
+
+
Always
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">
+
+
-
+
-
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 {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap import1 {
+ get {
+ object obj = ResourceManager.GetObject("import1", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap import2 {
+ get {
+ object obj = ResourceManager.GetObject("import2", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
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 @@
Compare excel sheets
+
+ ..\Resources\import1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\import2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/ENI2/Resources/import1.png b/ENI2/Resources/import1.png
new file mode 100644
index 00000000..ccde244d
Binary files /dev/null and b/ENI2/Resources/import1.png differ
diff --git a/ENI2/Resources/import2.png b/ENI2/Resources/import2.png
new file mode 100644
index 00000000..51e2c05d
Binary files /dev/null and b/ENI2/Resources/import2.png differ