Merge branch 'master' of https://github.com/Serg-Norseman/GEDKeeper i…

…nto test-carbuna
Serg-Norseman · Jun 28, 2024 · 3fe62b6 · 3fe62b6
2 parents 9b98ab9 + ebb7c55
commit 3fe62b6
Show file tree

Hide file tree

Showing 51 changed files with 739 additions and 238 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 saving of column width settings for all lists.
             <li>Completed Spanish localization [Miguel Á. Pérez Valdenebro].
             <li>Added remembering and the feature to select from a list of causes and agencies of events.
             <li>Added an option to select list filtering methods (differences in speed).

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>Завершена локализация на испанский язык [Miguel Á. Pérez Valdenebro].
             <li>Добавлено запоминание и возможность выбора из списка причин и удостоверяющих организаций событий.
             <li>Добавлена опция выбора методов фильтрации списков (различия по скорости).

diff --git a/projects/GKCore/GKCore/Controllers/BaseWinController.cs b/projects/GKCore/GKCore/Controllers/BaseWinController.cs
@@ -619,10 +619,9 @@ public void RestoreListsSettings()
             for (var rt = GDMRecordType.rtIndividual; rt <= GDMRecordType.rtLocation; rt++) {
                 IListView rView = fTabParts[(int)rt].ListView;
                 if (rView != null) {
-                    rView.SetSortColumn(globOptions.ListOptions[rt].SortColumn, false);
-                    if (rt == GDMRecordType.rtIndividual) {
-                        globOptions.IndividualListColumns.CopyTo(rView.ListMan.ListColumns);
-                    }
+                    var columnOpts = globOptions.ListOptions[rt];
+                    rView.SetSortColumn(columnOpts.SortColumn, false);
+                    columnOpts.Columns.CopyTo(rView.ListMan.ListColumns);
                 }
             }
         }
@@ -633,10 +632,9 @@ public void SaveListsSettings()
             for (var rt = GDMRecordType.rtIndividual; rt <= GDMRecordType.rtLocation; rt++) {
                 IListView rView = fTabParts[(int)rt].ListView;
                 if (rView != null) {
-                    globOptions.ListOptions[rt].SortColumn = rView.SortColumn;
-                    if (rt == GDMRecordType.rtIndividual) {
-                        rView.ListMan.ListColumns.CopyTo(globOptions.IndividualListColumns);
-                    }
+                    var columnOpts = globOptions.ListOptions[rt];
+                    columnOpts.SortColumn = rView.SortColumn;
+                    rView.ListMan.ListColumns.CopyTo(columnOpts.Columns);
                 }
             }
         }

diff --git a/projects/GKCore/GKCore/Controllers/CommunicationEditDlgController.cs b/projects/GKCore/GKCore/Controllers/CommunicationEditDlgController.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".
  *
