Added an option to simplify the form of woman single surnames in exte…

…nded mode (fix #598)
Serg-Norseman · Sep 16, 2024 · c833879 · c833879
1 parent 522c77e
commit c833879
Show file tree

Hide file tree

Showing 28 changed files with 72 additions and 10 deletions.
diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/English.lng b/locales/English.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/czech.lng b/locales/czech.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/french.lng b/locales/french.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/german.lng b/locales/german.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Added an option to simplify the form of woman single surnames in extended mode (output without brackets if there are no other surnames).
             <li>Added protection against problems with folders in Windows if the file name has a space before the extension.
             <li>Added statistics type on parents' ages at child's birth.
             <li>Fixed a frequent error saving images to cache "A generic error occurred in GDI+".

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Добавлена опция упрощения формы единственных фамилий женщин в расширенном режиме (вывод без скобок, если других фамилий нет).
             <li>Добавлена защита от проблем с папками в Windows, если в имени файла перед расширением есть пробел.
             <li>Добавлен тип статистики по возрастам родителей при рождении ребенка.
             <li>Исправлена частая ошибка сохранения изображений в кэш "A generic error occurred in GDI+".

diff --git a/locales/italian.lng b/locales/italian.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/polish.lng b/locales/polish.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/locales/russian.lng b/locales/russian.lng
@@ -1008,3 +1008,4 @@
 995=Удалить учетный номер "{0}"?
 996=Архив не указан
 997=Возраст родителей
+998=Простая форма единственных фамилий
diff --git a/locales/ukrainian.lng b/locales/ukrainian.lng
@@ -1008,3 +1008,4 @@
 995=Are you sure you want to remove call number "{0}"?
 996=Repository is not specified
 997=Age of parents
+998=Simple form of single surnames
diff --git a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
@@ -296,6 +296,9 @@ public void UpdateWomanSurnameFormat()
                     GetControl<IRadioButton>("radMarried").Checked = true;
                     break;
             }
+
+            GetControl<ICheckBox>("chkSimpleSingleSurnames").Checked = isExtend && fOptions.SimpleSingleSurnames;
+            GetControl<ICheckBox>("chkSimpleSingleSurnames").Enabled = isExtend;
         }
 
         public void ChangeExtendWomanSurnames()
@@ -308,6 +311,7 @@ public void ChangeExtendWomanSurnames()
                 GetControl<IRadioButton>("radMarried_Maiden").Enabled = true;
                 GetControl<IRadioButton>("radMaiden").Enabled = true;
                 GetControl<IRadioButton>("radMarried").Enabled = true;
+                GetControl<ICheckBox>("chkSimpleSingleSurnames").Enabled = true;
             }
         }
 
@@ -326,6 +330,7 @@ public void AcceptWomanSurnameFormat()
                     fOptions.WomanSurnameFormat = WomanSurnameFormat.wsfMarried;
                 }
             }
+            fOptions.SimpleSingleSurnames = GetControl<ICheckBox>("chkSimpleSingleSurnames").Checked;
         }
 
         public void ResetInterfaceOptions()
@@ -993,6 +998,7 @@ public override void SetLocale()
             GetControl<IRadioButton>("radMarried_Maiden").Text = LangMan.LS(LSID.WSF_Married_Maiden);
             GetControl<IRadioButton>("radMaiden").Text = LangMan.LS(LSID.WSF_Maiden);
             GetControl<IRadioButton>("radMarried").Text = LangMan.LS(LSID.WSF_Married);
+            GetControl<ICheckBox>("chkSimpleSingleSurnames").Text = LangMan.LS(LSID.SimpleSingleSurnames);
 
             GetControl<ITabPage>("pageViewPersons").Text = LangMan.LS(LSID.ListPersons);
             GetControl<IButton>("btnResetDefaults").Text = LangMan.LS(LSID.DefList);

