Release preparation

CHANGELOG.md

@@ -1,4 +1,50 @@
 
+## 18.09.2019 [v2.16.2]
+- Implemented moving notes up and down [Milan Kosina].
+- Implemented line wrapping in the HyperView of information panel.
+- Added check for file existence when creating multimedia records.
+- Added verification of the database for multimedia records (lack of files, archives, storages).
+- Added support for relative paths to media files [Milan Kosina].
+- Fixed the choice of the type of file storage in the multimedia dialog.
+- Implemented the removal of multimedia files when deleting their records.
+- Fixed event output if an additional event type is not specified.
+- Fixed renaming and deleting of location records.
+- Fixed merging family and individual records, transition buttons in editing dialogs, button images.
+- Fixed editing dates of events with periods.
+- Added new diagnostics for data verification: for families without spouses and/or children [Kevin D. Sandal].
+- Added hotkey for saving files from tree diagrams.
+- Fixed support for formats with zero IDs of records.
+- Fixed opening files and OSM geocoder operation.
+- Cleaning and optimization, improved support for two third-party GEDCOM formats.
+- Fixed the script of the portable package.
+- Fixed the work of the "Compare databases" tool.
+- Fixed external viewing of PDF files (and other not supported by the embedded viewer).
+- Proofreading of the English manual [Kevin D. Sandal].
+- Implemented preliminary support for GedML format.
+- Fixed pedigrees localization.
+- Fixed Calendar plugin.
+- Fixed overlapping of neighboring persons in tree diagrams.
+- Fixed incorrect parsing of interpretable dates from Ahnenblatt.
+- Fixed missing substructures in media records from extraneous files.
+- Fixed convert links to sources in source records .
+- Fixed convert media links to media records, and convert non-standard x-references.
+- Fixed reading standard coordinates of the place.
+- Minor improvement of circle chart.
+- Improved support for several GEDCOM file formats.
+- Fix of sorting the columns of some tables.
+- Fix of long-distance displacement of male nodes (tree chart) in the presence of more than 
+one marriage and a large tree of descendants from the first wife.
+- Improved date input in the event dialog with regional format settings.
+- Bugfixes for FlowInput plugin.
+- Added the possibility to create and connect plugins to replace record's edit dialogs.
+- Restored loading recent files.
+- Created a new plugin for managing "folders" in GEDCOM files (to separate work areas in large files).
+- Added option to automatically detect charset of GEDCOM files at load.
+- Fixed execution of Lua scripts.
+- Reduced memory consumption when loading large files (25-42%).
+- Optimized a number of functions, allowing to significantly increase the speed of loading and processing large files 
+(from 30 thousand records to very large files - 91mb, 538 thousand records, load time 25 seconds!).
+
 ## 14.02.2019 [v2.15.0]
 - Added control unit for several families of parents and for the type of 
 child/parent linkage (adoption, foster, etc.).

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.16.0.{build}
+version: 2.16.2.{build}
 configuration: Debug
 platform: x86
 skip_tags: true

deploy/DEBIAN/changelog

@@ -1,6 +1,6 @@
-gedkeeper (2.16.0-1~rc1) unstable; urgency=low
+gedkeeper (2.16.2-1~rc1) unstable; urgency=low
 
   * Packaged release
   * See changelog.md for changes
 
- -- Sergey V. Zhdanovskih (aka Norseman) <[email protected]>  Thu, 20 Jun 2019 19:00:00 +0300
+ -- Sergey V. Zhdanovskih (aka Norseman) <[email protected]>  Wed, 18 Sep 2019 00:00:00 +0300

deploy/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: gedkeeper
-Version: 2.16.0-1
+Version: 2.16.2-1
 Architecture: all
 Depends: mono-runtime (>=5.12)
 Maintainer: Sergey V. Zhdanovskih (aka Norseman) <[email protected]>

deploy/gedkeeper.appdata.xml

