Added UnrestrictedExtendedSurnames option, no UI (fix #502)

Serg-Norseman · Feb 1, 2025 · dee93f5 · dee93f5
1 parent c2667eb
commit dee93f5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/projects/GKCore/GKCore/Controllers/PersonEditDlgController.cs b/projects/GKCore/GKCore/Controllers/PersonEditDlgController.cs
@@ -122,9 +122,7 @@ public override void Done()
         private bool IsExtendedWomanSurname()
         {
             var selectedSex = fView.SexCombo.GetSelectedTag<GDMSex>();
-            bool result = (GlobalOptions.Instance.WomanSurnameFormat != WomanSurnameFormat.wsfNotExtend) &&
-                (selectedSex == GDMSex.svFemale);
-            return result;
+            return GlobalOptions.Instance.CanExtendedSurname(selectedSex);
         }
 
         public void ChangeSex()

diff --git a/projects/GKCore/GKCore/Controllers/PersonalNameEditDlgController.cs b/projects/GKCore/GKCore/Controllers/PersonalNameEditDlgController.cs
@@ -88,9 +88,7 @@ public override bool Accept()
 
         private bool IsExtendedWomanSurname()
         {
-            bool result = (GlobalOptions.Instance.WomanSurnameFormat != WomanSurnameFormat.wsfNotExtend) &&
-                (fIndividualRecord.Sex == GDMSex.svFemale);
-            return result;
+            return GlobalOptions.Instance.CanExtendedSurname(fIndividualRecord.Sex);
         }
 
         public override void UpdateView()

diff --git a/projects/GKCore/GKCore/Options/GlobalOptions.cs b/projects/GKCore/GKCore/Options/GlobalOptions.cs
@@ -290,6 +290,8 @@ public TreeChartOptions TreeChartOptions
             get { return fTreeChartOptions; }
         }
 
+        public bool UnrestrictedExtendedSurnames { get; set; }
+
         public bool UseExtendedNotes { get; set; }
 
         public bool UseSurnamesInPersonSelectionFilter { get; set; }
@@ -403,13 +405,15 @@ public void ResetDefaults_Interface()
             ShortKinshipForm = false;
             SurnameFirstInOrder = true;
             SurnameInCapitals = false;
-            WomanSurnameFormat = WomanSurnameFormat.wsfNotExtend;
-            SimpleSingleSurnames = false;
             UseSurnamesInPersonSelectionFilter = false;
             UseBirthDatesInPersonSelectionFilter = false;
             ShowIndiAssociations = false;
             ShowIndiNamesakes = true;
             MatchPatternMethod = MatchPatternMethod.RegEx;
+
+            WomanSurnameFormat = WomanSurnameFormat.wsfNotExtend;
+            SimpleSingleSurnames = false;
+            UnrestrictedExtendedSurnames = false;
         }
 
         public void ResetDefaults_Specials()
@@ -691,6 +695,14 @@ private void SaveStringList(IniFile ini, StringList list, string section, string
 
         #endregion
 
+        #region Features
+
+        public bool CanExtendedSurname(GDMSex selectedSex)
+        {
+            bool result = (WomanSurnameFormat != WomanSurnameFormat.wsfNotExtend) && (UnrestrictedExtendedSurnames || (selectedSex == GDMSex.svFemale));
+            return result;
+        }
+
         #region Record Select Dialog Filters
 
         public StringList GetRSFilters(GDMRecordType rt)
@@ -737,6 +749,8 @@ private void SaveRSFilters(IniFile ini)
 
         #endregion
 
+        #endregion
+
         public void LoadFromFile(IniFile ini)
         {
             if (ini == null)
@@ -779,6 +793,7 @@ public void LoadFromFile(IniFile ini)
 
             WomanSurnameFormat = (WomanSurnameFormat)ini.ReadInteger("Common", "WomanSurnameFormat", 0);
             SimpleSingleSurnames = ini.ReadBool("Common", "SimpleSingleSurnames", false);
+            UnrestrictedExtendedSurnames = ini.ReadBool("Common", "UnrestrictedExtendedSurnames", false);
 
             Geocoder = ini.ReadString("Common", "Geocoder", "Google");
             GeoSearchCountry = ini.ReadString("Common", "GeoSearchCountry", "");
@@ -920,6 +935,7 @@ public void SaveToFile(IniFile ini)
 
             ini.WriteInteger("Common", "WomanSurnameFormat", (int)WomanSurnameFormat);
             ini.WriteBool("Common", "SimpleSingleSurnames", SimpleSingleSurnames);
+            ini.WriteBool("Common", "UnrestrictedExtendedSurnames", UnrestrictedExtendedSurnames);
 
             ini.WriteString("Common", "Geocoder", Geocoder);
             ini.WriteString("Common", "GeoSearchCountry", GeoSearchCountry);