@@ -73,6 +73,12 @@ public override void Init(IBaseWindow baseWin)
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {

diff --git a/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs b/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs
@@ -69,6 +69,13 @@ public override void Init(IBaseWindow baseWin)
             fView.SourcesList.ListModel = new SourceCitationsListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+            fView.SourcesList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {

diff --git a/projects/GKCore/GKCore/Controllers/FamilyEditDlgController.cs b/projects/GKCore/GKCore/Controllers/FamilyEditDlgController.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".
  *
@@ -65,12 +65,21 @@ public override void Init(IBaseWindow baseWin)
             base.Init(baseWin);
 
             fView.ChildrenList.ListModel = new FamilyChildrenListModel(fView, baseWin, fLocalUndoman);
-            fView.EventsList.ListModel = new EventsListModel(fView, baseWin, fLocalUndoman, false);
+            fView.EventsList.ListModel = new EventsListModel(fView, baseWin, fLocalUndoman);
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
             fView.SourcesList.ListModel = new SourceCitationsListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.ChildrenList.ListModel.SaveSettings();
+            fView.EventsList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+            fView.SourcesList.ListModel.SaveSettings();
+        }
+
         public void SetTarget(TargetMode targetType, GDMIndividualRecord target)
         {
             if (targetType == TargetMode.tmNone || target == null) return;

diff --git a/projects/GKCore/GKCore/Controllers/GroupEditDlgController.cs b/projects/GKCore/GKCore/Controllers/GroupEditDlgController.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".
  *
@@ -62,6 +62,13 @@ public override void Init(IBaseWindow baseWin)
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.MembersList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {

diff --git a/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs b/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs
@@ -70,6 +70,14 @@ public override void Init(IBaseWindow baseWin)
             fView.NamesList.OnModify += ModifyNamesSheet;
         }
 
+        public override void Done()
+        {
+            fView.NamesList.ListModel.SaveSettings();
+            fView.LinksList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+        }
+
         private void ModifyNamesSheet(object sender, ModifyEventArgs eArgs)
         {
             fView.Name.Text = fLocationRecord.LocationName;

diff --git a/projects/GKCore/GKCore/Controllers/MediaEditDlgController.cs b/projects/GKCore/GKCore/Controllers/MediaEditDlgController.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".
  *
@@ -69,6 +69,12 @@ public override void Init(IBaseWindow baseWin)
             fView.SourcesList.ListModel = new SourceCitationsListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.NotesList.ListModel.SaveSettings();
+            fView.SourcesList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {

diff --git a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
@@ -19,6 +19,7 @@
  */
 
 using System.Threading.Tasks;
+using GDModel;
 using GKCore.Design;
 using GKCore.Design.Controls;
 using GKCore.Design.Views;
@@ -50,7 +51,7 @@ public IListColumns TempColumns
         public OptionsDlgController(IOptionsDlg view) : base(view)
         {
             fOptions = GlobalOptions.Instance;
-            fTempColumns = IndividualListModel.CreateIndividualListColumns();
+            fTempColumns = IndividualListModel.CreateListColumns();
 
             FillGeoSearchCountries();
 
@@ -120,7 +121,7 @@ public void AcceptColumnsList()
                 fTempColumns.OrderedColumns[i].CurActive = listView.Items[i].Checked;
             }
 
-            fTempColumns.CopyTo(fOptions.IndividualListColumns);
+            fTempColumns.CopyTo(fOptions.ListOptions[GDMRecordType.rtIndividual].Columns);
         }
 
         public void UpdateProxyOptions()
@@ -774,7 +775,7 @@ public override void UpdateView()
             UpdateInterfaceOptions();
             UpdateWomanSurnameFormat();
 
-            fOptions.IndividualListColumns.CopyTo(fTempColumns);
+            fOptions.ListOptions[GDMRecordType.rtIndividual].Columns.CopyTo(fTempColumns);
             UpdateColumnsList();
 
             // pedigrees

diff --git a/projects/GKCore/GKCore/Controllers/PersonEditDlgController.cs b/projects/GKCore/GKCore/Controllers/PersonEditDlgController.cs
@@ -93,7 +93,7 @@ public override void Init(IBaseWindow baseWin)
         {
             base.Init(baseWin);
 
-            fView.EventsList.ListModel = new EventsListModel(fView, baseWin, fLocalUndoman, true);
+            fView.EventsList.ListModel = new EventsListModel(fView, baseWin, fLocalUndoman);
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
             fView.SourcesList.ListModel = new SourceCitationsListModel(fView, baseWin, fLocalUndoman);
@@ -105,6 +105,20 @@ public override void Init(IBaseWindow baseWin)
             fView.ParentsList.ListModel = new IndiParentsListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.EventsList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+            fView.SourcesList.ListModel.SaveSettings();
+            fView.AssociationsList.ListModel.SaveSettings();
+            fView.GroupsList.ListModel.SaveSettings();
+            fView.NamesList.ListModel.SaveSettings();
+            fView.SpousesList.ListModel.SaveSettings();
+            fView.UserRefList.ListModel.SaveSettings();
+            fView.ParentsList.ListModel.SaveSettings();
+        }
+
         private bool IsExtendedWomanSurname()
         {
             var selectedSex = fView.SexCombo.GetSelectedTag<GDMSex>();

diff --git a/projects/GKCore/GKCore/Controllers/RepositoryEditDlgController.cs b/projects/GKCore/GKCore/Controllers/RepositoryEditDlgController.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".
  *
@@ -60,6 +60,11 @@ public override void Init(IBaseWindow baseWin)
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.NotesList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {

diff --git a/projects/GKCore/GKCore/Controllers/ResearchEditDlgController.cs b/projects/GKCore/GKCore/Controllers/ResearchEditDlgController.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".
  *
@@ -69,6 +69,14 @@ public override void Init(IBaseWindow baseWin)
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.TasksList.ListModel.SaveSettings();
+            fView.CommunicationsList.ListModel.SaveSettings();
+            fView.GroupsList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {

diff --git a/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs b/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
@@ -62,6 +62,13 @@ public override void Init(IBaseWindow baseWin)
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.RepositoriesList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {

diff --git a/projects/GKCore/GKCore/Controllers/StdPersonEditDlgController.cs b/projects/GKCore/GKCore/Controllers/StdPersonEditDlgController.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".
  *
@@ -39,6 +39,13 @@ public override void Init(IBaseWindow baseWin)
             fView.ChildrenList.ListModel = new IndividualChildrenListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            base.Done();
+
+            fView.ChildrenList.ListModel.SaveSettings();
+        }
+
         protected override void UpdateListModels(GDMIndividualRecord indiRec)
         {
             base.UpdateListModels(indiRec);

diff --git a/projects/GKCore/GKCore/Controllers/TaskEditDlgController.cs b/projects/GKCore/GKCore/Controllers/TaskEditDlgController.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".
  *
@@ -70,6 +70,11 @@ public override void Init(IBaseWindow baseWin)
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.NotesList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {

diff --git a/projects/GKCore/GKCore/Design/DialogController.cs b/projects/GKCore/GKCore/Design/DialogController.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".
  *
@@ -81,11 +81,18 @@ protected void RollbackChanges()
         /// <returns>if `true`, discard dialog closing events</returns>
         public async Task<bool> CheckChangesPersistence()
         {
+            bool result;
             if (GlobalOptions.Instance.DialogClosingWarn && fLocalUndoman != null && fLocalUndoman.HasChanges()) {
-                return (await AppHost.StdDialogs.ShowQuestion(LangMan.LS(LSID.WarningOfDialogUnsavedChanges)));
+                result = (await AppHost.StdDialogs.ShowQuestion(LangMan.LS(LSID.WarningOfDialogUnsavedChanges)));
             } else {
-                return false;
+                result = false;
+            }
+
+            if (!result) {
+                Done();
             }
+
+            return result;
         }
 
         public override void Init(IBaseWindow baseWin)

diff --git a/projects/GKCore/GKCore/Design/FormController.cs b/projects/GKCore/GKCore/Design/FormController.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".
  *
@@ -50,6 +50,10 @@ public virtual void Init(IBaseWindow baseWin)
             fBase = baseWin;
         }
 
+        public virtual void Done()
+        {
+        }
+
         protected T GetControl<T>(string controlName) where T : class, IControl
         {
             return fControlsManager.GetControl<T>(controlName);

diff --git a/projects/GKCore/GKCore/GKUtils.cs b/projects/GKCore/GKCore/GKUtils.cs
@@ -676,6 +676,17 @@ public static string GetEventName(GDMCustomEvent evt)
             return result;
         }
 
+        public static string GetEventPlaceAndAttributeValues(GDMCustomEvent evt)
+        {
+            string st = evt.HasPlace ? evt.Place.StringValue : string.Empty;
+
+            if (evt.StringValue != "") {
+                st = st + " [" + evt.StringValue + "]";
+            }
+
+            return st;
+        }
+
         public static string GetAttributeStr(GDMIndividualAttribute iAttr)
         {
             if (iAttr == null)