Added option to display dotted lines for divorced spouses in tree dia…

…grams (fix #537)
Serg-Norseman · Mar 29, 2024 · 2270f51 · 2270f51
1 parent 082bc73
commit 2270f51
Show file tree

Hide file tree

Showing 28 changed files with 67 additions and 12 deletions.
diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/English.lng b/locales/English.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/czech.lng b/locales/czech.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/french.lng b/locales/french.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/german.lng b/locales/german.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>02.03.2024 [v2.29.1 &amp; v3.5.1]</b><ul>
+            <li>Added option to display dotted lines for divorced spouses in tree diagrams.
             <li>Added the option to generate extended places by full or abbreviated names.
             <li>Added option for the reverse order of listing places in the ATD (by default, direct - from largest to smallest, reverse - from smallest to largest), 
                 the option only affects the listing of places in events/facts (when using extended processing of places) and when displayed in diagrams trees.

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>02.03.2024 [v2.29.1 &amp; v3.5.1]</b><ul>
+            <li>Добавлена опция вывода пунктирных линий разведенных супругов в диаграммах деревьев.
             <li>Добавлена опция формирования расширенных мест по полным или сокращенным названиям.
             <li>Выведена опция обратного порядка перечисления мест в АТД (по умолчанию прямой - от большего к меньшему, обратный - от меньшего к большему),
                 опция действует только на перечисление мест в событиях/фактах (при использовании расширенной обработки мест) и при выводе в диаграммах деревьев.

diff --git a/locales/italian.lng b/locales/italian.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/polish.lng b/locales/polish.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/locales/russian.lng b/locales/russian.lng
@@ -961,3 +961,4 @@
 951=РИ:Рекрут
 952=Обратный порядок мест (от меньш. к больш.)
 953=Сокращенные названия мест
+954=Пунктирные линии разведенных супругов
diff --git a/locales/ukrainian.lng b/locales/ukrainian.lng
@@ -961,3 +961,4 @@
 951=RI:Recruit
 952=Reverse order of places
 953=Abbreviated location names
+954=Dotted lines of divorced spouses
diff --git a/projects/GKCore/GKCore/Charts/TreeChartModel.cs b/projects/GKCore/GKCore/Charts/TreeChartModel.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".
  *
@@ -1931,9 +1931,13 @@ private void DrawDescendants(TreeChartPerson person, ChartDrawMode drawMode)
                 case GDMSex.svMale:
                     for (int i = 0; i < spousesCount; i++) {
                         TreeChartPerson spouse = person.GetSpouse(i);
+                        bool divorced = fOptions.DottedLinesOfDivorcedSpouses && spouse.HasFlag(PersonFlag.pfDivorced);
+
+                        var linePen = (!divorced) ? fLinePen : fDottedLinePen;
+                        var decorativeLinePen = (!divorced) ? fDecorativeLinePen : fDottedDecorativeLinePen;
 
                         int spbV = spbBeg + spbOfs * i;
-                        DrawLine(person.Rect.Right + 1, spbV, spouse.Rect.Left, spbV); // h
+                        DrawLine(person.Rect.Right + 1, spbV, spouse.Rect.Left, spbV, linePen, decorativeLinePen); // h
 
                         if (!string.IsNullOrEmpty(spouse.MarriageDate)) {
                             int q = (!fOptions.InvertedTree) ? 4 : 3;
@@ -1945,9 +1949,13 @@ private void DrawDescendants(TreeChartPerson person, ChartDrawMode drawMode)
                 case GDMSex.svFemale:
                     for (int i = 0; i < spousesCount; i++) {
                         TreeChartPerson spouse = person.GetSpouse(i);
+                        bool divorced = fOptions.DottedLinesOfDivorcedSpouses && spouse.HasFlag(PersonFlag.pfDivorced);
+
+                        var linePen = (!divorced) ? fLinePen : fDottedLinePen;
+                        var decorativeLinePen = (!divorced) ? fDecorativeLinePen : fDottedDecorativeLinePen;
 
                         int spbV = spbBeg + spbOfs * i;
-                        DrawLine(spouse.Rect.Right + 1, spbV, person.Rect.Left, spbV); // h
+                        DrawLine(spouse.Rect.Right + 1, spbV, person.Rect.Left, spbV, linePen, decorativeLinePen); // h
 
                         if (!string.IsNullOrEmpty(spouse.MarriageDate)) {
                             int q = (!fOptions.InvertedTree) ? 1 : 2;

diff --git a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
@@ -604,6 +604,7 @@ public void UpdateTreeChartsOptions()
             GetControl<ICheckBox>("chkHideUnknownSpouses").Checked = fOptions.TreeChartOptions.HideUnknownSpouses;
             GetControl<ICheckBox>("chkCheckTreeSize").Checked = fOptions.CheckTreeSize;
             GetControl<ICheckBox>("chkDottedLinesOfAdoptedChildren").Checked = fOptions.TreeChartOptions.DottedLinesOfAdoptedChildren;
+            GetControl<ICheckBox>("chkDottedLinesOfDivorcedSpouses").Checked = fOptions.TreeChartOptions.DottedLinesOfDivorcedSpouses;
             GetControl<ICheckBox>("chkSeparateDAPLines").Checked = fOptions.TreeChartOptions.SeparateDatesAndPlacesLines;
             GetControl<ICheckBox>("chkOnlyLocality").Checked = fOptions.TreeChartOptions.OnlyLocality;
             GetControl<ICheckBox>("chkBoldNames").Checked = fOptions.TreeChartOptions.BoldNames;
@@ -687,6 +688,7 @@ public void AcceptTreeChartsOptions()
             fOptions.TreeChartOptions.HideUnknownSpouses = GetControl<ICheckBox>("chkHideUnknownSpouses").Checked;
             fOptions.CheckTreeSize = GetControl<ICheckBox>("chkCheckTreeSize").Checked;
             fOptions.TreeChartOptions.DottedLinesOfAdoptedChildren = GetControl<ICheckBox>("chkDottedLinesOfAdoptedChildren").Checked;
+            fOptions.TreeChartOptions.DottedLinesOfDivorcedSpouses = GetControl<ICheckBox>("chkDottedLinesOfDivorcedSpouses").Checked;
             fOptions.TreeChartOptions.SeparateDatesAndPlacesLines = GetControl<ICheckBox>("chkSeparateDAPLines").Checked;
             fOptions.TreeChartOptions.OnlyLocality = GetControl<ICheckBox>("chkOnlyLocality").Checked;
             fOptions.TreeChartOptions.BoldNames = GetControl<ICheckBox>("chkBoldNames").Checked;
@@ -881,6 +883,7 @@ public override void SetLocale()
             GetControl<ICheckBox>("chkHideUnknownSpouses").Text = LangMan.LS(LSID.HideUnknownSpouses);
             GetControl<ICheckBox>("chkCheckTreeSize").Text = LangMan.LS(LSID.CheckTreeSize);
             GetControl<ICheckBox>("chkDottedLinesOfAdoptedChildren").Text = LangMan.LS(LSID.DottedLinesOfAdoptedChildren);
+            GetControl<ICheckBox>("chkDottedLinesOfDivorcedSpouses").Text = LangMan.LS(LSID.DottedLinesOfDivorcedSpouses);
             GetControl<ICheckBox>("chkBoldNames").Text = LangMan.LS(LSID.BoldNames);
             GetControl<ICheckBox>("chkMinimizingWidth").Text = LangMan.LS(LSID.MinimizingWidth);
             GetControl<ICheckBox>("chkShowAge").Text = LangMan.LS(LSID.ShowAge);

diff --git a/projects/GKCore/GKCore/LangMan.cs b/projects/GKCore/GKCore/LangMan.cs
@@ -1025,8 +1025,9 @@ public enum LSID
         /* 951 */ RI_Recruit,
         /* 952 */ ReversePlacesOrder,
         /* 953 */ EL_AbbreviatedNames,
+        /* 954 */ DottedLinesOfDivorcedSpouses,
 
-        /* 000 */ Last = EL_AbbreviatedNames
+        /* 000 */ Last = DottedLinesOfDivorcedSpouses
     }
 
 
@@ -2005,6 +2006,7 @@ public static class LangMan
             /* 951 */ "RI:Recruit",
             /* 952 */ "Reverse order of places",
             /* 953 */ "Abbreviated location names",
+            /* 954 */ "Dotted lines of divorced spouses",
         };
 
         private static readonly LangManager fLangMan = new LangManager();

diff --git a/projects/GKCore/GKCore/Options/TreeChartOptions.cs b/projects/GKCore/GKCore/Options/TreeChartOptions.cs
@@ -64,6 +64,7 @@ public sealed class TreeChartOptions : IOptions
         public bool ShowPlaces;
         public bool HideUnknownSpouses;
         public bool DottedLinesOfAdoptedChildren;
+        public bool DottedLinesOfDivorcedSpouses;
         public bool SeparateDatesAndPlacesLines;
         public bool BoldNames;
         public bool OnlyLocality;
@@ -133,6 +134,7 @@ public void ResetDefaults()
             ShowPlaces = false;
             HideUnknownSpouses = false;
             DottedLinesOfAdoptedChildren = false;
+            DottedLinesOfDivorcedSpouses = false;
             SeparateDatesAndPlacesLines = false;
             BoldNames = false;
             OnlyLocality = false;
@@ -207,6 +209,7 @@ public void Assign(IOptions source)
             ShowPlaces = srcOptions.ShowPlaces;
             HideUnknownSpouses = srcOptions.HideUnknownSpouses;
             DottedLinesOfAdoptedChildren = srcOptions.DottedLinesOfAdoptedChildren;
+            DottedLinesOfDivorcedSpouses = srcOptions.DottedLinesOfDivorcedSpouses;
             SeparateDatesAndPlacesLines = srcOptions.SeparateDatesAndPlacesLines;
             BoldNames = srcOptions.BoldNames;
             SeparateDepth = srcOptions.SeparateDepth;
@@ -258,6 +261,7 @@ public void LoadFromFile(IniFile iniFile)
             ShowPlaces = iniFile.ReadBool("Chart", "ShowPlaces", false);
             HideUnknownSpouses = iniFile.ReadBool("Chart", "HideUnknownSpouses", false);
             DottedLinesOfAdoptedChildren = iniFile.ReadBool("Chart", "DottedLinesOfAdoptedChildren", false);
+            DottedLinesOfDivorcedSpouses = iniFile.ReadBool("Chart", "DottedLinesOfDivorcedSpouses", false);
             SeparateDatesAndPlacesLines = iniFile.ReadBool("Chart", "SeparateDatesAndPlacesLines", false);
             BoldNames = iniFile.ReadBool("Chart", "BoldNames", false);
             BorderStyle = (GfxBorderStyle)iniFile.ReadInteger("Chart", "BorderStyle", 0);
@@ -324,6 +328,7 @@ public void SaveToFile(IniFile iniFile)
             iniFile.WriteBool("Chart", "ShowPlaces", ShowPlaces);
             iniFile.WriteBool("Chart", "HideUnknownSpouses", HideUnknownSpouses);
             iniFile.WriteBool("Chart", "DottedLinesOfAdoptedChildren", DottedLinesOfAdoptedChildren);
+            iniFile.WriteBool("Chart", "DottedLinesOfDivorcedSpouses", DottedLinesOfDivorcedSpouses);
             iniFile.WriteBool("Chart", "SeparateDatesAndPlacesLines", SeparateDatesAndPlacesLines);
             iniFile.WriteBool("Chart", "BoldNames", BoldNames);
             iniFile.WriteInteger("Chart", "BorderStyle", (int)BorderStyle);

diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
@@ -195,6 +195,7 @@
                         <CheckBox x:Name="chkHideUnknownSpouses" CheckedChanged="chkTreeChartOption_CheckedChanged" />
                         <CheckBox x:Name="chkCheckTreeSize" CheckedChanged="chkTreeChartOption_CheckedChanged" />
                         <CheckBox x:Name="chkDottedLinesOfAdoptedChildren" CheckedChanged="chkTreeChartOption_CheckedChanged" />
+                        <CheckBox x:Name="chkDottedLinesOfDivorcedSpouses" CheckedChanged="chkTreeChartOption_CheckedChanged" />
                         <CheckBox x:Name="chkBoldNames" CheckedChanged="chkTreeChartOption_CheckedChanged" />
                         <CheckBox x:Name="chkMinimizingWidth" CheckedChanged="chkTreeChartOption_CheckedChanged" />
                         <CheckBox x:Name="chkURNotesVisible" CheckedChanged="chkTreeChartOption_CheckedChanged" />