Preparing for release

Serg-Norseman · Dec 3, 2024 · 3d8ea12 · 3d8ea12
1 parent 9657f1c
commit 3d8ea12
Show file tree

Hide file tree

Showing 28 changed files with 44 additions and 34 deletions.
diff --git a/deploy/DEBIAN/changelog b/deploy/DEBIAN/changelog
@@ -1,6 +1,6 @@
-gedkeeper (3.7.0-1~rc1) unstable; urgency=low
+gedkeeper (3.8.0-1~rc1) unstable; urgency=low
 
   * Packaged release
   * See changelog.md for changes
 
- -- Sergey V. Zhdanovskih (aka Norseman) <[email protected]>  28 Jul 2024 00:00:00 +0300
+ -- Sergey V. Zhdanovskih (aka Norseman) <[email protected]>  14 Dec 2024 00:00:00 +0300
diff --git a/deploy/DEBIAN/control b/deploy/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: gedkeeper
-Version: 3.7.0-1
+Version: 3.8.0-1
 Architecture: all
 Depends: sqlite3
 Maintainer: Sergey V. Zhdanovskih (aka Norseman) <[email protected]>

diff --git a/deploy/Manjaro/PKGBUILD b/deploy/Manjaro/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sergey V. Zhdanovskih (aka Norseman) <[email protected]>
 
 pkgname=gedkeeper
-pkgver=3.7.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Personal genealogical database editor"
 arch=('x86_64')

diff --git a/deploy/gedkeeper.appdata.xml b/deploy/gedkeeper.appdata.xml
@@ -40,7 +40,7 @@
   <developer_name>Sergey V. Zhdanovskih</developer_name>
 
   <releases>
-    <release version="3.7.0" date="2024-07-28">
+    <release version="3.8.0" date="2024-12-14">
       <description>
       </description>
     </release>

diff --git a/deploy/gk2_win_installer.cmd b/deploy/gk2_win_installer.cmd
@@ -1,7 +1,7 @@
 @echo off
 cls
 
-set GKVER=2.31.0
+set GKVER=2.32.0
 
 del .\*.exe /q
 del .\*.zip /q

diff --git a/deploy/gk2_win_setup.nsi b/deploy/gk2_win_setup.nsi
@@ -9,7 +9,7 @@ Unicode true
 !define MUI_ICON "..\projects\GEDKeeper_48.ico"
 
 Name "GEDKeeper"
-OutFile "gedkeeper_2.31.0_win86.exe"
+OutFile "gedkeeper_2.32.0_win86.exe"
 InstallDir $PROGRAMFILES\GEDKeeper2
 
 CRCCheck on

diff --git a/deploy/gk3_win_setup.nsi b/deploy/gk3_win_setup.nsi
@@ -8,7 +8,7 @@ Unicode true
 !define MUI_ICON "..\projects\GEDKeeper_48.ico"
 
 Name "GEDKeeper"
-OutFile "gedkeeper_3.7.0_win86.exe"
+OutFile "gedkeeper_3.8.0_win86.exe"
 InstallDir $PROGRAMFILES\GEDKeeper3
 
 CRCCheck on

diff --git a/deploy/make_gk2_mswin_portable.cmd b/deploy/make_gk2_mswin_portable.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set APP_VER=2.31.0
+set APP_VER=2.32.0
 
 call ..\clean.cmd
 

diff --git a/deploy/make_gk3_freebsd_image.sh b/deploy/make_gk3_freebsd_image.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-APP_VER="3.7.0"
+APP_VER="3.8.0"
 dotnet build ../projects/GKv3/GEDKeeper3.sln /p:Configuration=Release /p:Platform=FreeBSD
 #cd ./deploy/
 sh ./gk_freebsd_image.sh $APP_VER
diff --git a/deploy/make_gk3_linux_debian_pack.sh b/deploy/make_gk3_linux_debian_pack.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-APP_VER="3.7.0"
+APP_VER="3.8.0"
 dotnet build ../projects/GKv3/GEDKeeper3.sln /p:Configuration=Release /p:Platform=Linux
 #cd ./deploy/
 sh ./gk_linux_deb_package.sh $APP_VER
diff --git a/deploy/make_gk3_linux_fedora_pack.sh b/deploy/make_gk3_linux_fedora_pack.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-APP_VER="3.7.0"
+APP_VER="3.8.0"
 dotnet build ../projects/GKv3/GEDKeeper3.sln /p:Configuration=Release /p:Platform=Linux
 #cd ./deploy/
 sh ./gk_linux_rpm_fedora_package.sh $APP_VER
