Added the feature to enter user's references in family, media, source…

… and repository records
Serg-Norseman · Jul 25, 2024 · 48db916 · 48db916
1 parent a502c5d
commit 48db916
Show file tree

Hide file tree

Showing 38 changed files with 347 additions and 131 deletions.
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>14.06.2024 [v2.30.1 &amp; v3.6.1]</b><ul>
+            <li>Added the feature to enter user's references in family, media, source and repository records.
             <li>Added the option to include page numbers of sources in pedigrees.
             <li>Added place analyzer/constructor to locations management tool.
             <li>Added a section for links to subordinate locations in the location information panel.

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>14.06.2024 [v2.30.1 &amp; v3.6.1]</b><ul>
+            <li>Добавлена возможность ввода пользовательских ссылок в записях семей, мультимедиа, источников и архивов.
             <li>Добавлена опция включения номеров страниц источников в родословные росписи.
             <li>Добавлен анализатор/конструктор мест в инструмент управления местами.
             <li>Добавлена секция ссылок на подчиненные места в панель информации мест.

diff --git a/projects/GKCore/GKCore.csproj b/projects/GKCore/GKCore.csproj
@@ -65,6 +65,8 @@
       <Link>GlobalSuppressions.cs</Link>
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="GKCore\Controllers\SourceCallNumberDlgController.cs" />
+    <Compile Include="GKCore\Design\Views\ISourceCallNumberEditDlg.cs" />
     <Compile Include="GKCore\Design\Views\ILocExpertDlg.cs" />
     <Compile Include="GKCore\Controllers\EventDefEditDlgController.cs" />
     <Compile Include="GKCore\Controllers\LocExpertDlgController.cs" />
@@ -544,6 +546,7 @@
     <Compile Include="GKCore\Interfaces\IScrollableContainer.cs" />
     <Compile Include="GKCore\EventDefinitions.cs" />
     <Compile Include="GKCore\Types\GKPageSize.cs" />
+    <Compile Include="GKCore\Lists\URefsListModel.cs" />
   </ItemGroup>
   <Import Project="GKCore.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/projects/GKCore/GKCore/Controllers/FamilyEditDlgController.cs b/projects/GKCore/GKCore/Controllers/FamilyEditDlgController.cs
@@ -69,6 +69,7 @@ public override void Init(IBaseWindow baseWin)
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
             fView.SourcesList.ListModel = new SourceCitationsListModel(fView, baseWin, fLocalUndoman);
+            fView.UserRefList.ListModel = new URefsListModel(fView, baseWin, fLocalUndoman);
         }
 
         public override void Done()
@@ -78,6 +79,7 @@ public override void Done()
             fView.NotesList.ListModel.SaveSettings();
             fView.MediaList.ListModel.SaveSettings();
             fView.SourcesList.ListModel.SaveSettings();
+            fView.UserRefList.ListModel.SaveSettings();
         }
 
         public void SetTarget(TargetMode targetType, GDMIndividualRecord target)
@@ -124,6 +126,7 @@ public override void UpdateView()
                 fView.NotesList.ListModel.DataOwner = fFamilyRecord;
                 fView.MediaList.ListModel.DataOwner = fFamilyRecord;
                 fView.SourcesList.ListModel.DataOwner = fFamilyRecord;
+                fView.UserRefList.ListModel.DataOwner = fFamilyRecord;
 
                 if (fFamilyRecord == null) {
                     fView.MarriageStatus.Enabled = false;
@@ -164,6 +167,7 @@ private void UpdateControls()
             fView.NotesList.UpdateSheet();
             fView.MediaList.UpdateSheet();
             fView.SourcesList.UpdateSheet();
+            fView.UserRefList.UpdateSheet();
         }
 
         public async void AddHusband()
@@ -219,6 +223,7 @@ public override void SetLocale()
             GetControl<ITabPage>("pageNotes").Text = LangMan.LS(LSID.RPNotes);
             GetControl<ITabPage>("pageMultimedia").Text = LangMan.LS(LSID.RPMultimedia);
             GetControl<ITabPage>("pageSources").Text = LangMan.LS(LSID.RPSources);
+            GetControl<ITabPage>("pageUserRefs").Text = LangMan.LS(LSID.UserRefs);
             GetControl<ILabel>("lblRestriction").Text = LangMan.LS(LSID.Restriction);
 
             SetToolTip("btnHusbandAdd", LangMan.LS(LSID.HusbandAddTip));

diff --git a/projects/GKCore/GKCore/Controllers/MediaEditDlgController.cs b/projects/GKCore/GKCore/Controllers/MediaEditDlgController.cs
@@ -67,12 +67,14 @@ public override void Init(IBaseWindow baseWin)
 
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
             fView.SourcesList.ListModel = new SourceCitationsListModel(fView, baseWin, fLocalUndoman);
+            fView.UserRefList.ListModel = new URefsListModel(fView, baseWin, fLocalUndoman);
         }
 
         public override void Done()
         {
             fView.NotesList.ListModel.SaveSettings();
             fView.SourcesList.ListModel.SaveSettings();
+            fView.UserRefList.ListModel.SaveSettings();
         }
 
         public override bool Accept()
