From a00c07c8b7145c2d87062ee45afe23c4ec1eca36 Mon Sep 17 00:00:00 2001
From: "Sergey V. Zhdanovskih" <serg.zhdanovskih@yandex.ru>
Date: Fri, 26 Jan 2024 21:25:49 +0300
Subject: [PATCH] Added a non-standard date attribute to source records (fix
 #524)

---
 locales/help_enu/gkhHistory.html              |  1 +
 locales/help_rus/gkhHistory.html              |  1 +
 projects/GKCore/GDModel/GDMSourceRecord.cs    | 27 +++++++++-
 .../Providers/GEDCOM/GEDCOMProvider.cs        |  8 ++-
 .../GDModel/Providers/GEDCOM/GEDCOMTagType.cs |  4 +-
 .../Controllers/SourceEditDlgController.cs    | 15 +++++-
 .../GKCore/Design/Views/ISourceEditDlg.cs     |  4 +-
 .../GKCore/GKCore/Lists/SourceListModel.cs    | 18 +++++--
 .../GKUI/Forms/SourceEditDlg.Designer.cs      | 51 ++++++++++++++-----
 .../GEDKeeper2/GKUI/Forms/SourceEditDlg.cs    |  7 ++-
 .../GEDKeeper3/GKUI/Forms/SourceEditDlg.cs    |  9 +++-
 .../GEDKeeper3/GKUI/Forms/SourceEditDlg.xeto  |  4 ++
 .../GEDKeeperX/GKUI/Components/ImageView.cs   | 12 ++++-
 .../GKUI/Forms/MediaViewerWin.xaml.cs         |  2 +-
 .../GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml  | 15 +++---
 .../GKUI/Forms/SourceEditDlg.xaml.cs          |  7 ++-
 16 files changed, 151 insertions(+), 34 deletions(-)

diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
index 67ba985c1..c08c6b974 100644
--- a/locales/help_enu/gkhHistory.html
+++ b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.29.0 &amp; v3.5.0]</b><ul>
+            <li>Added a non-standard date attribute to source records (for clarifying and sorting censuses, parish books, confession books and personal documents).
             <li>Fixed missing empty lines in notes.
             <li>Fixed an error in attaching unknown (and webp) multimedia files.
             <li>Added columns for signs of the presence of multimedia, notes and sources to the lists of events/facts.
diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
index e6865b859..3e27b44e3 100644
--- a/locales/help_rus/gkhHistory.html
+++ b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.29.0 &amp; v3.5.0]</b><ul>
+            <li>Добавлен нестандартный атрибут даты в записи источников (для уточнения и сортировки переписей, метрических книг, ревизских сказок, исповедных книг и личных документов).
             <li>Исправлены отсутствующие пустые строки в заметках.
             <li>Исправлена ошибка присоединения неизвестных (и webp) мультимедиа файлов.
             <li>Добавлены столбцы признаков наличия мультимедиа, заметок и источников в списки событий/фактов.
diff --git a/projects/GKCore/GDModel/GDMSourceRecord.cs b/projects/GKCore/GDModel/GDMSourceRecord.cs
index 7c91696b8..3e74a28ea 100644
--- a/projects/GKCore/GDModel/GDMSourceRecord.cs
+++ b/projects/GKCore/GDModel/GDMSourceRecord.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2021 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -27,6 +27,7 @@ namespace GDModel
     public sealed class GDMSourceRecord : GDMRecord
     {
         private GDMSourceData fData;
+        private readonly GDMDateValue fDate;
         private GDMTextTag fOriginator;
         private GDMTextTag fPublication;
         private GDMList<GDMRepositoryCitation> fRepositoryCitations;
@@ -40,6 +41,11 @@ public GDMSourceData Data
             get { return fData; }
         }
 
