]> err.no Git - mapper/blobdiff - src/poi-gui.c
Fixes to gstreamer element and caps handlings.
[mapper] / src / poi-gui.c
index 5119c2e3e2d663246abc8dd24536681f3bdd8e88..3538295faa7428ffd118aabbb29386e3d8e2719b 100644 (file)
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <fcntl.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <curl/multi.h>
-#include <gconf/gconf-client.h>
-#include <libxml/parser.h>
-
 #include <libintl.h>
 #include <locale.h>
-
-#include <sqlite3.h>
+#include <gtkhtml/gtkhtml.h>
+#include <gtkhtml/gtkhtml-stream.h>
 
 #include "utils.h"
 #include "poi.h"
 #include "gps.h"
 #include "map.h"
 #include "mapper-types.h"
+#include "latlon.h"
 #include "ui-common.h"
 #include "settings.h"
+#include "poi-gui.h"
+#include "osm.h"
+#include "osm-db.h"
+#include "dialogs.h"
+#include "help.h"
+#include "track.h"
+#include "poi-gui.h"
+
+#ifdef WITH_OSSO
+#include <libosso.h>
+#ifdef WITH_HILDON_NEW
+#include <tablet-browser-interface.h>
+#else
+#include <osso-browser-interface.h>
+#endif
+#include "ui-maemo.h"
+#endif
 
-guint _poi_zoom = 6;
-
-gboolean category_delete(GtkWidget * widget, DeletePOI * dpoi)
-{
+typedef struct _search_dialog search_dialog;
+struct _search_dialog {
        GtkWidget *dialog;
-       guint i;
-       gchar *buffer;
-       printf("%s()\n", __PRETTY_FUNCTION__);
-
-       buffer = g_strdup_printf("%s\n\t%s\n%s",
-                                _("Delete category?"),
-                                dpoi->txt_label,
-                                _
-                                ("WARNING: All POIs in that category will also be deleted!"));
-       dialog = hildon_note_new_confirmation(GTK_WINDOW(_window), buffer);
-       g_free(buffer);
-       i = gtk_dialog_run(GTK_DIALOG(dialog));
-       gtk_widget_destroy(GTK_WIDGET(dialog));
-
-       if (i == GTK_RESPONSE_OK) {
-               /* delete dpoi->poi_id */
-               if (SQLITE_OK != sqlite3_bind_int(_stmt_delete_poi_by_catid, 1,
-                                                 dpoi->id) ||
-                   SQLITE_DONE != sqlite3_step(_stmt_delete_poi_by_catid)) {
-                       MACRO_BANNER_SHOW_INFO(_window,
-                                              _("Problem deleting POI"));
-                       sqlite3_reset(_stmt_delete_poi_by_catid);
-                       return FALSE;
-               }
-               sqlite3_reset(_stmt_delete_poi_by_catid);
-
-               if (SQLITE_OK != sqlite3_bind_int(_stmt_delete_cat, 1, dpoi->id)
-                   || SQLITE_DONE != sqlite3_step(_stmt_delete_cat)) {
-                       MACRO_BANNER_SHOW_INFO(_window,
-                                              _("Problem deleting category"));
-                       sqlite3_reset(_stmt_delete_cat);
-                       return FALSE;
-               }
-               sqlite3_reset(_stmt_delete_cat);
+       GtkWidget *list;
+       GtkWidget *cmb_category;
+       GtkWidget *search_entry;
+       GtkListStore *store;
+       gdouble lat;
+       gdouble lon;
+};
 
-               gtk_widget_hide_all(dpoi->dialog);
-               map_force_redraw();
-       }
+static search_dialog sd;
 
-       vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
-       return TRUE;
+typedef struct _PoiCategoryEditInfo PoiCategoryEditInfo;
+struct _PoiCategoryEditInfo {
+       GtkWidget *cmb_category;
+       guint cat_id;
+};
+
+/* XXX: Load this from somewhere instead of hc... */
+struct _quick_poi_categories {
+    node_type_t type;
+    const gchar *name;
+};
+
+#define QPBS_X (4)
+#define QPBS_Y (3)
+#define POI_QUICK_BUTTONS (QPBS_X*QPBS_Y)
+
+static struct _quick_poi_categories quick_poi_categories[] = {
+       { NODE_AMENITY_SPEEDCAM,        "Speedcam", },
+       { NODE_AMENITY_FUEL,            "Fuel", },
+       { NODE_AMENITY_PARKING,         "Parking", },
+       { NODE_AMENITY_TAXI,            "Taxi", },
+
+       { NODE_AMENITY_PUB,             "Pub", },
+       { NODE_AMENITY_CAFE,            "Cafe", },
+       { NODE_AMENITY_FOOD,            "Fast Food", },
+       { NODE_AMENITY_RESTAURANT,      "Restaurant", },
+
+       { NODE_AMENITY_SHOP,            "Shop", },
+       { NODE_AMENITY_BANK,            "Bank", },
+       { NODE_AMENITY_ATM,             "ATM", },
+       { NODE_AMENITY_POST_BOX,        "Post box", },
+};
+
+static poi_quick_data qp;
+
+static gboolean 
+category_delete(GtkWidget *widget, delete_poi *dpoi)
+{
+GtkWidget *dialog;
+guint i;
+gchar *buffer;
+
+buffer = g_strdup_printf("%s\n\t%s\n%s", _("Delete category?"),
+                        dpoi->txt_label, _("WARNING: All POIs in that category will also be deleted!"));
+dialog = hildon_note_new_confirmation(GTK_WINDOW(_window), buffer);
+g_free(buffer);
+i = gtk_dialog_run(GTK_DIALOG(dialog));
+gtk_widget_destroy(GTK_WIDGET(dialog));
+
+if (i == GTK_RESPONSE_OK) {
+       if (poi_category_delete(dpoi->id)==FALSE)
+               popup_error(_window, _("Problem deleting category or POI"));
+       gtk_widget_hide_all(dpoi->dialog);
+       map_poi_cache_clear();
+       map_force_redraw();
+}
+
+return TRUE;
 }
 
-gboolean category_dialog(guint cat_id)
+GtkWidget *
+category_combo_new(void)
 {
-       gchar *cat_label = NULL, *cat_desc = NULL;
-       guint cat_enabled;
-       GtkWidget *dialog;
-       GtkWidget *table;
-       GtkWidget *label;
-       GtkWidget *txt_label;
-       GtkWidget *txt_desc;
-       GtkWidget *btn_delete = NULL;
-       GtkWidget *txt_scroll;
-       GtkWidget *chk_enabled;
-       GtkTextBuffer *desc_txt;
-       GtkTextIter begin, end;
-       gboolean results = TRUE;
-       DeletePOI dpoi = { NULL, NULL, 0 };
-       printf("%s()\n", __PRETTY_FUNCTION__);
-
-       if (cat_id > 0) {
-               if (SQLITE_OK !=
-                   sqlite3_bind_double(_stmt_select_cat, 1, cat_id)
-                   || SQLITE_ROW != sqlite3_step(_stmt_select_cat)) {
-                       vprintf("%s(): return FALSE\n", __PRETTY_FUNCTION__);
-                       sqlite3_reset(_stmt_select_cat);
-                       return FALSE;
-               }
+GtkWidget *cmb;
+GtkCellRenderer *renderer;
 
-               cat_label = g_strdup(sqlite3_column_text(_stmt_select_cat, 0));
-               cat_desc = g_strdup(sqlite3_column_text(_stmt_select_cat, 1));
-               cat_enabled = sqlite3_column_int(_stmt_select_cat, 2);
+/* Category ID, Label */
+cmb=gtk_combo_box_new_with_model(GTK_TREE_MODEL(gtk_list_store_new(2, G_TYPE_INT, G_TYPE_STRING)));
 
-               sqlite3_reset(_stmt_select_cat);
+/* Set up the view for the combo box. */
+renderer = gtk_cell_renderer_text_new();
+gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(cmb), renderer, TRUE);
+gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(cmb), renderer, "text", 1, NULL);
 
-               dialog = gtk_dialog_new_with_buttons(_("Edit Category"),
-                                                    GTK_WINDOW(_window),
-                                                    GTK_DIALOG_MODAL,
-                                                    GTK_STOCK_OK,
-                                                    GTK_RESPONSE_ACCEPT, NULL);
+return cmb;
+}
 
-               gtk_container_add(GTK_CONTAINER
-                                 (GTK_DIALOG(dialog)->action_area),
-                                 btn_delete =
-                                 gtk_button_new_with_label(_("Delete")));
+void 
+poi_category_combo_populate(GtkWidget *cmb_category, guint cat_id, gboolean add_na)
+{
+GtkTreeIter active;
+GtkListStore *store;
+GtkTreeIter iter;
+gboolean has_active = FALSE;
 
-               dpoi.dialog = dialog;
-               dpoi.txt_label = g_strdup(cat_label);
-               dpoi.id = cat_id;
+store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(cmb_category)));
+gtk_list_store_clear(store);
 
-               g_signal_connect(G_OBJECT(btn_delete), "clicked",
-                                G_CALLBACK(category_delete), &dpoi);
+if (add_na) {
+       gtk_list_store_append(store, &iter);
+       gtk_list_store_set(store, &iter, 0, -1, 1, _("[No category]"), -1);     
+}
 
