From 8540ba020a5178833b5f658b5e3202e5d3921ae7 Mon Sep 17 00:00:00 2001 From: martin-s Date: Sun, 4 Nov 2007 21:11:44 +0000 Subject: [PATCH] Added patches from gnunux for n770 support git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@515 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c | 5 +++++ navit/src/gui/gtk/gui_gtk_action.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c index 56e8755..9fd6308 100644 --- a/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c +++ b/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c @@ -61,6 +61,7 @@ graphics_destroy(struct graphics_priv *gr) } static char *fontpaths[]={ + "/usr/share/fonts", "/usr/X11R6/lib/X11/fonts/msttcorefonts", "/usr/X11R6/lib/X11/fonts/truetype", "/usr/share/fonts/truetype", @@ -117,6 +118,10 @@ static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct grap dbg(1,("font : %s\n",fontpath)); if (!FT_New_Face( gr->library, fontpath, 0, &font->face )) break; + sprintf(fontpath,"%s/NcrBI4nh.ttf",*filename); + dbg(1,("font : %s\n",fontpath)); + if (!FT_New_Face( gr->library, fontpath, 0, &font->face )) + break; filename++; } if (! *filename) { diff --git a/navit/src/gui/gtk/gui_gtk_action.c b/navit/src/gui/gtk/gui_gtk_action.c index b2684da..f8227e4 100644 --- a/navit/src/gui/gtk/gui_gtk_action.c +++ b/navit/src/gui/gtk/gui_gtk_action.c @@ -182,7 +182,11 @@ static GtkActionEntry entries[] = { "ZoomInAction", GTK_STOCK_ZOOM_IN, _n("ZoomIn"), NULL, NULL, G_CALLBACK(zoom_in_action) }, { "RefreshAction", GTK_STOCK_REFRESH, _n("Refresh"), NULL, NULL, G_CALLBACK(refresh_action) }, { "RoadbookAction", GTK_STOCK_JUSTIFY_FILL, _n("Roadbook"), NULL, NULL, G_CALLBACK(roadbook_action) }, +#ifdef GTK_STOCK_INFO { "InfoAction", GTK_STOCK_INFO, _n("Info"), NULL, NULL, G_CALLBACK(info_action) }, +#else + { "InfoAction", NULL, _n("Info"), NULL, NULL, G_CALLBACK(info_action) }, +#endif /*GTK_STOCK_INFO*/ { "DestinationAction", "flag_icon", _n("Destination"), NULL, NULL, G_CALLBACK(destination_action) }, { "RouteClearAction", NULL, _n("Clear"), NULL, NULL, G_CALLBACK(route_clear_action) }, { "Test", NULL, _n("Test"), NULL, NULL, G_CALLBACK(destination_action) }, @@ -196,7 +200,11 @@ static GtkToggleActionEntry toggleentries[] = { "CursorAction", "cursor_icon",_n("Cursor"), NULL, NULL, G_CALLBACK(cursor_action),TRUE }, { "TrackingAction", NULL ,_n("Tracking"), NULL, NULL, G_CALLBACK(tracking_action),TRUE }, { "OrientationAction", "orientation_icon", _n("Orientation"), NULL, NULL, G_CALLBACK(orient_north_action),FALSE }, +#ifdef GTK_STOCK_FULLSCREEN { "FullscreenAction",GTK_STOCK_FULLSCREEN, _n("Fullscreen"), NULL, NULL, G_CALLBACK(window_fullscreen_action), FALSE } +#else + { "FullscreenAction", NULL, _n("Fullscreen"), NULL, NULL, G_CALLBACK(window_fullscreen_action), FALSE } +#endif /*GTK_STOCK_FULLSCREEN*/ }; static guint n_toggleentries = G_N_ELEMENTS (toggleentries); -- 2.7.4