From 3d8ea12be2473f3293c3e9dd7e5c091ba5f72b57 Mon Sep 17 00:00:00 2001 From: "Sergey V. Zhdanovskih" Date: Tue, 3 Dec 2024 22:58:23 +0300 Subject: [PATCH] Preparing for release --- deploy/DEBIAN/changelog | 4 ++-- deploy/DEBIAN/control | 2 +- deploy/Manjaro/PKGBUILD | 2 +- deploy/gedkeeper.appdata.xml | 2 +- deploy/gk2_win_installer.cmd | 2 +- deploy/gk2_win_setup.nsi | 2 +- deploy/gk3_win_setup.nsi | 2 +- deploy/make_gk2_mswin_portable.cmd | 2 +- deploy/make_gk3_freebsd_image.sh | 2 +- deploy/make_gk3_linux_debian_pack.sh | 2 +- deploy/make_gk3_linux_fedora_pack.sh | 2 +- deploy/make_gk3_linux_manjaro_pack.sh | 2 +- deploy/make_gk3_mswin_installer.cmd | 2 +- deploy/make_gk3_mswin_portable.cmd | 2 +- deploy/rpm/gedkeeper-github.spec | 4 ++-- deploy/rpm/gedkeeper.spec | 4 ++-- locales/dev/gkhDev_Implementations.html | 6 +++--- locales/dev/gkhDev_Releases.html | 1 + locales/help_enu/gkhHistory.html | 2 +- locales/help_rus/gkhHistory.html | 2 +- projects/GKCore/GKCore/GKData.cs | 4 ++-- projects/GKTests/GKTests.csproj | 2 ++ projects/GKv2/GKTestsUI2/Plugins/FlowInputTests.cs | 3 --- .../GEDKeeperX.Android/Properties/AndroidManifest.xml | 2 +- .../plugins/GKFlowInputPlugin/FlowInputDlg.Designer.cs | 4 ---- projects/plugins/GKFlowInputPlugin/FlowInputDlg.cs | 8 ++++++++ projects/plugins/GKTreeSyncPlugin/TSForm.Designer.cs | 1 + projects/plugins/GKTreeSyncPlugin/TSForm.cs | 5 +++++ 28 files changed, 44 insertions(+), 34 deletions(-) diff --git a/deploy/DEBIAN/changelog b/deploy/DEBIAN/changelog index 0877503b8..a28546d05 100644 --- 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) 28 Jul 2024 00:00:00 +0300 + -- Sergey V. Zhdanovskih (aka Norseman) 14 Dec 2024 00:00:00 +0300 diff --git a/deploy/DEBIAN/control b/deploy/DEBIAN/control index 3452c0d0b..d6e1026ef 100644 --- 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) diff --git a/deploy/Manjaro/PKGBUILD b/deploy/Manjaro/PKGBUILD index 7f1e0b372..7d5f3feb1 100644 --- a/deploy/Manjaro/PKGBUILD +++ b/deploy/Manjaro/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sergey V. Zhdanovskih (aka Norseman) 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 index 99bf9bb3e..1505b8a43 100644 --- a/deploy/gedkeeper.appdata.xml +++ b/deploy/gedkeeper.appdata.xml @@ -40,7 +40,7 @@ Sergey V. Zhdanovskih - + diff --git a/deploy/gk2_win_installer.cmd b/deploy/gk2_win_installer.cmd index 5c3f33d63..ab2420002 100644 --- 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 index 1f314e1eb..c966000f9 100644 --- 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 index 8b157a3f5..5e0d4cd83 100644 --- 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 index 6bd1c0755..a90b4eb9d 100644 --- 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 index 72f00aa62..82bf493bb 100644 --- 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 index dc216eeb5..7a5517414 100644 --- 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 index 29b302252..6cc823eea 100644 --- 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 index 9e84b46c3..b2ac2bdd3 100644 --- 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 index 378c4cda8..96083b926 100644 --- 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 index 530952f85..45d186331 100644 --- 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 index 19d14870e..657ee3af2 100644 --- 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 index 043c61295..dea1ece66 100644 --- 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 index 9bd35cbb7..205e313f2 100644 --- a/locales/dev/gkhDev_Implementations.html +++ b/locales/dev/gkhDev_Implementations.html @@ -41,14 +41,14 @@

GEDKeeper2 (GKv2)

Development period: 05.08.2011 - present time.

Specificity: C#, WinForms.

Status: stable.

-

Last version: 2.31.0.

+

Last version: 2.32.0.

GEDKeeper3 (GKv3)

Development period: 24.05.2017 - present time.

Specificity: C#, Eto.Forms.

Status: stable.

-

Last version: 3.7.0.

+

Last version: 3.8.0.

GEDKeeperJ

@@ -61,7 +61,7 @@

GEDKeeperX (GKvX)

Development period: 13.10.2018 - present time.

Specificity: C#, Xamarin.

Status: beta.