@@ -40,7 +40,7 @@
   <developer_name>Sergey V. Zhdanovskih</developer_name>
 
   <releases>
-    <release version="2.16.0" date="2019-06-20">
+    <release version="2.16.2" date="2019-09-18">
       <description>
         <p>Fixes issues X, Y and Z</p>
       </description>

deploy/gk2_linux_deb_package.sh

@@ -3,13 +3,13 @@ APP="GEDKeeper2"
 EXT="ged"
 COMMENT="Personal genealogical database editor"
 # APP_PATH=/usr/bin/
-APP_VER="2.16.0"
+APP_VER="2.16.2"
 DEV_PATH="/home/norseman/share/gkdev/GEDKeeper"
 PACK_PATH="gedkeeper-$APP_VER"
 LIB_PATH="$PACK_PATH/usr/lib/gedkeeper"
 BIN_PATH="$PACK_PATH/usr/bin"
 
-rm -f ~/gedkeeper_2.16.0-1_all.deb
+rm -f ~/gedkeeper_2.16.2-1_all.deb
 rm -rf ~/$PACK_PATH
 
 # Create directories if missing

deploy/gk2_win_portable.cmd

@@ -5,7 +5,7 @@ rem Copyright (C) 2009-2019 by Sergey V. Zhdanovskih.
 rem This file is part of "GEDKeeper".
 
 set lstfile=".\listfile.txt"
-set out_fn="gedkeeper_2.16.0_win_portable"
+set out_fn="gedkeeper_2.16.2_win_portable"
 set zip_fn=".\%out_fn%.zip"
 set log_fn=".\%out_fn%.log"
 

deploy/gk2_win_setup.nsi

@@ -9,7 +9,7 @@
 
 Unicode true
 Name "GEDKeeper"
-OutFile "gedkeeper_2.16.0_winsetup.exe"
+OutFile "gedkeeper_2.16.2_winsetup.exe"
 InstallDir $PROGRAMFILES\GEDKeeper2
 
 CRCCheck on

locales/help_enu/gkhHistory.html

@@ -10,7 +10,7 @@
 
 <h1>Change log</h1>
 
-<p><b>??.08.2019 [v2.16.0]</b><ul>
+<p><b>18.09.2019 [v2.16.2]</b><ul>
 <li>(+) Implemented moving notes up and down [Milan Kosina].
 <li>(+) Implemented line wrapping in the HyperView of information panel.
 <li>(+) Added check for file existence when creating multimedia records.
@@ -20,19 +20,14 @@ <h1>Change log</h1>
 <li>(+) Implemented the removal of multimedia files when deleting their records.
 <li>(*) Fixed event output if an additional event type is not specified.
 <li>(*) Fixed renaming and deleting of location records.
-</ul></p>
-
-<p><b>08.07.2019 [v2.16.0-rc.2]</b><ul>
+<li>(*) Fixed merging family and individual records, transition buttons in editing dialogs, button images.
 <li>(*) Fixed editing dates of events with periods.
 <li>(+) Added new diagnostics for data verification: for families without spouses and/or children [Kevin D. Sandal].
 <li>(+) Added hotkey for saving files from tree diagrams.
 <li>(*) Fixed support for formats with zero IDs of records.
 <li>(*) Fixed opening files and OSM geocoder operation.
 <li>(*) Cleaning and optimization, improved support for two third-party GEDCOM formats.
 <li>(*) Fixed the script of the portable package.
-</ul></p>
-
-<p><b>20.06.2019 [v2.16.0-rc.1]</b><ul>
 <li>(*) Fixed the work of the "Compare databases" tool.
 <li>(*) Fixed external viewing of PDF files (and other not supported by the embedded viewer).
 <li>(*) Proofreading of the English manual [Kevin D. Sandal].

locales/help_rus/gkhHistory.html

@@ -10,7 +10,7 @@
 
 <h1>История версий</h1>
 