-               gtk_dialog_add_button(GTK_DIALOG(dialog),
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
-       } else {
-               cat_enabled = 1;
-               cat_label = g_strdup("");
-               cat_id = 0;
-               cat_desc = g_strdup("");
-
-               dialog = gtk_dialog_new_with_buttons(_("Add Category"),
-                                                    GTK_WINDOW(_window),
-                                                    GTK_DIALOG_MODAL,
-                                                    GTK_STOCK_OK,
-                                                    GTK_RESPONSE_ACCEPT,
-                                                    GTK_STOCK_CANCEL,
-                                                    GTK_RESPONSE_REJECT, NULL);
+while (SQLITE_ROW == sqlite3_step(poisql.selall_cat)) {
+       guint cid = sqlite3_column_int(poisql.selall_cat, 0);
+       gtk_list_store_append(store, &iter);
+       gtk_list_store_set(store, &iter, 
+               0, cid, 
+               1, sqlite3_column_text(poisql.selall_cat, 1), -1);
+       if (cid==cat_id) {
+               active=iter;
+               has_active=TRUE;
        }
+}
+sqlite3_reset(poisql.selall_cat);
 
-       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
-                          table = gtk_table_new(6, 4, FALSE), TRUE, TRUE, 0);
-
-       gtk_table_attach(GTK_TABLE(table),
-                        label = gtk_label_new(_("Label")),
-                        0, 1, 0, 1, GTK_FILL, 0, 2, 4);
-       gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-       gtk_table_attach(GTK_TABLE(table),
-                        txt_label = gtk_entry_new(),
-                        1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 2, 4);
-
-       gtk_table_attach(GTK_TABLE(table),
-                        label = gtk_label_new(_("Description")),
-                        0, 1, 1, 2, GTK_FILL, 0, 2, 4);
-       gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-
-       txt_scroll = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scroll),
-                                           GTK_SHADOW_IN);
-       gtk_table_attach(GTK_TABLE(table),
-                        txt_scroll,
-                        1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4);
-
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scroll),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-
-       txt_desc = gtk_text_view_new();
-       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(txt_desc), GTK_WRAP_WORD);
-
-       gtk_container_add(GTK_CONTAINER(txt_scroll), txt_desc);
-       gtk_widget_set_size_request(GTK_WIDGET(txt_scroll), 400, 60);
-
-       desc_txt = gtk_text_view_get_buffer(GTK_TEXT_VIEW(txt_desc));
-
-       gtk_table_attach(GTK_TABLE(table),
-                        chk_enabled =
-                        gtk_check_button_new_with_label(_("Enabled")), 0, 2, 2,
-                        3, GTK_EXPAND | GTK_FILL, 0, 2, 4);
-
-       /* label */
-       gtk_entry_set_text(GTK_ENTRY(txt_label), cat_label);
-
-       /* desc */
-       gtk_text_buffer_set_text(desc_txt, cat_desc, -1);
-
-       /* enabled */
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chk_enabled),
-                                    (cat_enabled == 1 ? TRUE : FALSE));
-
-       g_free(cat_label);
-       cat_label = NULL;
-       g_free(cat_desc);
-       cat_desc = NULL;
-
-       gtk_widget_show_all(dialog);
-
-       while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
-               if (strlen(gtk_entry_get_text(GTK_ENTRY(txt_label))))
-                       cat_label =
-                           g_strdup(gtk_entry_get_text(GTK_ENTRY(txt_label)));
-               else {
-                       popup_error(dialog,
-                                   _
-                                   ("Please specify a name for the category."));
-                       continue;
-               }
+if (!has_active)
+       gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &active);
 
-               gtk_text_buffer_get_iter_at_offset(desc_txt, &begin, 0);
-               gtk_text_buffer_get_end_iter(desc_txt, &end);
-               cat_desc =
-                   gtk_text_buffer_get_text(desc_txt, &begin, &end, TRUE);
-
-               cat_enabled =
-                   (gtk_toggle_button_get_active
-                    (GTK_TOGGLE_BUTTON(chk_enabled)) ? 1 : 0);
-
-               if (cat_id > 0) {
-                       /* edit category */
-                       if (SQLITE_OK !=
-                           sqlite3_bind_text(_stmt_update_cat, 1, cat_label,
-                                             -1, g_free)
-                           || SQLITE_OK != sqlite3_bind_text(_stmt_update_cat,
-                                                             2, cat_desc, -1,
-                                                             g_free)
-                           || SQLITE_OK != sqlite3_bind_int(_stmt_update_cat,
-                                                            3, cat_enabled)
-                           || SQLITE_OK != sqlite3_bind_int(_stmt_update_cat,
-                                                            4, cat_id)
-                           || SQLITE_DONE != sqlite3_step(_stmt_update_cat)) {
-                               MACRO_BANNER_SHOW_INFO(_window,
-                                                      _
-                                                      ("Problem updating category"));
-                               results = FALSE;
-                       }
-                       sqlite3_reset(_stmt_update_cat);
-               } else {
-                       /* add category */
-                       if (SQLITE_OK !=
-                           sqlite3_bind_text(_stmt_insert_cat, 1, cat_label,
-                                             -1, g_free)
-                           || SQLITE_OK != sqlite3_bind_text(_stmt_insert_cat,
-                                                             2, cat_desc, -1,
-                                                             g_free)
-                           || SQLITE_OK != sqlite3_bind_int(_stmt_insert_cat,
-                                                            3, cat_enabled)
-                           || SQLITE_DONE != sqlite3_step(_stmt_insert_cat)) {
-                               MACRO_BANNER_SHOW_INFO(_window,
-                                                      _
-                                                      ("Problem adding category"));
-                               results = FALSE;
-                       }
-                       sqlite3_reset(_stmt_insert_cat);
-               }
-               break;
+gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cmb_category), &active);
+}
+
+gboolean 
+poi_category_dialog(guint cat_id)
+{
+GtkWidget *dialog;
+GtkWidget *table;
+GtkWidget *label;
+GtkWidget *txt_label;
+GtkWidget *txt_desc;
+GtkWidget *btn_delete = NULL;
+GtkWidget *txt_scroll;
+GtkWidget *chk_enabled;
+GtkTextBuffer *desc_txt;
+GtkTextIter begin, end;
+gboolean results = TRUE;
+delete_poi dpoi = { NULL, NULL, 0 };
+poi_category *c;
+
+if (cat_id > 0) {
+       if (poi_category_get(cat_id, &c)==FALSE) {
+               popup_error(_window, "Failed to get category.");
+               return FALSE;
        }
 
-       g_free(dpoi.txt_label);
+       dialog = gtk_dialog_new_with_buttons(_("Edit Category"),
+                                    GTK_WINDOW(_window),
+                                    GTK_DIALOG_MODAL,
+                                    GTK_STOCK_OK,
+                                    GTK_RESPONSE_ACCEPT, NULL);
 
-       g_object_unref(desc_txt);
+       gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
+                         btn_delete = gtk_button_new_with_label(_("Delete")));
+
+       dpoi.dialog = dialog;
+       dpoi.txt_label = g_strdup(c->label);
+       dpoi.id = c->id;
+
+       g_signal_connect(G_OBJECT(btn_delete), "clicked", G_CALLBACK(category_delete), &dpoi);
+       gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
+} else {
+       c=poi_category_new();
+       c->enabled = 1;
+       c->label = g_strdup("");
+       c->id = 0;
+       c->desc = g_strdup("");
+
+       dialog = gtk_dialog_new_with_buttons(_("Add Category"),
+                                    GTK_WINDOW(_window),
+                                    GTK_DIALOG_MODAL,
+                                    GTK_STOCK_OK,
+                                    GTK_RESPONSE_ACCEPT,
+                                    GTK_STOCK_CANCEL,
+                                    GTK_RESPONSE_REJECT, NULL);
+}
 
-       gtk_widget_hide_all(dialog);
+gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table = gtk_table_new(6, 4, FALSE), TRUE, TRUE, 0);
 
-       vprintf("%s(): return\n", __PRETTY_FUNCTION__);
-       return results;
-}
+gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Label")), 0, 1, 0, 1, GTK_FILL, 0, 2, 4);
+gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+gtk_table_attach(GTK_TABLE(table), txt_label = gtk_entry_new(), 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Description")), 0, 1, 1, 2, GTK_FILL, 0, 2, 4);
+gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+txt_scroll = gtk_scrolled_window_new(NULL, NULL);
+gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scroll), GTK_SHADOW_IN);
+gtk_table_attach(GTK_TABLE(table), txt_scroll, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4);
 
-void category_toggled(GtkCellRendererToggle * cell, gchar * path, gpointer data)
-{
-       GtkTreeIter iter;
-       gboolean cat_enabled;
-       guint cat_id;
-       printf("%s()\n", __PRETTY_FUNCTION__);
+gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+txt_desc = gtk_text_view_new();
+gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(txt_desc), GTK_WRAP_WORD);
+
+gtk_container_add(GTK_CONTAINER(txt_scroll), txt_desc);
+gtk_widget_set_size_request(GTK_WIDGET(txt_scroll), 400, 60);
+
+gtk_table_attach(GTK_TABLE(table), chk_enabled = gtk_check_button_new_with_label(_("Enabled")), 0, 2, 2, 3, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+
+/* label */
+gtk_entry_set_text(GTK_ENTRY(txt_label), c->label);
+
+/* desc */
+desc_txt = gtk_text_view_get_buffer(GTK_TEXT_VIEW(txt_desc));
+gtk_text_buffer_set_text(desc_txt, c->desc, -1);
+
+/* enabled */
+gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chk_enabled), (c->enabled == 1 ? TRUE : FALSE));
+
+poi_category_free(c);
+
+gtk_widget_show_all(dialog);
+
+while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
+       if (strlen(gtk_entry_get_text(GTK_ENTRY(txt_label)))) {
+               c=poi_category_new();
+               c->label=g_strdup(gtk_entry_get_text(GTK_ENTRY(txt_label)));
+       } else {
+               popup_error(dialog,_("Please specify a name for the category."));
+               continue;
+       }
 
-       GtkTreeModel *model = GTK_TREE_MODEL(data);
-       if (!gtk_tree_model_get_iter_from_string(model, &iter, path))
-               return;
+       gtk_text_buffer_get_bounds(desc_txt, &begin, &end);
+       c->desc = gtk_text_buffer_get_text(desc_txt, &begin, &end, TRUE);
+       c->enabled = (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(chk_enabled)) ? 1 : 0);
 