+        public GDMDateValue Date
+        {
+            get { return fDate; }
+        }
+
         public GDMTextTag Originator
         {
             get { return fOriginator; }
@@ -83,6 +89,9 @@ public GDMSourceRecord(GDMTree tree) : base(tree)
             fShortTitle = string.Empty;
             fText = new GDMTextTag((int)GEDCOMTagType.TEXT);
             fTitle = new GDMTextTag((int)GEDCOMTagType.TITL);
+
+            fDate = new GDMDateValue();
+            fDate.SetName((int)GEDCOMTagType._DATE);
         }
 
         protected override void Dispose(bool disposing)
@@ -94,6 +103,8 @@ protected override void Dispose(bool disposing)
                 fRepositoryCitations.Dispose();
                 fText.Dispose();
                 fTitle.Dispose();
+
+                fDate.Dispose();
             }
             base.Dispose(disposing);
         }
@@ -108,6 +119,8 @@ internal override void TrimExcess()
             fRepositoryCitations.TrimExcess();
             fText.TrimExcess();
             fTitle.TrimExcess();
+
+            fDate.TrimExcess();
         }
 
         public override void Assign(GDMTag source)
@@ -125,6 +138,8 @@ public override void Assign(GDMTag source)
             fText.Assign(otherSource.fText);
             fTitle.Assign(otherSource.fTitle);
             AssignList(otherSource.fRepositoryCitations, fRepositoryCitations);
+
+            fDate.Assign(otherSource.fDate);
         }
 
         public override void Clear()
@@ -138,13 +153,16 @@ public override void Clear()
             fRepositoryCitations.Clear();
             fText.Clear();
             fTitle.Clear();
+
+            fDate.Clear();
         }
 
         public override bool IsEmpty()
         {
             return base.IsEmpty() && fData.IsEmpty() && fOriginator.IsEmpty() && fPublication.IsEmpty()
                 && string.IsNullOrEmpty(fShortTitle) && fText.IsEmpty() && fTitle.IsEmpty()
-                && (fRepositoryCitations.Count == 0);
+                && (fRepositoryCitations.Count == 0)
+                && fDate.IsEmpty();
         }
 
         public override void MoveTo(GDMRecord targetRecord)
@@ -174,12 +192,17 @@ public override void MoveTo(GDMRecord targetRecord)
                 GDMRepositoryCitation obj = fRepositoryCitations.Extract(0);
                 targetSource.RepositoryCitations.Add(obj);
             }
+
+            if (targetSource.Date.IsEmpty() && !fDate.IsEmpty()) {
+                targetSource.Date.Assign(fDate);
+            }
         }
 
         public override void ReplaceXRefs(GDMXRefReplacer map)
         {
             base.ReplaceXRefs(map);
             fRepositoryCitations.ReplaceXRefs(map);
+            fDate.ReplaceXRefs(map);
         }
 
 
diff --git a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMProvider.cs b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMProvider.cs
index d4d4d28ac..352846c92 100644
--- a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMProvider.cs
+++ b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMProvider.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -814,6 +814,9 @@ private StackTuple AddSourceRecordTag(GDMTag owner, int tagLevel, int tagId, str
                 curTag = sourRec.Title;
                 curTag.ParseString(tagValue);
                 addHandler = AddTextTag;
+            } else if (tagType == GEDCOMTagType._DATE) {
+                curTag = sourRec.Date;
+                GEDCOMUtils.ParseDateValue(fTree, sourRec.Date, tagValue);
             } else {
                 return AddRecordTag(owner, tagLevel, tagId, tagValue);
             }
@@ -836,6 +839,8 @@ private static void WriteSourceRecord(StreamWriter stream, int level, GDMTag tag
             WriteSourceData(stream, level, sourRec.Data);
             WriteText(stream, level, sourRec.Originator);
             WriteText(stream, level, sourRec.Text);
+
+            WriteBaseTag(stream, level, sourRec.Date);
         }
 
 
@@ -2674,6 +2679,7 @@ static GEDCOMProvider()
             GEDCOMTagsTable.RegisterTag(GEDCOMTagType._AWARD, GEDCOMTagName._AWARD, true);
             GEDCOMTagsTable.RegisterTag(GEDCOMTagType._BGRO, GEDCOMTagName._BGRO, true);
             GEDCOMTagsTable.RegisterTag(GEDCOMTagType._CENN, GEDCOMTagName._CENN, true);