-<p><b>??.08.2019 [v2.16.0]</b><ul>
+<p><b>18.09.2019 [v2.16.2]</b><ul>
 <li>(+) Реализовано изменение порядка заметок в списках [Milan Kosina].
 <li>(+) Реализован перенос строк в HyperView информационной панели.
 <li>(+) Добавлена проверка существования файла при создании мультимедиа записей.
@@ -20,19 +20,14 @@ <h1>История версий</h1>
 <li>(+) Реализовано удаление мультимедийных файлов при удалении их записей.
 <li>(*) Исправлен вывод событий, если дополнительный тип события не указан.
 <li>(*) Исправлено переименование и удаление записей местоположений.
-</ul></p>
-
-<p><b>08.07.2019 [v2.16.0-rc.2]</b><ul>
+<li>(*) Исправлено слияние записей семей и персон, кнопки переходов в диалогах редактирования, изображения кнопок.
 <li>(*) Исправлено редактирование дат событий с периодами.
 <li>(+) Добавлена новая диагностика проверки данных: на семьи без супругов и/или детей [Kevin D. Sandal].
 <li>(+) Добавлены горячие клавиши сохранения файлов из диаграмм деревьев.
 <li>(*) Исправлена поддержка форматов с нулевыми идентификаторами записей.
 <li>(*) Исправлено открытие файлов и работа OSM-геокодера.
 <li>(*) Чистка и оптимизация, улучшена поддержка двух сторонних форматов GEDCOM.
 <li>(*) Исправлен скрипт портируемого пакета установки.
-</ul></p>
-
-<p><b>20.06.2019 [v2.16.0-rc.1]</b><ul>
 <li>(*) Исправлена работа инструмента «Сравнить базы данных».
 <li>(*) Исправлен внешний просмотр файлов PDF (и других, не поддерживаемых встроенным средством просмотра).
 <li>(*) Корректура английского мануала [Kevin D. Sandal].

make_gk2_mswin_installer.cmd

@@ -13,6 +13,6 @@ exit /b 1
 
 :installer 
 "C:\Program Files (x86)\NSIS\makensis.exe" .\deploy\gk2_win_setup.nsi
-"c:\Program Files\7-zip\7z.exe" a -tzip -mx5 -scsWIN .\deploy\gedkeeper_2.16.0_win.zip .\deploy\gedkeeper_2.16.0_winsetup.exe
+"c:\Program Files\7-zip\7z.exe" a -tzip -mx5 -scsWIN .\deploy\gedkeeper_2.16.2_win.zip .\deploy\gedkeeper_2.16.2_winsetup.exe
 pause 
 exit /b 0

projects/GKCore/GKCore/GKUtils.cs