-       gtk_tree_model_get(model, &iter, CAT_ENABLED, &cat_enabled, -1);
-       gtk_tree_model_get(model, &iter, CAT_ID, &cat_id, -1);
+       results=poi_category_update(cat_id, c);
 
-       cat_enabled ^= 1;
+       if (results==FALSE)
+               popup_error(_window, _("Problem updating category"));
+       poi_category_free(c);
 
-       if (SQLITE_OK != sqlite3_bind_int(_stmt_toggle_cat, 1, cat_enabled) ||
-           SQLITE_OK != sqlite3_bind_int(_stmt_toggle_cat, 2, cat_id) ||
-           SQLITE_DONE != sqlite3_step(_stmt_toggle_cat)) {
-               MACRO_BANNER_SHOW_INFO(_window, _("Problem updating Category"));
-       } else
-               gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                                  CAT_ENABLED, cat_enabled, -1);
+       break;
+}
 
-       sqlite3_reset(_stmt_toggle_cat);
+if (dpoi.txt_label)
+       g_free(dpoi.txt_label);
+gtk_widget_destroy(dialog);
 
-       vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+return results;
 }
 
-GtkListStore *generate_store()
+static void 
+category_toggled_cb(GtkCellRendererToggle *cell, gchar *path, gpointer data)
 {
-       GtkTreeIter iter;
-       GtkListStore *store;
-       printf("%s()\n", __PRETTY_FUNCTION__);
-
-       store = gtk_list_store_new(CAT_NUM_COLUMNS,
-                                  G_TYPE_UINT,
-                                  G_TYPE_BOOLEAN,
-                                  G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
-
-       while (SQLITE_ROW == sqlite3_step(_stmt_selall_cat)) {
-               gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter,
-                                  CAT_ID, sqlite3_column_int(_stmt_selall_cat,
-                                                             0), CAT_ENABLED,
-                                  sqlite3_column_int(_stmt_selall_cat, 3),
-                                  CAT_LABEL,
-                                  sqlite3_column_text(_stmt_selall_cat, 1),
-                                  CAT_DESC,
-                                  sqlite3_column_text(_stmt_selall_cat, 2),
-                                  CAT_POI_CNT,
-                                  sqlite3_column_int(_stmt_selall_cat, 4), -1);
-       }
-       sqlite3_reset(_stmt_selall_cat);
+GtkTreeIter iter;
+gboolean cat_enabled;
+guint cat_id;
+
+GtkTreeModel *model = GTK_TREE_MODEL(data);
+if (!gtk_tree_model_get_iter_from_string(model, &iter, path))
+       return;
+
+gtk_tree_model_get(model, &iter, CAT_ENABLED, &cat_enabled, -1);
+gtk_tree_model_get(model, &iter, CAT_ID, &cat_id, -1);
+
+cat_enabled ^= 1;
+
+if (poi_category_toggle(cat_id, cat_enabled)==FALSE) {
+       popup_error(_window, _("Problem updating Category"));
+} else {
+       gtk_list_store_set(GTK_LIST_STORE(model), &iter, CAT_ENABLED, cat_enabled, -1);
+}
 
-       vprintf("%s(): return %p\n", __PRETTY_FUNCTION__, store);
-       return store;
 }
 
-gboolean category_add(GtkWidget * widget, GtkWidget * tree_view)
+static gboolean 
+category_add_cb(GtkWidget *widget, GtkWidget *tree_view)
 {
-       GtkListStore *store;
-       printf("%s()\n", __PRETTY_FUNCTION__);
+GtkListStore *store;
 
-       if (category_dialog(0)) {
-               store = generate_store();
-               gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view),
-                                       GTK_TREE_MODEL(store));
-               g_object_unref(G_OBJECT(store));
-       }
-       vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
-       return TRUE;
+if (poi_category_dialog(0)) {
+       store = poi_category_generate_store();
+       gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view), GTK_TREE_MODEL(store));
+       g_object_unref(G_OBJECT(store));
+}
+return TRUE;
 }
 
-gboolean category_edit(GtkWidget * widget, GtkWidget * tree_view)
+static gboolean 
+category_edit_cb(GtkWidget *widget, GtkWidget *tree_view)
 {
-       GtkTreeIter iter;
-       GtkTreeModel *store;
-       GtkTreeSelection *selection;
-       printf("%s()\n", __PRETTY_FUNCTION__);
-
-       store = gtk_tree_view_get_model(GTK_TREE_VIEW(tree_view));
-       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
-       if (gtk_tree_selection_get_selected(selection, &store, &iter)) {
-               GValue val;
-               memset(&val, 0, sizeof(val));
-               gtk_tree_model_get_value(store, &iter, 0, &val);
-               if (category_dialog(g_value_get_uint(&val))) {
-                       GtkListStore *new_store = generate_store();
-                       gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view),
-                                               GTK_TREE_MODEL(new_store));
-                       g_object_unref(G_OBJECT(new_store));
-               }
+GtkTreeIter iter;
+GtkTreeModel *store;
+GtkTreeSelection *selection;
+
+store = gtk_tree_view_get_model(GTK_TREE_VIEW(tree_view));
+selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
+if (gtk_tree_selection_get_selected(selection, &store, &iter)) {
+       GValue val;
+       memset(&val, 0, sizeof(val));
+       gtk_tree_model_get_value(store, &iter, 0, &val);
+       if (poi_category_dialog(g_value_get_uint(&val))) {
+               GtkListStore *new_store = poi_category_generate_store();
+               gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view), GTK_TREE_MODEL(new_store));
+               g_object_unref(G_OBJECT(new_store));
        }
-       vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
-       return TRUE;
+}
+return TRUE;
 }
 
-gboolean category_list()
+gboolean 
+poi_category_list()
 {
-       GtkWidget *dialog;
-       GtkWidget *tree_view;
-       GtkWidget *sw;
-       GtkWidget *btn_edit;
-       GtkWidget *btn_add;
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer;
-       GtkListStore *store;
-       printf("%s()\n", __PRETTY_FUNCTION__);
+GtkWidget *dialog;
+GtkWidget *tree_view;
+GtkWidget *sw;
+GtkWidget *btn_edit;
+GtkWidget *btn_add;
+GtkTreeViewColumn *column;
+GtkCellRenderer *renderer;
+GtkListStore *store;
+
+dialog = gtk_dialog_new_with_buttons(_("POI Categories"),
+                            GTK_WINDOW(_window),
+                            GTK_DIALOG_MODAL, GTK_STOCK_CLOSE,
+                            GTK_RESPONSE_ACCEPT, NULL);
+
+help_dialog_help_enable(GTK_DIALOG(dialog), HELP_ID_POICAT);
 
-       dialog = gtk_dialog_new_with_buttons(_("POI Categories"),
-                                            GTK_WINDOW(_window),
-                                            GTK_DIALOG_MODAL, GTK_STOCK_OK,
-                                            GTK_RESPONSE_ACCEPT, NULL);
+gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), btn_edit = gtk_button_new_with_label(_("Edit")));
+gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), btn_add = gtk_button_new_with_label(_("Add")));
 
+store=poi_category_generate_store();
+
+if (!store)
+       return TRUE;
+
+sw=gtk_scrolled_window_new(NULL, NULL);
+gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), sw, TRUE, TRUE, 0);
+
+tree_view=gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
 #ifdef WITH_HILDON
-       /* Enable the help button. */
-       ossohelp_dialog_help_enable(GTK_DIALOG(dialog), HELP_ID_POICAT, _osso);
+g_object_set(tree_view, "allow-checkbox-mode", FALSE, NULL);
 #endif
+gtk_container_add(GTK_CONTAINER(sw), tree_view);
 
-       gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
-                         btn_edit = gtk_button_new_with_label(_("Edit")));
+gtk_tree_selection_set_mode(gtk_tree_view_get_selection (GTK_TREE_VIEW(tree_view)), GTK_SELECTION_SINGLE);
+gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree_view), TRUE);
 
-       gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
-                         btn_add = gtk_button_new_with_label(_("Add")));
-
-       store = generate_store();
-
-       if (!store)
-               return TRUE;
-
-       sw = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
-                          sw, TRUE, TRUE, 0);
-
-       tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
-       /* Maemo-related? */
-       g_object_set(tree_view, "allow-checkbox-mode", FALSE, NULL);
-       gtk_container_add(GTK_CONTAINER(sw), tree_view);
-
-       gtk_tree_selection_set_mode(gtk_tree_view_get_selection
-                                   (GTK_TREE_VIEW(tree_view)),
-                                   GTK_SELECTION_SINGLE);
-       gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree_view), TRUE);
-
-       renderer = gtk_cell_renderer_text_new();
-       column =
-           gtk_tree_view_column_new_with_attributes(_("ID"), renderer, "text",
-                                                    CAT_ID, NULL);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
-       gtk_tree_view_column_set_max_width(column, 1);
-
-       renderer = gtk_cell_renderer_toggle_new();
-       g_signal_connect(renderer, "toggled",
-                        G_CALLBACK(category_toggled), store);
-       column =
-           gtk_tree_view_column_new_with_attributes(_("Enabled"), renderer,
-                                                    "active", CAT_ENABLED,
-                                                    NULL);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+renderer = gtk_cell_renderer_text_new();
+column = gtk_tree_view_column_new_with_attributes(_("ID"), renderer, "text", CAT_ID, NULL);
+gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
 
-       g_object_unref(G_OBJECT(store));
+renderer = gtk_cell_renderer_toggle_new();
+g_signal_connect(renderer, "toggled", G_CALLBACK(category_toggled_cb), store);
+column = gtk_tree_view_column_new_with_attributes(_("Enabled"), renderer, "active", CAT_ENABLED, NULL);
+gtk_tree_view_column_set_max_width(column, 32);
+gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+gtk_tree_view_column_set_sort_column_id (column, CAT_ENABLED);
 
