Pre-release preparation (4)

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

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/ .

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

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
             }
 

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();

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);
         }

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;
                 }
             }