+            GEDCOMTagsTable.RegisterTag(GEDCOMTagType._DATE, GEDCOMTagName._DATE, true);
             GEDCOMTagsTable.RegisterTag(GEDCOMTagType._ELEC, GEDCOMTagName._ELEC, true);
             GEDCOMTagsTable.RegisterTag(GEDCOMTagType._EXCM, GEDCOMTagName._EXCM, true);
             GEDCOMTagsTable.RegisterTag(GEDCOMTagType._EYES, GEDCOMTagName._EYES, true);
diff --git a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMTagType.cs b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMTagType.cs
index 49bb05882..ae37e059c 100644
--- a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMTagType.cs
+++ b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMTagType.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2019 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -175,6 +175,7 @@ public enum GEDCOMTagType
         _BGRO, // [MyFamilyTree] INDI.ATTR
         _BOOKMARK, // [GK]
         _CENN, // Census Name [BKW6]
+        _DATE, // Date value in non-standard use (source records) [GK]
         _ELEC, // Election [???] INDI.ATTR
         _EXCM, // Excommunication [FTM] INDI.ATTR
         _EYES, // [Gen] INDI.ATTR
@@ -367,6 +368,7 @@ public static class GEDCOMTagName
         public const string _AWARD = "_AWARD";
         public const string _BGRO = "_BGRO"; // [MyFamilyTree]
         public const string _CENN = "_CENN"; // Census Name [BKW6]
+        public const string _DATE = "_DATE"; // Date value in non-standard use (source records) [GK]
         public const string _ELEC = "_ELEC"; // Election [???]
         public const string _EXCM = "_EXCM"; // Excommunication [FTM]
         public const string _EYES = "_EYES"; // [Gen]
diff --git a/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs b/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
index 75784b3ba..60f8ffa52 100644
--- a/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -75,6 +75,16 @@ public override bool Accept()
                 fSourceRecord.Text.Clear();
                 fSourceRecord.SetTextArray(fView.Text.Lines);
 
+                try {
+                    GDMCustomDate dt = fView.Date.Date;
+                    if (dt == null) throw new ArgumentNullException("dt");
+
+                    fSourceRecord.Date.ParseString(dt.StringValue);
+                } catch (Exception ex) {
+                    AppHost.StdDialogs.ShowError(LangMan.LS(LSID.DateInvalid));
+                    throw ex;
+                }
+
                 fLocalUndoman.Commit();
 
                 fBase.NotifyRecord(fSourceRecord, RecordAction.raEdit);
@@ -94,6 +104,8 @@ public override void UpdateView()
             fView.Publication.Text = fSourceRecord.Publication.Lines.Text.Trim();
             fView.Text.Text = fSourceRecord.Text.Lines.Text.Trim();
 
+            fView.Date.Date = fSourceRecord.Date.Value;
+
             fView.RepositoriesList.ListModel.DataOwner = fSourceRecord;
             fView.NotesList.ListModel.DataOwner = fSourceRecord;
             fView.MediaList.ListModel.DataOwner = fSourceRecord;
@@ -109,6 +121,7 @@ public override void SetLocale()
             GetControl<ILabel>("lblAuthor").Text = LangMan.LS(LSID.Author);
             GetControl<ILabel>("lblTitle").Text = LangMan.LS(LSID.Title);
             GetControl<ILabel>("lblPublication").Text = LangMan.LS(LSID.Publication);
+            GetControl<ILabel>("lblDate").Text = LangMan.LS(LSID.Date);
             GetControl<ITabPage>("pageCommon").Text = LangMan.LS(LSID.Common);
             GetControl<ITabPage>("pageText").Text = LangMan.LS(LSID.Text);
             GetControl<ITabPage>("pageRepositories").Text = LangMan.LS(LSID.RPRepositories);