@@ -119,6 +121,7 @@ public override void UpdateView()
         {
             fView.NotesList.ListModel.DataOwner = fMultimediaRecord;
             fView.SourcesList.ListModel.DataOwner = fMultimediaRecord;
+            fView.UserRefList.ListModel.DataOwner = fMultimediaRecord;
 
             UpdateControls();
         }
@@ -153,6 +156,7 @@ private void UpdateControls()
 
             fView.NotesList.UpdateSheet();
             fView.SourcesList.UpdateSheet();
+            fView.UserRefList.UpdateSheet();
         }
 
         private void UpdateFileStore(bool isNew, MediaStoreType storeType)
@@ -244,6 +248,7 @@ public override void SetLocale()
             GetControl<ITabPage>("pageCommon").Text = LangMan.LS(LSID.Common);
             GetControl<ITabPage>("pageNotes").Text = LangMan.LS(LSID.RPNotes);
             GetControl<ITabPage>("pageSources").Text = LangMan.LS(LSID.RPSources);
+            GetControl<ITabPage>("pageUserRefs").Text = LangMan.LS(LSID.UserRefs);
             GetControl<ILabel>("lblName").Text = LangMan.LS(LSID.Title);
             GetControl<ILabel>("lblType").Text = LangMan.LS(LSID.Type);
             GetControl<ILabel>("lblStoreType").Text = LangMan.LS(LSID.StoreType);

diff --git a/projects/GKCore/GKCore/Controllers/RepositoryEditDlgController.cs b/projects/GKCore/GKCore/Controllers/RepositoryEditDlgController.cs
@@ -58,11 +58,13 @@ public override void Init(IBaseWindow baseWin)
             base.Init(baseWin);
 
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
+            fView.UserRefList.ListModel = new URefsListModel(fView, baseWin, fLocalUndoman);
         }
 
         public override void Done()
         {
             fView.NotesList.ListModel.SaveSettings();
+            fView.UserRefList.ListModel.SaveSettings();
         }
 
         public override bool Accept()
@@ -86,6 +88,7 @@ public override void UpdateView()
             fView.Name.Text = fRepositoryRecord.RepositoryName;
 
             fView.NotesList.ListModel.DataOwner = fRepositoryRecord;
+            fView.UserRefList.ListModel.DataOwner = fRepositoryRecord;
         }
 
         public async void ModifyAddress()
@@ -100,6 +103,7 @@ public override void SetLocale()
             GetControl<IButton>("btnCancel").Text = LangMan.LS(LSID.DlgCancel);
             GetControl<ILabel>("lblName").Text = LangMan.LS(LSID.Title);
             GetControl<ITabPage>("pageNotes").Text = LangMan.LS(LSID.RPNotes);
+            GetControl<ITabPage>("pageUserRefs").Text = LangMan.LS(LSID.UserRefs);
             GetControl<IButton>("btnAddress").Text = LangMan.LS(LSID.Address) + @"...";
         }
     }

diff --git a/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs b/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
@@ -60,13 +60,15 @@ public override void Init(IBaseWindow baseWin)
             fView.RepositoriesList.ListModel = new SourceRepositoriesListModel(fView, baseWin, fLocalUndoman);
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
+            fView.UserRefList.ListModel = new URefsListModel(fView, baseWin, fLocalUndoman);
         }
 
         public override void Done()
         {
             fView.RepositoriesList.ListModel.SaveSettings();
             fView.NotesList.ListModel.SaveSettings();
             fView.MediaList.ListModel.SaveSettings();
+            fView.UserRefList.ListModel.SaveSettings();
         }
 
         public override bool Accept()
@@ -116,6 +118,7 @@ public override void UpdateView()
             fView.RepositoriesList.ListModel.DataOwner = fSourceRecord;
             fView.NotesList.ListModel.DataOwner = fSourceRecord;
             fView.MediaList.ListModel.DataOwner = fSourceRecord;
+            fView.UserRefList.ListModel.DataOwner = fSourceRecord;
         }
 
         public override void SetLocale()
@@ -134,6 +137,7 @@ public override void SetLocale()
             GetControl<ITabPage>("pageRepositories").Text = LangMan.LS(LSID.RPRepositories);
             GetControl<ITabPage>("pageNotes").Text = LangMan.LS(LSID.RPNotes);
             GetControl<ITabPage>("pageMultimedia").Text = LangMan.LS(LSID.RPMultimedia);
+            GetControl<ITabPage>("pageUserRefs").Text = LangMan.LS(LSID.UserRefs);
         }
     }
 }
diff --git a/projects/GKCore/GKCore/Design/Views/IFamilyEditDlg.cs b/projects/GKCore/GKCore/Design/Views/IFamilyEditDlg.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".
  *
@@ -40,6 +40,7 @@ public interface IFamilyEditDlg : ICommonDialog, IBaseEditor
         ISheetList SourcesList { get; }
         ISheetList ChildrenList { get; }
         ISheetList EventsList { get; }