-       renderer = gtk_cell_renderer_text_new();
-       column =
-           gtk_tree_view_column_new_with_attributes(_("Label"), renderer,
-                                                    "text", CAT_LABEL, NULL);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+g_object_unref(G_OBJECT(store));
 
-       renderer = gtk_cell_renderer_text_new();
-       column =
-           gtk_tree_view_column_new_with_attributes(_("Description"), renderer,
-                                                    "text", CAT_DESC, NULL);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+renderer = gtk_cell_renderer_pixbuf_new();
+column = gtk_tree_view_column_new_with_attributes(_("Icon"), renderer, "pixbuf", CAT_ICON, NULL);
+gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
 
-       renderer = gtk_cell_renderer_text_new();
-       column =
-           gtk_tree_view_column_new_with_attributes(_("# POIs"), renderer,
-                                                    "text", CAT_POI_CNT, NULL);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+renderer = gtk_cell_renderer_text_new();
+column = gtk_tree_view_column_new_with_attributes(_("Label"), renderer, "text", CAT_LABEL, NULL);
+gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+gtk_tree_view_column_set_sort_column_id (column, CAT_LABEL);
 
-       gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 300);
-       gtk_widget_show_all(dialog);
+renderer = gtk_cell_renderer_text_new();
+column = gtk_tree_view_column_new_with_attributes(_("# POIs"), renderer, "text", CAT_POI_CNT, NULL);
+gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+gtk_tree_view_column_set_sort_column_id (column, CAT_POI_CNT);
 
-       g_signal_connect(G_OBJECT(btn_edit), "clicked",
-                        G_CALLBACK(category_edit), tree_view);
+renderer = gtk_cell_renderer_text_new();
+g_object_set(G_OBJECT(renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+column = gtk_tree_view_column_new_with_attributes(_("Description"), renderer, "text", CAT_DESC, NULL);
+gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
 
-       g_signal_connect(G_OBJECT(btn_add), "clicked",
-                        G_CALLBACK(category_add), tree_view);
+gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 300);
 
-       while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
-               break;
+g_signal_connect(G_OBJECT(btn_edit), "clicked", G_CALLBACK(category_edit_cb), tree_view);
+g_signal_connect(G_OBJECT(btn_add), "clicked", G_CALLBACK(category_add_cb), tree_view);
+
+gtk_widget_show_all(dialog);
+gtk_dialog_run(GTK_DIALOG(dialog));
+gtk_widget_destroy(dialog);
+
+return TRUE;
+}
+
+gboolean 
+poi_delete_confirm(GtkWidget *widget, delete_poi *dpoi)
+{
+GtkWidget *dialog;
+guint i;
+gchar *buffer;
+
+buffer = g_strdup_printf("%s\n%s", _("Delete POI?"), dpoi->txt_label);
+dialog = hildon_note_new_confirmation(GTK_WINDOW(_window), buffer);
+g_free(buffer);
+i = gtk_dialog_run(GTK_DIALOG(dialog));
+gtk_widget_destroy(GTK_WIDGET(dialog));
+
+if (i == GTK_RESPONSE_OK) {
+       if (poi_delete(dpoi->id)==FALSE) {
+               popup_error(_window, _("Problem deleting POI"));
+       } else {
+               gtk_widget_hide_all(dpoi->dialog);
+               map_poi_cache_clear();
+               map_force_redraw();
        }
-       gtk_widget_destroy(dialog);
+}
+return TRUE;
+}
 
-       vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+static gboolean
+poi_search_do_cb(GtkWidget *widget, gpointer data)
+{
+gchar *s;
+guint cid;
+GtkListStore *store;
+GtkTreeIter iter;
+search_dialog *sd=(search_dialog *)data;
+
+if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sd->cmb_category), &iter)==TRUE)
+       gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(sd->cmb_category)), &iter, 0, &cid, -1);
+else
+       cid=-1;
+
+if ((strlen(gtk_entry_get_text(GTK_ENTRY(sd->search_entry)))<2) && (cid==-1)) {
+       popup_error(sd->dialog, _("Query string too short. Minimum 2 characters."));
        return TRUE;
 }
 
-gboolean menu_cb_category(GtkAction * action)
+s=g_strdup(gtk_entry_get_text(GTK_ENTRY(sd->search_entry)));
+g_printf("Search: [%s]\n", s);
+
+#if 0
+store=gtk_tree_view_get_model(GTK_TREE_VIEW(sd->list));
+if (store) {
+       gtk_list_store_clear(store);
+       g_object_unref(G_OBJECT(store));
+}
+#endif
+
+if (poi_search((cid==-1) ? POI_SEARCH_TEXT : POI_SEARCH_TEXT_CAT, sd->lat, sd->lon, s, cid, &sd->store)==TRUE) {
+       gtk_tree_view_set_model(GTK_TREE_VIEW(sd->list), GTK_TREE_MODEL(sd->store));
+       g_object_unref(G_OBJECT(sd->store));
+} else {
+       sd->store=NULL;
+       gtk_tree_view_set_model(GTK_TREE_VIEW(sd->list), GTK_TREE_MODEL(sd->store));
+}
+
+g_free(s);
+return TRUE;
+}
+
+static gboolean
+poi_goto_cb(GtkWidget *widget, gpointer data)
 {
-       printf("%s()\n", __PRETTY_FUNCTION__);
+GtkTreeIter iter;
+GtkTreeModel *model;
+gdouble lat, lon;
+search_dialog *sd=(search_dialog *)data;
 
-       if (category_list())
-               map_force_redraw();
+if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->list)), NULL, &iter)) {
+       popup_error(sd->dialog, _("Select one POI from the list."));
+       return TRUE;
+}
 
-       vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+model=gtk_tree_view_get_model(GTK_TREE_VIEW(sd->list));
+if (!model)
        return TRUE;
+
+gtk_tree_model_get(model, &iter, ITEM_LAT, &lat, -1);
+gtk_tree_model_get(model, &iter, ITEM_LON, &lon, -1);
+
+map_center_latlon(lat, lon);
+map_update_location_from_center();
+
+return TRUE;
 }
 
-gboolean poi_delete_confirm(GtkWidget * widget, DeletePOI * dpoi)
+static gboolean
+poi_route_to_cb(GtkWidget *widget, gpointer data)
 {
-       GtkWidget *dialog;
-       guint i;
-       gchar *buffer;
-       printf("%s()\n", __PRETTY_FUNCTION__);
-
-       buffer = g_strdup_printf("%s\n%s", _("Delete POI?"), dpoi->txt_label);
-       dialog = hildon_note_new_confirmation(GTK_WINDOW(_window), buffer);
-       g_free(buffer);
-       i = gtk_dialog_run(GTK_DIALOG(dialog));
-       gtk_widget_destroy(GTK_WIDGET(dialog));
-
-       if (i == GTK_RESPONSE_OK) {
-               if (poi_delete(dpoi)==FALSE) {
-                       MACRO_BANNER_SHOW_INFO(_window, _("Problem deleting POI"));
-               } else {
-                       gtk_widget_hide_all(dpoi->dialog);
-                       map_force_redraw();
-               }
-       }
+GtkTreeIter iter;
+GtkTreeModel *model;
+search_dialog *sd=(search_dialog *)data;
 
-       vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->list)), NULL, &iter)) {
+       popup_error(sd->dialog, _("Select one POI from the list."));
        return TRUE;
 }
 
-gboolean select_poi(guint unitx, guint unity, PoiInfo * poi)
-{
-       guint x, y;
-       gfloat lat1, lon1, lat2, lon2;
-       GtkWidget *dialog;
-       GtkWidget *list;
-       GtkWidget *sw;
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer;
-       GtkListStore *store;
-       GtkTreeIter iter;
-       gboolean selected = FALSE;
-       gchar tmp1[16], tmp2[16];
-       guint num_cats = 0;
-       printf("%s()\n", __PRETTY_FUNCTION__);
-
-       x = unitx - pixel2unit(3 * _draw_width);
-       y = unity + pixel2unit(3 * _draw_width);
-       unit2latlon(x, y, lat1, lon1);
-
-       x = unitx + pixel2unit(3 * _draw_width);
-       y = unity - pixel2unit(3 * _draw_width);
-       unit2latlon(x, y, lat2, lon2);
-
-       store = gtk_list_store_new(POI_NUM_COLUMNS, G_TYPE_INT, /* POI ID */
-                                  G_TYPE_INT,  /* Category ID */
-                                  G_TYPE_FLOAT,        /* Latitude */
-                                  G_TYPE_FLOAT,        /* Longitude */
-                                  G_TYPE_STRING,       /* Lat/Lon */
-                                  G_TYPE_STRING,       /* POI Label */
-                                  G_TYPE_STRING,       /* POI Desc. */
-                                  G_TYPE_STRING);      /* Category Label */
-
-       if (SQLITE_OK != sqlite3_bind_double(_stmt_select_poi, 1, lat1) ||
-           SQLITE_OK != sqlite3_bind_double(_stmt_select_poi, 2, lat2) ||
-           SQLITE_OK != sqlite3_bind_double(_stmt_select_poi, 3, lon1) ||
-           SQLITE_OK != sqlite3_bind_double(_stmt_select_poi, 4, lon2)) {
-               g_printerr("Failed to bind values for _stmt_select_poi");
-               return FALSE;
-       }
+model=gtk_tree_view_get_model(GTK_TREE_VIEW(sd->list));
+if (!model)
+       return TRUE;
 
-       while (SQLITE_ROW == sqlite3_step(_stmt_select_poi)) {
-               gfloat lat, lon;
-               lat = sqlite3_column_double(_stmt_select_poi, 0);
-               lon = sqlite3_column_double(_stmt_select_poi, 1);
-               printf("Found POI: %f, %f, %s, %s, %s\n",
-                      lat,
-                      lon,
-                      sqlite3_column_text(_stmt_select_poi, 3),
-                      sqlite3_column_text(_stmt_select_poi, 4),
-                      sqlite3_column_text(_stmt_select_poi, 6));
-               lat_format(lat, tmp1);
-               lon_format(lon, tmp2);
-               gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter,
-                                  POI_POIID,
-                                  sqlite3_column_int(_stmt_select_poi, 2),
-                                  POI_CATID,
-                                  sqlite3_column_int(_stmt_select_poi, 5),
-                                  POI_LAT, lat, POI_LON, lon, POI_LATLON,
-                                  g_strdup_printf("%s, %s", tmp1, tmp2),
-                                  POI_LABEL,
-                                  sqlite3_column_text(_stmt_select_poi, 3),
-                                  POI_DESC,
-                                  sqlite3_column_text(_stmt_select_poi, 4),
-                                  POI_CATLAB,
-                                  sqlite3_column_text(_stmt_select_poi, 6),
-                                  -1);
-               num_cats++;
-       }
-       sqlite3_reset(_stmt_select_poi);
+_dest.valid=TRUE;
+gtk_tree_model_get(model, &iter, ITEM_LAT, &_dest.lat, -1);
+gtk_tree_model_get(model, &iter, ITEM_LON, &_dest.lon, -1);
 
