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: Michael F. <ho...@us...> - 2008-02-09 09:39:18
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31769/src Modified Files: osm2navit.c Log Message: Core:Add:Add highway exit icon. Thanks to Aurelien Jacobs for the patch Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** osm2navit.c 8 Feb 2008 08:48:24 -0000 1.51 --- osm2navit.c 9 Feb 2008 09:39:20 -0000 1.52 *************** *** 62,65 **** --- 62,66 ---- "n amenity theatre poi_theater\n" "n highway bus_stop poi_bus_stop\n" + "n highway motorway_junction highway_exit\n" "n highway traffic_signals traffic_signals\n" "n leisure slipway poi_boat_ramp\n" |
|
From: Michael F. <ho...@us...> - 2008-02-09 09:39:17
|
Update of /cvsroot/navit/navit/src/xpm In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31769/src/xpm Modified Files: Makefile.am Added Files: exit.xpm Log Message: Core:Add:Add highway exit icon. Thanks to Aurelien Jacobs for the patch Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/xpm/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.am 7 Feb 2008 11:04:56 -0000 1.12 --- Makefile.am 9 Feb 2008 09:39:20 -0000 1.13 *************** *** 1,4 **** include $(top_srcdir)/Makefile.inc ! xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm cafe.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm xpm_DATA += gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm xpm_DATA += shopping.xpm --- 1,4 ---- include $(top_srcdir)/Makefile.inc ! xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm cafe.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm exit.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm xpm_DATA += gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm xpm_DATA += shopping.xpm --- NEW FILE: exit.xpm --- /* XPM */ static char * exit_xpm[] = { "16 16 59 1", " c None", ". c #4F4FD1", "+ c #9292E2", "@ c #CCCCF2", "# c #0000BC", "$ c #0A0AB9", "% c #2E2EC2", "& c #1E1EBD", "* c #2424C2", "= c #1010BE", "- c #3030C5", "; c #1C1CBD", "> c #7D7DD8", ", c #F9F9F9", "' c #BABAEA", ") c #E0E0E8", "! c #2020C4", "~ c #D7D7F0", "{ c #FBFBFB", "] c #8B8BD9", "^ c #BEBEE7", "/ c #FFFFFF", "( c #C2C2F2", "_ c #3C3CC0", ": c #9C9CE3", "< c #DEDEEE", "[ c #F4F4FC", "} c #F7F7F7", "| c #2323C6", "1 c #1212C2", "2 c #C0C0F0", "3 c #F2F2FA", "4 c #F0F0F8", "5 c #2929C0", "6 c #6E6EDB", "7 c #B1B1E3", "8 c #5B5BD1", "9 c #8888D6", "0 c #0505BE", "a c #2020C6", "b c #9E9EE7", "c c #AEAEE4", "d c #6161D2", "e c #DBDBF4", "f c #AEAEE1", "g c #7272DB", "h c #2929C7", "i c #9F9FD2", "j c #A5A5DE", "k c #6161D5", "l c #E6E6FA", "m c #E9E9FA", "n c #8E8ED0", "o c #C6C6E6", "p c #0909BF", "q c #1616C3", "r c #1A1AC4", "s c #0E0EC0", "t c #0F0FC1", " .++++++++++++. ", ".@############@.", "+##############+", "+###$%&*#=%%-;#+", "+###>,')#!~,{]#+", "+###^/(/_:<[}|#+", "+##1}/2/34567##+", "+##8//'//9#0a##+", "+##b//c//d#####+", "+##e//f//g#####+", "+#h///i//j#####+", "+#klmlnlmo#####+", "+#pqrqsqrt#####+", "+##############+", ".@############@.", " .++++++++++++. "}; |
|
From: Michael F. <ho...@us...> - 2008-02-09 09:33:28
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31517/src Modified Files: navit.xml Log Message: Core:Fix:Don't show shopping POI on low zoom level. Thanks to Aurelien Jacobs for pointing this out. Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** navit.xml 8 Feb 2008 08:48:24 -0000 1.36 --- navit.xml 9 Feb 2008 09:33:30 -0000 1.37 *************** *** 627,631 **** <icon src="fuel.xpm" /> </item> ! <item type="poi_shopping" order="0-"> <icon src="shopping.xpm" /> </item> --- 627,631 ---- <icon src="fuel.xpm" /> </item> ! <item type="poi_shopping" order="10-"> <icon src="shopping.xpm" /> </item> |
|
From: KaZeR <ka...@us...> - 2008-02-08 15:24:51
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19759 Modified Files: configure.in Log Message: Fix:Install:Patch from Ian Haylock, fix ticket #81 : detection of libxmu Index: configure.in =================================================================== RCS file: /cvsroot/navit/navit/configure.in,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** configure.in 7 Feb 2008 14:29:41 -0000 1.72 --- configure.in 8 Feb 2008 15:24:54 -0000 1.73 *************** *** 172,175 **** --- 172,186 ---- AC_CHECK_HEADER( + X11/Xmu/Xmu.h, + AC_DEFINE( + [HAVE_XMU], + [], + Define to 1 if you have the <X11/Xmu/Xmu.h> header file. + ) + xmu=yes, + AC_MSG_WARN([*** no X11/Xmu/Xmu.h -- opengl and SDL support disabled]) + ) + + AC_CHECK_HEADER( GL/gl.h, AC_DEFINE( *************** *** 287,291 **** AC_SUBST(CEGUI_LIBS) ! AM_CONDITIONAL(GUI_SDL, [test "x$sdl" = "xyes" -a "x$cegui" = "xyes" -a "x$opengl" = "xyes" -a "x$glc" = "xyes" ]) AM_CONDITIONAL(GRAPHICS_OPENGL, [test "x$opengl" = "xyes" -a "x$glc" = "xyes" ]) --- 298,302 ---- AC_SUBST(CEGUI_LIBS) ! AM_CONDITIONAL(GUI_SDL, [test "x$sdl" = "xyes" -a "x$cegui" = "xyes" -a "x$opengl" = "xyes" -a "x$glc" = "xyes" -a "x$xmu" = "xyes" ]) AM_CONDITIONAL(GRAPHICS_OPENGL, [test "x$opengl" = "xyes" -a "x$glc" = "xyes" ]) *************** *** 463,486 **** fi # FIXME : maybe elaborate missing dependencies ! if test x"$sdl" = xyes then ! if test x"$cegui" = xyes ! then ! if test x"$glut" = xyes ! then ! if test x"$glc" = xyes ! then ! echo "OpenGL gui : ENABLED, with $CEGUI_LIBS" ! else ! echo "OpenGL gui : DISABLED, you are missing quesoglc" ! fi ! else ! echo "OpenGL gui : DISABLED, your are missing glut" ! fi ! else ! echo "OpenGL gui : DISABLED : you are missing cegui-devel >= 0.5" ! fi ! else ! echo "OpenGL gui : DISABLED : you are missing a SDL dependency (libsdl maybe?)" fi if test x"$enable_hildon" = xyes --- 474,502 ---- fi # FIXME : maybe elaborate missing dependencies ! if test x"$sdl" != xyes then ! sdl_failures="(libsdl maybe?) " ! fi ! if test x"$xmu" != xyes ! then ! sdl_failures=$sdl_failures"libxmu " ! fi ! if test x"$glut" != xyes ! then ! sdl_failures=$sdl_failures"glut " ! fi ! if test x"$glc" != xyes ! then ! sdl_failures=$sdl_failures"quesoglc " ! fi ! if test x"$cegui" != xyes ! then ! sdl_failures=$sdl_failures"cegui-devel >= 0.5 " ! fi ! if test -z "$sdl_failures" ! then ! echo "OpenGL gui : ENABLED, with $CEGUI_LIBS" ! else ! echo "OpenGL gui : DISABLED : you are missing $sdl_failures" fi if test x"$enable_hildon" = xyes |
|
From: KaZeR <ka...@us...> - 2008-02-08 08:48:22
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3173 Modified Files: item_def.h navit.xml osm2navit.c Log Message: Add:Core:Added Aurel's patches about various items definitions. Thanks Index: item_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/item_def.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** item_def.h 6 Feb 2008 13:26:33 -0000 1.22 --- item_def.h 8 Feb 2008 08:48:24 -0000 1.23 *************** *** 286,287 **** --- 286,288 ---- ITEM(poly_apron) ITEM(poly_terminal) + ITEM(street_pedestrian) Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** osm2navit.c 6 Feb 2008 13:26:34 -0000 1.50 --- osm2navit.c 8 Feb 2008 08:48:24 -0000 1.51 *************** *** 61,64 **** --- 61,65 ---- "n amenity telephone poi_telephone\n" "n amenity theatre poi_theater\n" + "n highway bus_stop poi_bus_stop\n" "n highway traffic_signals traffic_signals\n" "n leisure slipway poi_boat_ramp\n" *************** *** 112,115 **** --- 113,117 ---- "w aeroway taxiway aeroway_taxiway\n" "w aeroway terminal poly_terminal\n" + "w amenity parking poly_car_parking\n" "w highway cycleway street_nopass\n" "w highway footway street_nopass\n" *************** *** 118,122 **** "w highway track street_nopass\n" "w highway service street_service\n" ! "w highway pedestrian street_nopass\n" "w highway residential street_1_city\n" "w highway unclassified street_1_city\n" --- 120,124 ---- "w highway track street_nopass\n" "w highway service street_service\n" ! "w highway pedestrian street_pedestrian\n" "w highway residential street_1_city\n" "w highway unclassified street_1_city\n" *************** *** 124,128 **** "w highway tertiary street_2_city\n" "w highway secondary street_3_city\n" - "w highway pedestrian street_nopass\n" "w highway unsurfaced street_nopass\n" "w highway primary street_4_city\n" --- 126,129 ---- *************** *** 157,161 **** "w waterway stream water_line\n" "w waterway drain water_line\n" ! "w waterway riverbank water_line\n" "w boundary administrative border_country\n" "w route ferry ferry\n" --- 158,162 ---- "w waterway stream water_line\n" "w waterway drain water_line\n" ! "w waterway riverbank poly_water\n" "w boundary administrative border_country\n" "w route ferry ferry\n" Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** navit.xml 7 Feb 2008 14:03:21 -0000 1.35 --- navit.xml 8 Feb 2008 08:48:24 -0000 1.36 *************** *** 95,101 **** <polygon color="#4af04f" /> </item> ! <item type="poly_industry,poly_building,poly_place" order="0-"> <polygon color="#e6e6e6" /> </item> <item type="water_line" order="0-"> <polyline color="#5096b8" width="1" /> --- 95,104 ---- <polygon color="#4af04f" /> </item> ! <item type="poly_industry,poly_place" order="0-"> <polygon color="#e6e6e6" /> </item> + <item type="poly_building" order="0-"> + <polygon color="#b6a6a6" /> + </item> <item type="water_line" order="0-"> <polyline color="#5096b8" width="1" /> *************** *** 108,111 **** --- 111,120 ---- <polygon color="#e3c6a6" /> </item> + <item type="poly_cemetery" order="1-"> + <polygon color="#bde3cb" /> + </item> + <item type="poly_car_parking" order="1-"> + <polygon color="#e7cf87" /> + </item> <item type="rail" order="6-"> <polyline color="#808080" width="3" /> *************** *** 168,171 **** --- 177,216 ---- <polyline color="#000000" width="1" /> </item> + <item type="street_pedestrian" order="10"> + <polyline color="#d2d2d2" width="3" /> + <polyline color="#dddddd" width="1" /> + </item> + <item type="street_pedestrian" order="11"> + <polyline color="#d2d2d2" width="5" /> + <polyline color="#dddddd" width="3" /> + </item> + <item type="street_pedestrian" order="12"> + <polyline color="#d2d2d2" width="8" /> + <polyline color="#dddddd" width="6" /> + </item> + <item type="street_pedestrian" order="13"> + <polyline color="#d2d2d2" width="9" /> + <polyline color="#dddddd" width="7" /> + </item> + <item type="street_pedestrian" order="14"> + <polyline color="#d2d2d2" width="13" /> + <polyline color="#dddddd" width="9" /> + </item> + <item type="street_pedestrian" order="15"> + <polyline color="#d2d2d2" width="18" /> + <polyline color="#dddddd" width="14" /> + </item> + <item type="street_pedestrian" order="16"> + <polyline color="#d2d2d2" width="21" /> + <polyline color="#dddddd" width="17" /> + </item> + <item type="street_pedestrian" order="17"> + <polyline color="#d2d2d2" width="25" /> + <polyline color="#dddddd" width="21" /> + </item> + <item type="street_pedestrian" order="18"> + <polyline color="#d2d2d2" width="40" /> + <polyline color="#dddddd" width="34" /> + </item> <item type="street_service" order="11"> <polyline color="#d2d2d2" width="4" /> *************** *** 645,653 **** <icon src="bowling.xpm" /> </item> ! <item type="poi_bus_station" order="0-"> ! <icon src="bus_station.xpm" /> </item> ! <item type="poi_bus_stop" order="0-"> ! <icon src="bus_stop.xpm" /> </item> <item type="poi_bussines_service" order="0-"> --- 690,698 ---- <icon src="bowling.xpm" /> </item> ! <item type="poi_bus_station" order="12-"> ! <icon src="bus.xpm" /> </item> ! <item type="poi_bus_stop" order="12-"> ! <icon src="bus.xpm" /> </item> <item type="poi_bussines_service" order="0-"> |
|
From: KaZeR <ka...@us...> - 2008-02-07 15:59:10
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13337 Modified Files: gui_sdl_window.cpp Log Message: Fix:CEGUI:Forces the use of Silly image codec (instead of Devil) Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** gui_sdl_window.cpp 23 Jan 2008 19:27:38 -0000 1.48 --- gui_sdl_window.cpp 7 Feb 2008 15:58:59 -0000 1.49 *************** *** 561,566 **** try { CEGUI::System::setDefaultXMLParserName(CEGUI::String("TinyXMLParser")); ! dbg(1, "Using %s as the default CEGUI XML Parser\n", CEGUI::System::getDefaultXMLParserName().c_str()); renderer = new CEGUI::OpenGLRenderer(0,XRES,YRES); new CEGUI::System(renderer); --- 561,568 ---- try { + dbg(0, "Forcing silly image codec\n"); + CEGUI::OpenGLRenderer::setDefaultImageCodecName("SILLYImageCodec"); CEGUI::System::setDefaultXMLParserName(CEGUI::String("TinyXMLParser")); ! dbg(0, "Using %s as the default CEGUI XML Parser\n", CEGUI::System::getDefaultXMLParserName().c_str()); renderer = new CEGUI::OpenGLRenderer(0,XRES,YRES); new CEGUI::System(renderer); |
|
From: KaZeR <ka...@us...> - 2008-02-07 14:29:46
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20468 Modified Files: configure.in Log Message: Fix:Install:More cosmetics changes Index: configure.in =================================================================== RCS file: /cvsroot/navit/navit/configure.in,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** configure.in 7 Feb 2008 13:53:53 -0000 1.71 --- configure.in 7 Feb 2008 14:29:41 -0000 1.72 *************** *** 471,486 **** if test x"$glc" = xyes then ! echo "OpenGL gui : ENABLED, with $CEGUI_LIBS" else ! echo "OpenGL gui : DISABLED, you are missing quesoglc" fi else ! echo "OpenGL gui : DISABLED, your are missing glut" fi else ! echo "OpenGL gui : DISABLED : you are missing cegui-devel >= 0.5" fi else ! echo "OpenGL gui : DISABLED : you are missing a SDL dependency (libsdl maybe?)" fi if test x"$enable_hildon" = xyes --- 471,486 ---- if test x"$glc" = xyes then ! echo "OpenGL gui : ENABLED, with $CEGUI_LIBS" else ! echo "OpenGL gui : DISABLED, you are missing quesoglc" fi else ! echo "OpenGL gui : DISABLED, your are missing glut" fi else ! echo "OpenGL gui : DISABLED : you are missing cegui-devel >= 0.5" fi else ! echo "OpenGL gui : DISABLED : you are missing a SDL dependency (libsdl maybe?)" fi if test x"$enable_hildon" = xyes |
|
From: KaZeR <ka...@us...> - 2008-02-07 14:03:19
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1418 Modified Files: navit.xml Log Message: Add:Poi:Added cafe poi in navit.xml Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** navit.xml 31 Jan 2008 09:19:41 -0000 1.34 --- navit.xml 7 Feb 2008 14:03:21 -0000 1.35 *************** *** 588,591 **** --- 588,594 ---- <icon src="attraction.xpm" /> </item> + <item type="poi_cafe" order="12-"> + <icon src="cafe.xpm" /> + </item> <item type="poi_bar" order="12-"> <icon src="bar.xpm" /> |
|
From: KaZeR <ka...@us...> - 2008-02-07 13:56:33
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27261/gui/gtk Modified Files: gui_gtk_window.c Log Message: Fix:GTK:Fixed typo in keys names Index: gui_gtk_window.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_window.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** gui_gtk_window.c 7 Feb 2008 10:21:32 -0000 1.20 --- gui_gtk_window.c 7 Feb 2008 13:56:36 -0000 1.21 *************** *** 61,80 **** gtk_menu_shell_select_first(GTK_MENU_SHELL(this->menubar), TRUE); break; ! case KEY_Up: p.x=w/2; p.y=0; navit_set_center_screen(this->nav, &p); break; ! case KEY_Down: p.x=w/2; p.y=h; navit_set_center_screen(this->nav, &p); break; ! case KEY_Left: p.x=0; p.y=h/2; navit_set_center_screen(this->nav, &p); break; ! case KEY_Right: p.x=w; p.y=h/2; --- 61,80 ---- gtk_menu_shell_select_first(GTK_MENU_SHELL(this->menubar), TRUE); break; ! case KEY_UP: p.x=w/2; p.y=0; navit_set_center_screen(this->nav, &p); break; ! case KEY_DOWN: p.x=w/2; p.y=h; navit_set_center_screen(this->nav, &p); break; ! case KEY_LEFT: p.x=0; p.y=h/2; navit_set_center_screen(this->nav, &p); break; ! case KEY_RIGHT: p.x=w; p.y=h/2; |
|
From: KaZeR <ka...@us...> - 2008-02-07 13:54:00
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19956 Modified Files: autogen.sh configure.in Log Message: Fix:Install:Cosmetics changes in autoconf & configure Index: autogen.sh =================================================================== RCS file: /cvsroot/navit/navit/autogen.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** autogen.sh 5 Dec 2007 09:55:01 -0000 1.5 --- autogen.sh 7 Feb 2008 13:53:51 -0000 1.6 *************** *** 1,4 **** #!/bin/sh ! for pkg in pkg-config libtool automake aclocal autoreconf autopoint:gettext do if ! ${pkg%%:*} --version >/dev/null --- 1,4 ---- #!/bin/sh ! for pkg in pkg-config libtool automake aclocal autoreconf:autoconf autopoint:gettext do if ! ${pkg%%:*} --version >/dev/null Index: configure.in =================================================================== RCS file: /cvsroot/navit/navit/configure.in,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** configure.in 7 Feb 2008 10:22:49 -0000 1.70 --- configure.in 7 Feb 2008 13:53:53 -0000 1.71 *************** *** 471,486 **** if test x"$glc" = xyes then ! echo "SDL gui : ENABLED, with $CEGUI_LIBS" else ! echo "SDL gui : DISABLED, you are missing quesoglc" fi else ! echo "SDL gui : DISABLED, your are missing glut" fi else ! echo "SDL gui : DISABLED : you are missing cegui-devel >= 0.5" fi else ! echo "SDL gui : DISABLED : you are missing a SDL dependency" fi if test x"$enable_hildon" = xyes --- 471,486 ---- if test x"$glc" = xyes then ! echo "OpenGL gui : ENABLED, with $CEGUI_LIBS" else ! echo "OpenGL gui : DISABLED, you are missing quesoglc" fi else ! echo "OpenGL gui : DISABLED, your are missing glut" fi else ! echo "OpenGL gui : DISABLED : you are missing cegui-devel >= 0.5" fi else ! echo "OpenGL gui : DISABLED : you are missing a SDL dependency (libsdl maybe?)" fi if test x"$enable_hildon" = xyes *************** *** 526,530 **** echo "*** WARNING! you have no gui that can be built! ***" echo "Please install the dependency for at least gtk or sdl gui" ! echo "For more details, see the wiki at http://navit.sf.net/wiki/" echo "" exit 1 --- 526,530 ---- echo "*** WARNING! you have no gui that can be built! ***" echo "Please install the dependency for at least gtk or sdl gui" ! echo "For more details, see the wiki at http://wiki.navit-project.org/" echo "" exit 1 |
|
From: Michael F. <ho...@us...> - 2008-02-07 11:04:59
|
Update of /cvsroot/navit/navit/src/xpm In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21880/src/xpm Modified Files: Makefile.am Added Files: shopping.xpm Log Message: Core:Add:Add shopping icon. Thanks to Matt Callow for the patch Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/xpm/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.am 6 Feb 2008 13:26:34 -0000 1.11 --- Makefile.am 7 Feb 2008 11:04:56 -0000 1.12 *************** *** 2,5 **** --- 2,6 ---- xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm cafe.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm xpm_DATA += gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm + xpm_DATA += shopping.xpm EXTRA_DIST = $(xpm_DATA) #burgerking.ico: --- NEW FILE: shopping.xpm --- /* XPM */ static char * shopping_xpm[] = { "16 16 2 1", " g #FFFFFF", ". g #000000", " ", " ", " ... ", " . ......... ", " . . ", " . . . . . . ", " . . ", " . . . . . ", " . . ", " ........ ", " ", " . ", " ........ ", " .. .. ", " ", " "}; |
|
From: KaZeR <ka...@us...> - 2008-02-07 10:22:46
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8745 Modified Files: configure.in Log Message: Add:GTK:Added gnunux patch which adds --enable-hildon Index: configure.in =================================================================== RCS file: /cvsroot/navit/navit/configure.in,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** configure.in 1 Feb 2008 06:20:47 -0000 1.69 --- configure.in 7 Feb 2008 10:22:49 -0000 1.70 *************** *** 46,49 **** --- 46,63 ---- test x"${AVOID_FLOAT}" = xyes && AC_DEFINE(AVOID_FLOAT,[],Define to avoid floating point) + AC_ARG_ENABLE(hildon, [ --enable-hildon build with maemo/hildon support], enable_hildon=$enableval, enable_hildon=no) + if test "x${enable_hildon}" = "xyes" ; then + PKG_CHECK_MODULES(enable_hildon, hildon-libs >= 0.12.24, , [ + AC_MSG_RESULT(no) + enable_hildon=no + ]) + if test x"${enable_hildon}" = xyes ; then + AC_DEFINE(USE_HILDON, 1, [Build with maemo/hildon support]) + AC_SUBST(HILDON_CFLAGS) + AC_SUBST(HILDON_LIBS) + fi + fi + AM_CONDITIONAL(USE_HILDON, test "${enable_hildon}" = "xyes") + AC_ARG_ENABLE(libgps, [ --disable-libgps don't use libgps], USE_LIBGPS=$enableval, USE_LIBGPS=yes) AC_ARG_ENABLE(garmin, [ --disable-garmin disable garmin support], USE_GARMIN=$enableval, USE_GARMIN=yes) *************** *** 470,473 **** --- 484,494 ---- echo "SDL gui : DISABLED : you are missing a SDL dependency" fi + if test x"$enable_hildon" = xyes + then + echo "Maemo/Hildon: ENABLED" + else + echo "Maemo/Hildon: DISABLED" + fi + if test x"$gpsd" = xyes then |
|
From: KaZeR <ka...@us...> - 2008-02-07 10:21:31
|
Update of /cvsroot/navit/navit/src/graphics/gtk_drawing_area In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8368/graphics/gtk_drawing_area Modified Files: graphics_gtk_drawing_area.c Log Message: Add:GTK:Added gnunux patches about hildon's keys Index: graphics_gtk_drawing_area.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** graphics_gtk_drawing_area.c 1 Feb 2008 05:54:38 -0000 1.29 --- graphics_gtk_drawing_area.c 7 Feb 2008 10:21:31 -0000 1.30 *************** *** 408,413 **** FT_Set_Transform( font->face, &matrix, &pen ); - - for ( n = 0; n < len; n++ ) { --- 408,411 ---- |
|
From: KaZeR <ka...@us...> - 2008-02-07 10:21:31
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8368/gui/gtk Modified Files: gui_gtk_window.c Log Message: Add:GTK:Added gnunux patches about hildon's keys Index: gui_gtk_window.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_window.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** gui_gtk_window.c 31 Jan 2008 09:19:42 -0000 1.19 --- gui_gtk_window.c 7 Feb 2008 10:21:32 -0000 1.20 *************** *** 19,30 **** #include "gui_gtk.h" #include "transform.h" #ifndef GDK_Book #define GDK_Book XF86XK_Book #endif - #ifndef GDK_Calendar #define GDK_Calendar XF86XK_Calendar #endif #define _(text) gettext(text) --- 19,46 ---- #include "gui_gtk.h" #include "transform.h" + #include "config.h" + #ifdef USE_HILDON + #include "hildon-widgets/hildon-defines.h" + #define KEY_ZOOM_IN HILDON_HARDKEY_INCREASE + #define KEY_ZOOM_OUT HILDON_HARDKEY_DECREASE + #define KEY_UP HILDON_HARDKEY_UP + #define KEY_DOWN HILDON_HARDKEY_DOWN + #define KEY_LEFT HILDON_HARDKEY_LEFT + #define KEY_RIGHT HILDON_HARDKEY_RIGHT + #else #ifndef GDK_Book #define GDK_Book XF86XK_Book #endif #ifndef GDK_Calendar #define GDK_Calendar XF86XK_Calendar #endif + #define KEY_ZOOM_IN GDK_Book + #define KEY_ZOOM_OUT GDK_Calendar + #define KEY_UP GDK_Up + #define KEY_DOWN GDK_Down + #define KEY_LEFT GDK_Left + #define KEY_RIGHT GDK_Right + #endif #define _(text) gettext(text) *************** *** 34,37 **** --- 50,55 ---- { int w,h; + GtkToggleAction *action; + gboolean *fullscreen; struct point p; if (event->type != GDK_KEY_PRESS) *************** *** 43,72 **** gtk_menu_shell_select_first(GTK_MENU_SHELL(this->menubar), TRUE); break; ! case GDK_Up: p.x=w/2; p.y=0; navit_set_center_screen(this->nav, &p); break; ! case GDK_Down: p.x=w/2; p.y=h; navit_set_center_screen(this->nav, &p); break; ! case GDK_Left: p.x=0; p.y=h/2; navit_set_center_screen(this->nav, &p); break; ! case GDK_Right: p.x=w; p.y=h/2; navit_set_center_screen(this->nav, &p); break; ! case GDK_Book: navit_zoom_in(this->nav, 2, NULL); break; ! case GDK_Calendar: navit_zoom_out(this->nav, 2, NULL); break; default: return FALSE; --- 61,103 ---- gtk_menu_shell_select_first(GTK_MENU_SHELL(this->menubar), TRUE); break; ! case KEY_Up: p.x=w/2; p.y=0; navit_set_center_screen(this->nav, &p); break; ! case KEY_Down: p.x=w/2; p.y=h; navit_set_center_screen(this->nav, &p); break; ! case KEY_Left: p.x=0; p.y=h/2; navit_set_center_screen(this->nav, &p); break; ! case KEY_Right: p.x=w; p.y=h/2; navit_set_center_screen(this->nav, &p); break; ! case KEY_ZOOM_IN: navit_zoom_in(this->nav, 2, NULL); break; ! case KEY_ZOOM_OUT: navit_zoom_out(this->nav, 2, NULL); break; + #ifdef USE_HILDON + case HILDON_HARDKEY_FULLSCREEN: + action = GTK_TOGGLE_ACTION (gtk_action_group_get_action (this->base_group, "FullscreenAction")); + + if ( gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action))) + { + fullscreen = 0; + } else { + fullscreen = 1; + } + gtk_toggle_action_set_active (action, fullscreen); + break; + #endif /*HILDON*/ default: return FALSE; |
|
From: KaZeR <ka...@us...> - 2008-02-06 13:27:35
|
Update of /cvsroot/navit/navit/projs/CodeBlocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv707/CodeBlocks Modified Files: navit.xml.distr Log Message: Add:Core:Added cafe amenity (Thanks Helge) Index: navit.xml.distr =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/navit.xml.distr,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** navit.xml.distr 1 Feb 2008 22:42:08 -0000 1.2 --- navit.xml.distr 6 Feb 2008 13:27:37 -0000 1.3 *************** *** 590,593 **** --- 590,596 ---- <icon src="attraction.xpm" /> </item> + <item type="poi_cafe" order="12-"> + <icon src="cafe.xpm" /> + </item> <item type="poi_bar" order="12-"> <icon src="bar.xpm" /> |
|
From: KaZeR <ka...@us...> - 2008-02-06 13:27:00
|
Update of /cvsroot/navit/navit/src/xpm In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32581/xpm Added Files: cafe.xpm Log Message: Add:Core:Added cafe amenity (Thanks Helge) --- NEW FILE: cafe.xpm --- /* XPM */ static char * cafe_xpm[] = { "16 16 6 1", " c None", ". c #FFFFFF", "+ c #0000FF", "@ c #FEFEFE", "# c #000000", "$ c #808080", " .............. ", ".++++++++++++++.", ".++++++++++++++.", ".++@@@@@@@@@@++.", ".++@@.####.@@++.", ".++@##....##@++.", ".++@#######$#++.", ".++@#######$#++.", ".++@########@++.", ".++@.######.@++.", ".++#..####.@#++.", ".++@########@++.", ".++@@@@@@@@@@++.", ".++++++++++++++.", ".++++++++++++++.", " .............. "}; |
|
From: KaZeR <ka...@us...> - 2008-02-06 13:26:33
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32438 Modified Files: item_def.h osm2navit.c Log Message: Add:Core:Added cafe amenity (Thanks Helge) Index: item_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/item_def.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** item_def.h 28 Jan 2008 23:08:07 -0000 1.21 --- item_def.h 6 Feb 2008 13:26:33 -0000 1.22 *************** *** 87,90 **** --- 87,91 ---- ITEM(poi_water_feature) ITEM(poi_bar) + ITEM(poi_cafe) ITEM(poi_picnic) ITEM(poi_hospital) Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** osm2navit.c 1 Feb 2008 17:08:24 -0000 1.49 --- osm2navit.c 6 Feb 2008 13:26:34 -0000 1.50 *************** *** 39,43 **** "n amenity bank poi_bank\n" "n amenity pub poi_bar\n" ! "n amenity cafe poi_bar\n" "n amenity bus_station poi_bus_station\n" "n amenity parking poi_car_parking\n" --- 39,43 ---- "n amenity bank poi_bank\n" "n amenity pub poi_bar\n" ! "n amenity cafe poi_cafe\n" "n amenity bus_station poi_bus_station\n" "n amenity parking poi_car_parking\n" |
|
From: KaZeR <ka...@us...> - 2008-02-06 13:26:32
|
Update of /cvsroot/navit/navit/src/xpm In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32438/xpm Modified Files: Makefile.am Log Message: Add:Core:Added cafe amenity (Thanks Helge) Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/xpm/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 5 Jan 2008 21:02:04 -0000 1.10 --- Makefile.am 6 Feb 2008 13:26:34 -0000 1.11 *************** *** 1,4 **** include $(top_srcdir)/Makefile.inc ! xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm xpm_DATA += gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm EXTRA_DIST = $(xpm_DATA) --- 1,4 ---- include $(top_srcdir)/Makefile.inc ! xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm cafe.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm xpm_DATA += gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm EXTRA_DIST = $(xpm_DATA) |
|
From: Albert L F. <af...@us...> - 2008-02-05 00:46:03
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/win32gui In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12260 Modified Files: win32_graphics.c win32_gui.c win32_gui.h Log Message: Fix:projs/CodeBlocks:more work on native win32 gui/graphics Index: win32_graphics.c =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/win32gui/win32_graphics.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** win32_graphics.c 4 Feb 2008 23:53:13 -0000 1.4 --- win32_graphics.c 5 Feb 2008 00:46:07 -0000 1.5 *************** *** 689,694 **** void image_cache_hash_add( const char* key, struct graphics_image_priv* val_ptr) { - char* key_ptr = NULL; - if ( image_cache_hash == NULL ) { image_cache_hash = g_hash_table_new(g_str_hash, g_str_equal); --- 689,692 ---- Index: win32_gui.h =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/win32gui/win32_gui.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** win32_gui.h 4 Feb 2008 23:53:13 -0000 1.3 --- win32_gui.h 5 Feb 2008 00:46:07 -0000 1.4 *************** *** 17,20 **** --- 17,22 ---- #define ID_DISPLAY_ZOOMOUT 201 #define ID_DISPLAY_REFRESH 202 + #define ID_DISPLAY_CURSOR 203 + #define ID_DISPLAY_ORIENT 204 #define ID_FILE_EXIT 9001 Index: win32_gui.c =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/win32gui/win32_gui.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** win32_gui.c 4 Feb 2008 23:53:13 -0000 1.4 --- win32_gui.c 5 Feb 2008 00:46:07 -0000 1.5 *************** *** 9,14 **** --- 9,17 ---- #include "point.h" #include "menu.h" + #include "item.h" + #include "attr.h" #include "callback.h" #include <commctrl.h> + #include "debug.h" *************** *** 82,126 **** #endif - /* - TBBUTTON toolbutton [] = - { - {STD_FILENEW, IDM_NEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_FILEOPEN, IDM_LOAD, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_PRINT, IDM_PRINT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_FILESAVE, IDM_SAVE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_COPY, IDM_COPY, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_DELETE, IDM_DELETE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_PASTE, IDM_PASTE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_CUT, IDM_CUT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_FIND, IDM_FIND, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_HELP, IDM_HELP, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_PRINTPRE , IDM_PRINTVIEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_PROPERTIES, IDM_PROPERTY, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_REDOW, IDM_REDOW, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_REPLACE, IDM_REPLACE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {STD_UNDO, IDM_UNDO, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - {IDB_BITMAP1, IDM_CONSOLE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, - }; - */ - - static void AddToolbarBitmaps( HWND toolbar ) - { - // TBADDBITMAP mybit; - // memset (&mybit, 0, sizeof (TBADDBITMAP)); - // mybit.hInst = instance; - // mybit.nID = IDB_STD_SMALL_COLOR ; - - TBADDBITMAP dabit; - HBITMAP mybitmap = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_NAVITTOOLBAR)); - - memset (&dabit, 0, sizeof (TBADDBITMAP)); - dabit.hInst = NULL; - dabit.nID = (UINT) mybitmap; - - - //int n = SendMessage (toolbar, TB_ADDBITMAP, 0, (LPARAM) &mybit); - int n = SendMessage (toolbar, TB_ADDBITMAP, 10, (LPARAM) &dabit); - } - static void CreateToolBar(HWND hwnd) { --- 85,88 ---- *************** *** 132,156 **** hTool = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, (HMENU)ID_CHILD_TOOLBAR, GetModuleHandle(NULL), NULL); if(hTool == NULL) MessageBox(hwnd, "Could not create tool bar.", "Error", MB_OK | MB_ICONERROR); - // Send the TB_BUTTONSTRUCTSIZE message, which is required for - // backward compatibility. SendMessage(hTool, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); ! // AddToolbarBitmaps( hTool ); ! // LoadBitmap(GetModuleHandle(NULL), ); ! ! int inst = GetModuleHandle(NULL); ! tbab.hInst = inst; tbab.nID = IDB_NAVITTOOLBAR; ! int iImageOffset = SendMessage(hTool, TB_ADDBITMAP, 10, (LPARAM) &tbab); /* Bitmap contains 5 icons */ int iStr; - // tbab.hInst = HINST_COMMCTRL; - //tbab.nID = IDB_STD_SMALL_COLOR; - // SendMessage(hTool, TB_ADDBITMAP, 0, (LPARAM)&tbab); - ZeroMemory(tbb, sizeof(tbb)); --- 94,109 ---- hTool = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, (HMENU)ID_CHILD_TOOLBAR, GetModuleHandle(NULL), NULL); + if(hTool == NULL) MessageBox(hwnd, "Could not create tool bar.", "Error", MB_OK | MB_ICONERROR); SendMessage(hTool, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); ! tbab.hInst = GetModuleHandle(NULL); tbab.nID = IDB_NAVITTOOLBAR; ! int iImageOffset = SendMessage(hTool, TB_ADDBITMAP, 10, (LPARAM) &tbab); int iStr; ZeroMemory(tbb, sizeof(tbb)); *************** *** 172,176 **** tbb[2].fsState = TBSTATE_ENABLED; tbb[2].fsStyle = TBSTYLE_BUTTON; ! tbb[2].idCommand = ID_DISPLAY_ZOOMIN; iStr = SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("Refresh" ) ) ); tbb[2].iString = iStr; --- 125,129 ---- tbb[2].fsState = TBSTATE_ENABLED; tbb[2].fsStyle = TBSTYLE_BUTTON; ! tbb[2].idCommand = ID_DISPLAY_REFRESH; iStr = SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("Refresh" ) ) ); tbb[2].iString = iStr; *************** *** 186,190 **** tbb[4].fsState = TBSTATE_ENABLED; tbb[4].fsStyle = TBSTYLE_BUTTON; ! tbb[4].idCommand = ID_DISPLAY_ZOOMIN; iStr = SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("Orientation" ) ) ); tbb[4].iString = iStr; --- 139,143 ---- tbb[4].fsState = TBSTATE_ENABLED; tbb[4].fsStyle = TBSTYLE_BUTTON; ! tbb[4].idCommand = ID_DISPLAY_ORIENT; iStr = SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("Orientation" ) ) ); tbb[4].iString = iStr; *************** *** 212,217 **** SendMessage(hTool, TB_ADDBUTTONS, sizeof(tbb)/sizeof(TBBUTTON), (LPARAM)&tbb); - HWND hChild = GetDlgItem(hwnd, ID_CHILD_TOOLBAR); - hChild = hChild; } --- 165,168 ---- *************** *** 285,288 **** --- 236,283 ---- struct gui_priv* gui = (struct gui_priv*)GetWindowLongPtr( hwnd , DWLP_USER ); + + switch(LOWORD(wParam)) + { + case ID_DISPLAY_ZOOMIN: + navit_zoom_in(gui->nav, 2, NULL); + return 0; + break; + case ID_DISPLAY_ZOOMOUT: + navit_zoom_out(gui->nav, 2, NULL); + return 0; + break; + case ID_DISPLAY_REFRESH: + navit_draw(gui->nav); + return 0; + break; + case ID_DISPLAY_CURSOR: + { + struct attr attr; + attr.type=attr_cursor; + // TODO attr.u.num=gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(w)); + if(!navit_set_attr(gui->nav, &attr)) { + dbg(0, "Failed to set attr_cursor\n"); + } + return 0; + } + break; + case ID_DISPLAY_ORIENT: + { + struct attr attr; + + attr.type=attr_orientation; + // attr.u.num=gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(w)); + attr.u.num = 0; // TODO + if(!navit_set_attr(gui->nav, &attr)) { + dbg(0, "Failed to set attr_orientation\n"); + } + return 0; + } + + case ID_FILE_EXIT: + PostMessage(hwnd, WM_CLOSE, 0, 0); + return 0; + break; + } if ( popup_menu_array ) { *************** *** 299,316 **** } } - - switch(LOWORD(wParam)) - { - case ID_DISPLAY_ZOOMIN: - navit_zoom_in(gui->nav, 2, NULL); - break; - case ID_DISPLAY_ZOOMOUT: - navit_zoom_out(gui->nav, 2, NULL); - break; - case ID_FILE_EXIT: - PostMessage(hwnd, WM_CLOSE, 0, 0); - break; - } - return 0; } break; --- 294,297 ---- |
|
From: Albert L F. <af...@us...> - 2008-02-05 00:00:09
|
Update of /cvsroot/navit/navit/projs/CodeBlocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27535 Added Files: .cvsignore Log Message: Fix:projs/CodeBlocks:win32 native toolbar and added app icon --- NEW FILE: .cvsignore --- bin obj *.img *.bin navit.xml *.depend *.layout *.bak bak locale distr xpm *.bz2 *.zip destination.txt |
|
From: Albert L F. <af...@us...> - 2008-02-04 23:53:10
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/win32gui In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24391/win32gui Modified Files: win32_graphics.c win32_gui.c win32_gui.h Log Message: Fix:projs/CodeBlocks:win32 native toolbar and added app icon Index: win32_graphics.c =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/win32gui/win32_graphics.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** win32_graphics.c 4 Feb 2008 00:44:01 -0000 1.3 --- win32_graphics.c 4 Feb 2008 23:53:13 -0000 1.4 *************** *** 2,5 **** --- 2,8 ---- #include <wingdi.h> #include <glib.h> + #include <math.h> + #include <stdio.h> + #include <stdlib.h> #include "config.h" *************** *** 10,15 **** #include "plugin.h" #include "win32_gui.h" ! ! #include "xpm2bmp.h"; #ifndef GET_WHEEL_DELTA_WPARAM --- 13,17 ---- #include "plugin.h" #include "win32_gui.h" ! #include "xpm2bmp.h" #ifndef GET_WHEEL_DELTA_WPARAM *************** *** 17,20 **** --- 19,26 ---- #endif + + static GHashTable *image_cache_hash = NULL; + + HFONT EzCreateFont (HDC hdc, TCHAR * szFaceName, int iDeciPtHeight, int iDeciPtWidth, int iAttributes, BOOL fLogRes) ; *************** *** 141,145 **** ! struct graphics_priv *g_gra; static HDC hMemDC; static HBITMAP hBitmap; --- 147,152 ---- ! //struct graphics_priv *g_gra; ! static HDC hMemDC; static HBITMAP hBitmap; *************** *** 180,192 **** } ! static void HandleButtonClick( int updown, int button, long lParam ) { int xPos = LOWORD(lParam); int yPos = HIWORD(lParam); ! // printf( "WM_LBUTTONDOWN: %d %d \n", xPos, yPos ); ! if (g_gra->button_callback ) { struct point pt = {xPos, yPos}; ! (*g_gra->button_callback)(g_gra->button_callback_data, updown, button, &pt); } } --- 187,199 ---- } ! static void HandleButtonClick( struct graphics_priv *gra_priv, int updown, int button, long lParam ) { int xPos = LOWORD(lParam); int yPos = HIWORD(lParam); ! ! if (gra_priv->button_callback ) { struct point pt = {xPos, yPos}; ! (*gra_priv->button_callback)(gra_priv->button_callback_data, updown, button, &pt); } } *************** *** 196,216 **** //if ( Message != 15 ) ! // printf( "CHILD %d %d %d \n", Message, wParam, lParam ); switch(Message) { case WM_CREATE: { ! g_gra->wnd_handle = hwnd; ! //if (g_gra->resize_callback) ! // (*g_gra->resize_callback)(g_gra->resize_callback_data, g_gra->width, g_gra->height); ! //MoveWindow( hwnd, 0,0, 780, 680, TRUE ); ! ! { ! HDC hdc; ! hdc = GetDC( hwnd ); ! MakeMemoryDC(hwnd, hdc ); ! ReleaseDC( hwnd, hdc ); ! } ! PostMessage( g_gra->wnd_parent_handle, WM_USER + 1, 0, 0 ); } break; --- 203,218 ---- //if ( Message != 15 ) ! //printf( "CHILD %d %d %d \n", Message, wParam, lParam ); ! ! struct graphics_priv* gra_priv = (struct graphics_priv*)GetWindowLongPtr( hwnd , DWLP_USER ); ! switch(Message) { case WM_CREATE: { ! HDC hdc; ! hdc = GetDC( hwnd ); ! MakeMemoryDC(hwnd, hdc ); ! ReleaseDC( hwnd, hdc ); } break; *************** *** 225,234 **** DestroyWindow(hwnd); break; case WM_SIZE: { //graphics = GetWindowLong( hwnd, DWL_USER, 0 ); - g_gra->width = LOWORD( lParam ); - g_gra->height = HIWORD( lParam ); { --- 227,253 ---- DestroyWindow(hwnd); break; + case WM_USER+1: + if ( gra_priv ) + { + RECT rc ; + HDC hdc; + + GetClientRect( hwnd, &rc ); + gra_priv->width = rc.right; + gra_priv->height = rc.bottom; + + hdc = GetDC( hwnd ); + MakeMemoryDC(hwnd, hdc ); + ReleaseDC( hwnd, hdc ); + (*gra_priv->resize_callback)(gra_priv->resize_callback_data, gra_priv->width, gra_priv->height); + } + break; + case WM_SIZE: + /* + if ( gra_priv ) { //graphics = GetWindowLong( hwnd, DWL_USER, 0 ); { *************** *** 238,244 **** ReleaseDC( hwnd, hdc ); } ! printf( "resize gfx to: %d %d \n", g_gra->width, g_gra->height ); } break; case WM_DESTROY: --- 257,271 ---- ReleaseDC( hwnd, hdc ); } ! (*gra_priv->resize_callback)(gra_priv->resize_callback_data, gra_priv->width, gra_priv->height); ! } + */ + if ( gra_priv ) + { + gra_priv->width = LOWORD( lParam ); + gra_priv->height = HIWORD( lParam ); + printf( "resize gfx to: %d %d \n", gra_priv->width, gra_priv->height ); + } break; case WM_DESTROY: *************** *** 247,258 **** break; case WM_PAINT: { ! ! HDC hdc = GetDC(hwnd ); ! if ( hMemDC ) ! { ! BitBlt( hdc, 0, 0, g_gra->width , g_gra->height, hMemDC, 0, 0, SRCCOPY ); ! } ! ReleaseDC( hwnd, hdc ); } break; --- 274,285 ---- break; case WM_PAINT: + if ( gra_priv ) { ! HDC hdc = GetDC(hwnd ); ! if ( hMemDC ) ! { ! BitBlt( hdc, 0, 0, gra_priv->width , gra_priv->height, hMemDC, 0, 0, SRCCOPY ); ! } ! ReleaseDC( hwnd, hdc ); } break; *************** *** 264,268 **** // printf( "WM_MOUSEMOVE: %d %d \n", xPos, yPos ); ! (*g_gra->motion_callback)(g_gra->motion_callback_data, &pt); } --- 291,295 ---- // printf( "WM_MOUSEMOVE: %d %d \n", xPos, yPos ); ! (*gra_priv->motion_callback)(gra_priv->motion_callback_data, &pt); } *************** *** 270,293 **** case WM_LBUTTONDOWN: ! HandleButtonClick( 1, 1,lParam ); break; case WM_LBUTTONUP: ! HandleButtonClick( 0, 1,lParam ); break; case WM_RBUTTONDOWN: ! HandleButtonClick( 1, 3,lParam ); break; case WM_RBUTTONUP: ! HandleButtonClick( 0, 3,lParam ); ! break; ! ! case WM_HSCROLL: ! case WM_VSCROLL: ! printf( "mousewheel delta %d\n", wParam ); break; - case WM_MOUSEWHEEL: - printf( "mousewheel delta %d\n", wParam ); - break; default: return DefWindowProc(hwnd, Message, wParam, lParam); --- 297,312 ---- case WM_LBUTTONDOWN: ! HandleButtonClick( gra_priv,1, 1,lParam ); break; case WM_LBUTTONUP: ! HandleButtonClick( gra_priv, 0, 1,lParam ); break; case WM_RBUTTONDOWN: ! HandleButtonClick( gra_priv, 1, 3,lParam ); break; case WM_RBUTTONUP: ! HandleButtonClick( gra_priv, 0, 3,lParam ); break; default: return DefWindowProc(hwnd, Message, wParam, lParam); *************** *** 299,307 **** static const char g_szClassName[] = "NAVGRA"; ! void CreateGraphicsWindows( struct graphics_priv* gr ) { WNDCLASSEX wc; HWND hwnd; - MSG Msg; RECT rcParent; --- 318,325 ---- static const char g_szClassName[] = "NAVGRA"; ! HANDLE CreateGraphicsWindows( struct graphics_priv* gr ) { WNDCLASSEX wc; HWND hwnd; RECT rcParent; *************** *** 310,314 **** wc.lpfnWndProc = WndProc; wc.cbClsExtra = 0; ! wc.cbWndExtra = 0; wc.hInstance = NULL; wc.hIcon = NULL; --- 328,332 ---- wc.lpfnWndProc = WndProc; wc.cbClsExtra = 0; ! wc.cbWndExtra = 64; wc.hInstance = NULL; wc.hIcon = NULL; *************** *** 347,356 **** { ErrorExit( "Window Creation Failed!" ); ! return 0; } ! ShowWindow(hwnd, TRUE); ! UpdateWindow(hwnd); gr->wnd_handle = hwnd; } --- 365,381 ---- { ErrorExit( "Window Creation Failed!" ); ! return NULL; } ! SetWindowLongPtr( hwnd , DWLP_USER, gr ); ! ! ShowWindow( hwnd, TRUE ); ! UpdateWindow( hwnd ); ! gr->wnd_handle = hwnd; + + PostMessage( gr->wnd_parent_handle, WM_USER + 1, 0, 0 ); + + return hwnd; } *************** *** 368,373 **** } - static HPEN line_pen; - static void gc_set_linewidth(struct graphics_gc_priv *gc, int w) { --- 393,396 ---- *************** *** 414,418 **** struct graphics_gc_priv *gc=g_new(struct graphics_gc_priv, 1); *meth=gc_methods; ! gc->hwnd = g_gra->wnd_handle; gc->line_width = 1; gc->fg_color = RGB( 0,0,0 ); --- 437,441 ---- struct graphics_gc_priv *gc=g_new(struct graphics_gc_priv, 1); *meth=gc_methods; ! gc->hwnd = gr->wnd_handle; gc->line_width = 1; gc->fg_color = RGB( 0,0,0 ); *************** *** 425,439 **** { int i; - HANDLE hndl = gr->wnd_handle; - - HDC dc = hMemDC; - HPEN holdpen; HPEN hpen; hpen = CreatePen( PS_SOLID, gc->line_width, gc->fg_color ); ! holdpen = SelectObject( dc, hpen ); ! SetBkColor( dc, gc->bg_color ); int first = 1; --- 448,458 ---- { int i; HPEN holdpen; HPEN hpen; hpen = CreatePen( PS_SOLID, gc->line_width, gc->fg_color ); ! holdpen = SelectObject( hMemDC, hpen ); ! SetBkColor( hMemDC, gc->bg_color ); int first = 1; *************** *** 443,455 **** { first = 0; ! MoveToEx( dc, p[0].x, p[0].y, NULL ); } else { ! LineTo( dc, p[i].x, p[i].y ); } } ! SelectObject( dc, holdpen ); DeleteObject( hpen ); } --- 462,474 ---- { first = 0; ! MoveToEx( hMemDC, p[0].x, p[0].y, NULL ); } else { ! LineTo( hMemDC, p[i].x, p[i].y ); } } ! SelectObject( hMemDC, holdpen ); DeleteObject( hpen ); } *************** *** 513,517 **** static void draw_restore(struct graphics_priv *gr, struct point *p, int w, int h) { ! InvalidateRect( gr->wnd_handle, NULL, TRUE ); } --- 532,536 ---- static void draw_restore(struct graphics_priv *gr, struct point *p, int w, int h) { ! InvalidateRect( gr->wnd_handle, NULL, FALSE ); } *************** *** 608,640 **** if ( NULL == font->hfont ) { ! int size = font->size; ! long lfHeight = -MulDiv(font->size, GetDeviceCaps(hMemDC, LOGPIXELSY), 72); ! ! font->hfont = EzCreateFont (hMemDC, TEXT ("Arial"), size/2, 0, 0, TRUE) ; GetObject ( font->hfont, sizeof (LOGFONT), &font->lf) ; - - /* - font->hfont = CreateFont( lfHeight, - 0, - 0, - 0, - 0, - TRUE, - 0, - 0, - DEFAULT_CHARSET, - 0, - 0, - 0, - 0, - "Arial"); - */ } - // RECT rc = { p->x, p->y, 800, 800 }; - // DrawText(hMemDC, text, -1, &rc, DT_NOCLIP | DT_CALCRECT| DT_SINGLELINE); double angle = -atan2( dy, dx ) * 180 / 3.14159 ; ! // printf( "dx %d , dy %d angle %6.3f %s\n", dx, dy, angle, text); SetTextAlign (hMemDC, TA_BASELINE) ; SetViewportOrgEx (hMemDC, p->x, p->y, NULL) ; --- 627,637 ---- if ( NULL == font->hfont ) { ! font->hfont = EzCreateFont (hMemDC, TEXT ("Arial"), font->size/2, 0, 0, TRUE) ; GetObject ( font->hfont, sizeof (LOGFONT), &font->lf) ; } double angle = -atan2( dy, dx ) * 180 / 3.14159 ; ! SetTextAlign (hMemDC, TA_BASELINE) ; SetViewportOrgEx (hMemDC, p->x, p->y, NULL) ; *************** *** 645,649 **** HFONT hOldFont = SelectObject(hMemDC, font->hfont ); ! TextOut(hMemDC, 0,0, text, strlen( text ) ); SelectObject(hMemDC, hOldFont); --- 642,652 ---- HFONT hOldFont = SelectObject(hMemDC, font->hfont ); ! gunichar2* utf16 = NULL; ! glong utf16_len = 0; ! ! utf16 = g_utf8_to_utf16( text, -1, NULL, &utf16_len, NULL ); ! TextOutW(hMemDC, 0,0, utf16, (size_t)utf16_len ); ! g_free( utf16 ); ! SelectObject(hMemDC, hOldFont); *************** *** 683,694 **** } static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *name, int *w, int *h, struct point *hot) { struct graphics_image_priv* ret; ! ret = g_new( struct graphics_image_priv, 1 ); ! printf( "loading image '%s'\n", name ); ! ret->pxpm = Xpm2bmp_new(); ! Xpm2bmp_load( ret->pxpm, name ); return ret; } --- 686,731 ---- } + + void image_cache_hash_add( const char* key, struct graphics_image_priv* val_ptr) + { + char* key_ptr = NULL; + + if ( image_cache_hash == NULL ) { + image_cache_hash = g_hash_table_new(g_str_hash, g_str_equal); + } + + if ( g_hash_table_lookup(image_cache_hash, key ) == NULL ) + { + g_hash_table_insert(image_cache_hash, g_strdup( key ), (gpointer)val_ptr ); + } + + } + + struct graphics_image_priv* image_cache_hash_lookup( const char* key ) + { + struct graphics_image_priv* val_ptr = NULL; + + if ( image_cache_hash != NULL ) + { + val_ptr = g_hash_table_lookup(image_cache_hash, key ); + } + return val_ptr; + } + + + static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *name, int *w, int *h, struct point *hot) { struct graphics_image_priv* ret; ! if ( NULL == ( ret = image_cache_hash_lookup( name ) ) ) ! { ! ret = g_new( struct graphics_image_priv, 1 ); ! printf( "loading image '%s'\n", name ); ! ret->pxpm = Xpm2bmp_new(); ! Xpm2bmp_load( ret->pxpm, name ); ! image_cache_hash_add( name, ret ); ! } ! return ret; } *************** *** 729,733 **** struct graphics_priv *this_=g_new0(struct graphics_priv,1); *meth=graphics_methods; - g_gra = this_; this_->mode = -1; return this_; --- 766,769 ---- Index: win32_gui.h =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/win32gui/win32_gui.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** win32_gui.h 4 Feb 2008 00:44:01 -0000 1.2 --- win32_gui.h 4 Feb 2008 23:53:13 -0000 1.3 *************** *** 2,22 **** #define WIN32_GUI_INCLUDED #include "coord.h" #include "point.h" #include "graphics.h" ! #define ID_CHILD_GFX 2000 ! #define ID_CHILD_1 2001 ! #define ID_CHILD_2 ID_CHILD_1 + 1 ! #define ID_CHILD_3 ID_CHILD_2 + 1 ! #define ID_CHILD_4 ID_CHILD_4 + 1 ! #define ID_DISPLAY_ZOOMIN 8000 ! #define ID_DISPLAY_ZOOMOUT 8001 ! #define ID_FILE_EXIT 9001 ! #define ID_STUFF_GO 9002 #define _(text) gettext(text) struct statusbar_methods; --- 2,27 ---- #define WIN32_GUI_INCLUDED + #include "resources\resource.h" #include "coord.h" #include "point.h" #include "graphics.h" ! #define ID_CHILD_GFX 100 ! #define ID_CHILD_TOOLBAR (ID_CHILD_GFX + 1) ! #define ID_CHILD_1 (ID_CHILD_TOOLBAR + 1) ! #define ID_CHILD_2 (ID_CHILD_1 + 1) ! #define ID_CHILD_3 (ID_CHILD_2 + 1) ! #define ID_CHILD_4 (ID_CHILD_4 + 1) ! #define ID_DISPLAY_ZOOMIN 200 ! #define ID_DISPLAY_ZOOMOUT 201 ! #define ID_DISPLAY_REFRESH 202 ! ! #define ID_FILE_EXIT 9001 ! #define ID_STUFF_GO 9002 #define _(text) gettext(text) + #define POPUP_MENU_OFFSET 4000 struct statusbar_methods; *************** *** 26,29 **** --- 31,41 ---- struct callback; + + struct menu_priv { + HWND wnd_handle; + HMENU hMenu; + struct callback* cb; + }; + struct gui_priv { struct navit *nav; Index: win32_gui.c =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/win32gui/win32_gui.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** win32_gui.c 4 Feb 2008 00:44:01 -0000 1.3 --- win32_gui.c 4 Feb 2008 23:53:13 -0000 1.4 *************** *** 9,13 **** --- 9,18 ---- #include "point.h" #include "menu.h" + #include "callback.h" + #include <commctrl.h> + + //static GHashTable *popup_callback_hash = NULL; + static GArray *popup_menu_array; const char g_szClassName[] = "navit_gui_class"; *************** *** 16,19 **** --- 21,41 ---- static menu_id = 0; static POINT menu_pt; + static gunichar2* g_utf16 = NULL; + + static gunichar2* Utf8ToUtf16( const char* str ) + { + if ( g_utf16 ) + { + g_free( g_utf16 ); + } + g_utf16 = g_utf8_to_utf16( str, -1, NULL, NULL, NULL ); + return g_utf16; + } + + static gunichar2* Utf8ToUtf16_nd( const char* str ) + { + gunichar2* utf16= g_utf8_to_utf16( str, -1, NULL, NULL, NULL ); + return utf16; + } gboolean message_pump( gpointer data ) *************** *** 21,24 **** --- 43,48 ---- MSG messages; + Sleep( 1 ); + if (GetMessage (&messages, NULL, 0, 0)) { *************** *** 34,41 **** ! ! ! ! extern struct graphics_priv *g_gra; BOOL CALLBACK EnumChildProc(HWND hwndChild, LPARAM lParam) --- 58,62 ---- ! //extern struct graphics_priv *g_gra; BOOL CALLBACK EnumChildProc(HWND hwndChild, LPARAM lParam) *************** *** 51,55 **** MoveWindow( hwndChild, 0, 0, rcParent->right, rcParent->bottom, TRUE ); ! (*g_gra->resize_callback)(g_gra->resize_callback_data, rcParent->right, rcParent->bottom); } --- 72,76 ---- MoveWindow( hwndChild, 0, 0, rcParent->right, rcParent->bottom, TRUE ); ! PostMessage( hwndChild, WM_USER+1, 0, 0 ); } *************** *** 61,69 **** #endif static LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { RECT rcClient; ! //printf( "PARENT %d %d %d \n", Message, wParam, lParam ); switch(Message) --- 82,252 ---- #endif + /* + TBBUTTON toolbutton [] = + { + {STD_FILENEW, IDM_NEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_FILEOPEN, IDM_LOAD, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_PRINT, IDM_PRINT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_FILESAVE, IDM_SAVE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_COPY, IDM_COPY, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_DELETE, IDM_DELETE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_PASTE, IDM_PASTE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_CUT, IDM_CUT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_FIND, IDM_FIND, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_HELP, IDM_HELP, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_PRINTPRE , IDM_PRINTVIEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_PROPERTIES, IDM_PROPERTY, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_REDOW, IDM_REDOW, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_REPLACE, IDM_REPLACE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {STD_UNDO, IDM_UNDO, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + {IDB_BITMAP1, IDM_CONSOLE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, + }; + */ + + static void AddToolbarBitmaps( HWND toolbar ) + { + // TBADDBITMAP mybit; + // memset (&mybit, 0, sizeof (TBADDBITMAP)); + // mybit.hInst = instance; + // mybit.nID = IDB_STD_SMALL_COLOR ; + + TBADDBITMAP dabit; + HBITMAP mybitmap = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_NAVITTOOLBAR)); + + memset (&dabit, 0, sizeof (TBADDBITMAP)); + dabit.hInst = NULL; + dabit.nID = (UINT) mybitmap; + + + //int n = SendMessage (toolbar, TB_ADDBITMAP, 0, (LPARAM) &mybit); + int n = SendMessage (toolbar, TB_ADDBITMAP, 10, (LPARAM) &dabit); + } + + static void CreateToolBar(HWND hwnd) + { + // Create Toolbar + HWND hTool; + TBBUTTON tbb[8]; + TBADDBITMAP tbab; + + hTool = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, + hwnd, (HMENU)ID_CHILD_TOOLBAR, GetModuleHandle(NULL), NULL); + if(hTool == NULL) + MessageBox(hwnd, "Could not create tool bar.", "Error", MB_OK | MB_ICONERROR); + + // Send the TB_BUTTONSTRUCTSIZE message, which is required for + // backward compatibility. + SendMessage(hTool, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); + + // AddToolbarBitmaps( hTool ); + // LoadBitmap(GetModuleHandle(NULL), ); + + int inst = GetModuleHandle(NULL); + tbab.hInst = inst; + tbab.nID = IDB_NAVITTOOLBAR; + int iImageOffset = SendMessage(hTool, TB_ADDBITMAP, 10, (LPARAM) &tbab); /* Bitmap contains 5 icons */ + + int iStr; + + // tbab.hInst = HINST_COMMCTRL; + //tbab.nID = IDB_STD_SMALL_COLOR; + // SendMessage(hTool, TB_ADDBITMAP, 0, (LPARAM)&tbab); + + ZeroMemory(tbb, sizeof(tbb)); + + tbb[0].iBitmap = iImageOffset; + tbb[0].fsState = TBSTATE_ENABLED; + tbb[0].fsStyle = TBSTYLE_BUTTON; + tbb[0].idCommand = ID_DISPLAY_ZOOMIN; + iStr = SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("ZoomIn" ) ) ); + tbb[0].iString = iStr; + + tbb[1].iBitmap = iImageOffset+1; + tbb[1].fsState = TBSTATE_ENABLED; + tbb[1].fsStyle = TBSTYLE_BUTTON; + tbb[1].idCommand = ID_DISPLAY_ZOOMOUT; + iStr = SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("ZoomOut" ) ) ); + tbb[1].iString = iStr; + + tbb[2].iBitmap = iImageOffset+4; + tbb[2].fsState = TBSTATE_ENABLED; + tbb[2].fsStyle = TBSTYLE_BUTTON; + tbb[2].idCommand = ID_DISPLAY_ZOOMIN; + iStr = SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("Refresh" ) ) ); + tbb[2].iString = iStr; + + tbb[3].iBitmap = iImageOffset+2; + tbb[3].fsState = TBSTATE_ENABLED; + tbb[3].fsStyle = TBSTYLE_BUTTON; + tbb[3].idCommand = ID_DISPLAY_ZOOMIN; + iStr = SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("Cursor" ) ) ); + tbb[3].iString = iStr; + + tbb[4].iBitmap = iImageOffset+5; + tbb[4].fsState = TBSTATE_ENABLED; + tbb[4].fsStyle = TBSTYLE_BUTTON; + tbb[4].idCommand = ID_DISPLAY_ZOOMIN; + iStr = SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("Orientation" ) ) ); + tbb[4].iString = iStr; + + tbb[5].iBitmap = iImageOffset+8; + tbb[5].fsState = TBSTATE_ENABLED; + tbb[5].fsStyle = TBSTYLE_BUTTON; + tbb[5].idCommand = ID_DISPLAY_ZOOMIN; + iStr= SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("Destination" ) ) ); + tbb[5].iString = iStr; + + tbb[6].iBitmap = iImageOffset+3; + tbb[6].fsState = TBSTATE_ENABLED; + tbb[6].fsStyle = TBSTYLE_BUTTON; + tbb[6].idCommand = ID_DISPLAY_ZOOMIN; + iStr= SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("Roadbook" ) ) ); + tbb[6].iString = iStr; + + tbb[7].iBitmap = iImageOffset+9; + tbb[7].fsState = TBSTATE_ENABLED; + tbb[7].fsStyle = TBSTYLE_BUTTON; + tbb[7].idCommand = ID_FILE_EXIT; + iStr= SendMessage(hTool, TB_ADDSTRINGW, 0, (LPARAM) Utf8ToUtf16( _("_Quit" ) ) ); + tbb[7].iString = iStr; + + SendMessage(hTool, TB_ADDBUTTONS, sizeof(tbb)/sizeof(TBBUTTON), (LPARAM)&tbb); + HWND hChild = GetDlgItem(hwnd, ID_CHILD_TOOLBAR); + hChild = hChild; + } + + static void window_layout( HWND hwnd ) + { + RECT rcClient; + RECT rcTool; + int iToolHeight; + + HWND hChild = GetDlgItem(hwnd, ID_CHILD_TOOLBAR); + SendMessage(hChild, TB_AUTOSIZE, 0, 0); + + GetWindowRect(hChild, &rcTool); + iToolHeight = rcTool.bottom - rcTool.top; + + GetClientRect(hwnd, &rcClient); + //printf( "BEFORE resize gui to: %d %d %d %d \n", rcClient.left, rcClient.right, rcClient.top, rcClient.bottom ); + + rcClient.top += iToolHeight; + + printf( "resize gui to: %d %d %d %d \n", rcClient.left, rcClient.right, rcClient.top, rcClient.bottom ); + + + hChild = GetDlgItem(hwnd, ID_CHILD_GFX); + if ( hChild ) + { + MoveWindow( hChild, rcClient.left, rcClient.top, rcClient.right- rcClient.left, rcClient.bottom - rcClient.top, TRUE ); + PostMessage( hChild, WM_USER+1, 0, 0 ); + } + } + static LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { RECT rcClient; ! // printf( "PARENT %d %d %d \n", Message, wParam, lParam ); switch(Message) *************** *** 72,76 **** { HMENU hMenu, hSubMenu; ! HICON hIcon, hIconSm; hMenu = CreateMenu(); --- 255,260 ---- { HMENU hMenu, hSubMenu; ! ! CreateToolBar( hwnd ); hMenu = CreateMenu(); *************** *** 79,100 **** hSubMenu = CreatePopupMenu(); ! gunichar2* utf16 = NULL; ! ! utf16 = g_utf8_to_utf16( _( "_Quit" ), -1, NULL, NULL, NULL ); ! AppendMenuW(hSubMenu, MF_STRING, ID_FILE_EXIT, utf16 ); ! g_free( utf16 ); ! ! utf16 = g_utf8_to_utf16( _( "Zoom in" ), -1, NULL, NULL, NULL ); ! AppendMenuW(hSubMenu, MF_STRING, ID_DISPLAY_ZOOMIN, utf16 ); ! g_free( utf16 ); ! ! utf16 = g_utf8_to_utf16( _( "Zoom out" ), -1, NULL, NULL, NULL ); ! AppendMenuW(hSubMenu, MF_STRING, ID_DISPLAY_ZOOMOUT, utf16 ); ! g_free( utf16 ); ! ! utf16 = g_utf8_to_utf16( _( "Display" ), -1, NULL, NULL, NULL ); ! AppendMenuW(hMenu, MF_STRING | MF_POPUP, (UINT)hSubMenu, utf16 ); ! g_free( utf16 ); hSubMenu = CreatePopupMenu(); AppendMenu(hSubMenu, MF_STRING, ID_STUFF_GO, "&Go"); --- 263,273 ---- hSubMenu = CreatePopupMenu(); ! AppendMenuW(hSubMenu, MF_STRING, ID_DISPLAY_ZOOMIN, Utf8ToUtf16( _( "ZoomIn" ) ) ); ! AppendMenuW(hSubMenu, MF_STRING, ID_DISPLAY_ZOOMOUT, Utf8ToUtf16( _( "ZoomOut" ) ) ); ! AppendMenuW(hSubMenu, MF_STRING, ID_DISPLAY_REFRESH, Utf8ToUtf16( _( "Refresh" ) ) ); ! AppendMenuW(hSubMenu, MF_SEPARATOR, 0, NULL ); ! AppendMenuW(hSubMenu, MF_STRING, ID_FILE_EXIT, Utf8ToUtf16( _( "_Quit" ) ) ); + AppendMenuW(hMenu, MF_STRING | MF_POPUP, (UINT)hSubMenu, Utf8ToUtf16( _( "Display" ) ) ); hSubMenu = CreatePopupMenu(); AppendMenu(hSubMenu, MF_STRING, ID_STUFF_GO, "&Go"); *************** *** 103,120 **** SetMenu(hwnd, hMenu); ! #if 0 ! hIcon = LoadImage(NULL, "menu_two.ico", IMAGE_ICON, 32, 32, LR_LOADFROMFILE); ! if(hIcon) ! SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon); ! else ! MessageBox(hwnd, "Could not load large icon!", "Error", MB_OK | MB_ICONERROR); ! ! hIconSm = LoadImage(NULL, "menu_two.ico", IMAGE_ICON, 16, 16, LR_LOADFROMFILE); ! if(hIconSm) ! SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); ! else ! MessageBox(hwnd, "Could not load small icon!", "Error", MB_OK | MB_ICONERROR); ! ! #endif } --- 276,280 ---- SetMenu(hwnd, hMenu); ! window_layout( hwnd ); } *************** *** 122,127 **** --- 282,303 ---- case WM_COMMAND: { + printf( "WM_COMMAND %d\n", LOWORD(wParam) ); struct gui_priv* gui = (struct gui_priv*)GetWindowLongPtr( hwnd , DWLP_USER ); + if ( popup_menu_array ) + { + struct menu_priv* priv = (struct menu_priv*)g_array_index( popup_menu_array, gint, LOWORD(wParam) - POPUP_MENU_OFFSET ); + + if ( priv ) + { + struct callback* cb = priv->cb; + if ( priv->cb ) + { + callback_call_0( priv->cb ); + return 0; + } + } + } + switch(LOWORD(wParam)) { *************** *** 135,150 **** PostMessage(hwnd, WM_CLOSE, 0, 0); break; - case ID_STUFF_GO: - (*g_gra->resize_callback)(g_gra->resize_callback_data, g_gra->width, g_gra->height); - - // navit_draw(gui->nav); - // MessageBox(hwnd, "You clicked Go!", "Woo!", MB_OK); - break; } } break; case WM_USER+ 1: ! printf( "wm_user \n" ); ! (*g_gra->resize_callback)( g_gra->resize_callback_data, g_gra->width, g_gra->height ); break; case WM_CLOSE: --- 311,325 ---- PostMessage(hwnd, WM_CLOSE, 0, 0); break; } + return 0; } break; case WM_USER+ 1: ! GetClientRect(hwnd, &rcClient); ! printf( "resize gui to: %d %d \n", rcClient.right, rcClient.bottom ); ! ! window_layout( hwnd ); ! //EnumChildWindows(hwnd, EnumChildProc, (LPARAM) &rcClient); ! return 0; break; case WM_CLOSE: *************** *** 152,159 **** break; case WM_SIZE: ! GetClientRect(hwnd, &rcClient); ! printf( "resize gui to: %d %d \n", rcClient.right, rcClient.bottom ); ! ! EnumChildWindows(hwnd, EnumChildProc, (LPARAM) &rcClient); return 0; break; --- 327,331 ---- break; case WM_SIZE: ! window_layout( hwnd ); return 0; break; *************** *** 196,205 **** wc.cbWndExtra = 32; wc.hInstance = NULL; - wc.hIcon = NULL; wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wc.lpszMenuName = NULL; wc.lpszClassName = g_szClassName; ! wc.hIconSm = NULL; if(!RegisterClassEx(&wc)) --- 368,377 ---- wc.cbWndExtra = 32; wc.hInstance = NULL; wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wc.lpszMenuName = NULL; wc.lpszClassName = g_szClassName; ! wc.hIconSm = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_NAVIT)); ! wc.hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_NAVIT)); if(!RegisterClassEx(&wc)) *************** *** 252,259 **** } - struct menu_priv { - HWND wnd_handle; - HMENU hMenu; - }; static struct menu_methods menu_methods; --- 424,427 ---- *************** *** 284,287 **** --- 452,461 ---- AppendMenu( menu->hMenu, MF_STRING, menu_id, name ); } + + // g_hash_table_insert( popup_callback_hash, GINT_TO_POINTER( menu_id ), (gpointer)cb ); + g_array_append_val( popup_menu_array, ret ); + + ret->cb = cb; + menu_id++; *************** *** 309,323 **** static void popup_activate(struct menu_priv *menu) { ! POINT menu_pt = { 200,200 }; ! POINT pnt = menu_pt; ! ! ClientToScreen(menu->wnd_handle, (LPPOINT) &pnt); if (menu->hMenu) { ! TrackPopupMenu (menu->hMenu, 0, pnt.x, pnt.y, 0, menu->wnd_handle, NULL); } } struct menu_priv* win32_gui_popup_new(struct gui_priv *this_, struct menu_methods *meth) { --- 483,502 ---- static void popup_activate(struct menu_priv *menu) { ! POINT pnt; ! GetCursorPos( &pnt ); if (menu->hMenu) { ! TrackPopupMenu( menu->hMenu, 0, pnt.x, pnt.y, 0, menu->wnd_handle, NULL ); ! DestroyMenu( menu->hMenu ); } } + + static void popup_deactivate( struct menu_priv *menu ) + { + DestroyMenu( menu->hMenu ); + } + struct menu_priv* win32_gui_popup_new(struct gui_priv *this_, struct menu_methods *meth) { *************** *** 327,332 **** *meth = menu_methods; ! menu_id = 4000; ret->hMenu = CreatePopupMenu(); ret->wnd_handle = this_->hwnd; --- 506,520 ---- *meth = menu_methods; ! menu_id = POPUP_MENU_OFFSET; + if ( popup_menu_array ) + { + g_array_free (popup_menu_array, TRUE); + popup_menu_array = NULL; + } + + popup_menu_array = g_array_new (FALSE, FALSE, sizeof (gint)); + + ret->cb = NULL; ret->hMenu = CreatePopupMenu(); ret->wnd_handle = this_->hwnd; |
|
From: Albert L F. <af...@us...> - 2008-02-04 23:53:10
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/win32gui/resources In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24391/win32gui/resources Added Files: navit.ico resource.h resource.rc toolbar.bmp Log Message: Fix:projs/CodeBlocks:win32 native toolbar and added app icon --- NEW FILE: navit.ico --- (This appears to be a binary file; contents omitted.) --- NEW FILE: resource.h --- #include <windows.h> #define IDI_NAVIT 1100 #define IDB_NAVITTOOLBAR 1101 --- NEW FILE: resource.rc --- ///////////////////////////////////////////////////////////////////////////// // // Bitmap // #include "resource.h" ///////////////////////////////////////////////////////////////////////////// // // Bitmap // IDB_NAVITTOOLBAR BITMAP DISCARDABLE "toolbar.bmp" IDI_NAVIT ICON DISCARDABLE "navit.ico" --- NEW FILE: toolbar.bmp --- (This appears to be a binary file; contents omitted.) |
|
From: Albert L F. <af...@us...> - 2008-02-04 23:53:09
|
Update of /cvsroot/navit/navit/projs/CodeBlocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24391 Modified Files: Navit_win32.cbp makefile_extra Log Message: Fix:projs/CodeBlocks:win32 native toolbar and added app icon Index: Navit_win32.cbp =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit_win32.cbp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Navit_win32.cbp 4 Feb 2008 00:46:04 -0000 1.1 --- Navit_win32.cbp 4 Feb 2008 23:53:13 -0000 1.2 *************** *** 102,105 **** --- 102,108 ---- <Add directory="%GTK_DIR%\include\freetype2" /> </Compiler> + <ResourceCompiler> + <Add directory="win32gui\resources" /> + </ResourceCompiler> <Linker> <Add directory="%GTK_DIR%\lib" /> *************** *** 108,111 **** --- 111,118 ---- <Option compilerVar="CC" /> </Unit> + <Unit filename="win32gui\resources\resource.h" /> + <Unit filename="win32gui\resources\resource.rc"> + <Option compilerVar="WINDRES" /> + </Unit> <Extensions> <code_completion /> Index: makefile_extra =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/makefile_extra,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile_extra 12 Jan 2008 22:38:25 -0000 1.1 --- makefile_extra 4 Feb 2008 23:53:13 -0000 1.2 *************** *** 17,21 **** DST_MO_PATH = $(DST_BIN_PATH)/locale ! GTK_DLLS = \ freetype6.dll \ --- 17,28 ---- DST_MO_PATH = $(DST_BIN_PATH)/locale ! WIN32_DLLS = \ ! iconv.dll \ ! intl.dll \ ! libglib-2.0-0.dll \ ! libgmodule-2.0-0.dll \ ! libgobject-2.0-0.dll \ ! zlib1.dll ! GTK_DLLS = \ freetype6.dll \ *************** *** 40,44 **** zlib1.dll ! NAVIT_EXES = navit.exe osm2navit.exe --- 47,52 ---- zlib1.dll ! NAVIT_EXES_GTK = navit_gtk.exe osm2navit.exe ! NAVIT_EXES_W32 = navit_win32.exe osm2navit.exe *************** *** 76,85 **** rm -Rf locale ! distr: $(SAMPLE_MAP).bin $(POFILES) rm -Rf $(DISTR_TARGET_PATH); mkdir -p $(DST_BIN_PATH); mkdir -p $(DST_ETC_PATH); mkdir -p $(DST_LIB_PATH); ! for i in $(NAVIT_EXES); do \ cp $(SRC_NAVIT_EXE_PATH)/$$i $(DST_BIN_PATH)/$$i; \ done; --- 84,93 ---- rm -Rf locale ! distr_gtk: $(SAMPLE_MAP).bin $(POFILES) rm -Rf $(DISTR_TARGET_PATH); mkdir -p $(DST_BIN_PATH); mkdir -p $(DST_ETC_PATH); mkdir -p $(DST_LIB_PATH); ! for i in $(NAVIT_EXES_GTK); do \ cp $(SRC_NAVIT_EXE_PATH)/$$i $(DST_BIN_PATH)/$$i; \ done; *************** *** 101,102 **** --- 109,134 ---- cp -r $(SRC_MO_PATH)/* $(DST_MO_PATH)/ + distr_win32: $(SAMPLE_MAP).bin $(POFILES) + rm -Rf $(DISTR_TARGET_PATH); + mkdir -p $(DST_BIN_PATH); + mkdir -p $(DST_ETC_PATH); + mkdir -p $(DST_LIB_PATH); + for i in $(NAVIT_EXES); do \ + cp $(SRC_NAVIT_EXE_W32_PATH)/$$i $(DST_BIN_PATH)/$$i; \ + done; + for i in $(WIN32_DLLS); do \ + cp $(SRC_GTK_BIN_PATH)/$$i $(DST_BIN_PATH)/$$i; \ + done; + cp -r $(SRC_GTK_ETC_PATH)/* $(DST_ETC_PATH) ; + mkdir -p $(DST_LIB_PATH)/gtk-2.0/2.10.0 ; + cp -r $(SRC_GTK_LIB_PATH)/gtk-2.0/2.10.0/* $(DST_LIB_PATH)/gtk-2.0/2.10.0 ; + mkdir -p $(DST_LIB_PATH)/pango ; + cp -r $(SRC_GTK_LIB_PATH)/pango/* $(DST_LIB_PATH)/pango ; + cp ./navit.xml.distr $(DST_BIN_PATH)/navit.xml ; + cp ./*.ttf $(DST_BIN_PATH)/ ; + mkdir -p $(DST_MAP_PATH) ; + cp $(SAMPLE_MAP).bin $(DST_MAP_PATH)/ ; + mkdir -p $(DST_XPM_PATH) ; + cp -r $(SRC_XPM_PATH)/*.xpm $(DST_XPM_PATH)/ ; + mkdir -p $(DST_MO_PATH) ; + cp -r $(SRC_MO_PATH)/* $(DST_MO_PATH)/ |
|
From: Albert L F. <af...@us...> - 2008-02-04 23:53:09
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24391/Win32Extra Modified Files: navit_win32.c Log Message: Fix:projs/CodeBlocks:win32 native toolbar and added app icon Index: navit_win32.c =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/navit_win32.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** navit_win32.c 4 Feb 2008 00:44:01 -0000 1.1 --- navit_win32.c 4 Feb 2008 23:53:13 -0000 1.2 *************** *** 1,8 **** extern void module_vehicle_demo_init(void); extern void module_vehicle_file_init(void); - extern void module_win32_gui_init(void); extern void module_speech_speech_dispatcher_init(void); ! extern void builtin_init(void); void builtin_init(void) { module_data_textfile_init(); --- 1,14 ---- + + extern void module_data_textfile_init(void); + extern void module_data_binfile_init(void); + extern void module_data_mg_init(void); + extern void module_win32_gui_init(void); + extern void module_data_garmin_init(void); + extern void module_data_poi_geodownload_init(void); extern void module_vehicle_demo_init(void); extern void module_vehicle_file_init(void); extern void module_speech_speech_dispatcher_init(void); ! void builtin_init(void) { module_data_textfile_init(); |
|
From: Albert L F. <af...@us...> - 2008-02-04 23:49:12
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/win32gui/resources In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22597/resources Log Message: Directory /cvsroot/navit/navit/projs/CodeBlocks/win32gui/resources added to the repository |
13 messages has been excluded from this view by a project administrator.
