win32: updated settings view and layout

Author: gcclinux

internal/config/cities.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 )
 
-// AddCity appends a city to the list. Returns an error if the list already has 3 cities.
+// AddCity appends a city to the list. Returns an error if the list already has 5 cities.
 func AddCity(cities []CityConfig, city CityConfig) ([]CityConfig, error) {
-	if len(cities) >= 3 {
-		return cities, errors.New("maximum of 3 cities reached")
+	if len(cities) >= 5 {
+		return cities, errors.New("maximum of 5 cities reached")
 	}
 	return append(cities, city), nil
 }

internal/config/cities_property_test.go

@@ -11,8 +11,8 @@ import (
 
 func TestProperty4_CityListAddPreservesExistingAndAppends(t *testing.T) {
 	rapid.Check(t, func(rt *rapid.T) {
-		// Generate a list of 1-2 cities
-		count := rapid.IntRange(1, 2).Draw(rt, "cityCount")
+		// Generate a list of 1-4 cities
+		count := rapid.IntRange(1, 4).Draw(rt, "cityCount")
 		cities := make([]CityConfig, count)
 		for i := range cities {
 			cities[i] = genCityConfig(rt, "existing"+string(rune('0'+i)))
@@ -51,8 +51,8 @@ func TestProperty4_CityListAddPreservesExistingAndAppends(t *testing.T) {
 
 func TestProperty5_CityListRemoveDecreasesLengthAndExcludesTarget(t *testing.T) {
 	rapid.Check(t, func(rt *rapid.T) {
-		// Generate a list of 2-3 cities
-		count := rapid.IntRange(2, 3).Draw(rt, "cityCount")
+		// Generate a list of 2-5 cities
+		count := rapid.IntRange(2, 5).Draw(rt, "cityCount")
 		cities := make([]CityConfig, count)
 		for i := range cities {
 			cities[i] = genCityConfig(rt, "city"+string(rune('0'+i)))
@@ -87,8 +87,8 @@ func TestProperty5_CityListRemoveDecreasesLengthAndExcludesTarget(t *testing.T)
 
 func TestProperty6_CityListReorderPreservesSet(t *testing.T) {
 	rapid.Check(t, func(rt *rapid.T) {
-		// Generate a list of 1-3 cities
-		count := rapid.IntRange(1, 3).Draw(rt, "cityCount")
+		// Generate a list of 1-5 cities
+		count := rapid.IntRange(1, 5).Draw(rt, "cityCount")
 		cities := make([]CityConfig, count)
 		for i := range cities {
 			cities[i] = genCityConfig(rt, "city"+string(rune('0'+i)))

internal/config/cities_test.go

@@ -28,24 +28,24 @@ func TestAddCity_AppendsToList(t *testing.T) {
 }
 
 func TestAddCity_RejectsWhenFull(t *testing.T) {
-	cities := []CityConfig{city("A", "R1"), city("B", "R2"), city("C", "R3")}
-	_, err := AddCity(cities, city("D", "R4"))
+	cities := []CityConfig{city("A", "R1"), city("B", "R2"), city("C", "R3"), city("D", "R4"), city("E", "R5")}
+	_, err := AddCity(cities, city("F", "R6"))
 	if err == nil {
 		t.Fatal("expected error when adding to full list")
 	}
-	if err.Error() != "maximum of 3 cities reached" {
+	if err.Error() != "maximum of 5 cities reached" {
 		t.Errorf("unexpected error message: %v", err)
 	}
 }
 
-func TestAddCity_AllowsUpToThree(t *testing.T) {
-	cities := []CityConfig{city("A", "R1"), city("B", "R2")}
-	result, err := AddCity(cities, city("C", "R3"))
+func TestAddCity_AllowsUpToFive(t *testing.T) {
+	cities := []CityConfig{city("A", "R1"), city("B", "R2"), city("C", "R3"), city("D", "R4")}
+	result, err := AddCity(cities, city("E", "R5"))
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if len(result) != 3 {
-		t.Fatalf("expected length 3, got %d", len(result))
+	if len(result) != 5 {
+		t.Fatalf("expected length 5, got %d", len(result))
 	}
 }
 

internal/config/config_property_test.go

@@ -65,8 +65,8 @@ func genConfig(t *rapid.T) *Config {
 		ds = DataSourceLocalDatabase
 	}
 
-	// Generate 1-3 cities
-	cityCount := rapid.IntRange(1, 3).Draw(t, "cityCount")
+	// Generate 1-5 cities
+	cityCount := rapid.IntRange(1, 5).Draw(t, "cityCount")
 	cities := make([]CityConfig, cityCount)
 	for i := 0; i < cityCount; i++ {
 		cities[i] = genCityConfig(t, "city"+string(rune('0'+i)))

internal/config/validation.go

@@ -22,11 +22,11 @@ var allowedProviders = map[string]bool{
 func Validate(cfg *Config) []ValidationError {
 	var errs []ValidationError
 
-	// Cities length 1–3
-	if len(cfg.Cities) < 1 || len(cfg.Cities) > 3 {
+	// Cities length 1–5
+	if len(cfg.Cities) < 1 || len(cfg.Cities) > 5 {
 		errs = append(errs, ValidationError{
 			Field:   "cities",
-			Message: fmt.Sprintf("must contain 1 to 3 cities, got %d", len(cfg.Cities)),
+			Message: fmt.Sprintf("must contain 1 to 5 cities, got %d", len(cfg.Cities)),
 		})
 	}
 

internal/config/validation_property_test.go

@@ -69,15 +69,15 @@ func genMaybeInvalidConfig(t *rapid.T) (*Config, map[string]bool) {
 	invalidCitiesCount := rapid.Bool().Draw(t, "invalidCitiesCount")
 	var cityCount int
 	if invalidCitiesCount {
-		// Pick 0 or 4-10 cities
+		// Pick 0 or 6-10 cities
 		if rapid.Bool().Draw(t, "zeroCities") {
 			cityCount = 0
 		} else {
-			cityCount = rapid.IntRange(4, 10).Draw(t, "tooManyCities")
+			cityCount = rapid.IntRange(6, 10).Draw(t, "tooManyCities")
 		}
 		expectedErrors["cities"] = true
 	} else {
-		cityCount = rapid.IntRange(1, 3).Draw(t, "validCityCount")
+		cityCount = rapid.IntRange(1, 5).Draw(t, "validCityCount")
 	}
 
 	// --- Generate cities (each may have violations) ---

internal/config/validation_test.go

@@ -57,13 +57,13 @@ func TestValidate_CitiesLength(t *testing.T) {
 		t.Error("expected error for empty cities")
 	}
 
-	// Four cities
+	// Six cities
 	cfg.Cities = []CityConfig{
-		{Name: "A"}, {Name: "B"}, {Name: "C"}, {Name: "D"},
+		{Name: "A"}, {Name: "B"}, {Name: "C"}, {Name: "D"}, {Name: "E"}, {Name: "F"},
 	}
 	errs = Validate(cfg)
 	if !hasError(errs, "cities") {
-		t.Error("expected error for 4 cities")
+		t.Error("expected error for 6 cities")
 	}
 }
 

internal/ui/manager.go

@@ -54,8 +54,8 @@ func (u *UIManager) ShowWidget(cities []config.CityConfig) {
 	if count == 0 {
 		count = 1
 	}
-	if count > 3 {
-		count = 3
+	if count > 5 {
+		count = 5
 	}
 
 	u.panels = make([]*panel.CityPanel, count)