Added an option to display the full name in one line in trees (fix #572)

Serg-Norseman · Jun 17, 2024 · dbfb497 · dbfb497
1 parent 0aa7b4a
commit dbfb497
Show file tree

Hide file tree

Showing 30 changed files with 147 additions and 94 deletions.
diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/Dutch.lng b/locales/Dutch.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/English.lng b/locales/English.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single              ; tree border style

diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/Japanese.lng b/locales/Japanese.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/Spanish.lng b/locales/Spanish.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/czech.lng b/locales/czech.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/french.lng b/locales/french.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/german.lng b/locales/german.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

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 an option to display the full name in one line in trees, for countries with a short form of the full name (hieroglyphs).
             <li>Added custom event types, the feature to turn off events and add custom ones.
             <li>Added localizable names for tree borders.
             <li>Fixed an issue where blood group fact values would get stuck after use and when a different fact type was subsequently selected.

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/locales/italian.lng b/locales/italian.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/polish.lng b/locales/polish.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/locales/russian.lng b/locales/russian.lng
@@ -977,7 +977,7 @@
 966=Описание
 967=Для пользовательских событий и фактов необходимо ввести тип
 968=Определение события
-969=<?>
+969=Полное имя в одну строку
 970=<?>
 
 971=Одинарная

diff --git a/locales/ukrainian.lng b/locales/ukrainian.lng
@@ -977,7 +977,7 @@
 966=Description
 967=For custom events and facts, the type must be entered
 968=Event Definition
-969=<?>
+969=Full name on one line
 970=<?>
 
 971=Single

diff --git a/projects/GKCore/GKCore/Charts/TreeChartModel.cs b/projects/GKCore/GKCore/Charts/TreeChartModel.cs
@@ -889,49 +889,6 @@ public void ToggleCollapse(TreeChartPerson person)
             }
         }
 
-        private int InitInfoSize()
-        {
-            int lines = 0;
-
-            if (fOptions.FamilyVisible) {
-                lines++;
-            }
-
-            if (!fOptions.DiffLines) {
-                lines++;
-            } else {
-                lines++;
-                lines++;
-            }
-
-            if (fOptions.OnlyYears && !fOptions.ShowPlaces) {
-                lines++;
-            } else {
-                if (fOptions.BirthDateVisible) {
-                    lines++;
-                    if (fOptions.SeparateDatesAndPlacesLines) {
-                        lines++;
-                    }
-                }
-                if (fOptions.DeathDateVisible) {
-                    lines++;
-                    if (fOptions.SeparateDatesAndPlacesLines) {
-                        lines++;
-                    }
-                }
-            }
-
-            if (fOptions.Kinship) {
-                lines++;
-            }
-
-            if (fOptions.URNotesVisible) {
-                lines++;
-            }
-
-            return lines;
-        }
-
         private void Predef()
         {
             fPicScale = (fScale < 1.0f) ? fScale : 1.0f;
@@ -961,7 +918,7 @@ private void RecalcPersonBounds()
                 fGraph.SetTreeRoot(fKinRoot.Rec);
             }
 
-            int lines = InitInfoSize();
+            int lines = TreeChartPerson.InitInfoSize(fOptions);
 
             int maxWidth = 0;
             int num = fPersons.Count;

diff --git a/projects/GKCore/GKCore/Charts/TreeChartPerson.cs b/projects/GKCore/GKCore/Charts/TreeChartPerson.cs
@@ -413,6 +413,53 @@ public void BuildBy(GDMIndividualRecord iRec)
             }
         }
 
+        internal static int InitInfoSize(TreeChartOptions options)
+        {
+            int lines = 0;
+
+            if (options.FullNameOnOneLine) {
+                lines += 3;
+            } else {
+                if (options.FamilyVisible) {
+                    lines++;
+                }
+
+                if (!options.DiffLines) {
+                    lines++;
+                } else {
+                    lines++;
+                    lines++;
+                }
+            }
+
+            if (options.OnlyYears && !options.ShowPlaces) {
+                lines++;
+            } else {
+                if (options.BirthDateVisible) {
+                    lines++;
+                    if (options.SeparateDatesAndPlacesLines) {
+                        lines++;
+                    }
+                }
+                if (options.DeathDateVisible) {
+                    lines++;
+                    if (options.SeparateDatesAndPlacesLines) {
+                        lines++;
+                    }
+                }
+            }
+
+            if (options.Kinship) {
+                lines++;
+            }
+
+            if (options.URNotesVisible) {
+                lines++;
+            }
+
+            return lines;
+        }
+
         private void InitInfo(int lines)
         {
             Lines = new string[lines];
@@ -431,45 +478,61 @@ private void InitInfo(int lines)
                 // create lines
                 int idx = 0;
 
-                if (options.SurnameFirstInOrder) {
-                    if (options.FamilyVisible) {
-                        Lines[idx] = fSurname;
-                        NameLines++;
-                        idx++;
-                    }
-
-                    if (!options.DiffLines) {
-                        Lines[idx] = nameLine + " " + fPatronymic; // attention: "Name" is combined property
+                if (options.FullNameOnOneLine) {
+                    if (options.SurnameFirstInOrder) {
                         NameLines++;
                         idx++;
+                        Lines[idx] = fSurname + " " + nameLine;
+                        NameLines += 2;
+                        idx += 2;
                     } else {
-                        Lines[idx] = nameLine;
-                        NameLines++;
-                        idx++;
-
-                        Lines[idx] = fPatronymic;
                         NameLines++;
                         idx++;
+                        Lines[idx] = nameLine + " " + fSurname;
+                        NameLines += 2;
+                        idx += 2;
                     }
                 } else {
-                    if (!options.DiffLines) {
-                        Lines[idx] = nameLine + " " + fPatronymic; // attention: "Name" is combined property
-                        NameLines++;
-                        idx++;
+                    if (options.SurnameFirstInOrder) {
+                        if (options.FamilyVisible) {
+                            Lines[idx] = fSurname;
+                            NameLines++;
+                            idx++;
+                        }
+
+                        if (!options.DiffLines) {
+                            Lines[idx] = nameLine + " " + fPatronymic; // attention: "Name" is combined property
+                            NameLines++;
+                            idx++;
+                        } else {
+                            Lines[idx] = nameLine;
+                            NameLines++;
+                            idx++;
+
+                            Lines[idx] = fPatronymic;
+                            NameLines++;
+                            idx++;
+                        }
                     } else {
-                        Lines[idx] = nameLine;
-                        NameLines++;
-                        idx++;
+                        if (!options.DiffLines) {
+                            Lines[idx] = nameLine + " " + fPatronymic; // attention: "Name" is combined property
+                            NameLines++;
+                            idx++;
+                        } else {
+                            Lines[idx] = nameLine;
+                            NameLines++;
+                            idx++;
 
-                        Lines[idx] = fPatronymic;
-                        NameLines++;
-                        idx++;
-                    }
+                            Lines[idx] = fPatronymic;
+                            NameLines++;
+                            idx++;
+                        }
 
-                    if (options.FamilyVisible) {
-                        Lines[idx] = fSurname;
-                        NameLines++;
-                        idx++;
+                        if (options.FamilyVisible) {
+                            Lines[idx] = fSurname;
+                            NameLines++;
+                            idx++;
+                        }
                     }
                 }