-       switch (num_cats) {
-       case 0:
-               g_object_unref(G_OBJECT(store));
-               MACRO_BANNER_SHOW_INFO(_window, _("No POIs found."));
-               return FALSE;
-               break;
-       case 1:
-               /* iter is still set to the most-recently added POI. */
-               gtk_tree_model_get(GTK_TREE_MODEL(store),
-                                  &iter,
-                                  POI_POIID, &(poi->poi_id),
-                                  POI_CATID, &(poi->cat_id),
-                                  POI_LAT, &(poi->lat),
-                                  POI_LON, &(poi->lon),
-                                  POI_LABEL, &(poi->label),
-                                  POI_DESC, &(poi->desc), -1);
-               g_object_unref(G_OBJECT(store));
-               return TRUE;
-               break;
-       }
+map_update_location_from_center();
+
+return TRUE;
+}
 
-       /* There are at least 2 matching POI's - let the user select one. */
-       dialog = gtk_dialog_new_with_buttons(_("Select POI"),
-                                            GTK_WINDOW(_window),
-                                            GTK_DIALOG_MODAL, GTK_STOCK_OK,
-                                            GTK_RESPONSE_ACCEPT,
-                                            GTK_STOCK_CANCEL,
-                                            GTK_RESPONSE_REJECT, NULL);
-
-       gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 300);
-
-       sw = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-                                           GTK_SHADOW_ETCHED_IN);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
-                          sw, TRUE, TRUE, 0);
-
-       list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+gboolean
+poi_search_dialog(GtkListStore *store, poi_info *poi, gdouble lat, gdouble lon)
+{
+GtkWidget *sw, *hbox, *label, *btn_search, *btn_goto, *btn_route_to;
+GtkTreeViewColumn *column;
+GtkCellRenderer *renderer;
+GtkTreeIter iter;
+gboolean selected = FALSE;
+
+sd.dialog = gtk_dialog_new_with_buttons(_("Select POI"),
+                       GTK_WINDOW(_window),
+                       GTK_DIALOG_MODAL, 
+                       GTK_STOCK_OK,
+                       GTK_RESPONSE_ACCEPT,
+                       GTK_STOCK_CANCEL,
+                       GTK_RESPONSE_REJECT, NULL);
+sd.lat=lat;
+sd.lon=lon;
+
+gtk_container_add(GTK_CONTAINER(GTK_DIALOG(sd.dialog)->action_area),
+       btn_goto = gtk_button_new_with_label(_("Go")));
+
+gtk_container_add(GTK_CONTAINER(GTK_DIALOG(sd.dialog)->action_area),
+       btn_route_to = gtk_button_new_with_label(_("Route to")));
+
+gtk_window_set_default_size(GTK_WINDOW(sd.dialog), 500, 300);
+
+hbox = gtk_hbox_new(FALSE, 4),
+gtk_box_pack_start(GTK_BOX(GTK_DIALOG(sd.dialog)->vbox), hbox, FALSE, FALSE, 0);
+
+label=gtk_label_new(_("Search:"));
+gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+sd.cmb_category = category_combo_new();
+gtk_box_pack_start(GTK_BOX(hbox), sd.cmb_category, FALSE, FALSE, 0);
+poi_category_combo_populate(sd.cmb_category, 0, TRUE);
+
+sd.search_entry=gtk_entry_new();
+gtk_box_pack_start(GTK_BOX(hbox), sd.search_entry, TRUE, TRUE, 0);
+
+btn_search=gtk_button_new_with_label(_("Search"));
+gtk_box_pack_start(GTK_BOX(hbox), btn_search, FALSE, FALSE, 0);
+
+sw = gtk_scrolled_window_new(NULL, NULL);
+gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_ETCHED_IN);
+gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+gtk_box_pack_start(GTK_BOX(GTK_DIALOG(sd.dialog)->vbox), sw, TRUE, TRUE, 0);
+
+if (store!=NULL) {
+       sd.list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+       sd.store=store;
        g_object_unref(G_OBJECT(store));
-       gtk_container_add(GTK_CONTAINER(sw), list);
-
-       gtk_tree_selection_set_mode(gtk_tree_view_get_selection
-                                   (GTK_TREE_VIEW(list)),
-                                   GTK_SELECTION_SINGLE);
-       gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(list), TRUE);
-
-       renderer = gtk_cell_renderer_text_new();
-       column =
-           gtk_tree_view_column_new_with_attributes(_("Location"), renderer,
-                                                    "text", POI_LATLON, NULL);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
-
-       renderer = gtk_cell_renderer_text_new();
-       column =
-           gtk_tree_view_column_new_with_attributes(_("Label"), renderer,
-                                                    "text", POI_LABEL, NULL);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
-
-       renderer = gtk_cell_renderer_text_new();
-       column =
-           gtk_tree_view_column_new_with_attributes(_("Category"), renderer,
-                                                    "text", POI_CATLAB, NULL);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
-
-       gtk_widget_show_all(dialog);
-
-       while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
-               if (gtk_tree_selection_get_selected
-                   (gtk_tree_view_get_selection(GTK_TREE_VIEW(list)), NULL,
-                    &iter)) {
-                       gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
-                                          POI_POIID, &(poi->poi_id), -1);
-                       gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
-                                          POI_CATID, &(poi->cat_id), -1);
-                       gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
-                                          POI_LATLON, &(poi->lat), -1);
-                       gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
-                                          POI_LATLON, &(poi->lon), -1);
-                       gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
-                                          POI_LABEL, &(poi->label), -1);
-                       gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
-                                          POI_DESC, &(poi->desc), -1);
-                       selected = TRUE;
-                       break;
-               } else
-                       popup_error(dialog, _("Select one POI from the list."));
+} else {
+       sd.list=gtk_tree_view_new();
+       sd.store=NULL;
+}
+gtk_container_add(GTK_CONTAINER(sw), sd.list);
+
+gtk_tree_selection_set_mode(gtk_tree_view_get_selection (GTK_TREE_VIEW(sd.list)), GTK_SELECTION_SINGLE);
+gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(sd.list), TRUE);
+gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(sd.list), TRUE);
+gtk_tree_view_set_search_column (GTK_TREE_VIEW(sd.list), ITEM_LABEL);
+
+renderer = gtk_cell_renderer_text_new();
+column = gtk_tree_view_column_new_with_attributes(_("Location"), renderer, "text", ITEM_LATLON, NULL);
+gtk_tree_view_append_column(GTK_TREE_VIEW(sd.list), column);
+
+renderer = gtk_cell_renderer_text_new();
+column = gtk_tree_view_column_new_with_attributes(_("Label"), renderer, "text", ITEM_LABEL, NULL);
+gtk_tree_view_column_set_sort_column_id (column, ITEM_LABEL);
+gtk_tree_view_append_column(GTK_TREE_VIEW(sd.list), column);
+
+renderer = gtk_cell_renderer_text_new();
+column = gtk_tree_view_column_new_with_attributes(_("Category"), renderer, "text", ITEM_CATLAB, NULL);
+gtk_tree_view_column_set_sort_column_id (column, ITEM_CATLAB);
+gtk_tree_view_append_column(GTK_TREE_VIEW(sd.list), column);
+
+g_signal_connect(G_OBJECT(btn_search), "clicked", G_CALLBACK(poi_search_do_cb), &sd);
+g_signal_connect(G_OBJECT(btn_goto), "clicked", G_CALLBACK(poi_goto_cb), &sd);
+g_signal_connect(G_OBJECT(btn_route_to), "clicked", G_CALLBACK(poi_route_to_cb), &sd);
+
+gtk_widget_show_all(sd.dialog);
+
+while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(sd.dialog))) {
+       if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(sd.list)), NULL, &iter)) {
+               gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, ITEM_ID, &(poi->poi_id), -1);
+               gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, ITEM_CATID, &(poi->cat_id), -1);
+               gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, ITEM_LAT, &(poi->lat), -1);
+               gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, ITEM_LON, &(poi->lon), -1);
+               gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, ITEM_LABEL, &(poi->label), -1);
+               gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, ITEM_DESC, &(poi->desc), -1);
+               selected = TRUE;
+               break;
+       } else {
+               popup_error(sd.dialog, _("Select one POI from the list."));
        }
+}
 
-       gtk_widget_destroy(dialog);
-
-       vprintf("%s(): return %d\n", __PRETTY_FUNCTION__, selected);
-       return selected;
+gtk_widget_destroy(sd.dialog);
+return selected;
 }
 