diff --git a/deploy/make_gk3_linux_manjaro_pack.sh b/deploy/make_gk3_linux_manjaro_pack.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-APP_VER="3.7.0"
+APP_VER="3.8.0"
 dotnet build ../projects/GKv3/GEDKeeper3.sln /p:Configuration=Release /p:Platform=Linux
 #cd ./deploy/
 sh ./gk_linux_pkg_manjaro_package.sh $APP_VER
diff --git a/deploy/make_gk3_mswin_installer.cmd b/deploy/make_gk3_mswin_installer.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set APP_VER=3.7.0
+set APP_VER=3.8.0
 
 call ..\clean.cmd
 

diff --git a/deploy/make_gk3_mswin_portable.cmd b/deploy/make_gk3_mswin_portable.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set APP_VER=3.7.0
+set APP_VER=3.8.0
 
 call ..\clean.cmd
 

diff --git a/deploy/rpm/gedkeeper-github.spec b/deploy/rpm/gedkeeper-github.spec
@@ -1,7 +1,7 @@
 %define		summary GEDKeeper - program for work with personal genealogical database.
 
 Name:		gedkeeper
-Version:	3.7.0
+Version:	3.8.0
 Release:	1%{?dist}
 Summary:	%{summary}
 License:	GPLv3
@@ -57,5 +57,5 @@ chmod a+x %{buildroot}%{_libdir}/%{name}/bin/GEDKeeper3
 %{summary}
 
 %changelog
-* Jul 28 2024 GEDKeeper - 3.7.0
+* Dec 14 2024 GEDKeeper - 3.8.0
 - New upstream release
diff --git a/deploy/rpm/gedkeeper.spec b/deploy/rpm/gedkeeper.spec
@@ -2,7 +2,7 @@
 %define	        summary GEDKeeper - program for work with personal genealogical database
 
 Name:		gedkeeper
-Version:	3.7.0
+Version:	3.8.0
 Release:	1
 Summary:	%{summary}
 License:	GPLv3
@@ -47,5 +47,5 @@ cp -r bin \
 #rm -rf %{buildroot}%{_libdir}/%{name}/scripts/readme.txt
 
 %changelog
-* Jul 28 2024 GEDKeeper - 3.7.0
+* Dec 14 2024 GEDKeeper - 3.8.0
 - New upstream release
diff --git a/locales/dev/gkhDev_Implementations.html b/locales/dev/gkhDev_Implementations.html
@@ -41,14 +41,14 @@ <h3>GEDKeeper2 (GKv2)</h3>
     <p>Development period: <b>05.08.2011 - present time</b>.</p>
     <p>Specificity: C#, WinForms.</p>
     <p>Status: <b>stable</b>.</p>
-    <p>Last version: 2.31.0.</p>
+    <p>Last version: 2.32.0.</p>
 
 
     <h3>GEDKeeper3 (GKv3)</h3>
     <p>Development period: <b>24.05.2017 - present time</b>.</p>
     <p>Specificity: C#, <a href="https://github.com/picoe/eto">Eto.Forms</a>.</p>
     <p>Status: <b>stable</b>.</p>
-    <p>Last version: 3.7.0.</p>
+    <p>Last version: 3.8.0.</p>
 
 
     <h3>GEDKeeperJ</h3>
@@ -61,7 +61,7 @@ <h3>GEDKeeperX (GKvX)</h3>
     <p>Development period: <b>13.10.2018 - present time</b>.</p>
     <p>Specificity: C#, <a href="https://github.com/xamarin/xamarin.forms">Xamarin</a>.</p>
     <p>Status: <b>beta</b>.</p>
-    <p>Last version: 3.7.0.</p>
+    <p>Last version: 3.8.0.</p>
 
 
     <h3>GEDKeeperU (GKvU)</h3>

diff --git a/locales/dev/gkhDev_Releases.html b/locales/dev/gkhDev_Releases.html
@@ -70,6 +70,7 @@ <h1>Releases</h1>
         <li>v2.29.1/Windows &amp; v3.5.1/Linux,Windows,Android [02 Mar 2024]
         <li>v2.30.0/Windows &amp; v3.6.0/Linux,Windows,Android [28 May 2024]
         <li>v2.31.0/Windows &amp; v3.7.0/Linux,Windows,Android [28 Jul 2024]
+        <li>v2.32.0/Windows &amp; v3.8.0/Linux,Windows,Android [14 Dec 2024]
     </ul>
 
 </body>

diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -11,7 +11,7 @@
     <h1>Change log</h1>
 
     <p>
