fix warning
[belltower] / belltower.c
index 6787255..42e65d7 100644 (file)
@@ -19,6 +19,8 @@
 #define MAX_FIELDS 50
 #define MAX_RECENT 5
 #define CONFIG_GENERAL_GROUP "General"
+#define CONFIG_DISTANCES_KEY "Distances"
+#define CONFIG_TOWERSORT_KEY "Towersort"
 #define CONFIG_BOOKMARK_GROUP "Bookmarks"
 #define CONFIG_RECENT_GROUP "Recent"
 #define CONFIG_SEEN_CREDITS_KEY "seen_credits"
  */
 #define MANY_BELLTOWERS 10
 
+char *distances_settings[] = {
+  CONFIG_DISTANCES_KEY,
+  "Distances are measured in...",
+  "Miles",
+  "Kilometres",
+  NULL
+};
+
+char *towersort_settings[] = {
+  CONFIG_TOWERSORT_KEY,
+  "Towers are sorted by...",
+  "Name of town",
+  "Distance from you",
+  "Days until practice night",
+  "Number of bells",
+  "Weight of tenor",
+  NULL
+};
+
+char **settings[] = {
+  distances_settings,
+  towersort_settings
+};
+
+gint settings_value[G_N_ELEMENTS (settings)] = { 0, };
+
+typedef enum {
+  SETTINGS_DISTANCES,
+  SETTINGS_TOWERSORT
+} Settings;
+
+typedef enum {
+  DISTANCES_MILES,
+  DISTANCES_KILOMETRES
+} DistancesSetting;
+
+typedef enum {
+  TOWERSORT_TOWN,
+  TOWERSORT_DISTANCE,
+  TOWERSORT_PRACTICE,
+  TOWERSORT_BELLS,
+  TOWERSORT_WEIGHT
+} TowersortSetting;
+
 GtkWidget *window;
 LocationGPSDevice *device;
 GKeyFile *static_content;
@@ -100,6 +146,9 @@ typedef struct {
   int n_fields;
 } tower;
 
