X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=belltower.c;h=dfcc66d1534962c4b1b2016b7a3839c4db84a014;hb=171e1ff96df08f46acfbbd7486a6c385cf010ab8;hp=ba1a88f49ae7b2f9d0cad42703279103152faf42;hpb=33579a01fd419d4ff99901d4ccd0897c1a057e55;p=belltower diff --git a/belltower.c b/belltower.c index ba1a88f..dfcc66d 100644 --- a/belltower.c +++ b/belltower.c @@ -17,8 +17,64 @@ #include #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 CONFIG_DIRECTORY "/home/user/.config/belltower" +#define CONFIG_FILENAME CONFIG_DIRECTORY "/belltower.ini" + +/** + * Somewhat arbitrary minimum number of belltowers in + * one country for the country to be considered to have + * "many" belltowers. + */ +#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", + "Weight of tenor", + NULL +}; + +char **settings[] = { + distances_settings, + towersort_settings +}; + +gint settings_value[G_N_ELEMENTS (settings)] = { 0, }; + +typedef enum { + DISTANCES_MILES, + DISTANCES_KILOMETRES +} DistancesSetting; + +typedef enum { + TOWERSORT_TOWN, + TOWERSORT_DISTANCE, + TOWERSORT_PRACTICE, + TOWERSORT_WEIGHT +} TowersortSetting; GtkWidget *window; +LocationGPSDevice *device; +GKeyFile *static_content; +GKeyFile *config; typedef enum { /** stop scanning the database */ @@ -83,12 +139,8 @@ typedef struct { int n_fields; } tower; -/* - * we're going to pretend you're in Helsinki - * until I get the GPS working - */ -double current_lat = 60.161790; -double current_long = 23.924902; +static void show_towers_from_list (GSList *list, gchar *list_name); +static void free_tower_list (GSList *list); static void show_message (char *message) @@ -101,7 +153,85 @@ show_message (char *message) gtk_widget_destroy (GTK_WIDGET (note)); } -static gchar* +/** + * Loads the content of the static and dynamic data files. + * Possibly puts up a warning if we can't load the static file. + */ +static void +load_config (void) +{ + gint i; + + static_content = g_key_file_new (); + + if (!g_key_file_load_from_file (static_content, + "/usr/share/belltower/static.ini", + G_KEY_FILE_NONE, + NULL)) + { + show_message ("Could not load static content. Attempting to continue."); + } + + config = g_key_file_new (); + /* it doesn't matter if this fails */ + g_key_file_load_from_file (config, + CONFIG_FILENAME, + G_KEY_FILE_KEEP_COMMENTS, + NULL); + + for (i=0; ifields[FieldLat], &endptr); - if (*endptr) return g_strdup ("unknown"); + if (*endptr) return -1; tower_long = strtod(details->fields[FieldLong], &endptr); - if (*endptr) return g_strdup ("unknown"); + if (*endptr) return -1; - km_distance = location_distance_between (current_lat, - current_long, + km_distance = location_distance_between (device->fix->latitude, + device->fix->longitude, tower_lat, tower_long); - return g_strdup_printf("%dmi", (int) (km_distance / km_to_miles)); + return (int) (km_distance / km_to_miles); +} + +static gchar* +distance_to_tower_str (tower *details) +{ + int miles = distance_to_tower (details); + + if (miles==-1) + { + return g_strdup ("unknown"); + } + else + { + return g_strdup_printf("%dmi", (int) miles); + } } static void @@ -222,17 +367,54 @@ add_button (char *label, } +char *tower_displayed = NULL; +char *tower_website = NULL; +char *tower_map = NULL; +char *tower_directions = NULL; +char *peals_list = NULL; + +#define BUTTON_BOOKMARKED_YES "Remove from bookmarks" +#define BUTTON_BOOKMARKED_NO "Bookmark" + static void bookmark_toggled (GtkButton *button, gpointer dummy) { - show_message ("Bookmarks are not yet implemented."); -} + if (g_key_file_get_boolean (config, + CONFIG_BOOKMARK_GROUP, + tower_displayed, + NULL)) + { -char *tower_website = NULL; -char *tower_map = NULL; -char *tower_directions = NULL; -char *peals_list = NULL; + /* it's bookmarked; remove the bookmark */ + + if (!g_key_file_remove_key (config, + CONFIG_BOOKMARK_GROUP, + tower_displayed, + NULL)) + { + show_message ("Could not remove bookmark."); + return; + } + + save_config (); + gtk_button_set_label (button, + BUTTON_BOOKMARKED_NO); + } + else + { + /* it's not bookmarked; add a bookmark */ + + g_key_file_set_boolean (config, + CONFIG_BOOKMARK_GROUP, + tower_displayed, + TRUE); + + save_config (); + gtk_button_set_label (button, + BUTTON_BOOKMARKED_YES); + } +} static void show_tower_website (void) @@ -247,6 +429,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); @@ -257,17 +452,24 @@ get_countries_cb (tower *details, gpointer data) { GHashTable *hash = (GHashTable *)data; + gpointer value; if (details->serial==0) return TRUE; /* header row */ if (!g_hash_table_lookup_extended (hash, - details->fields[FieldCountry], - NULL, NULL)) + details->fields[FieldCountry], + NULL, &value)) { g_hash_table_insert (hash, g_strdup(details->fields[FieldCountry]), - g_strdup (details->fields[FieldCountry])); + GINT_TO_POINTER (0)); + } + else + { + g_hash_table_replace (hash, + g_strdup(details->fields[FieldCountry]), + GINT_TO_POINTER (GPOINTER_TO_INT (value)+1)); } return FILTER_IGNORE; @@ -308,6 +510,23 @@ get_counties_cb (tower *details, } static FilterResult +get_nearby_towers_cb (tower *details, + gpointer data) +{ + if (details->serial==0) + return FILTER_IGNORE; /* header row */ + + if (distance_to_tower (details) < 50) + { + return FILTER_ACCEPT; + } + else + { + return FILTER_IGNORE; + } +} + +static FilterResult get_towers_by_county_cb (tower *details, gpointer data) { @@ -325,6 +544,111 @@ get_towers_by_county_cb (tower *details, } static FilterResult +get_towers_by_search_cb (tower *details, + gpointer data) +{ + char *s = (char *) data; + + if (strcasestr(details->fields[FieldCountry], s) || + strcasestr(details->fields[FieldCounty], s) || + strcasestr(details->fields[FieldDedication], s) || + strcasestr(details->fields[FieldPlace], s)) + { + return FILTER_ACCEPT; + } + else + { + return FILTER_IGNORE; + } +} + +/** + * A filter which accepts towers based on whether they + * appear in a particular group in the config file. + * + * \param details the candidate tower + * \param data pointer to a char* which names the group + */ +static FilterResult +get_group_of_towers_cb (tower *details, + gpointer data) +{ + if (g_key_file_has_key (config, + (char*) data, + details->fields[FieldPrimaryKey], + NULL)) + { + return FILTER_ACCEPT; + } + else + { + return FILTER_IGNORE; + } +} + +/** + * Removes the oldest entry from the [Recent] group in the config + * file until there are only five entries left. Does not save + * the file; you have to do that. + */ +static void +remove_old_recent_entries (void) +{ + gint count; + + do + { + gchar **towers; + gint oldest_date = 0; + gchar *oldest_tower = NULL; + gint i; + + /* It is a bit inefficient to do this every + * time we go around the loop. However, it + * makes the code far simpler, and we almost + * never go around more than once. + */ + towers = g_key_file_get_keys (config, + CONFIG_RECENT_GROUP, + &count, + NULL); + + if (count <= MAX_RECENT) + /* everything's fine */ + return; + + for (i=0; i MAX_RECENT); +} + +static FilterResult single_tower_cb (tower *details, gpointer data) { @@ -343,31 +667,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("St %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); @@ -378,7 +680,7 @@ single_tower_cb (tower *details, buttons = gtk_vbox_new (TRUE, 0); menu = HILDON_APP_MENU (hildon_app_menu_new ()); - miles = distance_to_tower(details); + miles = distance_to_tower_str(details); add_table_field ("Distance", miles); add_table_field ("Postcode", details->fields[FieldPostcode]); @@ -400,15 +702,23 @@ single_tower_cb (tower *details, add_table_field ("Tenor", str); g_free (str); - add_button ("Tower website", show_tower_website); + if (strcmp(details->fields[FieldWebPage], "")!=0) + { + add_button ("Tower website", show_tower_website); + } 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, HILDON_BUTTON_ARRANGEMENT_VERTICAL, - "Bookmark", NULL); + g_key_file_get_boolean (config, + CONFIG_BOOKMARK_GROUP, + details->fields[FieldPrimaryKey], + NULL)? + BUTTON_BOOKMARKED_YES: BUTTON_BOOKMARKED_NO, + NULL); g_signal_connect (button, "clicked", G_CALLBACK (bookmark_toggled), NULL); gtk_box_pack_start (GTK_BOX (buttons), button, FALSE, FALSE, 0); @@ -429,6 +739,25 @@ 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]); + + g_key_file_set_integer (config, + CONFIG_RECENT_GROUP, + tower_displayed, + time (NULL)); + remove_old_recent_entries (); + save_config (); + gtk_widget_show_all (GTK_WIDGET (tower_window)); return FILTER_STOP; @@ -447,18 +776,29 @@ static FoundTower * found_tower_new (tower *basis) { FoundTower* result = g_new (FoundTower, 1); - gchar *distance = distance_to_tower (basis); result->sortkey = g_strdup (basis->fields[FieldPrimaryKey]); result->primarykey = g_strdup (basis->fields[FieldPrimaryKey]); - result->displayname = g_strdup_printf ("%s, %s (%s, %s) (%s)", - basis->fields[FieldDedication], - basis->fields[FieldPlace], - basis->fields[FieldBells], - basis->fields[FieldPracticeNight], - distance); - g_free (distance); + if (device->fix->fields & LOCATION_GPS_DEVICE_LATLONG_SET) + { + gchar *distance = distance_to_tower_str (basis); + result->displayname = g_strdup_printf ("%s, %s (%s, %s) (%s)", + basis->fields[FieldDedication], + basis->fields[FieldPlace], + basis->fields[FieldBells], + basis->fields[FieldPracticeNight], + distance); + g_free (distance); + } + else + { + result->displayname = g_strdup_printf ("%s, %s (%s, %s)", + basis->fields[FieldDedication], + basis->fields[FieldPlace], + basis->fields[FieldBells], + basis->fields[FieldPracticeNight]); + } return result; } @@ -472,16 +812,28 @@ found_tower_free (FoundTower *tower) g_free (tower); } +/** + * 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) { @@ -532,58 +884,63 @@ 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_append (filter_results, + found_tower_new (&result)); } result.serial++; } fclose (dove); -} -static void -nearby_towers (void) -{ - char buffer[4096]; - LocationGPSDevice *device; - device = g_object_new (LOCATION_TYPE_GPS_DEVICE, NULL); - - sprintf(buffer, "%f %f %x", - device->fix->latitude, - device->fix->longitude, - device->fix->fields); - show_message (buffer); - - if (device->fix->fields & LOCATION_GPS_DEVICE_LATLONG_SET) + if (dialogue_title) { - show_message ("I know where you are!"); + show_towers_from_list (filter_results, + dialogue_title); } else { - show_message ("I don't know where you are!"); + free_tower_list (filter_results); } - - g_object_unref (device); } 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 +free_tower_list (GSList *list) +{ + GSList *cursor = list; + + while (cursor) + { + found_tower_free ((FoundTower*) cursor->data); + cursor = cursor->next; + } + + 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) { @@ -603,12 +960,13 @@ show_towers_from_list (GSList *list) "One tower found."); show_tower (found->primarykey); - /* FIXME: and free the list */ + free_tower_list (list); return; } 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) { @@ -640,7 +998,7 @@ show_towers_from_list (GSList *list) show_tower (found->primarykey); } - /* FIXME: and free the list */ + free_tower_list (list); } static gint strcmp_f (gconstpointer a, @@ -661,6 +1019,20 @@ put_areas_into_list (gpointer key, } static void +nearby_towers (void) +{ + if (!(device->fix->fields & LOCATION_GPS_DEVICE_LATLONG_SET)) + { + show_message ("I don't know where you are!"); + return; + } + + parse_dove (get_nearby_towers_cb, + NULL, + "Towers within fifty miles of you"); +} + +static void towers_by_subarea (gchar *area) { GtkWidget *dialog = hildon_picker_dialog_new (GTK_WINDOW (window)); @@ -677,7 +1049,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, @@ -696,37 +1068,96 @@ 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)); } +/** + * Maps a hash table from country names to counts of belltowers to a + * newly-created hash table mapping country names to display + * names, containing only those countries which have many + * (or few) belltowers. + * + * \param source the source table + * \param want_many true if you want countries with many belltowers; + * false if you want countries with few. + */ +static GHashTable* +get_countries_with_many (GHashTable *source, + gboolean want_many) +{ + GHashTable *result = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + NULL); + GList *countries = g_hash_table_get_keys (source); + GList *cursor = countries; + + while (cursor) + { + gboolean has_many = + GPOINTER_TO_INT (g_hash_table_lookup (source, + cursor->data)) >= MANY_BELLTOWERS; + + if (has_many == want_many) + { + g_hash_table_insert (result, + g_strdup (cursor->data), + g_strdup (cursor->data)); + } + + cursor = cursor->next; + } + + g_list_free (countries); + return result; +} + +#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 (void) +towers_by_area_with_many (gboolean countries_with_many) { GtkWidget *dialog = hildon_picker_dialog_new (GTK_WINDOW (window)); GtkWidget *selector = hildon_touch_selector_new_text (); - GHashTable *hash = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, - g_free); + GHashTable *countries_to_counts = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + NULL); + GHashTable *country_names; GSList *list = NULL, *cursor; gchar *result = NULL; - gtk_window_set_title (GTK_WINDOW (dialog), "Areas of the world"); + gtk_window_set_title (GTK_WINDOW (dialog), + countries_with_many? + COUNTRIES_WITH_MANY : COUNTRIES_WITH_FEW); - parse_dove (get_countries_cb, NULL, hash); + parse_dove (get_countries_cb, countries_to_counts, NULL); - g_hash_table_foreach (hash, + country_names = get_countries_with_many (countries_to_counts, + countries_with_many); + + g_hash_table_foreach (country_names, put_areas_into_list, &list); @@ -736,6 +1167,12 @@ towers_by_area (void) cursor->data); } + if (countries_with_many) + { + hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), + COUNTRIES_WITH_FEW); + } + hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector)); @@ -745,19 +1182,55 @@ towers_by_area (void) { result = g_strdup (hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector))); } - g_hash_table_unref (hash); + + g_hash_table_unref (countries_to_counts); + g_hash_table_unref (country_names); gtk_widget_destroy (GTK_WIDGET (dialog)); if (result) { - towers_by_subarea (result); + 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 + { + 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); } } +/** + * Shows all the towers in areas with many towers. + */ +static void +towers_by_area (void) +{ + towers_by_area_with_many (TRUE); +} + static void show_bookmarks (void) { + parse_dove (get_group_of_towers_cb, + CONFIG_BOOKMARK_GROUP, + "Bookmarks"); } static void @@ -778,7 +1251,9 @@ tower_search (void) if (gtk_dialog_run (GTK_DIALOG (terms))==GTK_RESPONSE_OK) { - show_message (gtk_entry_get_text (GTK_ENTRY (entry))); + parse_dove (get_towers_by_search_cb, + (char*) gtk_entry_get_text (GTK_ENTRY (entry)), + "Search results"); } gtk_widget_destroy (GTK_WIDGET (terms)); @@ -787,6 +1262,160 @@ tower_search (void) static void recent_towers (void) { + parse_dove (get_group_of_towers_cb, + CONFIG_RECENT_GROUP, + "Towers you have recently viewed"); +} + +/** + * Displays a web page. + * (Perhaps this should be merged with show_browser().) + * + * \param url The URL. + */ +static void +show_web_page (GtkButton *dummy, + gpointer url) +{ + show_browser (url); +} + +/** + * Shows the credits. + * + * \param source If non-null, we were called from a button press, + * so always show the credits. If null, we were called + * automatically on startup, so show the credits if + * they haven't already been seen. + */ +static void +show_credits (GtkButton *source, + gpointer dummy) +{ + gboolean from_button = (source!=NULL); + GtkWidget *dialog, *label, *button; + + if (!from_button && + g_key_file_get_boolean (config, + CONFIG_GENERAL_GROUP, + CONFIG_SEEN_CREDITS_KEY, + NULL)) + { + return; + } + + + dialog = gtk_dialog_new_with_buttons ("Credits", + GTK_WINDOW (window), + GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + NULL + ); + + button = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT, + HILDON_BUTTON_ARRANGEMENT_VERTICAL, + "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), + "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, + "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), + button, + TRUE, TRUE, 0); + + button = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT, + HILDON_BUTTON_ARRANGEMENT_VERTICAL, + "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), + button, + TRUE, TRUE, 0); + + gtk_widget_show_all (GTK_WIDGET (dialog)); + + g_key_file_set_boolean (config, + CONFIG_GENERAL_GROUP, + CONFIG_SEEN_CREDITS_KEY, + TRUE); + save_config (); +} + +static void +settings_dialogue (GtkButton *source, + gpointer dummy) +{ + 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; ivbox), + button, + TRUE, TRUE, 0); + } + + gtk_widget_show_all (GTK_WIDGET (dialog)); + gtk_dialog_run (GTK_DIALOG (dialog)); + + for (i=0; idata; + 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 @@ -798,6 +1427,8 @@ main(int argc, char **argv) gtk_init (&argc, &argv); g_set_application_name ("Belltower"); + device = g_object_new (LOCATION_TYPE_GPS_DEVICE, NULL); + window = hildon_stackable_window_new (); gtk_window_set_title (GTK_WINDOW (window), "Belltower"); g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (gtk_main_quit), NULL); @@ -812,10 +1443,11 @@ main(int argc, char **argv) add_button ("Bookmarks", show_bookmarks); add_button ("By area", towers_by_area); add_button ("Search", tower_search); + add_button ("(temp) settings", settings_dialogue); /* extra buttons for the app menu */ button = gtk_button_new_with_label ("Credits"); - hildon_app_menu_append (menu, GTK_BUTTON (button)); + g_signal_connect (button, "clicked", G_CALLBACK (show_credits), NULL); hildon_app_menu_append (menu, GTK_BUTTON (button)); gtk_widget_show_all (GTK_WIDGET (menu)); @@ -830,6 +1462,9 @@ main(int argc, char **argv) gtk_container_add (GTK_CONTAINER (window), hbox); gtk_widget_show_all (GTK_WIDGET (window)); + load_config (); + show_credits (NULL, NULL); + gtk_main (); return EXIT_SUCCESS;