From a8a5f29b17a6435a6475971624e3d1b2ace5f8f5 Mon Sep 17 00:00:00 2001
From: "Serg V. Zhdanovskih" <serg.zhdanovskih@yandex.ru>
Date: Mon, 20 Jun 2016 09:35:27 +0500
Subject: [PATCH] Pre-release preparation (4)

---
 deploy/DEBIAN/control                                 |  2 +-
 deploy/gk2_linux_package.sh                           |  4 ++++
 deploy/gk2_win_setup.nsi                              |  8 ++++++++
 projects/GEDKeeper2/GKCore/Export/PedigreeExporter.cs |  2 +-
 projects/GEDKeeper2/GKUI/BaseWin.cs                   |  5 ++++-
 projects/GKCalculatorPlugin/CalcWidget.cs             |  2 +-
 projects/GKCalculatorPlugin/ExpCalculator.cs          | 11 +++++------
 7 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/deploy/DEBIAN/control b/deploy/DEBIAN/control
index 7382ac053..9e91fed9a 100644
--- a/deploy/DEBIAN/control
+++ b/deploy/DEBIAN/control
@@ -5,7 +5,7 @@ Depends: mono-complete (>=3)
 Maintainer: Serg V. Zhdanovskih (aka Norseman) <norseman@mail.ru>
 Homepage: https://gedkeeper.github.io/
 Origin: https://github.com/serg-norseman/gedkeeper
-Installed-Size: 6401
+Installed-Size: 10978
 Section: editors
 Priority: optional
 Description: GEDKeeper2
diff --git a/deploy/gk2_linux_package.sh b/deploy/gk2_linux_package.sh
index 0fc98d1e2..e747d6ced 100644
--- a/deploy/gk2_linux_package.sh
+++ b/deploy/gk2_linux_package.sh
@@ -44,4 +44,8 @@ cp -r $DEV_PATH/locales/ ~/$LIB_PATH/
 cp -r $DEV_PATH/plugins/ ~/$LIB_PATH/
 cp -r $DEV_PATH/scripts/ ~/$LIB_PATH/
 
+#cd ~/$PACK_PATH
+#md5deep -r usr > DEBIAN/md5sums
+#cd ..
+
 fakeroot dpkg-deb -b ~/$PACK_PATH/ .
diff --git a/deploy/gk2_win_setup.nsi b/deploy/gk2_win_setup.nsi
index 5de2aba3a..b4a53bbea 100644
--- a/deploy/gk2_win_setup.nsi
+++ b/deploy/gk2_win_setup.nsi
@@ -104,6 +104,10 @@ SectionGroup /e "
 		CreateDirectory "$INSTDIR\locales\help_enu"
 		SetOutPath "$INSTDIR\locales\help_enu"
 		File "..\locales\help_enu\*.*"
+
+		CreateDirectory "$INSTDIR\locales\help_enu\images"
+		SetOutPath "$INSTDIR\locales\help_enu\images"
+		File "..\locales\help_enu\images\*.*"
 	SectionEnd
 
 	Section "Українська"
@@ -177,6 +181,9 @@ SectionGroup /e "
   		File "..\plugins\csgl.dll"
   		File "..\plugins\csgl.native.dll"
 		File "..\plugins\GKTreeVizPlugin.dll"
+  		File "..\plugins\GKTreeVizPlugin.rus"
+  		File "..\plugins\GKTreeVizPlugin.eng"
+  		File "..\plugins\GKTreeVizPlugin.ukr"
 		File "..\plugins\ArborGVT.dll"
 	SectionEnd
 
@@ -212,6 +219,7 @@ Section "Uninstall"
   Delete $INSTDIR\GKCommon.dll
 
   Delete $INSTDIR\ArborGVT.dll
+  Delete $INSTDIR\DotNetRtfWriter.dll
   Delete $INSTDIR\ExcelLibrary.dll
   Delete $INSTDIR\itextsharp.dll
   Delete $INSTDIR\lua51.dll
diff --git a/projects/GEDKeeper2/GKCore/Export/PedigreeExporter.cs b/projects/GEDKeeper2/GKCore/Export/PedigreeExporter.cs
index 986fd5aa4..7a990a8a5 100644
--- a/projects/GEDKeeper2/GKCore/Export/PedigreeExporter.cs
+++ b/projects/GEDKeeper2/GKCore/Export/PedigreeExporter.cs
@@ -517,7 +517,7 @@ public override void Generate(bool show)
                 #if !GK_LINUX
                 this.fWriter = new PDFWriter();
                 #else
-                this.fWriter = new PDFJetWriter();//PDFClownWriter();
+                this.fWriter = new PDFWriter();//PDFJetWriter();//PDFClownWriter();
                 #endif
             }
 
diff --git a/projects/GEDKeeper2/GKUI/BaseWin.cs b/projects/GEDKeeper2/GKUI/BaseWin.cs
index d467b42b4..6d92b4b1b 100644
--- a/projects/GEDKeeper2/GKUI/BaseWin.cs
+++ b/projects/GEDKeeper2/GKUI/BaseWin.cs
@@ -243,7 +243,10 @@ private void Form_KeyDown(object sender, KeyEventArgs e)
                         this.RecordEdit(null, null);
                     }
                     break;
-                    
+
+                    /*case Keys.F12:
+                    throw new NotSupportedException(); // debug!*/
+
                     /*case Keys.F:
         			if (e.Control) {
         				this.QuickFind();
diff --git a/projects/GKCalculatorPlugin/CalcWidget.cs b/projects/GKCalculatorPlugin/CalcWidget.cs
index ca3d6e629..83d5ddb0c 100644
--- a/projects/GKCalculatorPlugin/CalcWidget.cs
+++ b/projects/GKCalculatorPlugin/CalcWidget.cs
@@ -52,7 +52,7 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
-                this.fCalc.Dispose();
+                //this.fCalc.Dispose();
             }
             base.Dispose(disposing);
         }
diff --git a/projects/GKCalculatorPlugin/ExpCalculator.cs b/projects/GKCalculatorPlugin/ExpCalculator.cs
index 5b620f214..597d96e25 100644
--- a/projects/GKCalculatorPlugin/ExpCalculator.cs
+++ b/projects/GKCalculatorPlugin/ExpCalculator.cs
@@ -9,8 +9,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Windows.Forms;
-using GKCommon;
 
 namespace GKCalculatorPlugin
 {
@@ -26,7 +24,7 @@ public CalculateException(string message) : base(message) {}
     /// <summary>
     /// 
     /// </summary>
-    public sealed class ExpCalculator : BaseObject //Control
+    public sealed class ExpCalculator
     {
         #region Private members
 
@@ -113,14 +111,14 @@ public ExpCalculator()
             this.fCaseSensitive = false;
         }
 
-        protected override void Dispose(bool disposing)
+        /*protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
                 this.ClearVars();
             }
             base.Dispose(disposing);
-        }
+        }*/
 
         public void ClearVars()
         {
@@ -951,7 +949,8 @@ public double GetVar(string name)
             for (int i = 0; i < num; i++) {
                 NamedVar nVar = this.fVars[i];
 
-                if (string.Compare(nVar.Name, name, false) == 0) {
+                if (string.Compare(nVar.Name, name, !this.fCaseSensitive) == 0)
+                {
                     return nVar.Value;
                 }
             }