-void poi_populate_cat_combo(GtkWidget * cmb_category, guint cat_id)
+gboolean 
+poi_select(guint unitx, guint unity, guint range, poi_info *poi)
 {
-       GtkTreeIter active;
-       GtkListStore *store;
-       gboolean has_active = FALSE;
-       printf("%s()\n", __PRETTY_FUNCTION__);
+GtkListStore *store;
+guint num_pois;
+GtkTreeIter iter;
+gdouble lat, lon;
 
-       store =
-           GTK_LIST_STORE(gtk_combo_box_get_model
-                          (GTK_COMBO_BOX(cmb_category)));
-       gtk_list_store_clear(store);
+if (poi_get_list_near_unit(unitx, unity, range, &store, &num_pois)==FALSE)
+       return FALSE;
 
-       while (SQLITE_ROW == sqlite3_step(_stmt_selall_cat)) {
-               GtkTreeIter iter;
-               guint cid = sqlite3_column_int(_stmt_selall_cat, 0);
-               gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter,
-                                  0, cid,
-                                  1, sqlite3_column_text(_stmt_selall_cat, 1),
-                                  -1);
-               if (cid == cat_id) {
-                       active = iter;
-                       has_active = TRUE;
-               }
-       }
-       sqlite3_reset(_stmt_selall_cat);
+switch (num_pois) {
+case 0:
+       MACRO_BANNER_SHOW_INFO(_window, _("No POIs found."));
+       g_object_unref(G_OBJECT(store));
+       return FALSE;
+       break;
+case 1:
+       gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter);
+       gtk_tree_model_get(GTK_TREE_MODEL(store),
+                       &iter,
+                       ITEM_ID, &(poi->poi_id),
+                       ITEM_CATID, &(poi->cat_id),
+                       ITEM_LAT, &(poi->lat),
+                       ITEM_LON, &(poi->lon),
+                       ITEM_LABEL, &(poi->label),
+                       ITEM_DESC, &(poi->desc), -1);
+       g_object_unref(G_OBJECT(store));
+       return TRUE;
+break;
+}
 
-       if (!has_active)
-               gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &active);
+unit2latlon(unitx, unity, lat, lon);
+return poi_search_dialog(store, poi, lat, lon);
+}
 
-       gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cmb_category), &active);
+gboolean 
+poi_edit_cat(GtkWidget * widget, PoiCategoryEditInfo * data)
+{
+if (poi_category_list())
+       poi_category_combo_populate(data->cmb_category, data->cat_id, FALSE);
+return TRUE;
+}
 
-       vprintf("%s(): return\n", __PRETTY_FUNCTION__);
+/**
+ * Url click callback
+ */
+static void
+poi_info_url_clicked_cb(GtkHTML *html, const gchar *url, gpointer data)
+{
+g_printf("URL: %s\n", url);
+#ifdef WITH_OSSO
+osso_rpc_run_with_defaults(_osso, "osso_browser",
+       OSSO_BROWSER_OPEN_NEW_WINDOW_REQ, NULL,
+       DBUS_TYPE_STRING, url, DBUS_TYPE_BOOLEAN, FALSE, DBUS_TYPE_INVALID);
+#else
+g_debug("Not yet implemented for !OSSO\n");
+#endif
 }
 
-typedef struct _PoiCategoryEditInfo PoiCategoryEditInfo;
-struct _PoiCategoryEditInfo {
-       GtkWidget *cmb_category;
-       guint cat_id;
-};
 
-gboolean poi_edit_cat(GtkWidget * widget, PoiCategoryEditInfo * data)
+/**
+ * Callback to load requested url
+ */
+static void
+poi_info_url_requested_cb(GtkHTML *html, const char *url, GtkHTMLStream *stream)
 {
-       printf("%s()\n", __PRETTY_FUNCTION__);
-       if (category_list())
-               poi_populate_cat_combo(data->cmb_category, data->cat_id);
-       vprintf("%s(): return\n", __PRETTY_FUNCTION__);
-       return TRUE;
+g_printf("URL: %s\n", url);
+gtk_html_stream_close(stream, GTK_HTML_STREAM_ERROR);
 }
 
-gboolean poi_dialog(POIAction action, guint unitx, guint unity)
+static void
+poi_info_title_cb(GtkHTML *html, const gchar *title)
 {
-       PoiInfo poi;
-       gchar slat1[10], slon1[10];
-       gchar *p_latlon;
-       GtkWidget *dialog;
-       GtkWidget *table;
-       GtkWidget *label;
-       GtkWidget *txt_label;
-       GtkWidget *cmb_category;
-       GtkWidget *txt_desc;
-       GtkWidget *btn_delete = NULL;
-       GtkWidget *btn_catedit;
-       GtkWidget *hbox;
-       GtkWidget *txt_scroll;
-       GtkTextBuffer *desc_txt;
-       GtkTextIter begin, end;
-       DeletePOI dpoi = { NULL, NULL, 0 };
-       PoiCategoryEditInfo pcedit;
-       printf("%s()\n", __PRETTY_FUNCTION__);
+g_printf("Title: %s\n", title);
+}
 
-       if (action == ACTION_EDIT_POI) {
-               if (!select_poi(unitx, unity, &poi)) {
-                       return FALSE;
-               }
+#define WRITE_HTML(html, args...) \
+       { gchar *ph; \
+       ph=g_markup_printf_escaped(html, ##args); \
+       gtk_html_write(GTK_HTML(info), s, ph, strlen(ph)); \
+       g_free(ph); }
+
+/**
+ * Display a nice POI information dialog
+ *
+ */
+gboolean
+poi_info_dialog(guint poi_id)
+{
+GtkWidget *dialog;
+GtkWidget *info;
+GtkWidget *sw;
+poi_info *p;
+GtkHTMLStream *s;
+gint ls;
+
+p=poi_get_by_id(poi_id);
+if (!p) {
+       g_debug("Requested info for POI %d that does not exist!\n", poi_id);
+       return FALSE;
+}
 
-               dialog = gtk_dialog_new_with_buttons(_("Edit POI"),
-                                                    GTK_WINDOW(_window),
-                                                    GTK_DIALOG_MODAL,
-                                                    GTK_STOCK_OK,
-                                                    GTK_RESPONSE_ACCEPT, NULL);
+dialog=gtk_dialog_new_with_buttons(_("POI"),
+                       GTK_WINDOW(_window), GTK_DIALOG_MODAL,
+                       GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+                       NULL);
+
+/* XXX: Add edit button */
+
+info=gtk_html_new();
+gtk_html_set_editable(GTK_HTML(info), FALSE);
+gtk_html_allow_selection(GTK_HTML(info), TRUE);
+sw=gtk_scrolled_window_new(NULL, NULL);
+gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+gtk_container_add(GTK_CONTAINER(sw), info);
+gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), sw, TRUE, TRUE, 0);
+
+g_signal_connect(G_OBJECT(info), "link_clicked", G_CALLBACK(poi_info_url_clicked_cb), NULL);
+g_signal_connect(G_OBJECT(info), "url_requested", G_CALLBACK(poi_info_url_requested_cb), NULL);
+g_signal_connect(G_OBJECT(info), "title_changed", G_CALLBACK(poi_info_title_cb), dialog);
+
+s=gtk_html_begin(GTK_HTML(info));
+ls=strlen(p->label);
+
+/* XXX: Format lat/lon according to settings */
+
+WRITE_HTML("<html><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" \
+       "<head><title>POI - %s</title></head><body><b>%s (<i>%s</i>)</b><br/><table>" \
+       "<tr><th align=\"left\">Location:</th><td>%.5f, %.5f</td></tr>",
+       ls>0 ? p->label : _("(Unknown)"), 
+       ls>0 ? p->label : _("(Unknown)"), p->cat_label, 
+       p->lat, p->lon);
+
+if (p->postal_code)
+       WRITE_HTML("<tr><th align=\"left\">Postal Code:</th><td>%s</td></tr>", p->postal_code);
+if (p->url)
+       WRITE_HTML("<tr><th align=\"left\">Link:</th><td><a href=\"%s\">%s</a></td></tr>", p->url, p->url);
+if (p->desc)
+       WRITE_HTML("<tr><th align=\"left\" colspan=\"2\">Description:</th><td colspan=\"2\">%s</td></tr>", p->desc);
+
+WRITE_HTML("</table><br/>");
+
+# if 0
+if (p->image)
+       WRITE_HTML("<img src=\"%s\">", p->image);
+#endif
 
-               gtk_container_add(GTK_CONTAINER
-                                 (GTK_DIALOG(dialog)->action_area),
-                                 btn_delete =
-                                 gtk_button_new_with_label(_("Delete")));
+WRITE_HTML("</body></html>");
+gtk_html_end(GTK_HTML(info), s, GTK_HTML_STREAM_OK);
 
-               dpoi.dialog = dialog;
-               dpoi.txt_label = g_strdup(poi.label);
-               dpoi.id = poi.poi_id;
+poi_free(p);
 
-               g_signal_connect(G_OBJECT(btn_delete), "clicked",
-                                G_CALLBACK(poi_delete_confirm), &dpoi);
+gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 250);
+gtk_widget_show_all(dialog);
+gtk_dialog_run(GTK_DIALOG(dialog));
+gtk_widget_destroy(dialog);
 