-        <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+        <b>14.12.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
             <li>Added protection for empty records (individual, notes and multimedia) in files from other programs.
             <li>Added option in tree diagrams - use additional dates (baptism, burial) if the main ones (births, deaths) are missing.
             <li>Added options in tree diagrams: text paddings, date designations and mourning edges.

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -11,7 +11,7 @@
     <h1>История версий</h1>
 
     <p>
-        <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+        <b>14.12.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
             <li>Добавлена защита пустых записей (персональных, заметок и мультимедиа) в файлах из сторонних программ.
             <li>Добавлена опция в диаграммах деревьев - использовать дополнительные даты (крещения и похорон), если отсутствуют основные (рождения, смерти).
             <li>Добавлены опции в диаграммах деревьев: отступа текста, обозначений дат и траурных рамок.

diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs
@@ -34,8 +34,8 @@ public static class GKData
 
         public const string APP_COPYRIGHT = "Copyright © 2009-2024 by Sergey V. Zhdanovskih";
 
-        public const string APP_VERSION_2X = "2.31.0.0";
-        public const string APP_VERSION_3X = "3.7.0.0";
+        public const string APP_VERSION_2X = "2.32.0.0";
+        public const string APP_VERSION_3X = "3.8.0.0";
 
 #if !GK3
         public const string UpdateURL = "https://sourceforge.net/projects/gedkeeper/files/gk_version.xml";

diff --git a/projects/GKTests/GKTests.csproj b/projects/GKTests/GKTests.csproj
@@ -10,6 +10,8 @@
     <AssemblyName>GKTests</AssemblyName>
     <NoWin32Manifest>False</NoWin32Manifest>
     <DefineConstants>UNDIS_NUF</DefineConstants>
+    <RunSettingsFilePath>
+    </RunSettingsFilePath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>bin\Debug\</OutputPath>

diff --git a/projects/GKv2/GKTestsUI2/Plugins/FlowInputTests.cs b/projects/GKv2/GKTestsUI2/Plugins/FlowInputTests.cs
@@ -118,9 +118,6 @@ public override void TearDown()
         [Test]
         public void Test_Close()
         {
-            //var lblMail = new LabelTester("lblMail", fDialog);
-            //lblMail.FireEvent("Click", new EventArgs());
-
             ClickButton("btnClose", fDialog);
         }
 

diff --git a/projects/GKvX/GEDKeeperX.Android/Properties/AndroidManifest.xml b/projects/GKvX/GEDKeeperX.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="6" android:versionName="3.7.0" package="com.SVZsoft.GEDKeeperX">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="7" android:versionName="3.8.0" package="com.SVZsoft.GEDKeeperX">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

diff --git a/projects/plugins/GKFlowInputPlugin/FlowInputDlg.Designer.cs b/projects/plugins/GKFlowInputPlugin/FlowInputDlg.Designer.cs
diff --git a/projects/plugins/GKFlowInputPlugin/FlowInputDlg.cs b/projects/plugins/GKFlowInputPlugin/FlowInputDlg.cs
@@ -24,6 +24,7 @@
 using System.Windows.Forms;
 using BSLib;
 using GDModel;
+using GKCore;
 using GKCore.Interfaces;
 using GKUI.Components;
 using GKUI.Forms;
@@ -42,6 +43,13 @@ public FlowInputDlg(IPlugin plugin, IBaseWindow baseWin)
         {
             InitializeComponent();
 
+            if (!AppHost.TEST_MODE) {
+                dataGridView1.AllowDrop = true;
+                dataGridView1.DragDrop += new DragEventHandler(dataGridView_DragDrop);
+                dataGridView1.DragOver += new DragEventHandler(dataGridView_DragOver);
+                dataGridView1.MouseMove += new MouseEventHandler(dataGridView_MouseMove);
+            }
+
             btnClose.Image = UIHelper.LoadResourceImage("Resources.btn_cancel.gif");
 
             fPlugin = plugin;

diff --git a/projects/plugins/GKTreeSyncPlugin/TSForm.Designer.cs b/projects/plugins/GKTreeSyncPlugin/TSForm.Designer.cs
diff --git a/projects/plugins/GKTreeSyncPlugin/TSForm.cs b/projects/plugins/GKTreeSyncPlugin/TSForm.cs
@@ -79,6 +79,11 @@ private void rbSyncRecords_CheckedChanged(object sender, EventArgs e)
             cmbRecordTypes.Enabled = !rbSyncAll.Checked;
         }
 
+        private void chkOnlyModified_CheckStateChanged(object sender, EventArgs e)
+        {
+            UpdateLists();
+        }
+
         private GDMRecordType GetRecordType()
         {
             if (rbSyncAll.Checked) {