From 007db5f957b571f3587d2c7bb85ebda734d1aba4 Mon Sep 17 00:00:00 2001
From: Ethan Chien <liangtie.qian@gmail.com>
Date: Thu, 27 Feb 2025 22:45:58 +0000
Subject: [PATCH] Improve string clarity in Zone Manager and DIALOG_COPPER_ZONE
 for "Minimum island size"

- Renamed "Minimum island size" to "Area limit" in Zone Manager and DIALOG_COPPER_ZONE to align with terminology used in the dropdown.
- The change aims to make the connection between the dropdown choice and the field more intuitive, reducing ambiguity for users.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17255
---
 pcbnew/dialogs/dialog_copper_zones_base.cpp   |  2 +-
 pcbnew/dialogs/dialog_copper_zones_base.fbp   | 46 +++++++++----------
 .../panel_zone_properties_base.cpp            |  2 +-
 .../panel_zone_properties_base.fbp            |  2 +-
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pcbnew/dialogs/dialog_copper_zones_base.cpp b/pcbnew/dialogs/dialog_copper_zones_base.cpp
index a3d0ef2f66..a5755027cb 100644
--- a/pcbnew/dialogs/dialog_copper_zones_base.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones_base.cpp
@@ -360,7 +360,7 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
 	m_cbRemoveIslands->SetSelection( 0 );
 	gbSizer3->Add( m_cbRemoveIslands, wxGBPosition( 7, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-	m_islandThresholdLabel = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("Minimum island size:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_islandThresholdLabel = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("Area limit:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_islandThresholdLabel->Wrap( -1 );
 	m_islandThresholdLabel->Enable( false );
 	m_islandThresholdLabel->SetToolTip( _("Isolated islands smaller than this will be removed") );
diff --git a/pcbnew/dialogs/dialog_copper_zones_base.fbp b/pcbnew/dialogs/dialog_copper_zones_base.fbp
index 9c396fe36f..6997a9c00f 100644
--- a/pcbnew/dialogs/dialog_copper_zones_base.fbp
+++ b/pcbnew/dialogs/dialog_copper_zones_base.fbp
@@ -66,11 +66,11 @@
         <property name="name">m_MainBoxSizer</property>
         <property name="orient">wxVERTICAL</property>
         <property name="permission">protected</property>
-        <object class="sizeritem" expanded="true">
+        <object class="sizeritem" expanded="false">
           <property name="border">5</property>
           <property name="flag">wxBOTTOM|wxEXPAND</property>
           <property name="proportion">0</property>
-          <object class="wxInfoBar" expanded="true">
+          <object class="wxInfoBar" expanded="false">
             <property name="BottomDockable">1</property>
             <property name="LeftDockable">1</property>
             <property name="RightDockable">1</property>
@@ -127,16 +127,16 @@
             <property name="window_style"></property>
           </object>
         </object>
-        <object class="sizeritem" expanded="true">
+        <object class="sizeritem" expanded="false">
           <property name="border">5</property>
           <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
           <property name="proportion">1</property>
-          <object class="wxBoxSizer" expanded="true">
+          <object class="wxBoxSizer" expanded="false">
             <property name="minimum_size"></property>
             <property name="name">m_OptionsBoxSizer</property>
             <property name="orient">wxHORIZONTAL</property>
             <property name="permission">none</property>
-            <object class="sizeritem" expanded="true">
+            <object class="sizeritem" expanded="false">
               <property name="border">5</property>
               <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
               <property name="proportion">0</property>
@@ -179,11 +179,11 @@
                 </object>
               </object>
             </object>
-            <object class="sizeritem" expanded="true">
+            <object class="sizeritem" expanded="false">
               <property name="border">5</property>
               <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
               <property name="proportion">1</property>
-              <object class="wxStaticBoxSizer" expanded="true">
+              <object class="wxStaticBoxSizer" expanded="false">
                 <property name="id">wxID_ANY</property>
                 <property name="label">Net</property>
                 <property name="minimum_size"></property>
@@ -191,20 +191,20 @@
                 <property name="orient">wxVERTICAL</property>
                 <property name="parent">1</property>
                 <property name="permission">none</property>
-                <object class="sizeritem" expanded="true">
+                <object class="sizeritem" expanded="false">
                   <property name="border">5</property>
                   <property name="flag">wxEXPAND</property>
                   <property name="proportion">1</property>
-                  <object class="wxBoxSizer" expanded="true">
+                  <object class="wxBoxSizer" expanded="false">
                     <property name="minimum_size"></property>
                     <property name="name">bSizer8</property>
                     <property name="orient">wxHORIZONTAL</property>
                     <property name="permission">none</property>
-                    <object class="sizeritem" expanded="true">
+                    <object class="sizeritem" expanded="false">
                       <property name="border">20</property>
                       <property name="flag">wxEXPAND</property>
                       <property name="proportion">1</property>
-                      <object class="wxBoxSizer" expanded="true">
+                      <object class="wxBoxSizer" expanded="false">
                         <property name="minimum_size"></property>
                         <property name="name">bFilteringSizer</property>
                         <property name="orient">wxHORIZONTAL</property>
@@ -510,11 +510,11 @@
             <property name="name">bSizerMiddle</property>
             <property name="orient">wxHORIZONTAL</property>
             <property name="permission">none</property>
-            <object class="sizeritem" expanded="true">
+            <object class="sizeritem" expanded="false">
               <property name="border">5</property>
               <property name="flag">wxEXPAND</property>
               <property name="proportion">0</property>
-              <object class="wxBoxSizer" expanded="true">
+              <object class="wxBoxSizer" expanded="false">
                 <property name="minimum_size"></property>
                 <property name="name">bLeftColumn</property>
                 <property name="orient">wxVERTICAL</property>
@@ -803,7 +803,7 @@
                     </object>
                   </object>
                 </object>
-                <object class="sizeritem" expanded="true">
+                <object class="sizeritem" expanded="false">
                   <property name="border">10</property>
                   <property name="flag">wxEXPAND|wxLEFT|wxRIGHT|wxTOP</property>
                   <property name="proportion">1</property>
@@ -1641,7 +1641,7 @@
                   <property name="border">10</property>
                   <property name="flag">wxEXPAND|wxRIGHT|wxTOP</property>
                   <property name="proportion">1</property>
-                  <object class="wxStaticBoxSizer" expanded="false">
+                  <object class="wxStaticBoxSizer" expanded="true">
                     <property name="id">wxID_ANY</property>
                     <property name="label">Electrical Properties</property>
                     <property name="minimum_size"></property>
@@ -1649,11 +1649,11 @@
                     <property name="orient">wxVERTICAL</property>
                     <property name="parent">1</property>
                     <property name="permission">none</property>
-                    <object class="sizeritem" expanded="false">
+                    <object class="sizeritem" expanded="true">
                       <property name="border">5</property>
                       <property name="flag">wxEXPAND</property>
                       <property name="proportion">0</property>
-                      <object class="wxGridBagSizer" expanded="false">
+                      <object class="wxGridBagSizer" expanded="true">
                         <property name="empty_cell_size"></property>
                         <property name="flexible_direction">wxBOTH</property>
                         <property name="growablecols">1</property>
@@ -2662,7 +2662,7 @@
               <property name="border">10</property>
               <property name="flag">wxEXPAND|wxTOP|wxRIGHT</property>
               <property name="proportion">0</property>
-              <object class="wxStaticBoxSizer" expanded="false">
+              <object class="wxStaticBoxSizer" expanded="true">
                 <property name="id">wxID_ANY</property>
                 <property name="label">Fill</property>
                 <property name="minimum_size"></property>
@@ -2670,11 +2670,11 @@
                 <property name="orient">wxVERTICAL</property>
                 <property name="parent">1</property>
                 <property name="permission">none</property>
-                <object class="sizeritem" expanded="false">
+                <object class="sizeritem" expanded="true">
                   <property name="border">5</property>
                   <property name="flag">wxEXPAND|wxBOTTOM</property>
                   <property name="proportion">1</property>
-                  <object class="wxGridBagSizer" expanded="false">
+                  <object class="wxGridBagSizer" expanded="true">
                     <property name="empty_cell_size">-1,10</property>
                     <property name="flexible_direction">wxBOTH</property>
                     <property name="growablecols">0</property>
@@ -3909,7 +3909,7 @@
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
-                        <property name="label">Minimum island size:</property>
+                        <property name="label">Area limit:</property>
                         <property name="markup">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
@@ -4077,11 +4077,11 @@
             </object>
           </object>
         </object>
-        <object class="sizeritem" expanded="false">
+        <object class="sizeritem" expanded="true">
           <property name="border">5</property>
           <property name="flag">wxEXPAND|wxLEFT</property>
           <property name="proportion">0</property>
-          <object class="wxBoxSizer" expanded="false">
+          <object class="wxBoxSizer" expanded="true">
             <property name="minimum_size"></property>
             <property name="name">bSizerbottom</property>
             <property name="orient">wxHORIZONTAL</property>
diff --git a/pcbnew/zone_manager/panel_zone_properties_base.cpp b/pcbnew/zone_manager/panel_zone_properties_base.cpp
index fdfb2a2ab4..3e7c8e520d 100644
--- a/pcbnew/zone_manager/panel_zone_properties_base.cpp
+++ b/pcbnew/zone_manager/panel_zone_properties_base.cpp
@@ -285,7 +285,7 @@ PANEL_ZONE_PROPERTIES_BASE::PANEL_ZONE_PROPERTIES_BASE( wxWindow* parent, wxWind
 	m_cbRemoveIslands->SetSelection( 0 );
 	gbSizer3->Add( m_cbRemoveIslands, wxGBPosition( 7, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
 
-	m_islandThresholdLabel = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("Minimum island size:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_islandThresholdLabel = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("Area limit:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_islandThresholdLabel->Wrap( -1 );
 	m_islandThresholdLabel->Enable( false );
 	m_islandThresholdLabel->SetToolTip( _("Isolated islands smaller than this will be removed") );
diff --git a/pcbnew/zone_manager/panel_zone_properties_base.fbp b/pcbnew/zone_manager/panel_zone_properties_base.fbp
index a3b5f430ca..f9f18269fe 100644
--- a/pcbnew/zone_manager/panel_zone_properties_base.fbp
+++ b/pcbnew/zone_manager/panel_zone_properties_base.fbp
@@ -3336,7 +3336,7 @@
                     <property name="gripper">0</property>
                     <property name="hidden">0</property>
                     <property name="id">wxID_ANY</property>
-                    <property name="label">Minimum island size:</property>
+                    <property name="label">Area limit:</property>
                     <property name="markup">0</property>
                     <property name="max_size"></property>
                     <property name="maximize_button">0</property>