@@ -42,32 +42,6 @@ public static class GKUtils
     {
         #region Aux functions
 
-        public static int StrCompareEx(string str1, string str2)
-        {
-            double val1, val2;
-            bool v1 = double.TryParse(str1, out val1);
-            bool v2 = double.TryParse(str2, out val2);
-
-            int result;
-            if (v1 && v2) {
-                if (val1 < val2) {
-                    result = -1;
-                } else if (val1 > val2) {
-                    result = +1;
-                } else {
-                    result = 0;
-                }
-            } else {
-                result = string.Compare(str1, str2, false);
-                if (str1 != "" && str2 == "") {
-                    result = -1;
-                } else if (str1 == "" && str2 != "") {
-                    result = +1;
-                }
-            }
-            return result;
-        }
-
         public static bool ImplementsInterface(Type type, Type ifaceType)
         {
             Type[] intf = type.GetInterfaces();
@@ -1160,6 +1134,7 @@ public static GDMIndividualRecord GetFirstborn(GDMIndividualRecord iRec)
                 int num = iRec.SpouseToFamilyLinks.Count;
                 for (int i = 0; i < num; i++) {
                     GDMFamilyRecord family = iRec.SpouseToFamilyLinks[i].Family;
+                    if (family == null) continue;
 
                     int num2 = family.Children.Count;
                     for (int j = 0; j < num2; j++) {
@@ -1232,6 +1207,7 @@ public static int GetMarriageAge(GDMIndividualRecord iRec)
                     for (int i = 0; i < num; i++)
                     {
                         GDMFamilyRecord family = iRec.SpouseToFamilyLinks[i].Family;
+                        if (family == null) continue;
 
                         GDMCustomEvent marrEvt = family.FindEvent(GEDCOMTagType.MARR);
                         if (marrEvt == null) continue;

projects/GKCore/GKCore/Tools/TreeTools.cs

@@ -328,10 +328,13 @@ private static GDMIndividualRecord DetectCycleDescendants(GDMIndividualRecord iR
             int num = iRec.SpouseToFamilyLinks.Count;
             for (int i = 0; i < num; i++) {
                 GDMFamilyRecord family = iRec.SpouseToFamilyLinks[i].Family;
+                if (family == null) continue;
 
                 int num2 = family.Children.Count;
                 for (int j = 0; j < num2; j++) {
                     GDMIndividualRecord child = family.Children[j].Individual;
+                    if (child == null) continue;
+
                     var res = DetectCycleDescendants(child, stack);
                     if (res != null) return res;
                 }

projects/GKv2/GEDKeeper2/GKProgram.cs

@@ -31,7 +31,7 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyProduct("GEDKeeper")]
 [assembly: AssemblyCopyright("Copyright © 2009-2019 by Sergey V. Zhdanovskih")]
-[assembly: AssemblyVersion("2.16.0.0")]
+[assembly: AssemblyVersion("2.16.2.0")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]

projects/GKv2/GKComponents/GKUI/Components/GKListView.cs

@@ -122,7 +122,7 @@ public int CompareTo(object obj)
             }
 
             if (fValue is string && otherItem.fValue is string) {
-                return GKUtils.StrCompareEx((string)fValue, (string)otherItem.fValue);
+                return GKListView.StrCompareEx((string)fValue, (string)otherItem.fValue);
             }
 
             IComparable cv1 = fValue as IComparable;
@@ -199,7 +199,7 @@ public int Compare(object x, object y)
                             IComparable eitem2 = (IComparable)y;
                             result = eitem1.CompareTo(eitem2);
                         } else {
-                            result = GKUtils.StrCompareEx(item1.Text, item2.Text);
+                            result = GKListView.StrCompareEx(item1.Text, item2.Text);
                         }
                     } else if (sortColumn < item1.SubItems.Count && sortColumn < item2.SubItems.Count) {
                         ListViewItem.ListViewSubItem subitem1 = item1.SubItems[sortColumn];
@@ -210,7 +210,7 @@ public int Compare(object x, object y)
                             IComparable sub2 = (IComparable)subitem2;
                             result = sub1.CompareTo(sub2);
                         } else {
-                            result = GKUtils.StrCompareEx(subitem1.Text, subitem2.Text);
+                            result = GKListView.StrCompareEx(subitem1.Text, subitem2.Text);
                         }
                     }
 
@@ -744,5 +744,35 @@ public void SelectItem(object rowData)
         }
 
         #endregion
+
+        #region Internal functions
+
+        internal static int StrCompareEx(string str1, string str2)
+        {
+            double val1, val2;
+            bool v1 = double.TryParse(str1, out val1);
+            bool v2 = double.TryParse(str2, out val2);
+
+            int result;
+            if (v1 && v2) {
+                if (val1 < val2) {
+                    result = -1;
+                } else if (val1 > val2) {
+                    result = +1;
+                } else {
+                    result = 0;
+                }
+            } else {
+                result = string.Compare(str1, str2, false);
+                if (str1 != "" && str2 == "") {
+                    result = -1;
+                } else if (str1 == "" && str2 != "") {
+                    result = +1;
+                }
+            }
+            return result;
+        }
+
+        #endregion
     }
 }