Menu
▾
▴
navit-cvs-commit — CVS commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(59) |
Sep
(43) |
Oct
(95) |
Nov
(135) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(229) |
Feb
(141) |
Mar
(59) |
Apr
(70) |
May
(64) |
Jun
(87) |
Jul
(57) |
Aug
(108) |
Sep
(74) |
Oct
(203) |
Nov
(141) |
Dec
(108) |
| 2009 |
Jan
(114) |
Feb
(91) |
Mar
(101) |
Apr
(69) |
May
(54) |
Jun
(82) |
Jul
(49) |
Aug
(109) |
Sep
(81) |
Oct
(93) |
Nov
(100) |
Dec
(79) |
| 2010 |
Jan
(46) |
Feb
(36) |
Mar
(135) |
Apr
(103) |
May
(116) |
Jun
(130) |
Jul
(52) |
Aug
(31) |
Sep
(46) |
Oct
(48) |
Nov
(98) |
Dec
(110) |
| 2011 |
Jan
(234) |
Feb
(184) |
Mar
(150) |
Apr
(43) |
May
(53) |
Jun
(52) |
Jul
(112) |
Aug
(72) |
Sep
(79) |
Oct
(23) |
Nov
(6) |
Dec
(30) |
| 2012 |
Jan
(39) |
Feb
(37) |
Mar
(49) |
Apr
(60) |
May
(63) |
Jun
(38) |
Jul
(33) |
Aug
(24) |
Sep
(20) |
Oct
(14) |
Nov
(23) |
Dec
(50) |
| 2013 |
Jan
(30) |
Feb
(32) |
Mar
(27) |
Apr
(41) |
May
(59) |
Jun
(21) |
Jul
(10) |
Aug
(73) |
Sep
(23) |
Oct
(60) |
Nov
(14) |
Dec
(15) |
| 2014 |
Jan
(4) |
Feb
(8) |
Mar
(11) |
Apr
(6) |
May
(27) |
Jun
(4) |
Jul
(29) |
Aug
(62) |
Sep
(11) |
Oct
(17) |
Nov
(58) |
Dec
(9) |
| 2015 |
Jan
(23) |
Feb
(3) |
Mar
(26) |
Apr
(47) |
May
(8) |
Jun
(28) |
Jul
(10) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: KaZeR <ka...@us...> - 2007-09-04 09:13:25
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32319 Modified Files: gui_sdl_window.cpp Log Message: Removed the dependency on the object hierarchy in the SDL GUI Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** gui_sdl_window.cpp 3 Sep 2007 16:08:04 -0000 1.15 --- gui_sdl_window.cpp 4 Sep 2007 09:13:23 -0000 1.16 *************** *** 101,105 **** } ! MultiColumnList* mcl = static_cast<MultiColumnList*>(myRoot->getChild("Navit/RoadBook")->getChild("Roadbook")); mcl->resetList(); --- 101,105 ---- } ! MultiColumnList* mcl = static_cast<MultiColumnList*>(WindowManager::getSingleton().getWindow("Roadbook")); mcl->resetList(); *************** *** 119,123 **** printf("SDL : %s\n", str); ! /* mcl->addRow(); /* --- 119,123 ---- printf("SDL : %s\n", str); ! mcl->addRow(); /* *************** *** 157,160 **** --- 157,162 ---- static int gui_run_main_loop(struct gui_priv *this_) { + + using namespace CEGUI; dbg(1,"Entering main loop\n"); *************** *** 281,285 **** last_time_pulse = SDL_GetTicks(); } ! myRoot->getChild("OSD/Satellites")->setText(fps); /* --- 283,287 ---- last_time_pulse = SDL_GetTicks(); } ! WindowManager::getSingleton().getWindow("OSD/Satellites")->setText(fps); /* *************** *** 349,353 **** if(VIEW_MODE==VM_2D){ dbg(1,"Switching to 2D view\n"); ! // myRoot->getChild("OSD/ViewMode")->setText("2D"); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); --- 351,355 ---- if(VIEW_MODE==VM_2D){ dbg(1,"Switching to 2D view\n"); ! // myRoot->getWindow("OSD/ViewMode")->setText("2D"); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); *************** *** 359,363 **** } else { dbg(1,"Switching to 3D view\n"); ! // myRoot->getChild("OSD/ViewMode")->setText("3D"); // Dimensions de la fenetre de rendu --- 361,365 ---- } else { dbg(1,"Switching to 3D view\n"); ! // myRoot->getWindow("OSD/ViewMode")->setText("3D"); // Dimensions de la fenetre de rendu *************** *** 393,399 **** if(VIEW_MODE==VM_2D){ ! myRoot->getChild("OSD/ViewMode")->setText("2D"); } else { ! myRoot->getChild("OSD/ViewMode")->setText("3D"); } init_GL(); --- 395,401 ---- if(VIEW_MODE==VM_2D){ ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ViewMode")->setText("2D"); } else { ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ViewMode")->setText("3D"); } init_GL(); *************** *** 402,406 **** bool MoveCamera(const CEGUI::EventArgs& event){ ! CEGUI::Scrollbar * sb = static_cast<const CEGUI::Scrollbar *>(myRoot->getChild("OSD/Scrollbar1")); // printf("moving : %f\n",sb->getScrollPosition()); eyeZ=-sb->getScrollPosition(); --- 404,408 ---- bool MoveCamera(const CEGUI::EventArgs& event){ ! CEGUI::Scrollbar * sb = static_cast<const CEGUI::Scrollbar *>(CEGUI::WindowManager::getSingleton().getWindow("OSD/Scrollbar1")); // printf("moving : %f\n",sb->getScrollPosition()); eyeZ=-sb->getScrollPosition(); *************** *** 411,416 **** bool ShowKeyboard(const CEGUI::EventArgs& event){ ! myRoot->getChild("Navit/Keyboard")->getChild("Navit/Keyboard/Input")->setText(""); ! myRoot->getChild("Navit/Keyboard")->show(); } --- 413,418 ---- bool ShowKeyboard(const CEGUI::EventArgs& event){ ! CEGUI::WindowManager::getSingleton().getWindow("Navit/Keyboard/Input")->setText(""); ! CEGUI::WindowManager::getSingleton().getWindow("Navit/Keyboard")->show(); } *************** *** 421,425 **** sprintf(button_name,"%s",key); FrameWindow* wnd = (FrameWindow*)WindowManager::getSingleton().createWindow("TaharezLook/Button", button_name); ! myRoot->getChild("Navit/Keyboard")->addChildWindow(wnd); wnd->setPosition(UVector2(cegui_absdim(x), cegui_absdim( y))); wnd->setSize(UVector2(cegui_absdim(w), cegui_absdim( 40))); --- 423,427 ---- sprintf(button_name,"%s",key); FrameWindow* wnd = (FrameWindow*)WindowManager::getSingleton().createWindow("TaharezLook/Button", button_name); ! CEGUI::WindowManager::getSingleton().getWindow("Navit/Keyboard")->addChildWindow(wnd); wnd->setPosition(UVector2(cegui_absdim(x), cegui_absdim( y))); wnd->setSize(UVector2(cegui_absdim(w), cegui_absdim( 40))); *************** *** 562,566 **** CEGUI::DefaultResourceProvider* rp = static_cast<CEGUI::DefaultResourceProvider*> ! (CEGUI::System::getSingleton().getResourceProvider()); --- 564,568 ---- CEGUI::DefaultResourceProvider* rp = static_cast<CEGUI::DefaultResourceProvider*> ! (System::getSingleton().getResourceProvider()); *************** *** 626,666 **** ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/CountryEditbox")->subscribeEvent(Window::EventKeyUp, Event::Subscriber(DestinationEntryChange)); ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/CountryEditbox")->subscribeEvent(Window::EventMouseButtonDown, Event::Subscriber(handleMouseEnters)); ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/TownEditbox")->subscribeEvent(Window::EventKeyUp, Event::Subscriber(DestinationEntryChange)); ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/TownEditbox")->subscribeEvent(Window::EventMouseButtonDown, Event::Subscriber(handleMouseEnters)); ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/StreetEditbox")->subscribeEvent(Window::EventKeyUp, Event::Subscriber(DestinationEntryChange)); ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/StreetEditbox")->subscribeEvent(Window::EventMouseButtonDown, Event::Subscriber(handleMouseEnters)); ! myRoot->getChild("OSD/DestinationButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(DialogWindowSwitch)); ! myRoot->getChild("OSD/RoadbookButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(RoadBookSwitch)); ! myRoot->getChild("OSD/RoadbookButton")->setText(_("RoadBook")); // this one is maybe not needed anymore ! myRoot->getChild("Navit/RoadBook")->getChild("OSD/RoadbookButton2")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(RoadBookSwitch)); ! myRoot->getChild("OSD/ZoomIn")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ZoomIn)); ! myRoot->getChild("OSD/ZoomIn")->setText(_("ZoomIn")); ! myRoot->getChild("OSD/ZoomOut")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ZoomOut)); ! myRoot->getChild("OSD/ZoomOut")->setText(_("ZoomOut")); ! myRoot->getChild("OSD/Quit")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ButtonQuit)); ! myRoot->getChild("OSD/Quit")->setText(_("Quit")); ! myRoot->getChild("OSD/ViewMode")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ToggleView)); ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/GO")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ButtonGo)); ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/KB")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ShowKeyboard)); ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/Listbox")->subscribeEvent(MultiColumnList::EventSelectionChanged, Event::Subscriber(ItemSelect)); ! myRoot->getChild("OSD/Scrollbar1")->subscribeEvent(Scrollbar::EventScrollPositionChanged, Event::Subscriber(MoveCamera)); // Translation for StaticTexts (labels) ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/Country")->setText(_("Country")); ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/Town")->setText(_("City")); ! myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/Street")->setText(_("Street")); MultiColumnList* mcl = static_cast<MultiColumnList*>(WindowManager::getSingleton().getWindow("DestinationWindow/Listbox")); --- 628,668 ---- ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/CountryEditbox")->subscribeEvent(Window::EventKeyUp, Event::Subscriber(DestinationEntryChange)); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/CountryEditbox")->subscribeEvent(Window::EventMouseButtonDown, Event::Subscriber(handleMouseEnters)); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/TownEditbox")->subscribeEvent(Window::EventKeyUp, Event::Subscriber(DestinationEntryChange)); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/TownEditbox")->subscribeEvent(Window::EventMouseButtonDown, Event::Subscriber(handleMouseEnters)); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/StreetEditbox")->subscribeEvent(Window::EventKeyUp, Event::Subscriber(DestinationEntryChange)); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/StreetEditbox")->subscribeEvent(Window::EventMouseButtonDown, Event::Subscriber(handleMouseEnters)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/DestinationButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(DialogWindowSwitch)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(RoadBookSwitch)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->setText(_("RoadBook")); // this one is maybe not needed anymore ! CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton2")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(RoadBookSwitch)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ZoomIn")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ZoomIn)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ZoomIn")->setText(_("ZoomIn")); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ZoomOut")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ZoomOut)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ZoomOut")->setText(_("ZoomOut")); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/Quit")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ButtonQuit)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/Quit")->setText(_("Quit")); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ViewMode")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ToggleView)); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/GO")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ButtonGo)); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/KB")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ShowKeyboard)); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/Listbox")->subscribeEvent(MultiColumnList::EventSelectionChanged, Event::Subscriber(ItemSelect)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/Scrollbar1")->subscribeEvent(Scrollbar::EventScrollPositionChanged, Event::Subscriber(MoveCamera)); // Translation for StaticTexts (labels) ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/Country")->setText(_("Country")); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/Town")->setText(_("City")); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/Street")->setText(_("Street")); MultiColumnList* mcl = static_cast<MultiColumnList*>(WindowManager::getSingleton().getWindow("DestinationWindow/Listbox")); *************** *** 714,722 **** double speed=*vehicle_speed_get(v); sprintf (buffer, "%02.02f km/h", speed); ! myRoot->getChild("OSD/SpeedoMeter")->setText(buffer); double height=*vehicle_height_get(v); sprintf (buffer, "%.0f m", height); ! myRoot->getChild("OSD/Altimeter")->setText(buffer); } --- 716,724 ---- double speed=*vehicle_speed_get(v); sprintf (buffer, "%02.02f km/h", speed); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/SpeedoMeter")->setText(buffer); double height=*vehicle_height_get(v); sprintf (buffer, "%.0f m", height); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/Altimeter")->setText(buffer); } |
|
From: KaZeR <ka...@us...> - 2007-09-03 16:08:05
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv344/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Added the display of height Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** gui_sdl_window.cpp 3 Sep 2007 13:44:56 -0000 1.14 --- gui_sdl_window.cpp 3 Sep 2007 16:08:04 -0000 1.15 *************** *** 93,97 **** sdl_update_roadbook(struct navigation *nav, void *data) { ! /* using namespace CEGUI; extern Window* myRoot; --- 93,97 ---- sdl_update_roadbook(struct navigation *nav, void *data) { ! using namespace CEGUI; extern Window* myRoot; *************** *** 109,117 **** list=navigation_list_new(nav); - while ((str=navigation_list_get(list, navigation_mode_short))) { ! // printf("SDL : %s\n", str); mcl->addRow(); /* --- 109,123 ---- list=navigation_list_new(nav); ! char *text; + list=navigation_list_new(nav); + text=navigation_list_get(list, navigation_mode_speech); + + while ((str=navigation_list_get(list, navigation_mode_short))) { + /* + printf("SDL : %s\n", str); + /* mcl->addRow(); /* *************** *** 143,150 **** itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush"); mcl->setItem(itemListbox, 0, mcl->getRowCount()-1); ! } ! navigation_list_destroy(list); ! */ } --- 149,156 ---- itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush"); mcl->setItem(itemListbox, 0, mcl->getRowCount()-1); ! */ } ! // navigation_list_destroy(list); ! } *************** *** 194,198 **** if(navig){ dbg(1,"navig valid, registering callback\n"); ! navigation_register_callback(navig, navigation_mode_long, callback_new((void (*)())sdl_update_roadbook, 1, (void **)&sdl_gui_navit)); } else { dbg(1,"navig unvalid\n"); --- 200,217 ---- if(navig){ dbg(1,"navig valid, registering callback\n"); ! /* ! this_->roadbook_callback=callback_new_1(callback_cast(navit_window_roadbook_update), this_); ! ! navigation_register_callback(this_->navigation, ! navigation_mode_long, ! this_->roadbook_callback ! ); ! ! */ ! navigation_register_callback(navig, ! navigation_mode_long, ! // callback_new((void (*)())sdl_update_roadbook, 1, (void **)&sdl_gui_navit) ! callback_new_1(callback_cast(sdl_update_roadbook), &sdl_gui_navit) ! ); } else { dbg(1,"navig unvalid\n"); *************** *** 262,266 **** last_time_pulse = SDL_GetTicks(); } ! myRoot->getChild("OSD/Altimeter")->setText(fps); /* --- 281,285 ---- last_time_pulse = SDL_GetTicks(); } ! myRoot->getChild("OSD/Satellites")->setText(fps); /* *************** *** 692,699 **** static void vehicle_callback_handler( struct navit *nav, struct vehicle *v){ - double speed=*vehicle_speed_get(v); char buffer [50]; sprintf (buffer, "%02.02f km/h", speed); myRoot->getChild("OSD/SpeedoMeter")->setText(buffer); } --- 711,722 ---- static void vehicle_callback_handler( struct navit *nav, struct vehicle *v){ char buffer [50]; + double speed=*vehicle_speed_get(v); sprintf (buffer, "%02.02f km/h", speed); myRoot->getChild("OSD/SpeedoMeter")->setText(buffer); + + double height=*vehicle_height_get(v); + sprintf (buffer, "%.0f m", height); + myRoot->getChild("OSD/Altimeter")->setText(buffer); } |
|
From: KaZeR <ka...@us...> - 2007-09-03 16:06:53
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31774 Modified Files: vehicle.c vehicle.h Log Message: Added a binding to get the vehicle's height Index: vehicle.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** vehicle.c 21 Jul 2007 08:35:05 -0000 1.17 --- vehicle.c 3 Sep 2007 16:06:44 -0000 1.18 *************** *** 113,116 **** --- 113,121 ---- double * + vehicle_height_get(struct vehicle *this) + { + return &this->height; + } + double * vehicle_dir_get(struct vehicle *this) { Index: vehicle.h =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** vehicle.h 3 Sep 2007 13:06:45 -0000 1.10 --- vehicle.h 3 Sep 2007 16:06:44 -0000 1.11 *************** *** 10,13 **** --- 10,14 ---- struct coord *vehicle_pos_get(struct vehicle *this_); double *vehicle_speed_get(struct vehicle *this_); + double *vehicle_height_get(struct vehicle *this_); double *vehicle_dir_get(struct vehicle *this_); void vehicle_set_position(struct vehicle *this_, struct coord *pos); |
|
From: KaZeR <ka...@us...> - 2007-09-03 15:06:35
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26137/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Fixed the variable name (sdl_skin -> skin) Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** gui_sdl_window.cpp 3 Sep 2007 13:05:31 -0000 1.12 --- gui_sdl_window.cpp 3 Sep 2007 13:12:02 -0000 1.13 *************** *** 718,722 **** init_sdlgui(data->u.str); } else { ! g_warning("Warning, no sdl_skin set in navit. Using default one"); init_sdlgui("navit.layout"); } --- 718,722 ---- init_sdlgui(data->u.str); } else { ! g_warning("Warning, no skin set for <sdl> in navit.xml. Using default one"); init_sdlgui("navit.layout"); } |
|
From: Horwitz <ho...@us...> - 2007-09-03 14:10:34
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7572 Modified Files: graphics.h navit.h vehicle.h xmlconfig.c Log Message: Fix some warnings Index: graphics.h =================================================================== RCS file: /cvsroot/navit/navit/src/graphics.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** graphics.h 28 Aug 2007 17:31:07 -0000 1.7 --- graphics.h 3 Sep 2007 07:43:14 -0000 1.8 *************** *** 97,100 **** --- 97,101 ---- struct transformation; struct graphics *graphics_new(const char *type, struct attr **attrs); + struct graphics * graphics_overlay_new(struct graphics *parent, struct point *p, int w, int h); void graphics_init(struct graphics *this_); void *graphics_get_data(struct graphics *this_, char *type); *************** *** 112,115 **** --- 113,117 ---- void graphics_draw_lines(struct graphics *this_, struct graphics_gc *gc, struct point *p, int count); void graphics_draw_circle(struct graphics *this_, struct graphics_gc *gc, struct point *p, int r); + void graphics_draw_rectangle(struct graphics *this_, struct graphics_gc *gc, struct point *p, int w, int h); void display_add(struct displaylist *displaylist, struct item *item, int count, struct point *pnt, char *label); int graphics_ready(struct graphics *this_); Index: vehicle.h =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** vehicle.h 1 Sep 2007 16:21:27 -0000 1.8 --- vehicle.h 3 Sep 2007 07:43:14 -0000 1.9 *************** *** 18,20 **** #ifdef __cplusplus } ! #endif \ No newline at end of file --- 18,21 ---- #ifdef __cplusplus } ! #endif ! Index: navit.h =================================================================== RCS file: /cvsroot/navit/navit/src/navit.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** navit.h 28 Aug 2007 17:31:11 -0000 1.14 --- navit.h 3 Sep 2007 07:43:14 -0000 1.15 *************** *** 35,38 **** --- 35,39 ---- void navit_set_gui(struct navit *this_, struct gui *gui); void navit_set_graphics(struct navit *this_, struct graphics *gra); + struct graphics * navit_get_graphics(struct navit *this_); void navit_set_destination(struct navit *this_, struct coord *c, char *description); void navit_add_bookmark(struct navit *this_, struct coord *c, char *description); *************** *** 63,66 **** --- 64,69 ---- void navit_add_vehicle_cb(struct navit *this_, struct callback *cb); void navit_remove_vehicle_cb(struct navit *this_, struct callback *cb); + void navit_add_init_cb(struct navit *this_, struct callback *cb); + void navit_remove_init_cb(struct navit *this_, struct callback *cb); void navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv); void navit_tracking_add(struct navit *this_, struct tracking *tracking); Index: xmlconfig.c =================================================================== RCS file: /cvsroot/navit/navit/src/xmlconfig.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** xmlconfig.c 29 Aug 2007 18:32:14 -0000 1.15 --- xmlconfig.c 3 Sep 2007 07:43:15 -0000 1.16 *************** *** 278,282 **** const char *value=find_attribute(state, "distance", 0); const char *type=find_attribute(state, "type", 1); ! char *tok,*str,*type_str,*saveptr; if (! name || !type) return 0; --- 278,282 ---- const char *value=find_attribute(state, "distance", 0); const char *type=find_attribute(state, "type", 1); ! char *tok,*str,*type_str,*saveptr=NULL; if (! name || !type) return 0; *************** *** 322,326 **** int v; enum item_type itype; ! char *saveptr, *tok, *type_str, *str; type=find_attribute(state, "type", 1); --- 322,326 ---- int v; enum item_type itype; ! char *saveptr=NULL, *tok, *type_str, *str; type=find_attribute(state, "type", 1); *************** *** 372,376 **** int i; enum item_type itype; ! char *saveptr, *tok, *type_str, *str; type=find_attribute(state, "type", 1); --- 372,376 ---- int i; enum item_type itype; ! char *saveptr=NULL, *tok, *type_str, *str; type=find_attribute(state, "type", 1); *************** *** 458,462 **** int min, max; enum item_type itype; ! char *saveptr, *tok, *type_str, *str; if (! type) --- 458,462 ---- int min, max; enum item_type itype; ! char *saveptr=NULL, *tok, *type_str, *str; if (! type) |
|
From: KaZeR <ka...@us...> - 2007-09-03 13:44:57
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12585 Modified Files: gui_sdl_window.cpp Log Message: Fixed SDL scheme loading Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** gui_sdl_window.cpp 3 Sep 2007 13:12:02 -0000 1.13 --- gui_sdl_window.cpp 3 Sep 2007 13:44:56 -0000 1.14 *************** *** 585,589 **** CEGUI::ScriptModule::setDefaultResourceGroup("lua_scripts"); ! CEGUI::SchemeManager::getSingleton().loadScheme("TaharezLook.scheme"); CEGUI::FontManager::getSingleton().createFont("DejaVuSans-10.font"); --- 585,593 ---- CEGUI::ScriptModule::setDefaultResourceGroup("lua_scripts"); ! char buffer [50]; ! sprintf (buffer, "%s.scheme", skin_layout); ! dbg(1,"Loading scheme : %s\n",buffer); ! ! CEGUI::SchemeManager::getSingleton().loadScheme(buffer); CEGUI::FontManager::getSingleton().createFont("DejaVuSans-10.font"); *************** *** 594,600 **** CEGUI::WindowManager& wmgr = CEGUI::WindowManager::getSingleton(); ! dbg(1,"Loading layout : %s\n",skin_layout); ! myRoot = CEGUI::WindowManager::getSingleton().loadWindowLayout(skin_layout); CEGUI::System::getSingleton().setGUISheet(myRoot); --- 598,606 ---- CEGUI::WindowManager& wmgr = CEGUI::WindowManager::getSingleton(); ! dbg(1,"Loading layout : %s\n",buffer); ! sprintf (buffer, "%s.layout", skin_layout); ! ! myRoot = CEGUI::WindowManager::getSingleton().loadWindowLayout(buffer); CEGUI::System::getSingleton().setGUISheet(myRoot); *************** *** 719,723 **** } else { g_warning("Warning, no skin set for <sdl> in navit.xml. Using default one"); ! init_sdlgui("navit.layout"); } dbg(1,"End SDL init\n"); --- 725,729 ---- } else { g_warning("Warning, no skin set for <sdl> in navit.xml. Using default one"); ! init_sdlgui("TaharezLook"); } dbg(1,"End SDL init\n"); |
|
From: KaZeR <ka...@us...> - 2007-09-03 13:06:47
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21823 Modified Files: vehicle.h Log Message: Fixed little typo Index: vehicle.h =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** vehicle.h 3 Sep 2007 07:43:14 -0000 1.9 --- vehicle.h 3 Sep 2007 13:06:45 -0000 1.10 *************** *** 1,5 **** #ifdef __cplusplus extern "C" { ! #endif/* prototypes */ enum projection; struct callback; --- 1,6 ---- #ifdef __cplusplus extern "C" { ! #endif ! /* prototypes */ enum projection; struct callback; |
|
From: KaZeR <ka...@us...> - 2007-09-03 13:05:38
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20976/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Added a skin option to sdl gui Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gui_sdl_window.cpp 30 Aug 2007 16:24:56 -0000 1.11 --- gui_sdl_window.cpp 3 Sep 2007 13:05:31 -0000 1.12 *************** *** 19,22 **** --- 19,23 ---- #include "navigation.h" #include "debug.h" + #include "attr.h" #include "CEGUI.h" *************** *** 477,481 **** } ! static void init_sdlgui(void) { SDL_Surface * screen; --- 478,482 ---- } ! static void init_sdlgui(char * skin_layout) { SDL_Surface * screen; *************** *** 593,597 **** CEGUI::WindowManager& wmgr = CEGUI::WindowManager::getSingleton(); ! myRoot = CEGUI::WindowManager::getSingleton().loadWindowLayout("navit.layout"); CEGUI::System::getSingleton().setGUISheet(myRoot); --- 594,600 ---- CEGUI::WindowManager& wmgr = CEGUI::WindowManager::getSingleton(); ! dbg(1,"Loading layout : %s\n",skin_layout); ! ! myRoot = CEGUI::WindowManager::getSingleton().loadWindowLayout(skin_layout); CEGUI::System::getSingleton().setGUISheet(myRoot); *************** *** 710,714 **** this_=g_new0(struct gui_priv, 1); ! init_sdlgui(); dbg(1,"End SDL init\n"); --- 713,724 ---- this_=g_new0(struct gui_priv, 1); ! ! struct attr *data=attr_search(attrs, NULL, attr_skin); ! if(data){ ! init_sdlgui(data->u.str); ! } else { ! g_warning("Warning, no sdl_skin set in navit. Using default one"); ! init_sdlgui("navit.layout"); ! } dbg(1,"End SDL init\n"); |
|
From: KaZeR <ka...@us...> - 2007-09-03 13:05:38
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20976 Modified Files: attr.h attr_def.h Log Message: Added a skin option to sdl gui Index: attr.h =================================================================== RCS file: /cvsroot/navit/navit/src/attr.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** attr.h 28 Aug 2007 17:31:05 -0000 1.6 --- attr.h 3 Sep 2007 13:05:30 -0000 1.7 *************** *** 1,2 **** --- 1,5 ---- + #ifdef __cplusplus + extern "C" { + #endif #ifndef ATTR_H #define ATTR_H *************** *** 32,33 **** --- 35,39 ---- /* end of prototypes */ #endif + #ifdef __cplusplus + } + #endif Index: attr_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/attr_def.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** attr_def.h 29 Aug 2007 18:32:13 -0000 1.5 --- attr_def.h 3 Sep 2007 13:05:30 -0000 1.6 *************** *** 1,2 **** --- 1,4 ---- + /* prototypes */ + /* common */ ATTR2(none,0x00000000) *************** *** 22,25 **** --- 24,28 ---- ATTR2(type_string_begin,0x00030000) + ATTR(skin) ATTR(label) ATTR(data) |
|
From: Horwitz <ho...@us...> - 2007-09-03 09:15:49
|
Update of /cvsroot/navit/navit/src/osd/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7572/osd/core Modified Files: osd_core.c Log Message: Fix some warnings Index: osd_core.c =================================================================== RCS file: /cvsroot/navit/navit/src/osd/core/osd_core.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** osd_core.c 29 Aug 2007 18:32:16 -0000 1.1 --- osd_core.c 3 Sep 2007 07:43:16 -0000 1.2 *************** *** 13,16 **** --- 13,17 ---- #include "callback.h" #include "color.h" + #include "vehicle.h" struct compass { *************** *** 139,143 **** } ! struct osd_priv * osd_compass_new(struct navit *nav, struct osd_methods *meth, struct attr **attrs) { --- 140,144 ---- } ! static struct osd_priv * osd_compass_new(struct navit *nav, struct osd_methods *meth, struct attr **attrs) { |
|
From: KaZeR <ka...@us...> - 2007-09-01 18:29:27
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/looknfeel In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4500/looknfeel Modified Files: Mineque.looknfeel Log Message: Worked on Mineque's GUI Index: Mineque.looknfeel =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/looknfeel/Mineque.looknfeel,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Mineque.looknfeel 1 Sep 2007 15:01:47 -0000 1.1 --- Mineque.looknfeel 1 Sep 2007 18:29:17 -0000 1.2 *************** *** 102,106 **** <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim> </Area> ! <Image imageset="TaharezLook" image="RightPanel" /> <VertFormat type="Stretched" /> <HorzFormat type="Tiled" /> --- 102,106 ---- <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim> </Area> ! <Image imageset="Mineque-Black" image="RightPanel" /> <VertFormat type="Stretched" /> [...4976 lines suppressed...] ! </Section> ! </Layer> ! </StateImagery> ! <StateImagery name="Disabled"> ! <Layer> ! <Section section="normal"> ! <Colours topLeft="FF7F7F7F" topRight="FF7F7F7F" bottomLeft="FF7F7F7F" bottomRight="FF7F7F7F" /> ! </Section> ! <Section section="label"> ! <ColourProperty name="DisabledTextColour" /> ! </Section> ! </Layer> ! </StateImagery> </WidgetLook> + + </Falagard> |
|
From: KaZeR <ka...@us...> - 2007-09-01 18:29:27
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/imagesets In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4500/imagesets Modified Files: navit-skin-black-imageset.tga Log Message: Worked on Mineque's GUI Index: navit-skin-black-imageset.tga =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/imagesets/navit-skin-black-imageset.tga,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsNgZB5R and /tmp/cvsBHQ33y differ |
|
From: KaZeR <ka...@us...> - 2007-09-01 18:29:27
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/schemes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4500/schemes Modified Files: Mineque.scheme Log Message: Worked on Mineque's GUI Index: Mineque.scheme =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/schemes/Mineque.scheme,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Mineque.scheme 1 Sep 2007 15:01:47 -0000 1.1 --- Mineque.scheme 1 Sep 2007 18:29:17 -0000 1.2 *************** *** 3,14 **** <Imageset Name="TaharezLook" Filename="TaharezLook.imageset" /> <Imageset Name="Mineque-Black" Filename="Mineque-Black.imageset" /> - <LookNFeel Filename="TaharezLook.looknfeel" /> <LookNFeel Filename="Mineque.looknfeel" /> <WindowRendererSet Filename="CEGUIFalagardWRBase" /> <FalagardMapping WindowType="NavitGrey/RightPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/RightPanel" /> <FalagardMapping WindowType="NavitGrey/TopPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/TopPanel" /> <FalagardMapping WindowType="NavitGrey/BottomStreetPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/BottomStreetPanel" /> <FalagardMapping WindowType="NavitGrey/ViewModeSwitchButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ViewModeSwitchButton" /> --- 3,21 ---- <Imageset Name="TaharezLook" Filename="TaharezLook.imageset" /> <Imageset Name="Mineque-Black" Filename="Mineque-Black.imageset" /> <LookNFeel Filename="Mineque.looknfeel" /> + <LookNFeel Filename="TaharezLook.looknfeel" /> <WindowRendererSet Filename="CEGUIFalagardWRBase" /> + <FalagardMapping WindowType="NavitGrey/RightPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/RightPanel" /> <FalagardMapping WindowType="NavitGrey/TopPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/TopPanel" /> <FalagardMapping WindowType="NavitGrey/BottomStreetPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/BottomStreetPanel" /> + <FalagardMapping WindowType="NavitGrey/ZoomInButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ZoomInButton" /> + <FalagardMapping WindowType="NavitGrey/ZoomOutButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ZoomOutButton" /> + <FalagardMapping WindowType="NavitGrey/SpeakerOffButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/SpeakerOffButton" /> + <FalagardMapping WindowType="NavitGrey/RouteButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/RouteButton" /> + <FalagardMapping WindowType="NavitGrey/QuitButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/QuitButton" /> + <FalagardMapping WindowType="NavitGrey/ModeSwitchButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ModeSwitchButton" /> <FalagardMapping WindowType="NavitGrey/ViewModeSwitchButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ViewModeSwitchButton" /> |
|
From: KaZeR <ka...@us...> - 2007-09-01 18:29:27
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4500/layouts Modified Files: Mineque.layout Log Message: Worked on Mineque's GUI Index: Mineque.layout =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/Mineque.layout,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Mineque.layout 1 Sep 2007 15:01:47 -0000 1.1 --- Mineque.layout 1 Sep 2007 18:29:16 -0000 1.2 *************** *** 3,6 **** --- 3,10 ---- <GUILayout > <Window Type="DefaultWindow" Name="Navit" > + <Property Name="InheritsAlpha" Value="False" /> + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> + <Window Type="NavitGrey/RightPanel" Name="RightPanel" > <Property Name="TitlebarEnabled" Value="False" /> *************** *** 14,19 **** <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,550},{0,1},{0,800},{0,50}}" /> ! </Window> ! <Window Type="NavitGrey/ViewModeSwitchButton" Name="ViewModeSwitchButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,502},{0,702},{0,98},{0,98}}" /> --- 18,24 ---- <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,550},{0,1},{0,800},{0,50}}" /> ! </Window> ! <!-- <Window Type="NavitGrey/ViewModeSwitchButton" Name="OSD/ViewMode" > --> ! <Window Type="TaharezLook/Button" Name="OSD/ViewMode" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,502},{0,702},{0,98},{0,98}}" /> *************** *** 21,25 **** <Window Type="NavitGrey/ZoomInButton" Name="ZoomInButton" > <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,708},{0,445},{0,92},{0,62}}" /> </Window> <Window Type="NavitGrey/ZoomOutButton" Name="ZoomOuButton" > --- 26,30 ---- <Window Type="NavitGrey/ZoomInButton" Name="ZoomInButton" > <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,707},{0,476},{0,800},{0,536}}" /> </Window> <Window Type="NavitGrey/ZoomOutButton" Name="ZoomOuButton" > *************** *** 27,39 **** <Property Name="UnifiedAreaRect" Value="{{0,646},{0,507},{0,62},{0,93}}" /> </Window> ! <Window Type="NavitGrey/SpeakerOffButton" Name="SpeakerOffButton" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,28},{0,36}}" /> ! </Window> <Window Type="NavitGrey/SpeakerOnButton" Name="SpeakerOnButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,28},{0,36}}" /> </Window> ! <Window Type="NavitGrey/QuitButton" Name="QuitButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,29},{0,30}}" /> --- 32,42 ---- <Property Name="UnifiedAreaRect" Value="{{0,646},{0,507},{0,62},{0,93}}" /> </Window> ! <!-- <Window Type="NavitGrey/SpeakerOnButton" Name="SpeakerOnButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,28},{0,36}}" /> </Window> ! --> ! <Window Type="NavitGrey/QuitButton" Name="OSD/Quit" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,29},{0,30}}" /> *************** *** 43,47 **** <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,36},{0,36}}" /> </Window> ! <Window Type="NavitGrey/OptionsButton" Name="OptionsButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,37},{0,25}}" /> --- 46,50 ---- <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,36},{0,36}}" /> </Window> ! <!-- <Window Type="NavitGrey/OptionsButton" Name="OptionsButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,37},{0,25}}" /> *************** *** 78,88 **** <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,34},{0,39}}" /> ! </Window> ! </Window> ! <Property Name="InheritsAlpha" Value="False" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> <Window Type="TaharezLook/FrameWindow" Name="DestinationWindow" > <Property Name="Text" Value="Choose your destination" /> --- 81,94 ---- <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,34},{0,39}}" /> ! </Window>--> + + <Window Type="NavitGrey/QuitButton" Name="SpeakerOffButton" > + <Property Name="TitlebarEnabled" Value="False" /> + <Property Name="UnifiedAreaRect" Value="{{0,707},{0,476},{0,799},{0,536}}" /> + </Window> + ! <Window Type="TaharezLook/FrameWindow" Name="DestinationWindow" > <Property Name="Text" Value="Choose your destination" /> *************** *** 147,151 **** </Window> ! <Window Type="TaharezLook/StaticText" Name="Navit/Routing/Tips" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="Text" Value="No destination set." /> --- 153,158 ---- </Window> ! ! <Window Type="TaharezLook/StaticText" Name="Navit/Routing/Tips" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="Text" Value="No destination set." /> *************** *** 221,231 **** </Window> ! <Window Type="NavitGrey/ModeSwitchButton" Name="OSD/ViewMode" > ! <Property Name="Text" Value="3D" /> --> <Property Name="AlwaysOnTop" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,708},{0,508},{0,799},{0,599}}" /> </Window> <Window Type="NavitGrey/QuitButton" Name="OSD/Quit" > <Property Name="AlwaysOnTop" Value="True" /> --- 228,239 ---- </Window> ! <!-- <Window Type="NavitGrey/ModeSwitchButton" Name="OSD/ViewMode" > ! <Property Name="Text" Value="3D" /> <Property Name="AlwaysOnTop" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,708},{0,508},{0,799},{0,599}}" /> </Window> + <Window Type="NavitGrey/QuitButton" Name="OSD/Quit" > <Property Name="AlwaysOnTop" Value="True" /> *************** *** 233,236 **** --- 241,245 ---- <Property Name="UnifiedAreaRect" Value="{{0,10},{0,10},{0,38},{0,40}}" /> </Window> + --> <Window Type="TaharezLook/FrameWindow" Name="Navit/ProgressWindow" > <Property Name="Text" Value="Calculating the route" /> *************** *** 278,281 **** --- 287,292 ---- </Window> </Window> + <!-- <Window Type="NavitGrey/SpeakerOffButton" Name="SpeakerOffButton" > --> </Window> + </GUILayout> |
|
From: KaZeR <ka...@us...> - 2007-09-01 16:21:30
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13662 Modified Files: vehicle.h Log Message: Made vehicle.h c++ compliant Index: vehicle.h =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** vehicle.h 16 Jul 2007 22:25:39 -0000 1.7 --- vehicle.h 1 Sep 2007 16:21:27 -0000 1.8 *************** *** 1,15 **** ! /* prototypes */ enum projection; struct callback; struct coord; struct vehicle; ! enum projection vehicle_projection(struct vehicle *this); ! struct coord *vehicle_pos_get(struct vehicle *this); ! double *vehicle_speed_get(struct vehicle *this); ! double *vehicle_dir_get(struct vehicle *this); ! void vehicle_set_position(struct vehicle *this, struct coord *pos); struct vehicle *vehicle_new(const char *url); ! void vehicle_callback_add(struct vehicle *this, struct callback *cb); ! void vehicle_callback_remove(struct vehicle *this, struct callback *cb); ! void vehicle_destroy(struct vehicle *this); /* end of prototypes */ --- 1,20 ---- ! #ifdef __cplusplus ! extern "C" { ! #endif/* prototypes */ enum projection; struct callback; struct coord; struct vehicle; ! enum projection vehicle_projection(struct vehicle *this_); ! struct coord *vehicle_pos_get(struct vehicle *this_); ! double *vehicle_speed_get(struct vehicle *this_); ! double *vehicle_dir_get(struct vehicle *this_); ! void vehicle_set_position(struct vehicle *this_, struct coord *pos); struct vehicle *vehicle_new(const char *url); ! void vehicle_callback_add(struct vehicle *this_, struct callback *cb); ! void vehicle_callback_remove(struct vehicle *this_, struct callback *cb); ! void vehicle_destroy(struct vehicle *this_); /* end of prototypes */ + #ifdef __cplusplus + } + #endif \ No newline at end of file |
|
From: KaZeR <ka...@us...> - 2007-09-01 15:01:49
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11816/layouts Added Files: Mineque.layout Log Message: Working on Mineque's GUI design --- NEW FILE: Mineque.layout --- <?xml version="1.0" encoding="UTF-8"?> <GUILayout > <Window Type="DefaultWindow" Name="Navit" > <Window Type="NavitGrey/RightPanel" Name="RightPanel" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,635},{0,1},{0,165},{0,600}}" /> </Window> <Window Type="NavitGrey/TopPanel" Name="TopPanel" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,1},{0,1},{0,800},{0,131}}" /> </Window> <Window Type="NavitGrey/BottomStreetPanel" Name="BottomStreetPanel" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,550},{0,1},{0,800},{0,50}}" /> </Window> <Window Type="NavitGrey/ViewModeSwitchButton" Name="ViewModeSwitchButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,502},{0,702},{0,98},{0,98}}" /> </Window> <Window Type="NavitGrey/ZoomInButton" Name="ZoomInButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,708},{0,445},{0,92},{0,62}}" /> </Window> <Window Type="NavitGrey/ZoomOutButton" Name="ZoomOuButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,646},{0,507},{0,62},{0,93}}" /> </Window> <Window Type="NavitGrey/SpeakerOffButton" Name="SpeakerOffButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,28},{0,36}}" /> </Window> <Window Type="NavitGrey/SpeakerOnButton" Name="SpeakerOnButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,28},{0,36}}" /> </Window> <Window Type="NavitGrey/QuitButton" Name="QuitButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,29},{0,30}}" /> </Window> <Window Type="NavitGrey/RouteButton" Name="RouteButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,36},{0,36}}" /> </Window> <Window Type="NavitGrey/OptionsButton" Name="OptionsButton" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,37},{0,25}}" /> </Window> <Window Type="NavitGrey/SateliteImage" Name="SateliteImage" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,30},{0,38}}" /> </Window> <Window Type="NavitGrey/SateliteStrenghBarOn" Name="SateliteStrenghBarOn" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,17},{0,32}}" /> </Window> <Window Type="NavitGrey/SateliteStrenghBarOff" Name="SateliteStrenghBarOff" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,17},{0,32}}" /> </Window> <Window Type="NavitGrey/NavitAboutButton" Name="NavitAboutButton"> <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,82},{0,25}}" /> </Window> <Window Type="NavitGrey/ArrowLeft" Name="ArrowLeft" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,39},{0,34}}" /> </Window> <Window Type="NavitGrey/ArrowTop" Name="ArrowTop" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,34},{0,39}}" /> </Window> <Window Type="NavitGrey/ArrowRight" Name="ArrowRight" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,39},{0,34}}" /> </Window> <Window Type="NavitGrey/ArrowDown" Name="ArrowDown" > <Property Name="TitlebarEnabled" Value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,34},{0,39}}" /> </Window> </Window> <Property Name="InheritsAlpha" Value="False" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> <Window Type="TaharezLook/FrameWindow" Name="DestinationWindow" > <Property Name="Text" Value="Choose your destination" /> <Property Name="Visible" Value="False" /> <Property Name="Alpha" Value="0.7" /> <Property Name="TitlebarEnabled" Value="True" /> <Property Name="UnifiedAreaRect" Value="{{0.001,0},{0.07,0},{0.8,0},{0.9,0}}" /> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Country" > <Property Name="Text" Value="Country :" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.05,0},{0.271871,0},{0.1,0}}" /> </Window> <Window Type="TaharezLook/Editbox" Name="DestinationWindow/CountryEditbox" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.9,0},{0.1,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Town" > <Property Name="Text" Value="Town : " /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.11,0},{0.275,0},{0.16,0}}" /> </Window> <Window Type="TaharezLook/Editbox" Name="DestinationWindow/TownEditbox" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.11,0},{0.9,0},{0.16,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Street" > <Property Name="Text" Value="Street : " /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.17,0},{0.275,0},{0.22,0}}" /> </Window> <Window Type="TaharezLook/Editbox" Name="DestinationWindow/StreetEditbox" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.17,0},{0.9,0},{0.22,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Label1" > <Property Name="Text" Value="Pick your choice :" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.23,0},{0.9,0},{0.28,0}}" /> </Window> <Window Type="TaharezLook/MultiColumnList" Name="DestinationWindow/Listbox" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.29,0},{0.945,0},{0.905842,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="DestinationWindow/KB" > <Property Name="Text" Value="Keyboard" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.54,0},{0.92,0},{0.70,0},{0.98,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="DestinationWindow/GO" > <Property Name="Text" Value="Go!" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.92,0},{0.97,0},{0.98,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_x" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.92,0},{0.12,0},{0.98,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_y" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.12,0},{0.92,0},{0.23,0},{0.98,0}}" /> </Window> </Window> <Window Type="TaharezLook/StaticText" Name="Navit/Routing/Tips" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="Text" Value="No destination set." /> <Property Name="Alpha" Value="0.7" /> <Property Name="Visible" Value="False" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.88,0},{0.77,0},{0.98,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="Navit/Routing/CurrentRoadName" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="Alpha" Value="0.7" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.001,0},{0.77,0},{0.07,0}}" /> </Window> <Window Type="NavitGrey/RouteButton" Name="OSD/DestinationButton" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,50},{0,10},{0,78},{0,40}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="OSD/SpeedoMeter" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.06,0},{0.99,0},{0.11,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="OSD/Altimeter" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.11,0},{0.99,0},{0.16,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="OSD/Satellites" > <Property Name="Font" Value="DejaVuSans-12" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.16,0},{0.99,0},{0.21,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="OSD/Coords" > <Property Name="Font" Value="DejaVuSans-12" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.21,0},{0.99,0},{0.26,0}}" /> </Window> <Window Type="NavitGrey/ZoomOutButton" Name="OSD/ZoomOut" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,670},{0,514},{0,734},{0,600}}" /> </Window> <Window Type="NavitGrey/ZoomInButton" Name="OSD/ZoomIn" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,707},{0,476},{0,800},{0,536}}" /> </Window> <Window Type="TaharezLook/Button" Name="OSD/RoadbookButton" > <Property Name="Text" Value="RoadBook" /> <Property Name="Visible" Value="False" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.36,0},{0.99,0},{0.41,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="OSD/ETA" > <Property Name="Font" Value="DejaVuSans-12" /> <Property Name="Visible" Value="False" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.41,0},{0.99,0},{0.51,0}}" /> </Window> <Window Type="TaharezLook/LargeVerticalScrollbar" Name="OSD/Scrollbar1" > <Property Name="PageSize" Value="0" /> <Property Name="OverlapSize" Value="0" /> <Property Name="DocumentSize" Value="2000" /> <Property Name="ScrollPosition" Value="0" /> <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" /> <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.10,0},{0.53,0},{0.15,0},{0.85,0}}" /> </Window> <Window Type="NavitGrey/ModeSwitchButton" Name="OSD/ViewMode" > <Property Name="Text" Value="3D" /> --> <Property Name="AlwaysOnTop" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,708},{0,508},{0,799},{0,599}}" /> </Window> <Window Type="NavitGrey/QuitButton" Name="OSD/Quit" > <Property Name="AlwaysOnTop" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,10},{0,10},{0,38},{0,40}}" /> </Window> <Window Type="TaharezLook/FrameWindow" Name="Navit/ProgressWindow" > <Property Name="Text" Value="Calculating the route" /> <Property Name="Visible" Value="False" /> <Property Name="TitlebarFont" Value="Commonwealth-10" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="TitlebarEnabled" Value="True" /> <Property Name="UnifiedAreaRect" Value="{{0.137865,0},{0.775,0},{0.729668,0},{0.888333,0}}" /> <Window Type="TaharezLook/ProgressBar" Name="Navit/ProgressWindow/Bar" > <Property Name="StepSize" Value="0.01" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="CurrentProgress" Value="0" /> <Property Name="UnifiedAreaRect" Value="{{0.0920548,0},{0.513128,0},{0.872384,0},{0.921541,0}}" /> </Window> </Window> <Window Type="TaharezLook/FrameWindow" Name="Navit/RoadBook" > <Property Name="Alpha" Value="0.85" /> <Property Name="Visible" Value="False" /> <Property Name="AlwaysOnTop" Value="True" /> <Property Name="Text" Value="Road Book" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.02,0},{0.99,0},{0.87,0}}" /> <Window Type="TaharezLook/MultiColumnList" Name="Roadbook" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.05,0},{0.99,0},{0.93,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="RoadBook/ETA" > <Property Name="Font" Value="DejaVuSans-12" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.94,0},{0.7,0},{0.99,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="OSD/RoadbookButton2" > <Property Name="Text" Value="Close" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.94,0},{0.99,0},{0.99,0}}" /> </Window> </Window> <Window Type="TaharezLook/FrameWindow" Name="Navit/Keyboard" > <Property Name="Alpha" Value="0.85" /> <Property Name="Visible" Value="False" /> <Property Name="AlwaysOnTop" Value="True" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.5,0},{0.99,0},{0.87,0}}" /> <Window Type="TaharezLook/StaticText" Name="Navit/Keyboard/Input" > <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.80,0},{0.7,0},{0.95,0}}" /> </Window> </Window> </Window> </GUILayout> |
|
From: KaZeR <ka...@us...> - 2007-09-01 15:01:49
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/schemes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11816/schemes Added Files: Mineque.scheme Log Message: Working on Mineque's GUI design --- NEW FILE: Mineque.scheme --- <?xml version="1.0" ?> <GUIScheme Name="TaharezLook"> <Imageset Name="TaharezLook" Filename="TaharezLook.imageset" /> <Imageset Name="Mineque-Black" Filename="Mineque-Black.imageset" /> <LookNFeel Filename="TaharezLook.looknfeel" /> <LookNFeel Filename="Mineque.looknfeel" /> <WindowRendererSet Filename="CEGUIFalagardWRBase" /> <FalagardMapping WindowType="NavitGrey/RightPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/RightPanel" /> <FalagardMapping WindowType="NavitGrey/TopPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/TopPanel" /> <FalagardMapping WindowType="NavitGrey/BottomStreetPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/BottomStreetPanel" /> <FalagardMapping WindowType="NavitGrey/ViewModeSwitchButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ViewModeSwitchButton" /> <FalagardMapping WindowType="TaharezLook/Button" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="TaharezLook/Button" /> <FalagardMapping WindowType="TaharezLook/Checkbox" TargetType="CEGUI/Checkbox" Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/Checkbox" /> <FalagardMapping WindowType="TaharezLook/ImageButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="TaharezLook/ImageButton" /> <FalagardMapping WindowType="TaharezLook/RadioButton" TargetType="CEGUI/RadioButton" Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/RadioButton" /> <FalagardMapping WindowType="TaharezLook/FrameWindow" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="TaharezLook/FrameWindow" /> <FalagardMapping WindowType="TaharezLook/Titlebar" TargetType="CEGUI/Titlebar" Renderer="Falagard/Titlebar" LookNFeel="TaharezLook/Titlebar" /> <FalagardMapping WindowType="TaharezLook/SystemButton" TargetType="CEGUI/PushButton" Renderer="Falagard/SystemButton" LookNFeel="TaharezLook/Button" /> <FalagardMapping WindowType="TaharezLook/Editbox" TargetType="CEGUI/Editbox" Renderer="Falagard/Editbox" LookNFeel="TaharezLook/Editbox" /> <FalagardMapping WindowType="TaharezLook/MultiLineEditbox" TargetType="CEGUI/MultiLineEditbox" Renderer="Falagard/MultiLineEditbox" LookNFeel="TaharezLook/MultiLineEditbox" /> <FalagardMapping WindowType="TaharezLook/Menubar" TargetType="CEGUI/Menubar" Renderer="Falagard/Menubar" LookNFeel="TaharezLook/Menubar" /> <FalagardMapping WindowType="TaharezLook/PopupMenu" TargetType="CEGUI/PopupMenu" Renderer="Falagard/PopupMenu" LookNFeel="TaharezLook/PopupMenu" /> <FalagardMapping WindowType="TaharezLook/MenuItem" TargetType="CEGUI/MenuItem" Renderer="Falagard/MenuItem" LookNFeel="TaharezLook/MenuItem" /> <FalagardMapping WindowType="TaharezLook/AlternateProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/AltProgressBar" /> <FalagardMapping WindowType="TaharezLook/ProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/ProgressBar" /> <FalagardMapping WindowType="TaharezLook/VUMeter" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/VUMeter" /> <FalagardMapping WindowType="TaharezLook/VerticalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/VerticalScrollbar" /> <FalagardMapping WindowType="TaharezLook/HorizontalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/HorizontalScrollbar" /> <FalagardMapping WindowType="TaharezLook/VerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/VerticalScrollbarThumb" /> <FalagardMapping WindowType="TaharezLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/HorizontalScrollbarThumb" /> <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/LargeVerticalScrollbar" /> <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" /> <FalagardMapping WindowType="TaharezLook/TabButton" TargetType="CEGUI/TabButton" Renderer="Falagard/TabButton" LookNFeel="TaharezLook/TabButton" /> <FalagardMapping WindowType="TaharezLook/TabControl" TargetType="CEGUI/TabControl" Renderer="Falagard/TabControl" LookNFeel="TaharezLook/TabControl" /> <FalagardMapping WindowType="TaharezLook/TabContentPane" TargetType="DefaultWindow" Renderer="Falagard/Default" LookNFeel="TaharezLook/TabContentPane" /> <FalagardMapping WindowType="TaharezLook/TabButtonPane" TargetType="DefaultWindow" Renderer="Falagard/Default" LookNFeel="TaharezLook/TabButtonPane" /> <FalagardMapping WindowType="TaharezLook/ComboDropList" TargetType="CEGUI/ComboDropList" Renderer="Falagard/Listbox" LookNFeel="TaharezLook/ComboDropList" /> <FalagardMapping WindowType="TaharezLook/ComboEditbox" TargetType="CEGUI/Editbox" Renderer="Falagard/Editbox" LookNFeel="TaharezLook/ComboEditbox" /> <FalagardMapping WindowType="TaharezLook/Combobox" TargetType="CEGUI/Combobox" Renderer="Falagard/Default" LookNFeel="TaharezLook/Combobox" /> <FalagardMapping WindowType="TaharezLook/Listbox" TargetType="CEGUI/Listbox" Renderer="Falagard/Listbox" LookNFeel="TaharezLook/Listbox" /> <FalagardMapping WindowType="TaharezLook/ListHeader" TargetType="CEGUI/ListHeader" Renderer="Falagard/ListHeader" LookNFeel="TaharezLook/ListHeader" /> <FalagardMapping WindowType="TaharezLook/ListHeaderSegment" TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="TaharezLook/ListHeaderSegment" /> <FalagardMapping WindowType="TaharezLook/MultiColumnList" TargetType="CEGUI/MultiColumnList" Renderer="Falagard/MultiColumnList" LookNFeel="TaharezLook/MultiColumnList" /> <FalagardMapping WindowType="TaharezLook/Slider" TargetType="CEGUI/Slider" Renderer="Falagard/Slider" LookNFeel="TaharezLook/Slider" /> <FalagardMapping WindowType="TaharezLook/SliderThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/SliderThumb" /> <FalagardMapping WindowType="TaharezLook/ScrollablePane" TargetType="CEGUI/ScrollablePane" Renderer="Falagard/ScrollablePane" LookNFeel="TaharezLook/ScrollablePane" /> <FalagardMapping WindowType="TaharezLook/Spinner" TargetType="CEGUI/Spinner" Renderer="Falagard/Default" LookNFeel="TaharezLook/Spinner" /> <FalagardMapping WindowType="TaharezLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="TaharezLook/Tooltip" /> <FalagardMapping WindowType="TaharezLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="TaharezLook/StaticImage" /> <FalagardMapping WindowType="TaharezLook/StaticText" TargetType="DefaultWindow" Renderer="Falagard/StaticText" LookNFeel="TaharezLook/StaticText" /> <FalagardMapping WindowType="TaharezLook/ItemListbox" TargetType="CEGUI/ItemListbox" Renderer="Falagard/ItemListbox" LookNFeel="TaharezLook/ItemListbox" /> <FalagardMapping WindowType="TaharezLook/ListboxItem" TargetType="CEGUI/ItemEntry" Renderer="Falagard/ItemEntry" LookNFeel="TaharezLook/ListboxItem" /> </GUIScheme> |
|
From: KaZeR <ka...@us...> - 2007-09-01 15:01:49
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/imagesets In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11816/imagesets Added Files: Mineque-Black.imageset navit-skin-black-imageset.tga Log Message: Working on Mineque's GUI design --- NEW FILE: Mineque-Black.imageset --- <?xml version="1.0" ?> <Imageset Name="Mineque-Black" Imagefile="navit-skin-black-imageset.tga" NativeHorzRes="800" NativeVertRes="730" AutoScaled="true"> <!-- Imagefile - file with all textures inside NativeHorzRes, NativeVertRes - image size in pixels Image Name - name of texture we will further use in layout and looknfeel files XPos, YPos - position (X,Y) of texture parts in image file it's count for "d" corner as below d____e | | |____| f g --> <!-- Round panel parts --> <Image Name="ZoomOutButton" XPos="0" YPos="260" Width="62" Height="93" /> <Image Name="ZoomInButton" XPos="0" YPos="360" Width="92" Height="62" /> <Image Name="ViewModeSwitchButton" XPos="0" YPos="153" Width="98" Height="98" /> <!-- Top panel parts --> <Image Name="QuitButton" XPos="0" YPos="450" Width="29" Height="30" /> <Image Name="RouteButton" XPos="35" YPos="450" Width="36" Height="36" /> <Image Name="OptionsButton" XPos="75" YPos="450" Width="37" Height="25" /> <Image Name="SpeakerOffButton" XPos="115" YPos="450" Width="28" Height="36" /> <Image Name="SpeakerOnButton" XPos="145" YPos="450" Width="28" Height="36" /> <Image Name="SateliteImage" XPos="230" YPos="450" Width="30" Height="38" /> <Image Name="SateliteStrenghBarOn" XPos="180" YPos="450" Width="17" Height="32" /> <Image Name="SateliteStrenghBarOff" XPos="200" YPos="450" Width="17" Height="32" /> <Image Name="TopPanel" XPos="0" YPos="660" Width="800" Height="131" /> <Image Name="NavitAboutButton" XPos="0" YPos="500" Width="82" Height="25" /> <!-- Right panel parts --> <Image Name="RightPanel" XPos="635" YPos="127" Width="165" Height="600" /> <!-- Navigation area --> <Image Name="ArrowLeft" XPos="258" YPos="450" Width="39" Height="34" /> <Image Name="ArrowTop" XPos="316" YPos="450" Width="34" Height="39" /> <Image Name="ArrowRight" XPos="435" YPos="450" Width="39" Height="34" /> <Image Name="ArrowDown" XPos="275" YPos="450" Width="34" Height="39" /> <!-- Bottom street panel part --> <Image Name="BottomStreetPanel" XPos="0" YPos="0" Width="800" Height="50" /> </Imageset> --- NEW FILE: navit-skin-black-imageset.tga --- (This appears to be a binary file; contents omitted.) |
|
From: KaZeR <ka...@us...> - 2007-09-01 15:01:49
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/looknfeel In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11816/looknfeel Added Files: Mineque.looknfeel Log Message: Working on Mineque's GUI design --- NEW FILE: Mineque.looknfeel --- <?xml version="1.0" ?> <Falagard> <WidgetLook name="NavitGrey/RightPanel"> <PropertyLinkDefinition name="CaptionColour" widget="__auto_titlebar__" targetProperty="CaptionColour" initialValue="FFFFFFFF" /> <Property name="NSSizingCursorImage" value="set:TaharezLook image:MouseNoSoCursor" /> <Property name="EWSizingCursorImage" value="set:TaharezLook image:MouseEsWeCursor" /> <Property name="NWSESizingCursorImage" value="set:TaharezLook image:MouseNwSeCursor" /> <Property name="NESWSizingCursorImage" value="set:TaharezLook image:MouseNeSwCursor" /> <NamedArea name="ClientNoTitleWithFrame"> <Area> <Dim type="LeftEdge" ><ImageDim imageset="TaharezLook" image="WindowTopLeft" dimension="Width" /></Dim> <Dim type="TopEdge" ><ImageDim imageset="TaharezLook" image="WindowTopEdge" dimension="Height" /></Dim> <Dim type="RightEdge" > <UnifiedDim scale="1" type="RightEdge"> <DimOperator op="Subtract"> <ImageDim imageset="TaharezLook" image="WindowTopRight" dimension="Width" /> </DimOperator> </UnifiedDim> [...4804 lines suppressed...] <StateImagery name="SelectedEnabled"> <Layer> <Section section="selection" /> <Section section="label"> <ColourProperty name="SelectedTextColour" /> </Section> </Layer> </StateImagery> <StateImagery name="SelectedDisabled"> <Layer> <Section section="selection" /> <Section section="label"> <ColourProperty name="SelectedTextColour" /> </Section> </Layer> </StateImagery> </WidgetLook> </Falagard> |
|
From: KaZeR <ka...@us...> - 2007-08-30 16:24:58
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2204 Modified Files: gui_sdl_window.cpp Log Message: Reenabled Speed-O-Meter, disabled update_roadbook(broken) Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gui_sdl_window.cpp 28 Aug 2007 17:31:20 -0000 1.10 --- gui_sdl_window.cpp 30 Aug 2007 16:24:56 -0000 1.11 *************** *** 7,10 **** --- 7,11 ---- #include "item.h" #include "navit.h" + #include "vehicle.h" #include "profile.h" #include "transform.h" *************** *** 21,25 **** #include "CEGUI.h" ! // This is for 3d fonts. Needs QuesoGLC. Could probably (and should) be moved to graphics instead // since fonts here are handled by CEGUI #include "GL/glc.h" --- 22,26 ---- #include "CEGUI.h" ! // FIXME This is for 3d fonts. Needs QuesoGLC. Could probably (and should) be moved to graphics instead // since fonts here are handled by CEGUI #include "GL/glc.h" *************** *** 91,94 **** --- 92,96 ---- sdl_update_roadbook(struct navigation *nav, void *data) { + /* using namespace CEGUI; extern Window* myRoot; *************** *** 136,140 **** mcl->setItem(itemListbox, 4, mcl->getRowCount()-1); ! */ ListboxTextItem* itemListbox = new ListboxTextItem(str); itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush"); --- 138,142 ---- mcl->setItem(itemListbox, 4, mcl->getRowCount()-1); ! */ /* ListboxTextItem* itemListbox = new ListboxTextItem(str); itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush"); *************** *** 143,146 **** --- 145,149 ---- } navigation_list_destroy(list); + */ } *************** *** 254,263 **** frames++; if(SDL_GetTicks()-last_time_pulse>1000){ ! sprintf(fps,"%i",frames); // /(SDL_GetTicks()/1000)); frames=0; last_time_pulse = SDL_GetTicks(); } ! ! myRoot->getChild("OSD/SpeedoMeter")->setText(fps); /* --- 257,265 ---- frames++; if(SDL_GetTicks()-last_time_pulse>1000){ ! sprintf(fps,"%i fps",frames); // /(SDL_GetTicks()/1000)); frames=0; last_time_pulse = SDL_GetTicks(); } ! myRoot->getChild("OSD/Altimeter")->setText(fps); /* *************** *** 680,683 **** --- 682,692 ---- } + static void vehicle_callback_handler( struct navit *nav, struct vehicle *v){ + double speed=*vehicle_speed_get(v); + char buffer [50]; + sprintf (buffer, "%02.02f km/h", speed); + myRoot->getChild("OSD/SpeedoMeter")->setText(buffer); + } + static struct gui_priv * gui_sdl_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs) *************** *** 704,719 **** dbg(1,"End SDL init\n"); ! /* ! this_->win = gtk_window_new(GTK_WINDOW_TOPLEVEL); ! this_->vbox = gtk_vbox_new(FALSE, 0); ! gtk_window_set_default_size(GTK_WINDOW(this_->win), w, h); ! gtk_window_set_title(GTK_WINDOW(this_->win), "Navit"); ! gtk_widget_realize(this_->win); ! gtk_container_add(GTK_CONTAINER(this_->win), this_->vbox); ! gtk_widget_show_all(this_->win); ! */ this_->nav=nav; - return this_; } --- 713,721 ---- dbg(1,"End SDL init\n"); ! //gui_sdl_window.cpp:710: error: invalid conversion from 'void (*)(vehicle*)' to 'void (*)()' ! struct callback *cb=callback_new_0(callback_cast(vehicle_callback_handler)); ! navit_add_vehicle_cb(nav,cb); this_->nav=nav; return this_; } |
|
From: Horwitz <ho...@us...> - 2007-08-29 21:56:42
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11423 Modified Files: navit.xml Log Message: Fix typo and increase inimal font size Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** navit.xml 29 Aug 2007 21:30:21 -0000 1.10 --- navit.xml 29 Aug 2007 21:56:05 -0000 1.11 *************** *** 388,397 **** </item> <item type="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-"> ! <circle color="#000000" radius="3" label_size="5" /> </item> <item type="district_label_1e3,district_label_2e3,district_label_5e3" order="11-"> <circle color="#000000" radius="3" label_size="7" /> </item> ! <item type="town_label_1e,town_label_2e3,town_label_5e3" order="10-"> <circle color="#000000" radius="3" label_size="7" /> </item> --- 388,397 ---- </item> <item type="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-"> ! <circle color="#000000" radius="3" label_size="7" /> </item> <item type="district_label_1e3,district_label_2e3,district_label_5e3" order="11-"> <circle color="#000000" radius="3" label_size="7" /> </item> ! <item type="town_label_1e3,town_label_2e3,town_label_5e3" order="10-"> <circle color="#000000" radius="3" label_size="7" /> </item> |
|
From: Horwitz <ho...@us...> - 2007-08-29 21:30:27
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32286 Modified Files: navit.xml Log Message: Improve map display Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** navit.xml 28 Aug 2007 17:31:12 -0000 1.9 --- navit.xml 29 Aug 2007 21:30:21 -0000 1.10 *************** *** 378,419 **** <circle color="#000000" radius="3" label_size="7" /> </item> ! <item type="district_label_1e3,district_label_2e3" order="10-11"> ! <circle color="#000000" radius="3" label_size="7" /> </item> ! <item type="district_label_5e3" order="10-"> ! <circle color="#000000" radius="3" label_size="10" /> </item> ! <item type="town_label_5e1" order="10-"> ! <circle color="#000000" radius="3" label_size="10" /> </item> ! <item type="town_label_1e3" order="10-"> ! <circle color="#000000" radius="3" label_size="10" /> </item> ! <item type="town_label_5e3" order="6-7"> <circle color="#000000" radius="3" label_size="7" /> </item> ! <item type="town_label_5e3" order="8-10"> ! <circle color="#000000" radius="3" label_size="10" /> </item> ! <item type="town_label_5e3" order="11"> ! <circle color="#000000" radius="3" label_size="15" /> </item> ! <item type="town_label_1e4" order="5-6"> ! <circle color="#000000" radius="5" label_size="7" /> </item> ! <item type="town_label_1e4" order="7-10"> ! <circle color="#000000" radius="5" label_size="10" /> </item> ! <item type="town_label_1e4" order="11"> ! <circle color="#000000" radius="5" label_size="15" /> </item> ! <item type="town_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,town_label_1e3,town_label_2e3,town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4,town_label_1e5,town_label_2e5,town_label_5e5,town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7,district_label,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2,district_label_1e3,district_label_2e3,district_label_5e3,district_label_1e4,district_label_2e4,district_label_5e4,district_label_1e5,district_label_2e5,district_label_5e5,district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7" order="2-"> <circle color="#000000" radius="3" label_size="15" /> </item> ! <item type="town_label_1e5,town_label_2e5" order="2-"> ! <circle color="#000000" radius="3" label_size="10" /> </item> ! <item type="town_label_1e5,town_label_5e5,town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="0-"> ! <circle color="#000000" radius="3" label_size="10" /> </item> <item type="poi_airport" order="0-"> --- 378,419 ---- <circle color="#000000" radius="3" label_size="7" /> </item> ! <item type="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes" order="10-18"> ! <label label_size="8" /> </item> ! <item type="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18"> ! <label label_size="9" /> </item> ! <item type="street_nopass,street_0,street_1_city,street_1_land" order="12-18"> ! <label label_size="9" /> </item> ! <item type="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-"> ! <circle color="#000000" radius="3" label_size="5" /> </item> ! <item type="district_label_1e3,district_label_2e3,district_label_5e3" order="11-"> <circle color="#000000" radius="3" label_size="7" /> </item> ! <item type="town_label_1e,town_label_2e3,town_label_5e3" order="10-"> ! <circle color="#000000" radius="3" label_size="7" /> </item> ! <item type="district_label_1e4,district_label_2e4,district_label_5e4" order="9-"> ! <circle color="#000000" radius="3" label_size="7" /> </item> ! <item type="town_label_1e4,town_label_2e4,town_label_5e4" order="8-"> ! <circle color="#000000" radius="3" label_size="7" /> </item> ! <item type="district_label_1e5,district_label_2e5,district_label_5e5" order="6-"> ! <circle color="#000000" radius="3" label_size="10" /> </item> ! <item type="town_label_1e5,town_label_2e5,town_label_5e5" order="4-"> ! <circle color="#000000" radius="3" label_size="10" /> </item> ! <item type="district_label_1e6,district_label_2e6,district_label_5e6" order="3-"> <circle color="#000000" radius="3" label_size="15" /> </item> ! <item type="town_label_1e6,town_label_2e6,town_label_5e6" order="2-"> ! <circle color="#000000" radius="3" label_size="15" /> </item> ! <item type="town_label_1e7,district_label_1e7" order="1-"> ! <circle color="#000000" radius="3" label_size="15" /> </item> <item type="poi_airport" order="0-"> *************** *** 460,505 **** </item> </layer> ! <!-- ! <layer name="sea" details="0"> ! <item type="sea" order="0-"> ! <polygon color="#82c8ea" /> ! </item> ! </layer> ! <layer name="wood" details="0"> ! <item type="wood" order="0-"> ! <polygon color="#8ec78d" /> ! </item> ! </layer> ! <layer name="highway" details="0"> ! <item type="highway" order="0-"> ! <line color="#ff0000" width="3" /> ! <line color="#ffff0a" width="1" /> ! </item> ! <item type="highway" order="2-5"> ! <line color="#ff0000" width="5" /> ! <line color="#ffff0a" width="3" /> ! <text color="#000000" font="arial" size="12"> ! </item> ! </layer> ! <layer name="label" details="0"> ! <item type="town0" order="3-"> ! <circle radius="3" /> ! <text color="#000000" font="arial" size="12"> ! </item> ! </layer> ! <layer name="poi" details="0"> ! <item type="mcdonalds" order="3-"> ! <icon src="mcdonalds.xpm" /> ! </item> ! </layer> ! <layer name="wood" details="0"> ! <item type="wood" order="1-"> ! <polygon color="#8ec78d" /> ! <polyline color="#8ec78d" /> ! </item> ! </layer> ! --> ! </layout> ! <layout name="Nacht"> ! </layout> </navit> --- 460,465 ---- </item> </layer> ! </layout> ! <layout name="Nacht"> ! </layout> </navit> |
|
From: Martin S. <mar...@us...> - 2007-08-29 18:41:07
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13170 Modified Files: Makefile.am Log Message: Reworked osd Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.am 29 Aug 2007 18:32:12 -0000 1.16 --- Makefile.am 29 Aug 2007 18:41:04 -0000 1.17 *************** *** 17,21 **** cursor.h data.h data_window.h data_window_int.h debug.h destination.h draw_info.h \ file.h graphics.h gtkext.h gui.h item.h item_def.h log.h layer.h layout.h main.h map-share.h map.h\ ! map_data.h mapset.h maptype.h menu.h navigation.h navit.h \ param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h search.h speech.h statusbar.h \ transform.h track.h util.h vehicle.h xmlconfig.h --- 17,21 ---- cursor.h data.h data_window.h data_window_int.h debug.h destination.h draw_info.h \ file.h graphics.h gtkext.h gui.h item.h item_def.h log.h layer.h layout.h main.h map-share.h map.h\ ! map_data.h mapset.h maptype.h menu.h navigation.h navit.h osd.h \ param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h search.h speech.h statusbar.h \ transform.h track.h util.h vehicle.h xmlconfig.h |
|
From: Martin S. <mar...@us...> - 2007-08-29 18:33:27
|
Update of /cvsroot/navit/navit/src/osd/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6123/core Log Message: Directory /cvsroot/navit/navit/src/osd/core added to the repository |
|
From: Martin S. <mar...@us...> - 2007-08-29 18:33:23
|
Update of /cvsroot/navit/navit/src/osd/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7588/src/osd/core Added Files: Makefile.am osd_core.c Log Message: Reworked osd --- NEW FILE: Makefile.am --- include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"osd_core\" moduleosd_LTLIBRARIES = libosd_core.la libosd_core_la_SOURCES = osd_core.c --- NEW FILE: osd_core.c --- #include <math.h> #include <stdio.h> #include <glib.h> #include "item.h" #include "point.h" #include "coord.h" #include "graphics.h" #include "transform.h" #include "route.h" #include "navit.h" #include "plugin.h" #include "debug.h" #include "callback.h" #include "color.h" struct compass { struct point p; struct graphics *gr; struct graphics_gc *bg; struct graphics_gc *white; struct graphics_gc *green; struct graphics_font *font; }; static void transform_rotate(struct point *center, int angle, struct point *p, int count) { int i,x,y; double dx,dy; for (i = 0 ; i < count ; i++) { dx=sin(M_PI*angle/180.0); dy=cos(M_PI*angle/180.0); x=dy*p->x-dx*p->y; y=dx*p->x+dy*p->y; p->x=center->x+x; p->y=center->y+y; p++; } } static void handle(struct graphics *gr, struct graphics_gc *gc, struct point *p, int r, int dir) { struct point ph[3]; int l=r*0.4; ph[0].x=0; ph[0].y=r; ph[1].x=0; ph[1].y=-r; transform_rotate(p, dir, ph, 2); graphics_draw_lines(gr, gc, ph, 2); ph[0].x=-l; ph[0].y=-r+l; ph[1].x=0; ph[1].y=-r; ph[2].x=l; ph[2].y=-r+l; transform_rotate(p, dir, ph, 3); graphics_draw_lines(gr, gc, ph, 3); } static void osd_compass_draw(struct compass *this, struct vehicle *v) { struct point p; struct coord *pos, *dest; double *vehicle_dir,dir,distance; int dx,dy; char buffer[16]; graphics_draw_mode(this->gr, draw_mode_begin); p.x=0; p.y=0; graphics_draw_rectangle(this->gr, this->bg, &p, 60, 80); p.x=30; p.y=30; graphics_draw_circle(this->gr, this->white, &p, 50); if (v) { vehicle_dir=vehicle_dir_get(v); handle(this->gr, this->white, &p, 20, -*vehicle_dir); #if 0 /* FIXME */ dest=route_get_destination(co->route); if (dest) { pos=vehicle_pos_get(co->vehicle); dx=dest->x-pos->x; dy=dest->y-pos->y; dir=atan2(dx,dy)*180.0/M_PI; #if 0 printf("dx %d dy %d dir=%f vehicle_dir=%f\n", dx, dy, dir, *vehicle_dir); #endif if (! co->flags->orient_north) dir-=*vehicle_dir; handle(comp->gr, comp->green, &p, 20, dir); p.x=8; p.y=72; distance=transform_distance(pos, dest)/1000.0; if (distance >= 100) sprintf(buffer,"%.0f km", distance); else if (distance >= 10) sprintf(buffer,"%.1f km", distance); else sprintf(buffer,"%.2f km", distance); comp->gr->draw_text(comp->gr, comp->green, NULL, comp->font, buffer, &p, 0x10000, 0); } #endif } graphics_draw_mode(this->gr, draw_mode_end); } static void osd_compass_init(struct compass *this, struct navit *nav) { struct point p; struct graphics *navit_gr; struct color c; navit_gr=navit_get_graphics(nav); this->gr=graphics_overlay_new(navit_gr, &this->p, 60, 80); this->bg=graphics_gc_new(this->gr); c.r=0; c.g=0; c.b=0; graphics_gc_set_foreground(this->bg, &c); this->white=graphics_gc_new(this->gr); c.r=65535; c.g=65535; c.b=65535; graphics_gc_set_foreground(this->white, &c); graphics_gc_set_linewidth(this->white, 2); this->green=graphics_gc_new(this->gr); c.r=0; c.g=65535; c.b=0; graphics_gc_set_foreground(this->green, &c); graphics_gc_set_linewidth(this->green, 2); osd_compass_draw(this, NULL); } struct osd_priv * osd_compass_new(struct navit *nav, struct osd_methods *meth, struct attr **attrs) { struct compass *this=g_new0(struct compass, 1); struct attr *attr; this->p.x=20; this->p.y=20; attr=attr_search(attrs, NULL, attr_x); if (attr) this->p.x=attr->u.num; attr=attr_search(attrs, NULL, attr_y); if (attr) this->p.y=attr->u.num; navit_add_init_cb(nav, callback_new_1(osd_compass_init, this)); return (struct osd_priv *) this; } void plugin_init(void) { plugin_register_osd_type("compass", osd_compass_new); } |
13 messages has been excluded from this view by a project administrator.