diff --git a/projects/GKCore/GKCore/GKUtils.cs b/projects/GKCore/GKCore/GKUtils.cs
@@ -3544,22 +3544,34 @@ public static string GetFmtSurname(GDMSex iSex, GDMPersonalName personalName, st
             var globOpts = GlobalOptions.Instance;
 
             WomanSurnameFormat wsFmt = globOpts.WomanSurnameFormat;
+            bool simpleSingle = globOpts.SimpleSingleSurnames;
+
             if (iSex == GDMSex.svFemale && wsFmt != WomanSurnameFormat.wsfNotExtend) {
                 string marriedSurname = personalName.MarriedName;
                 switch (wsFmt) {
                     case WomanSurnameFormat.wsfMaiden_Married:
                         result = defSurname;
+                        simpleSingle = simpleSingle && string.IsNullOrEmpty(result);
                         if (marriedSurname.Length > 0) {
-                            string op = (result.Length > 0) ? " (" : "(";
-                            result = string.Concat(result, op, marriedSurname, ")");
+                            if (!simpleSingle) {
+                                string op = (result.Length > 0) ? " (" : "(";
+                                result = string.Concat(result, op, marriedSurname, ")");
+                            } else {
+                                result = marriedSurname;
+                            }
                         }
                         break;
 
                     case WomanSurnameFormat.wsfMarried_Maiden:
                         result = marriedSurname;
+                        simpleSingle = simpleSingle && string.IsNullOrEmpty(result);
                         if (defSurname.Length > 0) {
-                            string op = (result.Length > 0) ? " (" : "(";
-                            result = string.Concat(result, op, defSurname, ")");
+                            if (!simpleSingle) {
+                                string op = (result.Length > 0) ? " (" : "(";
+                                result = string.Concat(result, op, defSurname, ")");
+                            } else {
+                                result = defSurname;
+                            }
                         }
                         break;
 

diff --git a/projects/GKCore/GKCore/LangMan.cs b/projects/GKCore/GKCore/LangMan.cs
@@ -1072,8 +1072,9 @@ public enum LSID
         /* 995 */ RemoveCallNumberQuery,
         /* 996 */ RepositoryIsNotSpecified,
         /* 997 */ ParentsAge,
+        /* 998 */ SimpleSingleSurnames,
 
-        /* 000 */ Last = ParentsAge
+        /* 000 */ Last = SimpleSingleSurnames
     }
 
 
@@ -2099,6 +2100,7 @@ public static class LangMan
             /* 995 */ "Are you sure you want to remove call number \"{0}\"?",
             /* 996 */ "Repository is not specified",
             /* 997 */ "Age of parents",
+            /* 998 */ "Simple form of single surnames",
         };
 
         private static readonly LangManager fLangMan = new LangManager();

diff --git a/projects/GKCore/GKCore/Options/GlobalOptions.cs b/projects/GKCore/GKCore/Options/GlobalOptions.cs
@@ -243,8 +243,6 @@ public StringList ResidenceFilters
         }
 
         /// <summary>
-        /// Hidden option for non-standard order.
-        ///
         /// Initial implementation (now just default) for enumerating ATDs: from largest to smallest.
         /// Reverse order of places: from smallest to largest.
         ///
@@ -295,6 +293,8 @@ public TreeChartOptions TreeChartOptions
 
         public WomanSurnameFormat WomanSurnameFormat { get; set; }
 
+        public bool SimpleSingleSurnames { get; set; }
+
 
         private GlobalOptions()
         {
@@ -399,6 +399,7 @@ public void ResetDefaults_Interface()
             SurnameFirstInOrder = true;
             SurnameInCapitals = false;
             WomanSurnameFormat = WomanSurnameFormat.wsfNotExtend;
+            SimpleSingleSurnames = false;
             UseSurnamesInPersonSelectionFilter = false;
             UseBirthDatesInPersonSelectionFilter = false;
             ShowIndiAssociations = false;
@@ -769,6 +770,7 @@ public void LoadFromFile(IniFile ini)
             AutosaveInterval = ini.ReadInteger("Common", "AutosaveInterval", 10);
 
             WomanSurnameFormat = (WomanSurnameFormat)ini.ReadInteger("Common", "WomanSurnameFormat", 0);
+            SimpleSingleSurnames = ini.ReadBool("Common", "SimpleSingleSurnames", false);
 
             Geocoder = ini.ReadString("Common", "Geocoder", "Google");
             GeoSearchCountry = ini.ReadString("Common", "GeoSearchCountry", "");
@@ -908,6 +910,7 @@ public void SaveToFile(IniFile ini)
             ini.WriteInteger("Common", "AutosaveInterval", AutosaveInterval);
 
             ini.WriteInteger("Common", "WomanSurnameFormat", (int)WomanSurnameFormat);
+            ini.WriteBool("Common", "SimpleSingleSurnames", SimpleSingleSurnames);
 
             ini.WriteString("Common", "Geocoder", Geocoder);
             ini.WriteString("Common", "GeoSearchCountry", GeoSearchCountry);

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
@@ -378,6 +378,8 @@
                       <RadioButton x:Name="radMarried_Maiden" />
                       <RadioButton x:Name="radMaiden" />
                       <RadioButton x:Name="radMarried" />
+                      <StackLayoutItem />
+                      <CheckBox x:Name="chkSimpleSingleSurnames" />
 
                     </StackLayout>
                   </GroupBox>

diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
@@ -307,6 +307,8 @@
                                                 <input:RadioButton x:Name="radMarried_Maiden" />
                                                 <input:RadioButton x:Name="radMaiden" />
                                                 <input:RadioButton x:Name="radMarried" />
+                                                <Label />
+                                                <input:CheckBox x:Name="chkSimpleSingleSurnames" />
                                             </input:RadioButtonGroupView>
                                         </comcom:GroupBox>