add sorting on number of bells

[belltower] / belltower.c

diff --git a/belltower.c b/belltower.c
index 2a406bf..89e9574 100644 (file)
--- a/belltower.c
+++ b/belltower.c
@@ -48,6 +48,7 @@ char *towersort_settings[] = {
   "Name of town",
   "Distance from you",
   "Days until practice night",
+  "Number of bells",
   "Weight of tenor",
   NULL
 };
@@ -73,6 +74,7 @@ typedef enum {
   TOWERSORT_TOWN,
   TOWERSORT_DISTANCE,
   TOWERSORT_PRACTICE,
+  TOWERSORT_BELLS,
   TOWERSORT_WEIGHT
 } TowersortSetting;
 
@@ -788,7 +790,27 @@ found_tower_new (tower *basis)
 {
   FoundTower* result = g_new (FoundTower, 1);
 
-  result->sortkey = g_strdup (basis->fields[FieldPrimaryKey]);
+  switch (settings_value[SETTINGS_TOWERSORT])
+    {
+    case TOWERSORT_DISTANCE:
+      result->sortkey = g_strdup_printf ("%5d %s",
+                                        distance_to_tower (basis),
+                                        basis->fields[FieldPlace]);
+      break;
+    case TOWERSORT_PRACTICE:
+      result->sortkey = g_strdup ("FIXME");
+      break;
+    case TOWERSORT_BELLS:
+      result->sortkey = g_strdup_printf ("%10s", basis->fields[FieldBells]);
+      break;
+    case TOWERSORT_WEIGHT:
+      result->sortkey = g_strdup_printf ("%10s", basis->fields[FieldWt]);
+      break;
+    case TOWERSORT_TOWN:
+    default:
+      result->sortkey = g_strdup (basis->fields[FieldPlace]);
+    }
+
   result->primarykey = g_strdup (basis->fields[FieldPrimaryKey]);
 
   if (device->fix->fields & LOCATION_GPS_DEVICE_LATLONG_SET)
@@ -824,6 +846,21 @@ found_tower_free (FoundTower *tower)
 }
 
 /**
+ * Comparison function for FoundTower objects.
+ *
+ * \param a   a FoundTower
+ * \param b   another FoundTower
+ */
+gint found_tower_compare (gconstpointer a,
+                         gconstpointer b)
+{
+  FoundTower *fta = (FoundTower *)a;
+  FoundTower *ftb = (FoundTower *)b;
+
+  return strcmp (fta->sortkey, ftb->sortkey);
+}
+
+/**
  * Calls a given function once for each tower in the world.
  * (The first call, however, is a header row.)
  *
@@ -895,8 +932,9 @@ parse_dove (ParseDoveCallback callback,
          return;
 
        case FILTER_ACCEPT:
-         filter_results = g_slist_append (filter_results,
-                                          found_tower_new (&result));
+         filter_results = g_slist_insert_sorted (filter_results,
+                                                 found_tower_new (&result),
+                                                 found_tower_compare);
        }
 
       result.serial++;
@@ -1411,7 +1449,7 @@ settings_dialogue (GtkButton *source,
                          TRUE, TRUE, 0);
     }
 
-  gtk_widget_show_all (GTK_WIDGET (dialog));  
+  gtk_widget_show_all (GTK_WIDGET (GTK_DIALOG(dialog)->vbox));  
   gtk_dialog_run (GTK_DIALOG (dialog));
 
   for (i=0; i<G_N_ELEMENTS (settings); i++)