-               gtk_dialog_add_button(GTK_DIALOG(dialog),
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
-       } else {
-               if (SQLITE_ROW == sqlite3_step(_stmt_nextlabel_poi))
-                       poi.label = g_strdup_printf("Point%06d",
-                                                   sqlite3_column_int
-                                                   (_stmt_nextlabel_poi, 0));
-               sqlite3_reset(_stmt_nextlabel_poi);
-
-               unit2latlon(unitx, unity, poi.lat, poi.lon);
-
-               poi.poi_id = 0;
-               poi.cat_id = 0;
-               poi.desc = g_strdup("");
-
-               dialog = gtk_dialog_new_with_buttons(_("Add POI"),
-                                                    GTK_WINDOW(_window),
-                                                    GTK_DIALOG_MODAL,
-                                                    GTK_STOCK_OK,
-                                                    GTK_RESPONSE_ACCEPT,
-                                                    GTK_STOCK_CANCEL,
-                                                    GTK_RESPONSE_REJECT, NULL);
-       }
+return TRUE;
+}
+
+/**
+ * poi_edit_dialog
+ *
+ * Edit or Add POI with given information in poi_info
+ *
+ */
+gboolean 
+poi_edit_dialog(POIAction action, poi_info *poi)
+{
+gchar slat1[10], slon1[10];
+gchar *p_latlon;
+GtkWidget *dialog;
+GtkWidget *table;
+GtkWidget *label;
+GtkWidget *txt_label;
+GtkWidget *cmb_category;
+GtkWidget *txt_desc;
+GtkWidget *txt_postal_code, *txt_url;
+GtkWidget *btn_delete = NULL;
+GtkWidget *btn_catedit;
+GtkWidget *hbox;
+GtkWidget *txt_scroll;
+GtkTextBuffer *desc_txt;
+GtkTextIter begin, end;
+delete_poi dpoi = { NULL, NULL, 0 };
+PoiCategoryEditInfo pcedit;
+gchar tmp1[16], tmp2[16];
+
+/* Fatal, poi must be set */
+
+if (!poi)
+       return FALSE;
+
+dialog = gtk_dialog_new_with_buttons(action == ACTION_EDIT_POI ? _("Edit POI") : _("Add POI"),
+                    GTK_WINDOW(_window),
+                    GTK_DIALOG_MODAL,
+                    GTK_STOCK_OK,
+                    GTK_RESPONSE_ACCEPT,
+                    GTK_STOCK_CANCEL,
+                    GTK_RESPONSE_REJECT, NULL);
+
+if (action == ACTION_EDIT_POI) {
+       gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), btn_delete = gtk_button_new_with_label(_("Delete")));
+
+       dpoi.dialog=dialog;
+       dpoi.txt_label=g_strdup(poi->label);
+       dpoi.id=poi->poi_id;
+
+       g_signal_connect(G_OBJECT(btn_delete), "clicked", G_CALLBACK(poi_delete_confirm), &dpoi);
+}
+
+/* Set the p_latlon string. */
+lat_format(_degformat, poi->lat, tmp1);
+lon_format(_degformat, poi->lon, tmp2);
+p_latlon=g_strdup_printf("%s, %s", tmp1, tmp2);
+
+gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table = gtk_table_new(6, 4, FALSE), TRUE, TRUE, 0);
+
+gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Lat, Lon")), 0, 1, 0, 1, GTK_FILL, 0, 2, 4);
+gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+
+gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(p_latlon), 1, 3, 0, 1, GTK_FILL, 0, 2, 4);
+gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
+
+gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Label")), 0, 1, 1, 2, GTK_FILL, 0, 2, 4);
+gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+gtk_table_attach(GTK_TABLE(table), txt_label = gtk_entry_new(), 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+
+gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Category")), 0, 1, 3, 4, GTK_FILL, 0, 2, 4);
+gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+gtk_table_attach(GTK_TABLE(table), hbox = gtk_hbox_new(FALSE, 4), 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+
+gtk_box_pack_start(GTK_BOX(hbox), cmb_category = category_combo_new(), FALSE, FALSE, 4);
+
+gtk_box_pack_start(GTK_BOX(hbox), btn_catedit = gtk_button_new_with_label(_("Edit Categories...")),    FALSE, FALSE, 4);
 
-       /* Set the p_latlon string. */
-       {
-               gchar tmp1[16], tmp2[16];
-               lat_format(poi.lat, tmp1);
-               lon_format(poi.lon, tmp2);
-               p_latlon = g_strdup_printf("%s, %s", tmp1, tmp2);
+gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Description")), 0, 1, 5, 6, GTK_FILL, 0, 2, 4);
+gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+
+txt_scroll = gtk_scrolled_window_new(NULL, NULL);
+gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scroll), GTK_SHADOW_IN);
+gtk_table_attach(GTK_TABLE(table), txt_scroll, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+
+gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+txt_desc=gtk_text_view_new();
+gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(txt_desc), GTK_WRAP_WORD);
+
+gtk_container_add(GTK_CONTAINER(txt_scroll), txt_desc);
+gtk_widget_set_size_request(GTK_WIDGET(txt_scroll), 400, 60);
+
+desc_txt=gtk_text_view_get_buffer(GTK_TEXT_VIEW(txt_desc));
+
+/* label */
+if (poi->label)
+       gtk_entry_set_text(GTK_ENTRY(txt_label), poi->label);
+if (poi->desc)
+       gtk_text_buffer_set_text(desc_txt, poi->desc, -1);
+
+poi_category_combo_populate(cmb_category, poi->cat_id, FALSE);
+
+/* Connect Signals */
+pcedit.cmb_category=cmb_category;
+pcedit.cat_id=poi->cat_id;
+
+g_signal_connect(G_OBJECT(btn_catedit), "clicked", G_CALLBACK(poi_edit_cat), &pcedit);
+gtk_widget_show_all(dialog);
+
+while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
+       GtkTreeIter iter;
+
+       if (strlen(gtk_entry_get_text(GTK_ENTRY(txt_label))))
+               poi->label=g_strdup(gtk_entry_get_text(GTK_ENTRY(txt_label)));
+       else {
+               popup_error(dialog, _("Please specify a name for the POI."));
+               continue;
        }
 
-       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
-                          table = gtk_table_new(6, 4, FALSE), TRUE, TRUE, 0);
-
-       gtk_table_attach(GTK_TABLE(table),
-                        label = gtk_label_new(_("Lat, Lon")),
-                        0, 1, 0, 1, GTK_FILL, 0, 2, 4);
-       gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-
-       gtk_table_attach(GTK_TABLE(table),
-                        label = gtk_label_new(p_latlon),
-                        1, 3, 0, 1, GTK_FILL, 0, 2, 4);
-       gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
-
-       gtk_table_attach(GTK_TABLE(table),
-                        label = gtk_label_new(_("Label")),
-                        0, 1, 1, 2, GTK_FILL, 0, 2, 4);
-       gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-       gtk_table_attach(GTK_TABLE(table),
-                        txt_label = gtk_entry_new(),
-                        1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4);
-
-       gtk_table_attach(GTK_TABLE(table),
-                        label = gtk_label_new(_("Category")),
-                        0, 1, 3, 4, GTK_FILL, 0, 2, 4);
-       gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-       gtk_table_attach(GTK_TABLE(table),
-                        hbox = gtk_hbox_new(FALSE, 4),
-                        1, 2, 3, 4, GTK_EXPAND | GTK_FILL, 0, 2, 4);
-       gtk_box_pack_start(GTK_BOX(hbox), cmb_category = gtk_combo_box_new_with_model(GTK_TREE_MODEL(gtk_list_store_new(2, G_TYPE_INT,  /* Category ID */
-                                                                                                                       G_TYPE_STRING))),       /* Category Label */
-                          FALSE, FALSE, 4);
-       /* Set up the view for the combo box. */
-       {
-               GtkCellRenderer *renderer;
-               renderer = gtk_cell_renderer_text_new();
-               gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(cmb_category),
-                                          renderer, TRUE);
-               gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(cmb_category),
-                                              renderer, "text", 1, NULL);
+       if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(cmb_category), &iter)) {
+               popup_error(dialog, _("Please specify a category for the POI."));
+               continue;
        }
 
-       gtk_box_pack_start(GTK_BOX(hbox),
-                          btn_catedit =
-                          gtk_button_new_with_label(_("Edit Categories...")),
-                          FALSE, FALSE, 4);
-
-       gtk_table_attach(GTK_TABLE(table),
-                        label = gtk_label_new(_("Description")),
-                        0, 1, 5, 6, GTK_FILL, 0, 2, 4);
-       gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-
-       txt_scroll = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scroll),
-                                           GTK_SHADOW_IN);
-       gtk_table_attach(GTK_TABLE(table),
-                        txt_scroll,
-                        1, 2, 5, 6, GTK_EXPAND | GTK_FILL, 0, 2, 4);
-
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scroll),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-
-       txt_desc = gtk_text_view_new();
-       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(txt_desc), GTK_WRAP_WORD);
-
-       gtk_container_add(GTK_CONTAINER(txt_scroll), txt_desc);
-       gtk_widget_set_size_request(GTK_WIDGET(txt_scroll), 400, 60);
-
-       desc_txt = gtk_text_view_get_buffer(GTK_TEXT_VIEW(txt_desc));
-
-       /* label */
-       gtk_entry_set_text(GTK_ENTRY(txt_label), poi.label);
-
-       /* category */
-       poi_populate_cat_combo(cmb_category, poi.cat_id);
-
-       /* poi_desc */
-       gtk_text_buffer_set_text(desc_txt, poi.desc, -1);
-
-       /* Connect Signals */
-       pcedit.cmb_category = cmb_category;
-       pcedit.cat_id = poi.cat_id;
-       g_signal_connect(G_OBJECT(btn_catedit), "clicked",
-                        G_CALLBACK(poi_edit_cat), &pcedit);
-       gtk_widget_show_all(dialog);
-
-       while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
-               const gchar *poi_label = NULL;
-               gchar *poi_desc = NULL;
-               GtkTreeIter iter;
-
-               if (strlen(gtk_entry_get_text(GTK_ENTRY(txt_label))))
-                       poi_label = gtk_entry_get_text(GTK_ENTRY(txt_label));
-               else {
-                       popup_error(dialog,
-                                   _("Please specify a name for the POI."));
-                       continue;
-               }
+       gtk_text_buffer_get_bounds(desc_txt, &begin, &end);
+       poi->desc=gtk_text_buffer_get_text(desc_txt, &begin, &end, TRUE);
 