+        ISheetList UserRefList { get; }
 
         IComboBox MarriageStatus { get; }
         IComboBox Restriction { get; }

diff --git a/projects/GKCore/GKCore/Design/Views/IMediaEditDlg.cs b/projects/GKCore/GKCore/Design/Views/IMediaEditDlg.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".
  *
@@ -31,6 +31,7 @@ public interface IMediaEditDlg : ICommonDialog, IBaseEditor
 
         ISheetList NotesList { get; }
         ISheetList SourcesList { get; }
+        ISheetList UserRefList { get; }
 
         IComboBox MediaType { get; }
         IComboBox StoreType { get; }

diff --git a/projects/GKCore/GKCore/Design/Views/IRepositoryEditDlg.cs b/projects/GKCore/GKCore/Design/Views/IRepositoryEditDlg.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".
  *
@@ -30,6 +30,7 @@ public interface IRepositoryEditDlg : ICommonDialog, IBaseEditor
         GDMRepositoryRecord RepositoryRecord { get; set; }
 
         ISheetList NotesList { get; }
+        ISheetList UserRefList { get; }
         ITextBox Name { get; }
     }
 }
diff --git a/projects/GKCore/GKCore/Design/Views/ISourceEditDlg.cs b/projects/GKCore/GKCore/Design/Views/ISourceEditDlg.cs
@@ -32,6 +32,7 @@ public interface ISourceEditDlg : ICommonDialog, IBaseEditor
         ISheetList NotesList { get; }
         ISheetList MediaList { get; }
         ISheetList RepositoriesList { get; }
+        ISheetList UserRefList { get; }
 
         ITextBox ShortTitle { get; }
         ITextBox Author { get; }

diff --git a/projects/GKCore/GKCore/Lists/IndividualListModel.cs b/projects/GKCore/GKCore/Lists/IndividualListModel.cs
@@ -1178,101 +1178,4 @@ public override async Task Modify(object sender, ModifyEventArgs eArgs)
             }
         }
     }
-
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public sealed class URefsListModel : SheetModel<GDMUserReference>
-    {
-        public URefsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
-        {
-            AllowedActions = EnumSet<RecordAction>.Create(RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete);
-        }
-
-        public static ListColumns CreateListColumns()
-        {
-            var result = new ListColumns(GKListType.stUserRefs);
-
-            result.AddColumn(LSID.Reference, 300, false);
-            result.AddColumn(LSID.Type, 200, false);
-
-            result.ResetDefaults();
-            return result;
-        }
-
-        protected override object GetColumnValueEx(int colType, int colSubtype, bool isVisible)
-        {
-            object result = null;
-            switch (colType) {
-                case 0:
-                    result = fFetchedRec.StringValue;
-                    break;
-                case 1:
-                    result = fFetchedRec.ReferenceType;
-                    break;
-            }
-            return result;
-        }
-
-        public override void UpdateContents()
-        {
-            var iRec = fDataOwner as GDMIndividualRecord;
-            if (iRec == null) return;
-
-            try {
-                UpdateStructList(iRec.UserReferences);
-            } catch (Exception ex) {
-                Logger.WriteError("URefsListModel.UpdateContents()", ex);
-            }
-        }
-
-        public override async Task Modify(object sender, ModifyEventArgs eArgs)
-        {
-            var iRec = fDataOwner as GDMIndividualRecord;
-            if (fBaseWin == null || iRec == null) return;
-
-            GDMUserReference userRef = eArgs.ItemData as GDMUserReference;
-
-            bool result = false;
-
-            switch (eArgs.Action) {
-                case RecordAction.raAdd:
-                case RecordAction.raEdit: {
-                        bool exists = (userRef != null);
-                        if (!exists) {
-                            userRef = new GDMUserReference();
-                        }
-
-                        using (var dlg = AppHost.ResolveDialog<IUserRefEditDlg>(fBaseWin)) {
-                            dlg.UserReference = userRef;
-                            result = await AppHost.Instance.ShowModalAsync(dlg, fOwner, false);
-                        }
-
-                        if (!exists) {
-                            if (result) {
-                                result = fUndoman.DoOrdinaryOperation(OperationType.otIndividualURefAdd, iRec, userRef);
-                            } else {
-                                userRef.Dispose();
-                            }
-                        }
-                    }
-                    break;
-
-                case RecordAction.raDelete: {
-                        string confirmation = !string.IsNullOrEmpty(userRef.StringValue) ? userRef.StringValue : userRef.ReferenceType;
-                        if (await AppHost.StdDialogs.ShowQuestion(LangMan.LS(LSID.RemoveUserRefQuery, confirmation))) {
-                            result = fUndoman.DoOrdinaryOperation(OperationType.otIndividualURefRemove, iRec, userRef);
-                            fBaseWin.Context.Modified = true;
-                        }
-                        break;
-                    }
-            }
-
-            if (result) {
-                fBaseWin.Context.Modified = true;
-                eArgs.IsChanged = true;
-            }
-        }
-    }
 }