- Fixed missing current road name display

- Ensures navigation tip is visible when needed
- Fix some other UTF-8 issues

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@591 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/src/gui/sdl/gui_sdl_window.cpp b/navit/src/gui/sdl/gui_sdl_window.cpp
index 3955f6c..0a23470 100644 (file)
--- a/navit/src/gui/sdl/gui_sdl_window.cpp
+++ b/navit/src/gui/sdl/gui_sdl_window.cpp
@@ -19,6 +19,8 @@
 #include "navigation.h"
 #include "debug.h"
 #include "attr.h"
+#include "track.h"
+
 
 #include "CEGUI.h"
 
@@ -99,12 +101,14 @@ sdl_update_roadbook(struct navigation *nav)
        struct navigation_list *list;   
        list=navigation_list_new(nav);
 
-       // First, update the 'Navigation Tip' on the main window
+       // First, ensure the navigation tip is visible. quick workaround for when resuming a destination
+       WindowManager::getSingleton().getWindow("Navit/Routing/Tips")->show();
 
+       // update the 'Navigation Tip' on the main window
        try {
                struct attr attr;
                item_attr_get(navigation_list_get_item(list), attr_navigation_speech, &attr);
-               WindowManager::getSingleton().getWindow("Navit/Routing/Tips")->setText(attr.u.str);
+               WindowManager::getSingleton().getWindow("Navit/Routing/Tips")->setText((CEGUI::utf8*)(attr.u.str));
        }
        catch (CEGUI::Exception& e)
        {
@@ -145,6 +149,21 @@ sdl_update_roadbook(struct navigation *nav)
 
 }
 
+static void show_road_name(){
+       struct tracking *tracking;
+       struct attr road_name_attr;
+       tracking=navit_get_tracking(sdl_gui_navit);
+
+       using namespace CEGUI;
+       extern Window* myRoot;
+
+
+       if (tracking && tracking_get_current_attr(tracking, attr_label, &road_name_attr) ) {
+               WindowManager::getSingleton().getWindow("Navit/Routing/CurrentRoadName")->setText((CEGUI::utf8*)(road_name_attr.u.str));
+       }
+
+}
+
 static int gui_run_main_loop(struct gui_priv *this_)
 {
 
@@ -214,6 +233,7 @@ static int gui_run_main_loop(struct gui_priv *this_)
                if(enable_timer)
                        profile(0,"main context");
 
+               show_road_name();
        //      graphics_get_data(this_->gra,DLid);
                
 #if 0