-               if (!gtk_combo_box_get_active_iter
-                   (GTK_COMBO_BOX(cmb_category), &iter)) {
-                       popup_error(dialog,
-                                   _
-                                   ("Please specify a category for the POI."));
-                       continue;
-               }
+       gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(cmb_category)), &iter, 0, &poi->cat_id, -1);
 
-               gtk_text_buffer_get_iter_at_offset(desc_txt, &begin, 0);
-               gtk_text_buffer_get_end_iter(desc_txt, &end);
-               poi_desc =
-                   gtk_text_buffer_get_text(desc_txt, &begin, &end, TRUE);
-
-               gtk_tree_model_get(gtk_combo_box_get_model
-                                  (GTK_COMBO_BOX(cmb_category)), &iter, 0,
-                                  &poi.cat_id, -1);
-
-               if (action == ACTION_EDIT_POI) {
-                       /* edit poi */
-                       if (SQLITE_OK !=
-                           sqlite3_bind_text(_stmt_update_poi, 1, poi_label,
-                                             -1, SQLITE_STATIC)
-                           || SQLITE_OK != sqlite3_bind_text(_stmt_update_poi,
-                                                             2, poi_desc, -1,
-                                                             g_free)
-                           || SQLITE_OK != sqlite3_bind_int(_stmt_update_poi,
-                                                            3, poi.cat_id)
-                           || SQLITE_OK != sqlite3_bind_int(_stmt_update_poi,
-                                                            4, poi.poi_id)
-                           || SQLITE_DONE != sqlite3_step(_stmt_update_poi)) {
-                               MACRO_BANNER_SHOW_INFO(_window,
-                                                      _
-                                                      ("Problem updating POI"));
-                       } else {
-                               MACRO_MAP_RENDER_DATA();
-                       }
-                       sqlite3_reset(_stmt_update_poi);
+       if (action == ACTION_EDIT_POI) {
+               /* edit poi */
+               if (poi_update(poi)==FALSE) {
+                       popup_error(_window, _("Problem updating POI"));
                } else {
-                       /* add poi */
-                       g_ascii_dtostr(slat1, sizeof(slat1), poi.lat);
-                       g_ascii_dtostr(slon1, sizeof(slon1), poi.lon);
-                       if (SQLITE_OK !=
-                           sqlite3_bind_double(_stmt_insert_poi, 1, poi.lat)
-                           || SQLITE_OK !=
-                           sqlite3_bind_double(_stmt_insert_poi, 2, poi.lon)
-                           || SQLITE_OK != sqlite3_bind_text(_stmt_insert_poi,
-                                                             3, poi_label, -1,
-                                                             g_free)
-                           || SQLITE_OK != sqlite3_bind_text(_stmt_insert_poi,
-                                                             4, poi_desc, -1,
-                                                             g_free)
-                           || SQLITE_OK != sqlite3_bind_int(_stmt_insert_poi,
-                                                            5, poi.cat_id)
-                           || SQLITE_DONE != sqlite3_step(_stmt_insert_poi)) {
-                               MACRO_BANNER_SHOW_INFO(_window,
-                                                      _("Problem adding POI"));
-                       } else {
-                               MACRO_MAP_RENDER_DATA();
-                       }
-                       sqlite3_reset(_stmt_insert_poi);
+                       map_poi_cache_clear();
+                       map_force_redraw();
+               }
+       } else {
+               /* add poi */
+               g_ascii_dtostr(slat1, sizeof(slat1), poi->lat);
+               g_ascii_dtostr(slon1, sizeof(slon1), poi->lon);
+               if (poi_add(poi)==FALSE) {
+                       popup_error(_window, _("Problem adding POI"));
+               } else {
+                       map_poi_cache_clear();
+                       map_force_redraw();
                }
-               break;
        }
+       break;
+}
 
-       g_free(dpoi.txt_label);
+poi_free(poi);
+g_free(dpoi.txt_label);
+g_free(p_latlon);
 
-       g_free(poi.label);
-       g_free(poi.desc);
-       g_free(p_latlon);
+gtk_widget_destroy(dialog);
 
-       gtk_widget_hide_all(dialog);
+return TRUE;
+}
 
-       vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
-       return TRUE;
+static gboolean
+poi_quick_button_cb(GtkWidget *button, gpointer data)
+{
+poi_info *p;
+poi_quick_data *qpdata=(poi_quick_data *)data;
+
+g_assert(data);
+
+p=poi_new();
+p->cat_id=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "pid"));
+
+if (strlen(gtk_entry_get_text(GTK_ENTRY(qpdata->label)))>0) {
+       p->label=g_strdup(gtk_entry_get_text(GTK_ENTRY(qpdata->label)));
+} else {
+       p->label=g_strdup("");
+}
+
+if (qpdata->fixed==TRUE) {
+       p->lat=qpdata->lat;
+       p->lon=qpdata->lon;
+} else {
+       p->lat=_gps->data.lat;  
+       p->lon=_gps->data.lon;
+}
+p->desc=g_strdup("Quick POI, update information please.");
+
+/* poi_add frees the label and desc so strdup */
+if (poi_add(p)==FALSE) {
+       popup_error(_window, _("Problem adding POI"));
+} else {
+       gchar *txt;
+
+       map_poi_cache_clear();
+
+       /* Add a text break to the current track */
+       /* XXX: Get category string in here if label is empty */
+       txt=g_strdup_printf("QP(%d): %f %f %s", p->cat_id, p->lat, p->lon, p->label);
+       track_insert_mark_text(txt);
+
+       map_force_redraw();
+       if (qpdata->close==TRUE)
+               gtk_widget_destroy(qpdata->dialog);
+
+       hildon_banner_show_information(_window, NULL, _("POI added"));
+}
+
+poi_free(p);
+return TRUE;
+}
+
+static void
+poi_button_set_icon(GtkWidget *button, node_type_t t)
+{
+const gchar *iname;
+GdkPixbuf *icon=NULL;
+
+iname=poi_get_icon_from_type(t);
+if (iname)
+       icon=poi_get_icon(iname, TRUE);
+if (icon) {
+       gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_pixbuf(icon));
+       gtk_button_set_image_position(GTK_BUTTON(button), GTK_POS_TOP);
+}
+}
+
+/**
+ * Return a vbox filled with POI_QUICK_BUTTONS POI buttons and one for other POI, 
+ * with an optinal POI label.
+ */
+GtkWidget *
+poi_quick_button_box(poi_quick_data *qpdata)
+{
+GtkWidget *table, *vbox;
+GtkWidget *buttons[POI_QUICK_BUTTONS];
+GtkWidget *otherbtn;
+guint x, y;
+
+vbox=gtk_vbox_new(FALSE, 6);
+table = gtk_table_new(QPBS_Y, QPBS_X, TRUE);
+gtk_table_set_col_spacings(GTK_TABLE(table), 6);
+gtk_table_set_row_spacings(GTK_TABLE(table), 6);
+
+for (y=0;y<QPBS_Y;y++) {
+       for (x=0;x<QPBS_X;x++) {
+               guint p=y*(QPBS_X)+x;
+
+               g_debug("B: %d (%d,%d)", p, x, y);
+               buttons[p]=gtk_button_new_with_label(quick_poi_categories[p].name);
+               poi_button_set_icon(buttons[p], quick_poi_categories[p].type);
+               gtk_table_attach(GTK_TABLE(table), buttons[p], x, x+1, y, y+1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 6, 6);
+               g_object_set_data(G_OBJECT(buttons[p]), "pid", GINT_TO_POINTER(quick_poi_categories[p].type));
+               g_signal_connect(G_OBJECT(buttons[p]), "clicked", G_CALLBACK(poi_quick_button_cb), qpdata);
+       }
+}
+
+gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
+
+/* Other POI button */
+otherbtn=gtk_button_new_with_label("Other POI");
+poi_button_set_icon(otherbtn, NODE_AMENITY_GENERIC);
+gtk_box_pack_start(GTK_BOX(vbox), otherbtn, TRUE, FALSE, 6);
+g_object_set_data(G_OBJECT(otherbtn), "pid", GINT_TO_POINTER(NODE_AMENITY_GENERIC));
+g_signal_connect(G_OBJECT(otherbtn), "clicked", G_CALLBACK(poi_quick_button_cb), qpdata);
+
+gtk_box_pack_start(GTK_BOX(vbox), qpdata->label = gtk_entry_new(), TRUE, FALSE, 0);
+
+return vbox;
+}
+
+/**
+ * Show simple dialog for adding a POI.
+ * Uses the above helper to get the buttons. The location is given as paramters.
+ */
+gboolean
+poi_quick_dialog(gdouble lat, gdouble lon)
+{
+GtkWidget *box;
+
+qp.dialog=gtk_dialog_new_with_buttons(_("Quick POI"),
+               GTK_WINDOW(_window),
+                   GTK_DIALOG_MODAL,
+                       GTK_STOCK_CANCEL,
+                       GTK_RESPONSE_REJECT,
+                       NULL);
+
+help_dialog_help_enable(GTK_DIALOG(qp.dialog), HELP_ID_POIQUICK);
+
+qp.fixed=TRUE;
+qp.lat=lat;
+qp.lon=lon;
+qp.close=TRUE;
+
+box=poi_quick_button_box(&qp);
+gtk_box_pack_start(GTK_BOX(GTK_DIALOG(qp.dialog)->vbox), box, TRUE, TRUE, 0);
+
+gtk_widget_show_all(qp.dialog);
+
+if (gtk_dialog_run(GTK_DIALOG(qp.dialog))==GTK_RESPONSE_REJECT)
+       gtk_widget_destroy(qp.dialog);
+
+return TRUE;
 }