+static void show_towers_from_list (GSList *list, gchar *list_name);
+static void free_tower_list (GSList *list);
+
 static void
 show_message (char *message)
 {
@@ -118,6 +167,8 @@ show_message (char *message)
 static void
 load_config (void)
 {
+  gint i;
+
   static_content = g_key_file_new ();
 
   if (!g_key_file_load_from_file (static_content,
@@ -134,6 +185,33 @@ load_config (void)
                             CONFIG_FILENAME,
                             G_KEY_FILE_KEEP_COMMENTS,
                             NULL);
+
+  for (i=0; i<G_N_ELEMENTS (settings); i++)
+    {
+      gchar *value = g_key_file_get_string (config,
+                                           CONFIG_GENERAL_GROUP,
+                                           settings[i][0],
+                                           NULL);
+
+      settings_value[i] = 0;
+
+      if (value)
+       {
+         gint j=0;
+         char **cursor = settings[i]+2;
+
+         while (*cursor)
+           {
+             if (strcmp (value, *cursor)==0)
+               {
+                 settings_value[i] = j;
+                 break;
+               }
+             cursor++;
+             j++;
+           }
+       }
+    }
 }
 
 /**
@@ -178,25 +256,68 @@ distance_to_tower (tower *details)
                                           device->fix->longitude,
                                           tower_lat,
                                           tower_long);
-
-  return (int) (km_distance / km_to_miles);
+  if (settings_value[SETTINGS_DISTANCES]==DISTANCES_KILOMETRES)
+    return (int) km_distance;
+  else
+    return (int) (km_distance / km_to_miles);
 }
 
 static gchar*
 distance_to_tower_str (tower *details)
 {
-  int miles = distance_to_tower (details);
+  int distance = distance_to_tower (details);
 
-  if (miles==-1)
+  if (distance==-1)
     {
       return g_strdup ("unknown");
     }
+  else if (settings_value[SETTINGS_DISTANCES]==DISTANCES_KILOMETRES)
+    {
+      return g_strdup_printf("%dkm", (int) distance);
+    }
   else
     {
-      return g_strdup_printf("%dmi", (int) miles);
+      return g_strdup_printf("%dmi", (int) distance);
     }
 }
 
+/**
+ * Returns the number of days from today until
+ * the tower's practice night.  If the tower's
+ * practice night is unknown, returns 9: this
+ * means that such towers always sort to the end.
+ */
+static gint
+days_until_practice_night (tower *details)
+{
+  /* let's not use the date parsing routines, because
+   * we might get confused by locales, and the day names
+   * used in Dove are constant
+   */
+  time_t now = time (NULL);
+  struct tm *calendar = localtime (&now);
+  const char* dove_days = "SunMonTueWedThuFriSat";
+  char *found;
+  gint practice_night;
+
+  if (strcmp (details->fields[FieldPracticeNight], "")==0)
+    {
+      /* we don't know */
+      return 9;
+    }
+
+  found = strstr (dove_days, details->fields[FieldPracticeNight]);
+
+  if (!found)
+    {
+      return 9;
+    }
+
+  practice_night = (found-dove_days)/3;
+
+  return ((practice_night+7)-calendar->tm_wday)%7;
+}
+
 static void
 call_dbus (DBusBusType type,
           char *name,
@@ -358,6 +479,19 @@ show_tower_map (void)
 }
 
 static void
+show_tower_directions (void)
+{
+  if (tower_directions)
+    {
+      show_browser (tower_directions);
+    }
+  else
+    {
+      show_message ("I don't know where you are!");
+    }
+}
+
+static void
 show_peals_list (void)
 {
   show_browser (peals_list);
@@ -427,12 +561,12 @@ get_counties_cb (tower *details,
 
 static FilterResult
 get_nearby_towers_cb (tower *details,
-                     gpointer data)
+                     gpointer distance)
 {
   if (details->serial==0)
     return FILTER_IGNORE; /* header row */
 
-  if (distance_to_tower (details) < 50)
+  if (distance_to_tower (details) <= GPOINTER_TO_INT (distance))
     {
       return FILTER_ACCEPT;
     }
@@ -573,7 +707,7 @@ single_tower_cb (tower *details,
   gchar *str;
   gint tenor_weight;
   gchar *primary_key = (gchar*) data;
-  gchar *miles;
+  gchar *distance;
 
   if (strcmp(details->fields[FieldPrimaryKey], primary_key)!=0)
     {
@@ -583,31 +717,9 @@ single_tower_cb (tower *details,
 
   tower_window = hildon_stackable_window_new ();
 
-  if (g_str_has_prefix (details->fields[FieldDedication],
-                       "S "))
-    {
-      /* FIXME: This needs to be cleverer, because we can have
-       * e.g. "S Peter and S Paul".
-       * May have to use regexps.
-       * Reallocation in general even when unchanged is okay,
-       * because it's the common case (most towers are S Something)
-       */
-      
-      /* FIXME: Since we're passing this in as markup,
-       * we need to escape the strings.
-       */
-
-      str = g_strdup_printf("S<sup>t</sup> %s, %s",
-                             details->fields[FieldDedication]+2,
-                             details->fields[FieldPlace]);
-
-    }
-  else
-    {
-      str = g_strdup_printf("%s, %s",
-                             details->fields[FieldDedication],
-                             details->fields[FieldPlace]);
-    }
+  str = g_strdup_printf("%s, %s",
+                       details->fields[FieldDedication],
+                       details->fields[FieldPlace]);
 
   hildon_window_set_markup (HILDON_WINDOW (tower_window),
                            str);
@@ -618,9 +730,9 @@ single_tower_cb (tower *details,
   buttons = gtk_vbox_new (TRUE, 0);
   menu = HILDON_APP_MENU (hildon_app_menu_new ());
 
-  miles = distance_to_tower_str(details);
+  distance = distance_to_tower_str(details);
 
-  add_table_field ("Distance", miles);
+  add_table_field ("Distance", distance);
   add_table_field ("Postcode", details->fields[FieldPostcode]);
   add_table_field ("County", details->fields[FieldCounty]);
   add_table_field ("Country", details->fields[FieldCountry]);
@@ -628,7 +740,7 @@ single_tower_cb (tower *details,
   add_table_field ("Practice night", details->fields[FieldPracticeNight]);
   add_table_field ("Bells", details->fields[FieldBells]);
 
-  g_free (miles);
+  g_free (distance);
 
   tenor_weight = atoi (details->fields[FieldWt]);
   str = g_strdup_printf("%dcwt %dqr %dlb in %s",
@@ -646,7 +758,7 @@ single_tower_cb (tower *details,
     }
   add_button ("Peals", show_peals_list);
   add_button ("Map", show_tower_map);
-  add_button ("Directions", NULL);
+  add_button ("Directions", show_tower_directions);
 
   /* don't use a toggle button: it looks stupid */
   button = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
@@ -677,6 +789,15 @@ single_tower_cb (tower *details,
   tower_map = g_strdup_printf ("http://maps.google.com/maps?q=%s,%s",
         details->fields[FieldLat],
         details->fields[FieldLong]);
+  g_free (tower_directions);
+  if (device->fix->fields & LOCATION_GPS_DEVICE_LATLONG_SET)
+    {
+      tower_directions = g_strdup_printf ("http://maps.google.com/maps?q=%f,%f+to+%s,%s",
+                                         device->fix->latitude,
+                                         device->fix->longitude,
+                                         details->fields[FieldLat],
+                                         details->fields[FieldLong]);
+    }
   g_free (tower_displayed);
   tower_displayed = g_strdup (details->fields[FieldPrimaryKey]);
 
@@ -706,7 +827,29 @@ 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_printf ("%d %s",
+                                        days_until_practice_night (basis),
+                                        basis->fields[FieldPlace]);
+      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)
@@ -741,16 +884,43 @@ found_tower_free (FoundTower *tower)
   g_free (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.)
+ *
+ * \param callback       The function to call.
+ * \param data           Arbitrary data to pass to the callback.
+ * \param dialogue_title If non-NULL, a list will be displayed
+ *                       with the results.  This is the title
+ *                       used for that dialogue.  (The dialogue
+ *                       will automatically free filter_results.)
+ */
 static void
 parse_dove (ParseDoveCallback callback,
-           GSList **filter_results,
-           gpointer data)
+           gpointer data,
+           gchar *dialogue_title)
 {
   FILE *dove = fopen("/usr/share/belltower/dove.txt", "r");
   char tower_rec[4096];
   tower result;
   char *i;
   gboolean seen_newline;
+  GSList *filter_results = NULL;
 
   if (!dove)
     {
@@ -801,23 +971,31 @@ parse_dove (ParseDoveCallback callback,
          return;
 
        case FILTER_ACCEPT:
-         if (filter_results)
-           {
-             *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++;
     }
 
   fclose (dove);
+
+  if (dialogue_title)
+    {
+      show_towers_from_list (filter_results,
+                            dialogue_title);
+    }
+  else
+    {
+      free_tower_list (filter_results);
+    }
 }
 
 static void
 show_tower (char *primary_key)
 {
-  parse_dove (single_tower_cb, NULL, primary_key);
+  parse_dove (single_tower_cb, primary_key, NULL);
 }
 
 static void
@@ -834,14 +1012,23 @@ free_tower_list (GSList *list)
   g_slist_free (list);
 }
 
+/**
+ * Displays a list of towers for the user to choose from.
+ * When one is chosen, we go to the display page for that tower.
+ * If there are none, this will tell the user there were none.
+ * If there is only one, we go straight to its display page.
+ *
+ * \param list       a GSList of FoundTower objects.
+ * \param list_name  the title for the dialogue.
+ */
 static void
-show_towers_from_list (GSList *list)
+show_towers_from_list (GSList *list,
+                      gchar *list_name)
 {
   GtkWidget *dialog;
   GtkWidget *selector;
   gint result = -1;
   GSList *cursor;
-  gchar foo[2048];
 
   if (!list)
     {
@@ -867,6 +1054,7 @@ show_towers_from_list (GSList *list)
 
   dialog = hildon_picker_dialog_new (GTK_WINDOW (window));
   selector = hildon_touch_selector_new_text ();
+  gtk_window_set_title (GTK_WINDOW (dialog), list_name);
 
   for (cursor=list; cursor; cursor=cursor->next)
     {
@@ -921,8 +1109,6 @@ put_areas_into_list (gpointer key,
 static void
 nearby_towers (void)
 {
-  GSList *matches = NULL;
-
   if (!(device->fix->fields & LOCATION_GPS_DEVICE_LATLONG_SET))
     {
       show_message ("I don't know where you are!");
@@ -930,10 +1116,12 @@ nearby_towers (void)
     }
 
   parse_dove (get_nearby_towers_cb,
-             &matches,
-             NULL);
-
-  show_towers_from_list (matches);
+             settings_value[SETTINGS_DISTANCES]==DISTANCES_KILOMETRES?
+             GINT_TO_POINTER (80) :
+             GINT_TO_POINTER (50),
+             settings_value[SETTINGS_DISTANCES]==DISTANCES_KILOMETRES?
+             "Towers within eighty kilometres of you":
+             "Towers within fifty miles of you");
 }
 
 static void
@@ -953,7 +1141,7 @@ towers_by_subarea (gchar *area)
   gtk_window_set_title (GTK_WINDOW (dialog), title);
   g_free (title);
 
-  parse_dove (get_counties_cb, NULL, &d);
+  parse_dove (get_counties_cb, &d, NULL);
 
   g_hash_table_foreach (hash,
                        put_areas_into_list,
@@ -972,15 +1160,16 @@ towers_by_subarea (gchar *area)
 
   if (gtk_dialog_run (GTK_DIALOG (dialog))==GTK_RESPONSE_OK)
     {
-      GSList *matches = NULL;
-      cac.county = strdup (hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector)));
+      gchar *title;
+      cac.county = g_strdup (hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector)));
+      title = g_strdup_printf ("Towers in %s",
+                              cac.county);
 
       parse_dove (get_towers_by_county_cb,
-                 &matches,
-                 &cac);
+                 &cac,
+                 title);
       g_free (cac.county);
-
-      show_towers_from_list (matches);
+      g_free (title);
     }
   g_hash_table_unref (hash);
   gtk_widget_destroy (GTK_WIDGET (dialog));
@@ -1030,6 +1219,14 @@ get_countries_with_many (GHashTable *source,
 #define COUNTRIES_WITH_MANY "Countries with many belltowers"
 #define COUNTRIES_WITH_FEW "Countries with few belltowers"
 
+/**
+ * Displays a list of areas of the world with many (or few)
+ * belltowers.  If you ask for the areas with many, it include
+ * a link to the areas with few.
+ *
+ * \param countries_with_many  True to list countries with many;
+ *                             false to list countries with few.
+ */
 static void
 towers_by_area_with_many (gboolean countries_with_many)
 {
@@ -1047,7 +1244,7 @@ towers_by_area_with_many (gboolean countries_with_many)
                        countries_with_many?
                        COUNTRIES_WITH_MANY : COUNTRIES_WITH_FEW);
 
-  parse_dove (get_countries_cb, NULL, countries_to_counts);
+  parse_dove (get_countries_cb, countries_to_counts, NULL);
 
   country_names = get_countries_with_many (countries_to_counts,
                                           countries_with_many);
@@ -1084,10 +1281,28 @@ towers_by_area_with_many (gboolean countries_with_many)
 
   if (result)
     {
-      if (strcmp (result, COUNTRIES_WITH_FEW)==0)
-       towers_by_area_with_many (FALSE);
+      if (countries_with_many)
+       {
+         /* these countries have many towers, so
+          * show the sub-areas
+          */
+         if (strcmp (result, COUNTRIES_WITH_FEW)==0)
+           towers_by_area_with_many (FALSE);
+         else
+           towers_by_subarea (result);
+       }
       else
-       towers_by_subarea (result);
+       {
+         country_and_county cac = { result, NULL };
+         gchar *title = g_strdup_printf ("Belltowers in %s",
+                                         result);
+
+         parse_dove (get_towers_by_county_cb,
+                     &cac,
+                     title);
+
+         g_free (title);
+       }
 
       g_free (result);
     }
@@ -1105,13 +1320,9 @@ towers_by_area (void)
 static void
 show_bookmarks (void)
 {
-  GSList *matches = NULL;
-
   parse_dove (get_group_of_towers_cb,
-             &matches,
-             CONFIG_BOOKMARK_GROUP);
-
-  show_towers_from_list (matches);
+             CONFIG_BOOKMARK_GROUP,
+             "Bookmarks");
 }
 
 static void
@@ -1124,7 +1335,6 @@ tower_search (void)
                                                  GTK_RESPONSE_OK,
                                                  NULL);
   GtkWidget *entry = gtk_entry_new ();
-  GSList *matches = NULL;
 
   gtk_box_pack_end (GTK_BOX (GTK_DIALOG (terms)->vbox),
                    entry, TRUE, TRUE, 0);
@@ -1133,13 +1343,9 @@ tower_search (void)
 
   if (gtk_dialog_run (GTK_DIALOG (terms))==GTK_RESPONSE_OK)
     {
-      GSList *matches = NULL;
-
       parse_dove (get_towers_by_search_cb,
-                 &matches,
-                 (char*) gtk_entry_get_text (GTK_ENTRY (entry)));
-
-      show_towers_from_list (matches);
+                 (char*) gtk_entry_get_text (GTK_ENTRY (entry)),
+                 "Search results");
     }
 
   gtk_widget_destroy (GTK_WIDGET (terms));
@@ -1148,13 +1354,9 @@ tower_search (void)
 static void
 recent_towers (void)
 {
-  GSList *matches = NULL;
-
   parse_dove (get_group_of_towers_cb,
-             &matches,
-             CONFIG_RECENT_GROUP);
-
-  show_towers_from_list (matches);
+             CONFIG_RECENT_GROUP,
+             "Towers you have recently viewed");
 }
 
 /**
@@ -1203,18 +1405,28 @@ show_credits (GtkButton *source,
 
   button = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
                                        HILDON_BUTTON_ARRANGEMENT_VERTICAL,
-                                       "View the GNU General Public Licence",
-                                       "This program is provided under the GPL, with no warranty.");
+                                       "Welcome to Belltower.  The program is \xc2\xa9 2009 Thomas Thurman.",
+                                       "View the program's home page.");
+  g_signal_connect (button, "clicked", G_CALLBACK (show_web_page),
+                   "http://belltower.garage.maemo.org");
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+                   button,
+                   TRUE, TRUE, 0);
+
+  button = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
+                                       HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+                                       "This program is provided under the GNU GPL, with no warranty.",
+                                       "View the GNU General Public Licence.");
   g_signal_connect (button, "clicked", G_CALLBACK (show_web_page),
-                   "www.gnu.org/copyleft/gpl.html");
+                   "http://www.gnu.org/copyleft/gpl.html");
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
                    button,
                    TRUE, TRUE, 0);
 
   button = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
                                        HILDON_BUTTON_ARRANGEMENT_VERTICAL,
-                                       "View Dove's Guide for Church Bell Ringers",
-                                       "The source of this program's data.");
+                                       "The data comes from Dove's Guide for Church Bell Ringers.",
+                                       "View Dove's Guide.");
   g_signal_connect (button, "clicked", G_CALLBACK (show_web_page),
                    "http://dove.cccbr.org.uk");
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
@@ -1223,8 +1435,8 @@ show_credits (GtkButton *source,
 
   button = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
                                        HILDON_BUTTON_ARRANGEMENT_VERTICAL,
-                                       "View belfry photograph",
-                                       "Image \xc2\xa9 Amanda Slater, cc-by-sa.");
+                                       "The belfry image is \xc2\xa9 Amanda Slater, cc-by-sa.",
+                                       "View the original photograph.");
   g_signal_connect (button, "clicked", G_CALLBACK (show_web_page),
                    "http://www.flickr.com/photos/pikerslanefarm/3398769335/");
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
@@ -1240,6 +1452,63 @@ show_credits (GtkButton *source,
   save_config ();
 }
 
+static void
+settings_dialogue (void)
+{
+  GtkWidget *dialog, *button;
+  GtkWidget *selector[G_N_ELEMENTS (settings)];
+  gint i;
+
+  dialog = gtk_dialog_new_with_buttons ("Settings",
+                                       GTK_WINDOW (window),
+                                       GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+                                       NULL
+                                       );
+
+  for (i=0; i<G_N_ELEMENTS (settings); i++)
+    {
+      char **cursor = settings[i]+2;
+      selector[i] = hildon_touch_selector_new_text ();
+
+      while (*cursor)
+       {
+         hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector[i]), *cursor);
+         cursor++;
+       }
+
+      hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector[i]), 0, settings_value[i]);
+
+      button = hildon_picker_button_new (HILDON_SIZE_AUTO, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+      hildon_button_set_title (HILDON_BUTTON (button), settings[i][1]);
+      hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (button),
+                                        HILDON_TOUCH_SELECTOR (selector[i]));
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+                         button,
+                         TRUE, TRUE, 0);
+    }
+
+  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++)
+    {
+      GList *rows = hildon_touch_selector_get_selected_rows (HILDON_TOUCH_SELECTOR (selector[i]),
+                                                            0);
+      GtkTreePath *path = (GtkTreePath*) rows->data;
+      gint *indices = gtk_tree_path_get_indices (path);
+
+      g_key_file_set_string (config,
+                            CONFIG_GENERAL_GROUP,
+                            settings[i][0],
+                            hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector[i])));
+
+      settings_value[i] = *indices;
+    }
+  save_config ();
+
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
 int
 main(int argc, char **argv)
 {
@@ -1265,6 +1534,11 @@ main(int argc, char **argv)
   add_button ("Bookmarks", show_bookmarks);
   add_button ("By area", towers_by_area);
   add_button ("Search", tower_search);
+  /* This won't be a button on the main screen
+   * for always, but we'll put it there for now
+   * to work around a hildon bug.
+   */
+  add_button ("Settings", settings_dialogue);
 
   /* extra buttons for the app menu */
   button = gtk_button_new_with_label ("Credits");