-

Last version: 3.7.0.

+

Last version: 3.8.0.

GEDKeeperU (GKvU)

diff --git a/locales/dev/gkhDev_Releases.html b/locales/dev/gkhDev_Releases.html index a0b0c4442..8fa7d8d84 100644 --- a/locales/dev/gkhDev_Releases.html +++ b/locales/dev/gkhDev_Releases.html @@ -70,6 +70,7 @@

Releases

  • v2.29.1/Windows & v3.5.1/Linux,Windows,Android [02 Mar 2024]
  • v2.30.0/Windows & v3.6.0/Linux,Windows,Android [28 May 2024]
  • v2.31.0/Windows & v3.7.0/Linux,Windows,Android [28 Jul 2024] +
  • v2.32.0/Windows & v3.8.0/Linux,Windows,Android [14 Dec 2024] diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html index f733c82c8..ba14650c8 100644 --- a/locales/help_enu/gkhHistory.html +++ b/locales/help_enu/gkhHistory.html @@ -11,7 +11,7 @@

    Change log

    - ??.??.2024 [v2.32.0 & v3.8.0]

      + 14.12.2024 [v2.32.0 & v3.8.0]
      • Added protection for empty records (individual, notes and multimedia) in files from other programs.
      • Added option in tree diagrams - use additional dates (baptism, burial) if the main ones (births, deaths) are missing.
      • 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 index 77d2b51a5..a64547f6e 100644 --- a/locales/help_rus/gkhHistory.html +++ b/locales/help_rus/gkhHistory.html @@ -11,7 +11,7 @@

        История версий

        - ??.??.2024 [v2.32.0 & v3.8.0]

          + 14.12.2024 [v2.32.0 & v3.8.0]
          • Добавлена защита пустых записей (персональных, заметок и мультимедиа) в файлах из сторонних программ.
          • Добавлена опция в диаграммах деревьев - использовать дополнительные даты (крещения и похорон), если отсутствуют основные (рождения, смерти).
          • Добавлены опции в диаграммах деревьев: отступа текста, обозначений дат и траурных рамок. diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs index 7820aadb1..2ad21ebb3 100644 --- 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 index a8a35ce9d..fcfb9bde0 100644 --- a/projects/GKTests/GKTests.csproj +++ b/projects/GKTests/GKTests.csproj @@ -10,6 +10,8 @@ GKTests False UNDIS_NUF + + bin\Debug\ diff --git a/projects/GKv2/GKTestsUI2/Plugins/FlowInputTests.cs b/projects/GKv2/GKTestsUI2/Plugins/FlowInputTests.cs index 0fbdeeaf4..4b363485e 100644 --- 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 index 7e434d6d3..e222473a1 100644 --- a/projects/GKvX/GEDKeeperX.Android/Properties/AndroidManifest.xml +++ b/projects/GKvX/GEDKeeperX.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/projects/plugins/GKFlowInputPlugin/FlowInputDlg.Designer.cs b/projects/plugins/GKFlowInputPlugin/FlowInputDlg.Designer.cs index 571238ac6..21ba49fd5 100644 --- a/projects/plugins/GKFlowInputPlugin/FlowInputDlg.Designer.cs +++ b/projects/plugins/GKFlowInputPlugin/FlowInputDlg.Designer.cs @@ -385,7 +385,6 @@ private void InitializeComponent() // // dataGridView1 // - this.dataGridView1.AllowDrop = true; this.dataGridView1.AllowUserToResizeRows = false; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -394,9 +393,6 @@ private void InitializeComponent() this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.Size = new System.Drawing.Size(609, 177); this.dataGridView1.TabIndex = 0; - this.dataGridView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.dataGridView_DragDrop); - this.dataGridView1.DragOver += new System.Windows.Forms.DragEventHandler(this.dataGridView_DragOver); - this.dataGridView1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.dataGridView_MouseMove); // // cbPersonLink // diff --git a/projects/plugins/GKFlowInputPlugin/FlowInputDlg.cs b/projects/plugins/GKFlowInputPlugin/FlowInputDlg.cs index eec714fde..c9c4873e6 100644 --- 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 index b863cf5a9..978c9b972 100644 --- a/projects/plugins/GKTreeSyncPlugin/TSForm.Designer.cs +++ b/projects/plugins/GKTreeSyncPlugin/TSForm.Designer.cs @@ -151,6 +151,7 @@ private void InitializeComponent() this.chkOnlyModified.TabIndex = 4; this.chkOnlyModified.Text = "Only modified"; this.chkOnlyModified.UseVisualStyleBackColor = true; + this.chkOnlyModified.CheckStateChanged += chkOnlyModified_CheckStateChanged; // // TSForm // diff --git a/projects/plugins/GKTreeSyncPlugin/TSForm.cs b/projects/plugins/GKTreeSyncPlugin/TSForm.cs index 264160c79..882edbec2 100644 --- 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) {