From c54b943b17ee6d839e364f5241084d401eaec18b Mon Sep 17 00:00:00 2001 From: btb Date: Thu, 29 May 2008 03:58:46 +0000 Subject: [PATCH] Make buildable without conic, gpsbt, gpsmgr, or the maemo version of gtk+ git-svn-id: svn+ssh://garage/var/lib/gforge/svnroot/maemo-mapper/trunk@187 6c538b50-5814-0410-93ad-8bdf4c0149d1 --- configure.ac | 10 +++++----- src/cmenu.c | 17 +++++++++-------- src/data.c | 3 +++ src/data.h | 3 +++ src/gps.c | 16 +++++++++++++++- src/gpsbt.c | 4 ++++ src/input.c | 8 +++++++- src/main.c | 40 ++++++++++++++++++++++++++++++++++----- src/maps.c | 8 ++++++++ src/menu.c | 51 ++++---------------------------------------------- src/path.c | 4 ++++ src/poi.c | 8 ++++++++ src/settings.c | 18 ++++++++++++++++++ 13 files changed, 123 insertions(+), 67 deletions(-) diff --git a/configure.ac b/configure.ac index 394e1be..eec7b64 100644 --- a/configure.ac +++ b/configure.ac @@ -45,15 +45,15 @@ PKG_CHECK_MODULES(SQLITE, sqlite3) AC_SUBST(SQLITE_LIBS) AC_SUBST(SQLITE_CFLAGS) -PKG_CHECK_MODULES(CONIC, conic) +PKG_CHECK_MODULES(CONIC, conic, AC_DEFINE(CONIC, 1, Use the conic library), AC_MSG_WARN(conic not found. Compiling without conic support.)) AC_SUBST(CONIC_LIBS) AC_SUBST(CONIC_CFLAGS) AC_CHECK_HEADER(gdbm.h, , AC_MSG_ERROR(gdbm.h not found. Please install libgdbm-dev.)) AC_CHECK_LIB(gdbm, gdbm_open, , AC_MSG_ERROR(libgdbm.so not found. Please install libgdbm.), -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0) -AC_CHECK_HEADER(gpsmgr.h, , AC_MSG_ERROR(gpsmgr.h not found. Please install libgpsmgr-dev.)) -AC_CHECK_LIB(gpsmgr, gpsmgr_start, , AC_MSG_ERROR(libgpsmgr.so not found. Please install libgpsmgr.), -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0) +AC_CHECK_HEADER(gpsmgr.h, , AC_MSG_WARN(gpsmgr.h not found. Compiling without gpsmgr support.)) +AC_CHECK_LIB(gpsmgr, gpsmgr_start, , AC_MSG_WARN(libgpsmgr.so not found. Compiling without gpsmgr support.), -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0) AC_ARG_ENABLE(legacy, AS_HELP_STRING([--enable-legacy],[Enable building for Chinook]), @@ -75,8 +75,8 @@ AS_IF([test "x$HAVE_LEGACY" = xyes], PKG_CHECK_MODULES(HILDON, hildon-1 hildon-fm-2) AC_CHECK_HEADER(gps.h, , AC_MSG_ERROR(gps.h not found. Please install libgps-dev.)) AC_CHECK_LIB(gps, gps_open, , AC_MSG_ERROR(libgps.so not found. Please install libgps.), -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0) - AC_CHECK_HEADER(gpsbt.h, , AC_MSG_ERROR(gpsbt.h not found. Please install libgpsbt-dev.)) - AC_CHECK_LIB(gpsbt, gpsbt_start, , AC_MSG_ERROR(libgpsbt.so not found. Please install libgpsbt.), -lgps -lgpsmgr -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0) + AC_CHECK_HEADER(gpsbt.h, , AC_MSG_WARN(gpsbt.h not found. Compiling without gpsbt support.)) + AC_CHECK_LIB(gpsbt, gpsbt_start, , AC_MSG_WARN(libgpsbt.so not found. Compiling without gpsbt support.), -lgps -lgpsmgr -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0) ]) AC_SUBST(OSSO_LIBS) diff --git a/src/cmenu.c b/src/cmenu.c index 0811d94..46b5ccd 100644 --- a/src/cmenu.c +++ b/src/cmenu.c @@ -621,16 +621,15 @@ cmenu_cb_hide(GtkMenuItem *item) void cmenu_init() { /* Create needed handles. */ - GtkMenu *menu; GtkWidget *submenu; GtkWidget *menu_item; printf("%s()\n", __PRETTY_FUNCTION__); /* Setup the context menu. */ - menu = GTK_MENU(gtk_menu_new()); + _map_cmenu = GTK_MENU(gtk_menu_new()); /* Setup the map context menu. */ - gtk_menu_append(menu, menu_item + gtk_menu_append(_map_cmenu, menu_item = gtk_menu_item_new_with_label(_("Tap Point"))); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu = gtk_menu_new()); @@ -665,7 +664,7 @@ void cmenu_init() _map_correction_unitx != 0 || _map_correction_unity != 0); /* Setup the waypoint context menu. */ - gtk_menu_append(menu, menu_item + gtk_menu_append(_map_cmenu, menu_item = gtk_menu_item_new_with_label(_("Waypoint"))); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu = gtk_menu_new()); @@ -693,7 +692,7 @@ void cmenu_init() = gtk_menu_item_new_with_label(_("Go to Next"))); /* Setup the POI context menu. */ - gtk_menu_append(menu, _cmenu_poi_submenu + gtk_menu_append(_map_cmenu, _cmenu_poi_submenu = gtk_menu_item_new_with_label(_("POI"))); gtk_menu_item_set_submenu(GTK_MENU_ITEM(_cmenu_poi_submenu), submenu = gtk_menu_new()); @@ -768,13 +767,15 @@ void cmenu_init() g_signal_connect(G_OBJECT(_cmenu_poi_goto_nearpoi_item), "activate", G_CALLBACK(menu_cb_view_goto_nearpoi), NULL); - gtk_widget_show_all(GTK_WIDGET(menu)); + gtk_widget_show_all(GTK_WIDGET(_map_cmenu)); - gtk_widget_tap_and_hold_setup(_map_widget, GTK_WIDGET(menu), NULL, 0); +#ifdef MAEMO_CHANGES + gtk_widget_tap_and_hold_setup(_map_widget, GTK_WIDGET(_map_cmenu), NULL, 0); +#endif /* Add a "hide" signal event handler to handle dismissing the context * menu. */ - g_signal_connect(GTK_WIDGET(menu), "hide", + g_signal_connect(GTK_WIDGET(_map_cmenu), "hide", G_CALLBACK(cmenu_cb_hide), NULL); vprintf("%s(): return\n", __PRETTY_FUNCTION__); diff --git a/src/data.c b/src/data.c index 8b2eb27..deb2895 100644 --- a/src/data.c +++ b/src/data.c @@ -79,6 +79,9 @@ GdkPixmap *_map_pixmap = NULL; /** The backing pixmap of _map_widget. */ GdkPixbuf *_map_pixbuf = NULL; +/** The context menu for the map. */ +GtkMenu *_map_cmenu = NULL; + gint _map_offset_devx; gint _map_offset_devy; diff --git a/src/data.h b/src/data.h index a0625a4..e27aa26 100644 --- a/src/data.h +++ b/src/data.h @@ -58,6 +58,9 @@ extern GdkPixmap *_map_pixmap; /** The backing pixmap of _map_widget. */ extern GdkPixbuf *_map_pixbuf; +/** The context menu for the map. */ +extern GtkMenu *_map_cmenu; + extern gint _map_offset_devx; extern gint _map_offset_devy; diff --git a/src/gps.c b/src/gps.c index 5656ca7..4414ee6 100644 --- a/src/gps.c +++ b/src/gps.c @@ -49,7 +49,11 @@ #include "display.h" #include "gps.h" -#include "gpsbt.h" + +#ifdef HAVE_LIBGPSBT +# include "gpsbt.h" +#endif + #include "path.h" #include "util.h" @@ -549,7 +553,9 @@ thread_read_nmea(GpsRcvrInfo *gri) GnomeVFSSocket *socket = NULL; GThread *my_thread = g_thread_self(); gboolean error = FALSE; +#ifdef HAVE_LIBGPSBT gpsbt_t gps_context; +#endif gboolean is_context = FALSE; printf("%s(%d)\n", __PRETTY_FUNCTION__, gri->type); @@ -560,6 +566,7 @@ thread_read_nmea(GpsRcvrInfo *gri) switch(gri->type) { +#ifdef HAVE_LIBGPSBT case GPS_RCVR_BT: { gchar errstr[BUFFER_SIZE] = ""; @@ -585,6 +592,7 @@ thread_read_nmea(GpsRcvrInfo *gri) } break; } +#endif case GPS_RCVR_GPSD: { /* Set gpsd_host and gpsd_port. */ @@ -592,6 +600,7 @@ thread_read_nmea(GpsRcvrInfo *gri) gpsd_port = gri->gpsd_port; break; } +#ifdef HAVE_LIBGPSMGR case GPS_RCVR_FILE: { /* Use gpsmgr to create a GPSD that uses the file. */ @@ -632,6 +641,7 @@ thread_read_nmea(GpsRcvrInfo *gri) } break; } +#endif default: error = TRUE; } @@ -765,13 +775,17 @@ thread_read_nmea(GpsRcvrInfo *gri) { switch(gri->type) { +#ifdef HAVE_LIBGPSBT case GPS_RCVR_BT: gpsbt_stop(&gps_context); break; +#endif +#ifdef HAVE_LIBGPSMGR case GPS_RCVR_FILE: gpsmgr_stop(&gps_context.mgr); break; +#endif default: ; diff --git a/src/gpsbt.c b/src/gpsbt.c index 2a6e69c..5dad65b 100644 --- a/src/gpsbt.c +++ b/src/gpsbt.c @@ -46,6 +46,8 @@ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WAR # include "config.h" #endif +#ifdef HAVE_LIBGPSBT + #define _GNU_SOURCE #include @@ -792,3 +794,5 @@ extern int gpsbt_stop(gpsbt_t *ctx) } #endif + +#endif /* HAVE_LIBGPSBT */ diff --git a/src/input.c b/src/input.c index 26368f1..25a9b7b 100644 --- a/src/input.c +++ b/src/input.c @@ -567,8 +567,14 @@ map_cb_button_release(GtkWidget *widget, GdkEventButton *event) _mouse_is_down = FALSE; + if(event->button == 3) /* right-click */ + { + gtk_menu_popup(_map_cmenu, NULL, NULL, NULL, NULL, + event->button, event->time); + } + else #ifdef DEBUG - if(event->button != 1) + if(event->button == 2) /* middle-click */ { screen2unit((gint)(event->x + 0.5), (gint)(event->y + 0.5), _pos.unitx, _pos.unity); diff --git a/src/main.c b/src/main.c index 978736b..55d383c 100644 --- a/src/main.c +++ b/src/main.c @@ -34,9 +34,15 @@ #include #include -#include -#include -#include + +#ifdef MAEMO_CHANGES /* probably not the best macro to check for here */ +# include +#endif + +#ifdef CONIC +# include +# include +#endif #ifndef LEGACY # include @@ -68,16 +74,19 @@ static void osso_cb_hw_state(osso_hw_state_t *state, gpointer data); static HildonProgram *_program = NULL; +#ifdef CONIC static ConIcConnection *_conic_conn = NULL; static gboolean _conic_is_connecting = FALSE; static gboolean _conic_conn_failed = FALSE; static GMutex *_conic_connection_mutex = NULL; static GCond *_conic_connection_cond = NULL; +#endif /* Dynamically-sized in-memory map cache. */ static size_t _map_cache_size = (32*1024*1024); static gboolean _map_cache_enabled = TRUE; +#ifdef CONIC static void conic_conn_event(ConIcConnection *connection, ConIcConnectionEvent *event) { @@ -110,13 +119,14 @@ conic_conn_event(ConIcConnection *connection, ConIcConnectionEvent *event) vprintf("%s(): return\n", __PRETTY_FUNCTION__); } +#endif void conic_recommend_connected() { printf("%s()\n", __PRETTY_FUNCTION__); -#ifdef __arm__ +#ifdef CONIC g_mutex_lock(_conic_connection_mutex); if(!_conic_is_connecting) { @@ -135,7 +145,7 @@ conic_ensure_connected() { printf("%s()\n", __PRETTY_FUNCTION__); -#ifdef __arm__ +#ifdef CONIC while(_window && !_conic_is_connected) { g_mutex_lock(_conic_connection_mutex); @@ -184,9 +194,11 @@ maemo_mapper_destroy() g_mutex_unlock(_mut_priority_mutex); /* Allow remaining downloads to finish. */ +#ifdef CONIC g_mutex_lock(_conic_connection_mutex); g_cond_broadcast(_conic_connection_cond); g_mutex_unlock(_conic_connection_mutex); +#endif g_thread_pool_free(_mut_thread_pool, TRUE, TRUE); if(_curr_repo->db) @@ -243,6 +255,7 @@ maemo_mapper_init(gint argc, gchar **argv) INFO_FONT_ENUM_TEXT[INFO_FONT_XLARGE] = "x-large"; INFO_FONT_ENUM_TEXT[INFO_FONT_XXLARGE] = "xx-large"; +#ifdef MAEMO_CHANGES /* probably not the best macro to check for here */ CUSTOM_KEY_ICON[CUSTOM_KEY_UP] = HWK_BUTTON_UP; CUSTOM_KEY_ICON[CUSTOM_KEY_LEFT] = HWK_BUTTON_LEFT; CUSTOM_KEY_ICON[CUSTOM_KEY_DOWN] = HWK_BUTTON_DOWN; @@ -252,6 +265,17 @@ maemo_mapper_init(gint argc, gchar **argv) CUSTOM_KEY_ICON[CUSTOM_KEY_DECREASE] = HWK_BUTTON_DECREASE; CUSTOM_KEY_ICON[CUSTOM_KEY_FULLSCREEN] = HWK_BUTTON_VIEW; CUSTOM_KEY_ICON[CUSTOM_KEY_ESC] = HWK_BUTTON_CANCEL; +#else + CUSTOM_KEY_ICON[CUSTOM_KEY_UP] = "Up"; + CUSTOM_KEY_ICON[CUSTOM_KEY_LEFT] = "Left"; + CUSTOM_KEY_ICON[CUSTOM_KEY_DOWN] = "Down"; + CUSTOM_KEY_ICON[CUSTOM_KEY_RIGHT] = "Right"; + CUSTOM_KEY_ICON[CUSTOM_KEY_SELECT] = "Enter"; + CUSTOM_KEY_ICON[CUSTOM_KEY_INCREASE] = "F7"; + CUSTOM_KEY_ICON[CUSTOM_KEY_DECREASE] = "F8"; + CUSTOM_KEY_ICON[CUSTOM_KEY_FULLSCREEN] = "F6"; + CUSTOM_KEY_ICON[CUSTOM_KEY_ESC] = "Esc"; +#endif CUSTOM_KEY_DEFAULT[CUSTOM_KEY_UP] = CUSTOM_ACTION_RESET_VIEW_ANGLE; CUSTOM_KEY_DEFAULT[CUSTOM_KEY_LEFT] =CUSTOM_ACTION_ROTATE_COUNTERCLOCKWISE; @@ -338,8 +362,10 @@ maemo_mapper_init(gint argc, gchar **argv) _mut_priority_mutex = g_mutex_new(); _mouse_mutex = g_mutex_new(); +#ifdef CONIC _conic_connection_mutex = g_mutex_new(); _conic_connection_cond = g_cond_new(); +#endif settings_init(); map_cache_init(_map_cache_size); @@ -352,6 +378,8 @@ maemo_mapper_init(gint argc, gchar **argv) _window = GTK_WIDGET(hildon_window_new()); hildon_program_add_window(_program, HILDON_WINDOW(_window)); + gtk_window_set_default_size(GTK_WINDOW(_window), 800, 480); + /* Lets go fullscreen if so requested in saved config */ if (_fullscreen) { gtk_window_fullscreen(GTK_WINDOW(_window)); @@ -512,10 +540,12 @@ maemo_mapper_init(gint argc, gchar **argv) /* If we have a route, calculate the next point. */ route_find_nearest_point(); +#ifdef CONIC _conic_conn = con_ic_connection_new(); g_object_set(_conic_conn, "automatic-connection-events", TRUE, NULL); g_signal_connect(G_OBJECT(_conic_conn), "connection-event", G_CALLBACK(conic_conn_event), NULL); +#endif g_idle_add((GSourceFunc)window_present, NULL); diff --git a/src/maps.c b/src/maps.c index 71dff22..cd24a1e 100644 --- a/src/maps.c +++ b/src/maps.c @@ -2901,6 +2901,7 @@ mapman_dialog() 1, 2, 3, 4, GTK_FILL, 0, 4, 0); gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_topleft_lat), 12); gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_topleft_lat), 1.f); +#ifdef MAEMO_CHANGES g_object_set(G_OBJECT(mapman_info.txt_topleft_lat), #ifndef LEGACY "hildon-input-mode", @@ -2911,12 +2912,14 @@ mapman_dialog() g_object_set(G_OBJECT(mapman_info.txt_topleft_lat), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), mapman_info.txt_topleft_lon = gtk_entry_new(), 2, 3, 3, 4, GTK_FILL, 0, 4, 0); gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_topleft_lon), 12); gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_topleft_lon), 1.f); +#ifdef MAEMO_CHANGES g_object_set(G_OBJECT(mapman_info.txt_topleft_lon), #ifndef LEGACY "hildon-input-mode", @@ -2927,6 +2930,7 @@ mapman_dialog() g_object_set(G_OBJECT(mapman_info.txt_topleft_lon), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif /* Bottom Right. */ @@ -2939,6 +2943,7 @@ mapman_dialog() 1, 2, 4, 5, GTK_FILL, 0, 4, 0); gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_botright_lat), 12); gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_botright_lat), 1.f); +#ifdef MAEMO_CHANGES g_object_set(G_OBJECT(mapman_info.txt_botright_lat), #ifndef LEGACY "hildon-input-mode", @@ -2949,12 +2954,14 @@ mapman_dialog() g_object_set(G_OBJECT(mapman_info.txt_botright_lat), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), mapman_info.txt_botright_lon = gtk_entry_new(), 2, 3, 4, 5, GTK_FILL, 0, 4, 0); gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_botright_lat), 12); gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_botright_lon), 1.f); +#ifdef MAEMO_CHANGES g_object_set(G_OBJECT(mapman_info.txt_botright_lon), #ifndef LEGACY "hildon-input-mode", @@ -2965,6 +2972,7 @@ mapman_dialog() g_object_set(G_OBJECT(mapman_info.txt_botright_lon), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif /* Default action is to download by area. */ diff --git a/src/menu.c b/src/menu.c index 9db80a6..a8e6dd6 100644 --- a/src/menu.c +++ b/src/menu.c @@ -55,53 +55,6 @@ #include "settings.h" #include "util.h" -static GtkWidget *_menu_route_open_item = NULL; -static GtkWidget *_menu_route_download_item = NULL; -static GtkWidget *_menu_route_save_item = NULL; -static GtkWidget *_menu_route_distnext_item = NULL; -static GtkWidget *_menu_route_distlast_item = NULL; -static GtkWidget *_menu_route_reset_item = NULL; -static GtkWidget *_menu_route_clear_item = NULL; -static GtkWidget *_menu_track_open_item = NULL; -static GtkWidget *_menu_track_save_item = NULL; -static GtkWidget *_menu_track_insert_break_item = NULL; -static GtkWidget *_menu_track_insert_mark_item = NULL; -static GtkWidget *_menu_track_distlast_item = NULL; -static GtkWidget *_menu_track_distfirst_item = NULL; -static GtkWidget *_menu_track_clear_item = NULL; -static GtkWidget *_menu_poi_import_item = NULL; -static GtkWidget *_menu_poi_download_item = NULL; -static GtkWidget *_menu_poi_browse_item = NULL; -static GtkWidget *_menu_poi_categories_item = NULL; -static GtkWidget *_menu_maps_submenu = NULL; -static GtkWidget *_menu_maps_mapman_item = NULL; -static GtkWidget *_menu_maps_repoman_item = NULL; -static GtkWidget *_menu_view_zoom_in_item = NULL; -static GtkWidget *_menu_view_zoom_out_item = NULL; -static GtkWidget *_menu_view_rotate_clock_item = NULL; -static GtkWidget *_menu_view_rotate_counter_item = NULL; -static GtkWidget *_menu_view_rotate_reset_item = NULL; -static GtkWidget *_menu_view_pan_up_item = NULL; -static GtkWidget *_menu_view_pan_down_item = NULL; -static GtkWidget *_menu_view_pan_left_item = NULL; -static GtkWidget *_menu_view_pan_right_item = NULL; -static GtkWidget *_menu_view_pan_north_item = NULL; -static GtkWidget *_menu_view_pan_south_item = NULL; -static GtkWidget *_menu_view_pan_west_item = NULL; -static GtkWidget *_menu_view_pan_east_item = NULL; -static GtkWidget *_menu_view_show_zoomlevel_item = NULL; -static GtkWidget *_menu_view_show_comprose_item = NULL; -static GtkWidget *_menu_view_show_velvec_item = NULL; -static GtkWidget *_menu_view_goto_latlon_item = NULL; -static GtkWidget *_menu_view_goto_address_item = NULL; -static GtkWidget *_menu_view_goto_gps_item = NULL; -static GtkWidget *_menu_view_goto_nextway_item = NULL; -static GtkWidget *_menu_view_goto_nearpoi_item = NULL; -static GtkWidget *_menu_settings_item = NULL; -static GtkWidget *_menu_help_item = NULL; -static GtkWidget *_menu_about_item = NULL; -static GtkWidget *_menu_close_item = NULL; - /**************************************************************************** * BELOW: ROUTE MENU ******************************************************** ****************************************************************************/ @@ -826,6 +779,7 @@ menu_cb_view_goto_latlon(GtkMenuItem *item) 1, 2, 0, 1, GTK_FILL, 0, 2, 4); gtk_entry_set_width_chars(GTK_ENTRY(txt_lat), 16); gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(txt_lat), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); @@ -833,6 +787,7 @@ menu_cb_view_goto_latlon(GtkMenuItem *item) g_object_set(G_OBJECT(txt_lat), HILDON_AUTOCAP, FALSE, NULL); g_object_set(G_OBJECT(txt_lat), HILDON_INPUT_MODE_HINT, HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL, NULL); +#endif #endif gtk_table_attach(GTK_TABLE(table), @@ -845,6 +800,7 @@ menu_cb_view_goto_latlon(GtkMenuItem *item) 1, 2, 1, 2, GTK_FILL, 0, 2, 4); gtk_entry_set_width_chars(GTK_ENTRY(txt_lon), 16); gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(txt_lon), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); @@ -852,6 +808,7 @@ menu_cb_view_goto_latlon(GtkMenuItem *item) g_object_set(G_OBJECT(txt_lon), HILDON_AUTOCAP, FALSE, NULL); g_object_set(G_OBJECT(txt_lon), HILDON_INPUT_MODE_HINT, HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL, NULL); +#endif #endif } diff --git a/src/path.c b/src/path.c index 445292b..85392ff 100644 --- a/src/path.c +++ b/src/path.c @@ -1277,11 +1277,13 @@ route_download(gchar *to) oti.txt_from = gtk_entry_new(), 1, 4, 3, 4, GTK_EXPAND | GTK_FILL, 0, 2, 4); gtk_entry_set_width_chars(GTK_ENTRY(oti.txt_from), 25); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(oti.txt_from), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(oti.txt_from), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif /* Destination. */ @@ -1293,11 +1295,13 @@ route_download(gchar *to) oti.txt_to = gtk_entry_new(), 1, 4, 4, 5, GTK_EXPAND | GTK_FILL, 0, 2, 4); gtk_entry_set_width_chars(GTK_ENTRY(oti.txt_to), 25); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(oti.txt_to), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(oti.txt_to), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif /* Swap button. */ diff --git a/src/poi.c b/src/poi.c index 85c8b87..385d7be 100644 --- a/src/poi.c +++ b/src/poi.c @@ -2597,11 +2597,13 @@ poi_download_dialog(gint unitx, gint unity) oti.txt_origin = gtk_entry_new(), 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 2, 4); gtk_entry_set_width_chars(GTK_ENTRY(oti.txt_origin), 25); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(oti.txt_origin), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(oti.txt_origin), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif /* Query. */ @@ -2613,11 +2615,13 @@ poi_download_dialog(gint unitx, gint unity) oti.txt_query = gtk_entry_new(), 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4); gtk_entry_set_width_chars(GTK_ENTRY(oti.txt_query), 25); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(oti.txt_query), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(oti.txt_query), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif /* Set up auto-completion. */ @@ -2914,11 +2918,13 @@ poi_browse_dialog(gint unitx, gint unity) oti.txt_origin = gtk_entry_new(), 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 2, 4); gtk_entry_set_width_chars(GTK_ENTRY(oti.txt_origin), 25); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(oti.txt_origin), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(oti.txt_origin), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif /* Destination. */ @@ -2930,11 +2936,13 @@ poi_browse_dialog(gint unitx, gint unity) oti.txt_query = gtk_entry_new(), 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4); gtk_entry_set_width_chars(GTK_ENTRY(oti.txt_query), 25); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(oti.txt_query), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(oti.txt_query), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif /* Set up auto-completion. */ diff --git a/src/settings.c b/src/settings.c index 62f8a15..bde2170 100644 --- a/src/settings.c +++ b/src/settings.c @@ -1195,15 +1195,22 @@ settings_dialog() gtk_box_pack_start(GTK_BOX(hbox), txt_gps_bt_mac = gtk_entry_new(), TRUE, TRUE, 0); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(txt_gps_bt_mac), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(txt_gps_bt_mac), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif gtk_box_pack_start(GTK_BOX(hbox), btn_scan = gtk_button_new_with_label(_("Scan...")), FALSE, FALSE, 0); +#ifndef HAVE_LIBGPSBT + gtk_widget_set_sensitive(rad_gps_bt, FALSE); + gtk_widget_set_sensitive(txt_gps_bt_mac, FALSE); + gtk_widget_set_sensitive(btn_scan, FALSE); +#endif /* File Path (RFComm). */ gtk_table_attach(GTK_TABLE(table), @@ -1217,15 +1224,22 @@ settings_dialog() gtk_box_pack_start(GTK_BOX(hbox), txt_gps_file_path = gtk_entry_new(), TRUE, TRUE, 0); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(txt_gps_file_path), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(txt_gps_file_path), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif gtk_box_pack_start(GTK_BOX(hbox), btn_browse_gps = gtk_button_new_with_label(_("Browse...")), FALSE, FALSE, 0); +#ifndef HAVE_LIBGPSBT + gtk_widget_set_sensitive(rad_gps_file, FALSE); + gtk_widget_set_sensitive(txt_gps_file_path, FALSE); + gtk_widget_set_sensitive(btn_browse_gps, FALSE); +#endif /* GPSD Hostname and Port. */ gtk_table_attach(GTK_TABLE(table), @@ -1239,11 +1253,13 @@ settings_dialog() gtk_box_pack_start(GTK_BOX(hbox), txt_gps_gpsd_host = gtk_entry_new(), TRUE, TRUE, 0); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(txt_gps_gpsd_host), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(txt_gps_gpsd_host), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif gtk_box_pack_start(GTK_BOX(hbox), label = gtk_label_new(_("Port")), @@ -1490,11 +1506,13 @@ settings_dialog() gtk_box_pack_start(GTK_BOX(hbox), txt_poi_db = gtk_entry_new(), TRUE, TRUE, 0); +#ifdef MAEMO_CHANGES #ifndef LEGACY g_object_set(G_OBJECT(txt_poi_db), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else g_object_set(G_OBJECT(txt_poi_db), HILDON_AUTOCAP, FALSE, NULL); +#endif #endif gtk_box_pack_start(GTK_BOX(hbox), btn_browse_poi = gtk_button_new_with_label(_("Browse...")), -- 2.45.0