diff --git a/projects/GKCore/GKCore/Design/Views/ISourceEditDlg.cs b/projects/GKCore/GKCore/Design/Views/ISourceEditDlg.cs
index aa15ed78f..27692358b 100644
--- a/projects/GKCore/GKCore/Design/Views/ISourceEditDlg.cs
+++ b/projects/GKCore/GKCore/Design/Views/ISourceEditDlg.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -38,5 +38,7 @@ public interface ISourceEditDlg : ICommonDialog, IBaseEditor
         ITextBox DescTitle { get; }
         ITextBox Publication { get; }
         ITextBox Text { get; }
+
+        IDateControl Date { get; }
     }
 }
diff --git a/projects/GKCore/GKCore/Lists/SourceListModel.cs b/projects/GKCore/GKCore/Lists/SourceListModel.cs
index dd6919718..30ef8e24e 100644
--- a/projects/GKCore/GKCore/Lists/SourceListModel.cs
+++ b/projects/GKCore/GKCore/Lists/SourceListModel.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -37,9 +37,11 @@ public sealed class SourceListModel : RecordsListModel<GDMSourceRecord>
         public enum ColumnType
         {
             ctXRefNum,
-            ctShortName,
+            ctShortTitle,
+            ctDate,
             ctAuthor,
             ctTitle,
+            //ctPublication,
             ctRepositories,
             ctChangeDate
         }
@@ -56,8 +58,10 @@ public static ListColumns<GDMSourceRecord> CreateSourceListColumns()
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.ShortTitle, DataType.dtString, 120, true, true);
+            result.AddColumn(LSID.Date, 80, false);
             result.AddColumn(LSID.Author, DataType.dtString, 200, true);
             result.AddColumn(LSID.Title, DataType.dtString, 200, true);
+            //result.AddColumn(LSID.Publication, DataType.dtString, 200, true);
             result.AddColumn(LSID.RPRepositories, DataType.dtString, 200, true);
             result.AddColumn(LSID.Changed, DataType.dtDateTime, 150, true);
 
@@ -82,10 +86,14 @@ protected override object GetColumnValueEx(int colType, int colSubtype, bool isV
                     result = fFetchedRec.GetId();
                     break;
 
-                case ColumnType.ctShortName:
+                case ColumnType.ctShortTitle:
                     result = fFetchedRec.ShortTitle.Trim();
                     break;
 
+                case ColumnType.ctDate:
+                    result = new GDMDateItem(fFetchedRec.Date.Value);
+                    break;
+
                 case ColumnType.ctAuthor:
                     result = fFetchedRec.Originator.Lines.Text.Trim();
                     break;
@@ -94,6 +102,10 @@ protected override object GetColumnValueEx(int colType, int colSubtype, bool isV
                     result = fFetchedRec.Title.Lines.Text.Trim();
                     break;
 
+                //case ColumnType.ctPublication:
+                //    result = fFetchedRec.Publication.Lines.Text.Trim();
+                //    break;
+
                 case ColumnType.ctRepositories:
                     result = GKUtils.GetSourceRepositories(fBaseContext.Tree, fFetchedRec);
                     break;
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/SourceEditDlg.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/SourceEditDlg.Designer.cs
index 20f81a2b2..cd1a1ac6b 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/SourceEditDlg.Designer.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/SourceEditDlg.Designer.cs
@@ -19,8 +19,10 @@ partial class SourceEditDlg
 		private System.Windows.Forms.TextBox txtTitle;
 		private System.Windows.Forms.Label lblPublication;
 		private System.Windows.Forms.TextBox txtPublication;
+        private System.Windows.Forms.Label lblDate;
+        private Components.GKDateControl dateCtl;
 
-		private void InitializeComponent()
+        private void InitializeComponent()
 		{
 		    this.btnAccept = new System.Windows.Forms.Button();
 		    this.btnCancel = new System.Windows.Forms.Button();
@@ -39,7 +41,9 @@ private void InitializeComponent()
 		    this.pageRepositories = new System.Windows.Forms.TabPage();
 		    this.pageNotes = new System.Windows.Forms.TabPage();
 		    this.pageMultimedia = new System.Windows.Forms.TabPage();
-		    this.tabsData.SuspendLayout();
+            this.lblDate = new System.Windows.Forms.Label();
+            this.dateCtl = new GKUI.Components.GKDateControl();
+            this.tabsData.SuspendLayout();
 		    this.pageCommon.SuspendLayout();
 		    this.pageText.SuspendLayout();
 		    this.SuspendLayout();
@@ -91,7 +95,9 @@ private void InitializeComponent()
 		    this.pageCommon.Controls.Add(this.txtAuthor);
 		    this.pageCommon.Controls.Add(this.txtTitle);
 		    this.pageCommon.Controls.Add(this.txtPublication);
-		    this.pageCommon.Location = new System.Drawing.Point(4, 26);
+            this.pageCommon.Controls.Add(this.lblDate);
+            this.pageCommon.Controls.Add(this.dateCtl);
+            this.pageCommon.Location = new System.Drawing.Point(4, 26);
 		    this.pageCommon.Name = "pageCommon";
 		    this.pageCommon.Size = new System.Drawing.Size(744, 457);
 		    this.pageCommon.TabIndex = 0;
@@ -109,7 +115,7 @@ private void InitializeComponent()
 		    // lblAuthor
 		    // 
 		    this.lblAuthor.AutoSize = true;
-		    this.lblAuthor.Location = new System.Drawing.Point(11, 39);
+		    this.lblAuthor.Location = new System.Drawing.Point(11, 104);
 		    this.lblAuthor.Name = "lblAuthor";
 		    this.lblAuthor.Size = new System.Drawing.Size(62, 17);
 		    this.lblAuthor.TabIndex = 2;
@@ -118,7 +124,7 @@ private void InitializeComponent()
 		    // lblTitle
 		    // 
 		    this.lblTitle.AutoSize = true;
-		    this.lblTitle.Location = new System.Drawing.Point(11, 175);
+		    this.lblTitle.Location = new System.Drawing.Point(11, 210);
 		    this.lblTitle.Name = "lblTitle";
 		    this.lblTitle.Size = new System.Drawing.Size(44, 17);
 		    this.lblTitle.TabIndex = 4;
@@ -127,7 +133,7 @@ private void InitializeComponent()
 		    // lblPublication
 		    // 
 		    this.lblPublication.AutoSize = true;
-		    this.lblPublication.Location = new System.Drawing.Point(11, 311);
+		    this.lblPublication.Location = new System.Drawing.Point(11, 316);
 		    this.lblPublication.Name = "lblPublication";
 		    this.lblPublication.Size = new System.Drawing.Size(85, 17);
 		    this.lblPublication.TabIndex = 6;
@@ -137,13 +143,13 @@ private void InitializeComponent()
 		    // 
 		    this.txtShortTitle.Location = new System.Drawing.Point(157, 10);
 		    this.txtShortTitle.Name = "txtShortTitle";
-		    this.txtShortTitle.Size = new System.Drawing.Size(326, 24);
+		    this.txtShortTitle.Size = new System.Drawing.Size(572, 24);
 		    this.txtShortTitle.TabIndex = 1;
 		    this.txtShortTitle.TextChanged += new System.EventHandler(this.EditShortTitle_TextChanged);
 		    // 
 		    // txtAuthor
 		    // 
-		    this.txtAuthor.Location = new System.Drawing.Point(157, 39);
+		    this.txtAuthor.Location = new System.Drawing.Point(157, 104);
 		    this.txtAuthor.Multiline = true;
 		    this.txtAuthor.Name = "txtAuthor";
 		    this.txtAuthor.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
@@ -152,7 +158,7 @@ private void InitializeComponent()
 		    // 
 		    // txtTitle
 		    // 
-		    this.txtTitle.Location = new System.Drawing.Point(157, 175);
+		    this.txtTitle.Location = new System.Drawing.Point(157, 210);
 		    this.txtTitle.Multiline = true;
 		    this.txtTitle.Name = "txtTitle";
 		    this.txtTitle.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
@@ -161,16 +167,33 @@ private void InitializeComponent()
 		    // 
 		    // txtPublication
 		    // 
-		    this.txtPublication.Location = new System.Drawing.Point(157, 311);
+		    this.txtPublication.Location = new System.Drawing.Point(157, 316);
 		    this.txtPublication.Multiline = true;
 		    this.txtPublication.Name = "txtPublication";
 		    this.txtPublication.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
 		    this.txtPublication.Size = new System.Drawing.Size(572, 127);
 		    this.txtPublication.TabIndex = 7;
-		    // 
-		    // pageText
-		    // 
-		    this.pageText.Controls.Add(this.txtText);
+            // 
+            // lblDate
+            // 
+            this.lblDate.AutoSize = true;
+            this.lblDate.Location = new System.Drawing.Point(11, 39);
+            this.lblDate.Name = "lblDate";
+            this.lblDate.Size = new System.Drawing.Size(49, 17);
+            this.lblDate.TabIndex = 10;
+            this.lblDate.Text = "lblDate";
+            // 
+            // dateCtl
+            // 
+            this.dateCtl.Location = new System.Drawing.Point(155, 39);
+            this.dateCtl.Margin = new System.Windows.Forms.Padding(2);
+            this.dateCtl.Name = "dateCtl";
+            this.dateCtl.Size = new System.Drawing.Size(474, 63);
+            this.dateCtl.TabIndex = 10;
+            // 
+            // pageText
+            // 
+            this.pageText.Controls.Add(this.txtText);
 		    this.pageText.Location = new System.Drawing.Point(4, 26);
 		    this.pageText.Name = "pageText";
 		    this.pageText.Size = new System.Drawing.Size(744, 457);
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/SourceEditDlg.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/SourceEditDlg.cs
index 6594494fb..e97345165 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/SourceEditDlg.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/SourceEditDlg.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -85,6 +85,11 @@ ITextBox ISourceEditDlg.Text
             get { return GetControlHandler<ITextBox>(txtText); }
         }
 
+        IDateControl ISourceEditDlg.Date
+        {
+            get { return GetControlHandler<IDateControl>(dateCtl); }
+        }
+
         #endregion
 
         public SourceEditDlg(IBaseWindow baseWin)
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/SourceEditDlg.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/SourceEditDlg.cs
index e1d28fb16..bfa6932dc 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/SourceEditDlg.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/SourceEditDlg.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -58,6 +58,8 @@ public sealed partial class SourceEditDlg : CommonDialog<ISourceEditDlg, SourceE
         private GKSheetList fNotesList;
         private GKSheetList fMediaList;
         private GKSheetList fRepositoriesList;
+        private Label lblDate;
+        private GKDateControl dateCtl;
 
 #pragma warning restore CS0169, CS0649, IDE0044, IDE0051
         #endregion
@@ -110,6 +112,11 @@ ITextBox ISourceEditDlg.Text
             get { return GetControlHandler<ITextBox>(txtText); }
         }
 
+        IDateControl ISourceEditDlg.Date
+        {
+            get { return GetControlHandler<IDateControl>(dateCtl); }
+        }
+
         #endregion
 
         public SourceEditDlg(IBaseWindow baseWin)
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/SourceEditDlg.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/SourceEditDlg.xeto
index 6d28c6bfd..3ea00daf4 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/SourceEditDlg.xeto
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/SourceEditDlg.xeto
@@ -14,6 +14,10 @@
               <Label x:Name="lblShortTitle" />
               <TextBox x:Name="txtShortTitle" TextChanged="EditShortTitle_TextChanged" />
             </TableRow>
+            <TableRow>
+              <Label x:Name="lblDate" />
+              <comcom:GKDateControl x:Name="dateCtl" />
+            </TableRow>
             <TableRow>
               <Label x:Name="lblAuthor" />
               <TextArea x:Name="txtAuthor" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Components/ImageView.cs b/projects/GKvX/GEDKeeperX/GKUI/Components/ImageView.cs
index a9e4bdc50..6e634bffe 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Components/ImageView.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Components/ImageView.cs
@@ -21,6 +21,8 @@
 using System;
 using System.Collections.Generic;
 using BSLib;
+using GDModel;
+using GKCore.Controllers;
 using GKCore.Design.Controls;
 using GKCore.Design.Graphics;
 using GKCore.Interfaces;
@@ -32,6 +34,9 @@ namespace GKUI.Components
 {
     public class ImageView : ContentView, ILocalizable, IImageView
     {
+        private GDMMultimediaRecord fMediaRecord;
+        private MediaViewerController fController;
+
         private ImageBox imageBox;
         private StackLayout toolStrip;
         private GKComboBox cbZoomLevels;
@@ -140,8 +145,13 @@ public void AddNamedRegion(string name, ExtRect region)
             imageBox.NamedRegions.Add(new NamedRegion(name, region));
         }
 
-        public void OpenImage(IImage image)
+        public void OpenImage(MediaViewerController controller, IImage image)
         {
+            fController = controller;
+            if (fController != null) {
+                fMediaRecord = fController.MultimediaRecord;
+            }
+
             if (image != null) {
                 OpenImage(((SKImageHandler)image).Handle);
             }
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/MediaViewerWin.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/MediaViewerWin.xaml.cs
index 03e047431..a8a6b2c76 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/MediaViewerWin.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/MediaViewerWin.xaml.cs
@@ -138,7 +138,7 @@ public void SetViewMedia(string mediaFile)
         public void SetViewImage(IImage img)
         {
             var imageCtl = new GKUI.Components.ImageView();
-            imageCtl.OpenImage(img);
+            imageCtl.OpenImage(fController, img);
 
             fController.ProcessPortraits(imageCtl);
 
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml
index b63bc4f38..336061adb 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml
@@ -26,14 +26,17 @@
                             <Label x:Name="lblShortTitle" Grid.Column="0" Grid.Row="0" />
                             <Entry x:Name="txtShortTitle" Grid.Column="1" Grid.Row="0" TextChanged="EditShortTitle_TextChanged" />
 
-                            <Label x:Name="lblAuthor" Grid.Column="0" Grid.Row="1" />
-                            <Entry x:Name="txtAuthor" Grid.Column="1" Grid.Row="1" />
+                            <Label x:Name="lblDate" Grid.Column="0" Grid.Row="1" />
+                            <comcom:GKDateControl x:Name="dateCtl" Grid.Column="1" Grid.Row="1" />
 
-                            <Label x:Name="lblTitle" Grid.Column="0" Grid.Row="2" />
-                            <Entry x:Name="txtTitle" Grid.Column="1" Grid.Row="2" />
+                            <Label x:Name="lblAuthor" Grid.Column="0" Grid.Row="2" />
+                            <Entry x:Name="txtAuthor" Grid.Column="1" Grid.Row="2" />
 
-                            <Label x:Name="lblPublication" Grid.Column="0" Grid.Row="3" />
-                            <Entry x:Name="txtPublication" Grid.Column="1" Grid.Row="3" />
+                            <Label x:Name="lblTitle" Grid.Column="0" Grid.Row="3" />
+                            <Entry x:Name="txtTitle" Grid.Column="1" Grid.Row="3" />
+
+                            <Label x:Name="lblPublication" Grid.Column="0" Grid.Row="4" />
+                            <Entry x:Name="txtPublication" Grid.Column="1" Grid.Row="4" />
                         </Grid>
 
                         <Label VerticalOptions="FillAndExpand" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml.cs
index 2ae652d7f..cd2f61475 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -80,6 +80,11 @@ ITextBox ISourceEditDlg.Text
             get { return GetControlHandler<ITextBox>(txtText); }
         }
 
+        IDateControl ISourceEditDlg.Date
+        {
+            get { return GetControlHandler<IDateControl>(dateCtl); }
+        }
+
         #endregion
 
         public SourceEditDlg(IBaseWindow baseWin)