Menu
▾
▴
roadmap-commit — track CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(92) |
Dec
(141) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(126) |
Feb
(72) |
Mar
(31) |
Apr
(200) |
May
(81) |
Jun
(130) |
Jul
(112) |
Aug
(134) |
Sep
(76) |
Oct
(89) |
Nov
(153) |
Dec
(9) |
| 2007 |
Jan
(59) |
Feb
(82) |
Mar
(50) |
Apr
(20) |
May
(9) |
Jun
(81) |
Jul
(41) |
Aug
(109) |
Sep
(91) |
Oct
(87) |
Nov
(33) |
Dec
(60) |
| 2008 |
Jan
(21) |
Feb
(15) |
Mar
(38) |
Apr
(75) |
May
(59) |
Jun
(46) |
Jul
(30) |
Aug
(20) |
Sep
(35) |
Oct
(32) |
Nov
(34) |
Dec
(19) |
| 2009 |
Jan
(29) |
Feb
(71) |
Mar
(54) |
Apr
(17) |
May
(4) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(58) |
Sep
(7) |
Oct
(7) |
Nov
(12) |
Dec
(18) |
| 2011 |
Jan
(17) |
Feb
(29) |
Mar
(11) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(11) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(87) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(44) |
Jun
(79) |
Jul
(16) |
Aug
(31) |
Sep
|
Oct
(51) |
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Paul F. <pg...@us...> - 2006-09-27 09:16:55
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3713 Modified Files: roadmap_trip.c Log Message: shorten "Arrive" message -- it takes too much on-screen space on small screens. Index: roadmap_trip.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** roadmap_trip.c 27 Sep 2006 09:15:07 -0000 1.58 --- roadmap_trip.c 27 Sep 2006 09:16:50 -0000 1.59 *************** *** 1426,1430 **** desc = next->description; if (desc == NULL) { ! desc = "Arrive at destination"; } --- 1426,1431 ---- desc = next->description; if (desc == NULL) { ! // desc = "Arrive at destination"; ! desc = "Arrive"; } |
|
From: Paul F. <pg...@us...> - 2006-09-27 09:15:15
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2934 Modified Files: roadmap_trip.c Log Message: include on-screen keyboard when adding a waypoint, for immediate renaming Index: roadmap_trip.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** roadmap_trip.c 27 Sep 2006 08:51:48 -0000 1.57 --- roadmap_trip.c 27 Sep 2006 09:15:07 -0000 1.58 *************** *** 551,555 **** ("Okay", roadmap_trip_add_waypoint_dialog_okay); ! roadmap_dialog_complete (0); } roadmap_dialog_set_data ("Name", "Name:", name); --- 551,555 ---- ("Okay", roadmap_trip_add_waypoint_dialog_okay); ! roadmap_dialog_complete (roadmap_preferences_use_keyboard ()); } roadmap_dialog_set_data ("Name", "Name:", name); |
|
From: Paul F. <pg...@us...> - 2006-09-27 08:51:52
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25747 Modified Files: roadmap_trip.c Log Message: one too many edits slipped in with last commit Index: roadmap_trip.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** roadmap_trip.c 27 Sep 2006 08:44:06 -0000 1.56 --- roadmap_trip.c 27 Sep 2006 08:51:48 -0000 1.57 *************** *** 1710,1715 **** static void roadmap_trip_standalone_waypoint_draw(const waypoint *waypointp) { ! roadmap_landmark_draw_waypoint ! (waypointp, "TripLandmark", 0, RoadMapLandmarksPen); } --- 1710,1714 ---- static void roadmap_trip_standalone_waypoint_draw(const waypoint *waypointp) { ! roadmap_landmark_draw_waypoint (waypointp, "TripLandmark"); } |
|
From: Paul F. <pg...@us...> - 2006-09-27 08:44:11
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22303 Modified Files: roadmap_start.c roadmap_trip.c roadmap_trip.h sprites Log Message: add ability to display waypoints from routes other than the currently active route. no directionality is shown for the "other" routes. Index: roadmap_trip.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** roadmap_trip.c 16 Aug 2006 14:00:00 -0000 1.55 --- roadmap_trip.c 27 Sep 2006 08:44:06 -0000 1.56 *************** *** 90,93 **** --- 90,96 ---- static int RoadMapTripFocusMoved = 1; + static int RoadMapTripDrawingActiveRoute; + static int RoadMapTripShowInactiveRoutes = 0; + typedef struct roadmap_trip_focal { *************** *** 1707,1711 **** static void roadmap_trip_standalone_waypoint_draw(const waypoint *waypointp) { ! roadmap_landmark_draw_waypoint(waypointp, "TripLandmark"); } --- 1710,1715 ---- static void roadmap_trip_standalone_waypoint_draw(const waypoint *waypointp) { ! roadmap_landmark_draw_waypoint ! (waypointp, "TripLandmark", 0, RoadMapLandmarksPen); } *************** *** 1720,1724 **** int azymuth = 0; ! if (RoadMapCurrentRoute->rte_is_track) { sprite = "Track"; rotate = 0; --- 1724,1730 ---- int azymuth = 0; ! if ( !RoadMapTripDrawingActiveRoute) { ! sprite = "Waypoint"; ! } else if (RoadMapCurrentRoute->rte_is_track) { sprite = "Track"; rotate = 0; *************** *** 1752,1755 **** --- 1758,1773 ---- RoadMapTripFocal *focal; RoadMapTripFocal *gps = RoadMapTripGps; + RoadMapListItem *elem, *tmp; + + /* Show all the inactive route waypoints first */ + if (RoadMapTripShowInactiveRoutes) { + RoadMapTripDrawingActiveRoute = 0; + ROADMAP_LIST_FOR_EACH (&RoadMapTripRouteHead, elem, tmp) { + route_head *rh = (route_head *) elem; + if (rh == RoadMapCurrentRoute) continue; + route_waypt_iterator + (rh, roadmap_trip_route_waypoint_draw); + } + } /* Show the standalone trip waypoints. */ *************** *** 1759,1762 **** --- 1777,1781 ---- /* Show all the on-route waypoints. */ if (RoadMapCurrentRoute != NULL) { + RoadMapTripDrawingActiveRoute = 1; route_waypt_iterator (RoadMapCurrentRoute, roadmap_trip_route_waypoint_draw); *************** *** 1794,1797 **** --- 1813,1823 ---- } + void roadmap_trip_toggle_show_inactive(void) { + + RoadMapTripShowInactiveRoutes = ! RoadMapTripShowInactiveRoutes; + RoadMapTripRefresh = 1; + roadmap_screen_refresh(); + } + static const char *roadmap_trip_current() { *************** *** 2154,2158 **** static void roadmap_trip_route_convert_worker (route_head *orig_route, char *new_name, ! int simplify, int wanttrack, int reverse) { int dropped = 0; --- 2180,2184 ---- static void roadmap_trip_route_convert_worker (route_head *orig_route, char *new_name, ! int simplify, int wanttrack, int reverse) { int dropped = 0; *************** *** 2173,2179 **** } ! if (reverse) { ! route_reverse(new_route); ! } if (wanttrack) { --- 2199,2205 ---- } ! if (reverse) { ! route_reverse(new_route); ! } if (wanttrack) { Index: roadmap_trip.h =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** roadmap_trip.h 15 Jul 2006 16:49:29 -0000 1.23 --- roadmap_trip.h 27 Sep 2006 08:44:06 -0000 1.24 *************** *** 68,71 **** --- 68,72 ---- void roadmap_trip_format_messages (void); void roadmap_trip_display (void); + void roadmap_trip_toggle_show_inactive(void); void roadmap_trip_new (void); Index: sprites =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/sprites,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** sprites 7 Dec 2005 18:57:35 -0000 1.9 --- sprites 27 Sep 2006 08:44:06 -0000 1.10 *************** *** 32,37 **** A RedDotCircle S Waypoint ! A GreenDot S Start --- 32,40 ---- A RedDotCircle + S PointOfInterest + A SmallRedDot + S Waypoint ! A DarkGreenDot S Start *************** *** 108,111 **** --- 111,118 ---- C 0,0 7 + S SmallRedDot + F red 1 + D 0,0 3 + S GreenTrianglePointer F green 2 *************** *** 123,126 **** --- 130,139 ---- C 0,0 5 + S DarkGreenDot + F darkgreen 1 + D 0,0 5 + F black 1 + C 0,0 5 + S GreenSquare F black 1 Index: roadmap_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** roadmap_start.c 15 Aug 2006 16:47:36 -0000 1.101 --- roadmap_start.c 27 Sep 2006 08:44:06 -0000 1.102 *************** *** 49,52 **** --- 49,53 ---- #include "roadmap_gps.h" + #include "roadmap_canvas.h" #include "roadmap_time.h" #include "roadmap_preferences.h" *************** *** 59,62 **** --- 60,64 ---- #include "roadmap_track.h" #include "roadmap_landmark.h" + // #include "roadmap_features.h" #include "roadmap_adjust.h" #include "roadmap_screen.h" *************** *** 502,505 **** --- 504,511 ---- "Select, rename, or delete routes", roadmap_trip_route_manage_dialog}, + {"allroutetoggle", "Show/Hide Inactive Routes", "AllRoutes", NULL, + "Show or Hide currently inactive routes", + roadmap_trip_toggle_show_inactive}, + {"gpsaswaypoint", "New place from GPS...", "GPS Place", "GW", "Create new place using current GPS position", *************** *** 627,630 **** --- 633,637 ---- "createroute", "setasdestination", + "allroutetoggle", ROADMAP_MENU "Places", *************** *** 1000,1003 **** --- 1007,1011 ---- roadmap_track_initialize (); roadmap_landmark_initialize (); + // roadmap_features_initialize (); roadmap_pointer_initialize (); roadmap_screen_initialize (); *************** *** 1048,1051 **** --- 1056,1060 ---- roadmap_track_autoload (); roadmap_landmark_load (); + // roadmap_features_load (); #endif |
|
From: Ehud S. <esh...@us...> - 2006-09-17 20:46:53
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/FreeMap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32609/FreeMap Modified Files: FreeMap.vcp Log Message: Update evc files. Index: FreeMap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/FreeMap/FreeMap.vcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FreeMap.vcp 4 Sep 2006 06:55:39 -0000 1.1 --- FreeMap.vcp 17 Sep 2006 20:46:45 -0000 1.2 *************** *** 46,54 **** # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 --- 46,55 ---- # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "FREEMAP_IL" /YX /O2 /M$(CECrtMT) /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 *************** *** 57,62 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "FreeMap - Win32 (WCE ARMV4) Debug" --- 58,63 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib aygshell.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "FreeMap - Win32 (WCE ARMV4) Debug" *************** *** 75,83 **** # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 --- 76,85 ---- # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "FREEMAP_IL" /YX /M$(CECrtMTDebug) /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 *************** *** 86,91 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ENDIF --- 88,93 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib aygshell.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ENDIF *************** *** 98,101 **** --- 100,161 ---- # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + # Begin Source File + + SOURCE=..\..\CEDevice.cpp + DEP_CPP_CEDEV=\ + "..\..\CEDevice.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\CEException.cpp + DEP_CPP_CEEXC=\ + "..\..\CEException.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\roadmap_main.cpp + DEP_CPP_ROADM=\ + "..\..\..\editor\editor_main.h"\ + "..\..\..\editor\export\editor_sync.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_dialog.h"\ + "..\..\..\roadmap_download.h"\ + "..\..\..\roadmap_factory.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gps.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_history.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_messagebox.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_screen.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_start.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\CEDevice.h"\ + "..\..\CEException.h"\ + "..\..\roadmap_win32.h"\ + "..\..\roadmap_wincecanvas.h"\ + "..\..\win32_serial.h"\ + "..\..\wince_input_mon.h"\ + "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"notify.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"winuserm.h"\ + + NODEP_CPP_ROADM=\ + "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ + + # End Source File # End Group # Begin Group "Header Files" *************** *** 106,109 **** --- 166,173 ---- # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + # Begin Source File + + SOURCE=..\..\roadmap.rc + # End Source File # End Group # End Target |
|
From: Ehud S. <esh...@us...> - 2006-09-17 20:46:50
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32609 Modified Files: Roadmap.vcw Log Message: Update evc files. Index: Roadmap.vcw =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap.vcw,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Roadmap.vcw 3 Sep 2006 18:20:34 -0000 1.10 --- Roadmap.vcw 17 Sep 2006 20:46:45 -0000 1.11 *************** *** 30,33 **** --- 30,60 ---- Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name agg + End Project Dependency + Begin Project Dependency + Project_Dep_Name fribidi + End Project Dependency + Begin Project Dependency + Project_Dep_Name libdgl + End Project Dependency + Begin Project Dependency + Project_Dep_Name libft + End Project Dependency + Begin Project Dependency + Project_Dep_Name libguiroadmap + End Project Dependency + Begin Project Dependency + Project_Dep_Name libosroadmap + End Project Dependency + Begin Project Dependency + Project_Dep_Name libroadmap + End Project Dependency + Begin Project Dependency + Project_Dep_Name libwinceguiroadmap + End Project Dependency + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency }}} |
|
From: Ehud S. <esh...@us...> - 2006-09-17 20:46:02
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/setupdll In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32232 Modified Files: setupdll.cpp Log Message: Remove old maps before a new installation. Index: setupdll.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/setupdll/setupdll.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** setupdll.cpp 3 Sep 2006 18:20:35 -0000 1.2 --- setupdll.cpp 17 Sep 2006 20:45:59 -0000 1.3 *************** *** 13,19 **** BOOL ffirstcall,BOOL fpreviouslyinstalled,LPCTSTR pszinstalldir) { ! //do nothing ! //return value ! return codeINSTALL_INIT_CONTINUE; } --- 13,37 ---- BOOL ffirstcall,BOOL fpreviouslyinstalled,LPCTSTR pszinstalldir) { ! if (!ffirstcall || !fpreviouslyinstalled) return codeINSTALL_INIT_CONTINUE; ! ! const int NUM_FILES = 2; ! const WCHAR *FILES[] = { ! L"edt77001.rdm", ! L"usc77001.dgl" ! }; ! ! ! WCHAR maps_dir[255]; ! wcscpy(maps_dir, pszinstalldir); ! wcscat(maps_dir, L"\\maps"); ! ! for (int i=0; i<NUM_FILES; i++) { ! WCHAR file[300]; ! ! _sntprintf(file, sizeof(file), L"%s\\%s", maps_dir, FILES[i]); ! DeleteFile(file); ! } ! ! return codeINSTALL_INIT_CONTINUE; } *************** *** 69,72 **** --- 87,91 ---- BOOL res = CeRunAppAtEvent(roadmap_exe, NOTIFICATION_EVENT_NONE); + /* //initialize character array memset(pszfilepath,0,sizeof(pszfilepath)); *************** *** 88,91 **** --- 107,111 ---- } + */ //return value return codeUNINSTALL_INIT_CONTINUE; |
|
From: Ehud S. <esh...@us...> - 2006-09-17 20:44:46
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/freemap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31837/freemap Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/freemap added to the repository |
|
From: Ehud S. <esh...@us...> - 2006-09-17 20:44:22
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31820 Added Files: freemap_install.inf roadmap_install.inf Log Message: Import wince installation scripts. --- NEW FILE: roadmap_install.inf --- [CEStrings] AppName = "Roadmap" InstallDir = %CE1%\%AppName% [Strings] CompanyName = "FreeMap" [Version] Signature = "$Chicago$" CESignature = "$Windows CE$" Provider = %CompanyName% [DefaultInstall] CEShortcuts = Shortcuts.All [DefaultInstall.ARM] CopyFiles = Files.Config, Files.Maps, Files.ARM, Files.Icons, Files.Sound, Files.Dll [SourceDisksNames] 1 = ,"Common config files",,L:\shared\roadmap_editor\src 2 = ,"Common map files",,L:\shared\roadmap_editor\maps 5 = ,"WinCE preferences",,L:\shared\roadmap_editor\src\win32 6 = ,"Manual",,L:\shared\roadmap_editor\manual 7 = ,"bmp icons",,L:\shared\roadmap_editor\src\icons\bmp 10 = ,"sound",,L:\shared\roadmap_editor\src\en_sound [SourceDisksNames.ARM] 3 = ,"ARM files",,L:\shared\roadmap_editor\src\win32\wince_env\Roadmap\ARMV4Rel 4 = ,"ARM files",,L:\shared\roadmap_editor\src\win32\wince_env\RoadGPS\ARMV4Rel 8 = ,"ARMDll files",,C:\Projects\ComSplit\ARMV4Rel [SourceDisksFiles] drivers = 1 preferences = 1 session = 5 roadmap.toolbar = 5 schema = 1 sprites = 1 objects = 1 objects_wide = 1 font.ttf = 1 usc77001.rdm = 2 usdir.rdm = 2 apt_toc.gif = 6 manual.html = 6 rm_2d.bmp = 7 rm_3d.bmp = 7 rm_clockwise.bmp = 7 rm_counterclockwise.bmp = 7 rm_destination.bmp = 7 rm_full.bmp = 7 rm_gps.bmp = 7 rm_hold.bmp = 7 rm_location.bmp = 7 rm_quit.bmp = 7 rm_record.bmp = 7 rm_stop.bmp = 7 rm_zoom1.bmp = 7 rm_zoomin.bmp = 7 rm_zoomout.bmp = 7 rm_menu.bmp = 7 nav_approaching.bmp = 7 nav_continue.bmp = 7 nav_keep_left.bmp = 7 nav_keep_right.bmp = 7 nav_panel.bmp = 7 nav_panel_wide.bmp = 7 nav_turn_left.bmp = 7 nav_turn_right.bmp = 7 nav_u_turn.bmp = 7 sync.bmp = 7 200.wav = 10 800.wav = 10 Arrive.wav = 10 KeepLeft.wav = 10 KeepRight.wav = 10 m.wav = 10 Straight.wav = 10 TurnLeft.wav = 10 TurnRight.wav = 10 within.wav = 10 rec_start.wav = 10 rec_end.wav = 10 [SourceDisksFiles.ARM] Roadmap.exe = 3 RoadGPS.exe = 4 ComSplit.dll = 8 [DestinationDirs] Shortcuts.All = 0,%CE11% Files.Config = 0,%InstallDir% Files.Maps = 0,%InstallDir%\Maps Files.ARM = 0,%InstallDir% Files.Icons = 0,%InstallDir%\icons Files.Sound = 0,%InstallDir%\sound Files.Dll = 0,\Windows DefaultDestDir = 0,%InstallDir% [Shortcuts.All] %AppName%,0,Roadmap.exe ; RoadGPS,0,RoadGPS.exe [Files.Config] drivers,,,0x00000010 preferences,,,0x00000010 session,,,0x00000010 roadmap.toolbar,,,0x00000010 schema,,,0x00000010 sprites,,,0x00000010 objects,,,0x00000010 objects_wide,,,0x00000010 font.ttf,,,0x00000010 apt_toc.gif,,,0 manual.html,,,0 [Files.Icons] rm_2d.bmp,,,0x00000010 rm_3d.bmp,,,0x00000010 rm_clockwise.bmp,,,0x00000010 rm_counterclockwise.bmp,,,0x00000010 rm_destination.bmp,,,0x00000010 rm_full.bmp,,,0x00000010 rm_gps.bmp,,,0x00000010 rm_hold.bmp,,,0x00000010 rm_location.bmp,,,0x00000010 rm_quit.bmp,,,0x00000010 rm_record.bmp,,,0x00000010 rm_stop.bmp,,,0x00000010 rm_zoom1.bmp,,,0x00000010 rm_zoomin.bmp,,,0x00000010 rm_zoomout.bmp,,,0x00000010 rm_menu.bmp,,,0x00000010 nav_approaching.bmp,,,0x00000010 nav_continue.bmp,,,0x00000010 nav_keep_left.bmp,,,0x00000010 nav_keep_right.bmp,,,0x00000010 nav_panel.bmp,,,0x00000010 nav_panel_wide.bmp,,,0x00000010 nav_turn_left.bmp,,,0x00000010 nav_turn_right.bmp,,,0x00000010 nav_u_turn.bmp,,,0x00000010 sync.bmp,,,0x00000010 [Files.Sound] 200.wav,,,0x00000010 800.wav,,,0x00000010 Arrive.wav,,,0x00000010 KeepLeft.wav,,,0x00000010 KeepRight.wav,,,0x00000010 m.wav,,,0x00000010 Straight.wav,,,0x00000010 TurnLeft.wav,,,0x00000010 TurnRight.wav,,,0x00000010 within.wav,,,0x00000010 rec_start.wav,,,0x00000010 rec_end.wav,,,0x00000010 [Files.Maps] usc77001.rdm,,,0x00000010 usdir.rdm,,,0x00000010 [Files.ARM] Roadmap.exe,,,0 RoadGPS.exe,,,0 [Files.Dll] ComSplit.dll,,,0 --- NEW FILE: freemap_install.inf --- [CEStrings] AppName = "FreeMap" InstallDir = %CE1%\%AppName% [Strings] CompanyName = "FreeMapIL" [Version] Signature = "$Chicago$" CESignature = "$Windows CE$" Provider = %CompanyName% [DefaultInstall] CESETUPDLL="setupdll.dll" CEShortcuts = Shortcuts.All [DefaultInstall.ARM] CopyFiles = Files.Config, Files.Maps, Files.ARM, Files.Icons, Files.Sound, Files.Dll [SourceDisksNames] 1 = ,"Common config files",,L:\shared\roadmap_editor\src 2 = ,"Common map files",,L:\shared\roadmap_editor\maps 5 = ,"WinCE preferences",,L:\shared\roadmap_editor\src\win32 6 = ,"Manual",,L:\shared\roadmap_editor\manual 7 = ,"bmp icons",,L:\shared\roadmap_editor\src\icons\bmp 10 = ,"sound",,L:\shared\roadmap_editor\src\sound [SourceDisksNames.ARM] 3 = ,"ARM files",,L:\shared\roadmap_editor\src\win32\wince_env\FreeMap\ARMV4Rel 4 = ,"ARM files",,L:\shared\roadmap_editor\src\win32\wince_env\RoadGPS\ARMV4Rel 8 = ,"ARMDll files",,C:\Projects\ComSplit\ARMV4Rel 9 = ,"Setup Dll",,L:\shared\roadmap_editor\src\win32\wince_env\setupdll\ARMV4Rel [SourceDisksFiles] drivers = 1 preferences = 5 session = 5 roadmap.toolbar = 5 quick.menu = 1 schema = 1 sprites = 1 objects = 1 objects_wide = 1 lang = 1 font.ttf = 1 usc77001.rdm = 2 usdir.rdm = 2 apt_toc.gif = 6 manual.html = 6 rm_2d.bmp = 7 rm_3d.bmp = 7 rm_clockwise.bmp = 7 rm_counterclockwise.bmp = 7 rm_destination.bmp = 7 rm_full.bmp = 7 rm_gps.bmp = 7 rm_hold.bmp = 7 rm_location.bmp = 7 rm_quit.bmp = 7 rm_record.bmp = 7 rm_stop.bmp = 7 rm_zoom1.bmp = 7 rm_zoomin.bmp = 7 rm_zoomout.bmp = 7 rm_menu.bmp = 7 nav_approaching.bmp = 7 nav_continue.bmp = 7 nav_keep_left.bmp = 7 nav_keep_right.bmp = 7 nav_panel.bmp = 7 nav_panel_wide.bmp = 7 nav_turn_left.bmp = 7 nav_turn_right.bmp = 7 nav_u_turn.bmp = 7 welcome.bmp = 7 sync.bmp = 7 200.wav = 10 800.wav = 10 Arrive.wav = 10 KeepLeft.wav = 10 KeepRight.wav = 10 m.wav = 10 Straight.wav = 10 TurnLeft.wav = 10 TurnRight.wav = 10 within.wav = 10 rec_start.wav = 10 rec_end.wav = 10 [SourceDisksFiles.ARM] FreeMap.exe = 3 RoadGPS.exe = 4 ComSplit.dll = 8 setupdll.dll = 9 [DestinationDirs] Shortcuts.All = 0,%CE11% Files.Config = 0,%InstallDir% Files.Maps = 0,%InstallDir%\Maps Files.ARM = 0,%InstallDir% Files.Icons = 0,%InstallDir%\icons Files.Sound = 0,%InstallDir%\sound Files.Dll = 0,\Windows DefaultDestDir = 0,%InstallDir% [Shortcuts.All] %AppName%,0,FreeMap.exe ; RoadGPS,0,RoadGPS.exe [Files.Config] drivers,,,0x00000010 preferences,,,0x00000010 session,,,0x00000010 roadmap.toolbar,,,0x00000010 quick.menu,,,0x00000010 schema,,,0x00000010 sprites,,,0x00000010 objects,,,0x00000010 objects_wide,,,0x00000010 lang,,,0x40000000 font.ttf,,,0x00000010 apt_toc.gif,,,0 manual.html,,,0 [Files.Icons] rm_2d.bmp,,,0x00000010 rm_3d.bmp,,,0x00000010 rm_clockwise.bmp,,,0x00000010 rm_counterclockwise.bmp,,,0x00000010 rm_destination.bmp,,,0x00000010 rm_full.bmp,,,0x00000010 rm_gps.bmp,,,0x00000010 rm_hold.bmp,,,0x00000010 rm_location.bmp,,,0x00000010 rm_quit.bmp,,,0x00000010 rm_record.bmp,,,0x00000010 rm_stop.bmp,,,0x00000010 rm_zoom1.bmp,,,0x00000010 rm_zoomin.bmp,,,0x00000010 rm_zoomout.bmp,,,0x00000010 rm_menu.bmp,,,0x00000010 nav_approaching.bmp,,,0x00000010 nav_continue.bmp,,,0x00000010 nav_keep_left.bmp,,,0x00000010 nav_keep_right.bmp,,,0x00000010 nav_panel.bmp,,,0x00000010 nav_panel_wide.bmp,,,0x00000010 nav_turn_left.bmp,,,0x00000010 nav_turn_right.bmp,,,0x00000010 nav_u_turn.bmp,,,0x00000010 welcome.bmp,,,0x40000000 sync.bmp,,,0x00000010 [Files.Sound] 200.wav,,,0x40000000 800.wav,,,0x40000000 Arrive.wav,,,0x40000000 KeepLeft.wav,,,0x40000000 KeepRight.wav,,,0x40000000 m.wav,,,0x40000000 Straight.wav,,,0x40000000 TurnLeft.wav,,,0x40000000 TurnRight.wav,,,0x40000000 within.wav,,,0x40000000 rec_start.wav,,,0x40000000 rec_end.wav,,,0x40000000 [Files.Maps] usc77001.rdm,,,0x40000000 usdir.rdm,,,0x40000000 [Files.ARM] FreeMap.exe,,,0 RoadGPS.exe,,,0 [Files.Dll] ComSplit.dll,,,0 setupdll.dll,,0x80000000 |
|
From: Ehud S. <esh...@us...> - 2006-09-17 20:43:02
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31061 Modified Files: roadmap_main.cpp Log Message: Menu configuration for win32. Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** roadmap_main.cpp 17 Sep 2006 18:55:56 -0000 1.19 --- roadmap_main.cpp 17 Sep 2006 20:42:59 -0000 1.20 *************** *** 132,139 **** ROADMAP_CONFIG_ITEM("GPS", "Virtual"); - #ifdef UNDER_CE static RoadMapConfigDescriptor RoadMapConfigMenuBar = ROADMAP_CONFIG_ITEM("General", "Menu bar"); static RoadMapConfigDescriptor RoadMapConfigAutoSync = ROADMAP_CONFIG_ITEM("FreeMap", "Auto sync"); --- 132,139 ---- ROADMAP_CONFIG_ITEM("GPS", "Virtual"); static RoadMapConfigDescriptor RoadMapConfigMenuBar = ROADMAP_CONFIG_ITEM("General", "Menu bar"); + #ifdef UNDER_CE static RoadMapConfigDescriptor RoadMapConfigAutoSync = ROADMAP_CONFIG_ITEM("FreeMap", "Auto sync"); *************** *** 576,582 **** case WM_CREATE: #ifdef UNDER_CE SHMENUBARINFO mbi; - bool create_menu; memset(&mbi, 0, sizeof(SHMENUBARINFO)); --- 576,588 ---- case WM_CREATE: + bool create_menu; + #ifdef _ROADGPS + create_menu = true; + #else + create_menu = roadmap_config_match (&RoadMapConfigMenuBar, "Yes") != 0; + #endif + #ifdef UNDER_CE SHMENUBARINFO mbi; memset(&mbi, 0, sizeof(SHMENUBARINFO)); *************** *** 592,600 **** // If I try to just create an empty menu, it does't work! (can't // add items to it). - #ifdef _ROADGPS - create_menu = true; - #else - create_menu = roadmap_config_match (&RoadMapConfigMenuBar, "Yes") != 0; - #endif if (!create_menu || !SHCreateMenuBar(&mbi)) { --- 598,601 ---- *************** *** 610,618 **** } #else ! RoadMapMainMenuBar = CreateMenu (); ! { ! DWORD res = SetMenu(hWnd, RoadMapMainMenuBar); ! res = res; ! } #endif --- 611,618 ---- } #else ! if (create_menu) { ! RoadMapMainMenuBar = CreateMenu (); ! SetMenu(hWnd, RoadMapMainMenuBar); ! } #endif *************** *** 856,862 **** DWORD style = WS_VISIBLE; - #ifdef UNDER_CE roadmap_config_declare_enumeration ("preferences", &RoadMapConfigMenuBar, "No", "Yes", NULL); roadmap_config_declare_enumeration ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); --- 856,862 ---- DWORD style = WS_VISIBLE; roadmap_config_declare_enumeration ("preferences", &RoadMapConfigMenuBar, "No", "Yes", NULL); + #ifdef UNDER_CE roadmap_config_declare_enumeration ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); |
|
From: Ehud S. <esh...@us...> - 2006-09-17 20:42:20
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31016 Modified Files: roadmap_dialog.c Log Message: Win32 fixes. Index: roadmap_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_dialog.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** roadmap_dialog.c 17 Sep 2006 18:36:23 -0000 1.15 --- roadmap_dialog.c 17 Sep 2006 20:42:17 -0000 1.16 *************** *** 1150,1156 **** if (frame == NULL) return; ! GetWindowRect(hDlg, &rc); ! ! dc = GetDC(hDlg); for (item = frame->children; item != NULL; item = item->next) { LPWSTR name; --- 1150,1155 ---- if (frame == NULL) return; ! GetClientRect(frame->w, &rc); ! dc = GetDC(frame->w); for (item = frame->children; item != NULL; item = item->next) { LPWSTR name; *************** *** 1387,1391 **** return (INT_PTR)TRUE; #else ! SetWindowPos(hDlg, HWND_TOP, 10, 30, 220, min_height+30, SWP_NOSIZE|SWP_DRAWFRAME); #endif --- 1386,1392 ---- return (INT_PTR)TRUE; #else ! if (num_containers < 3) { ! SetWindowPos(hDlg, HWND_TOP, 10, 30, 300, min_height+100, SWP_NOMOVE|SWP_DRAWFRAME); ! } #endif *************** *** 1396,1400 **** RECT rc; ! GetWindowRect(hDlg, &rc); lParam = MAKELPARAM(rc.right-rc.left, rc.bottom-rc.top); } --- 1397,1401 ---- RECT rc; ! GetClientRect(hDlg, &rc); lParam = MAKELPARAM(rc.right-rc.left, rc.bottom-rc.top); } *************** *** 1616,1619 **** --- 1617,1624 ---- width = tab.right - tab.left; height = tab.bottom - tab.top - MAX_ROW_HEIGHT; + #ifndef UNDER_CE + width -= 10; + height -= 20; + #endif MoveControlls (hDlg, frame, width, height-MAX_ROW_HEIGHT); |
|
From: Ehud S. <esh...@us...> - 2006-09-17 20:41:37
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30637 Modified Files: install.nsi Log Message: Update win32 install script. Index: install.nsi =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/install.nsi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** install.nsi 18 Aug 2006 18:08:19 -0000 1.1 --- install.nsi 17 Sep 2006 20:41:32 -0000 1.2 *************** *** 2,10 **** ; HM NIS Edit Wizard helper defines ! !define PRODUCT_NAME "RoadMap" ! !define PRODUCT_VERSION "0.8 Pre7" !define PRODUCT_PUBLISHER "FreeMap Israel" !define PRODUCT_WEB_SITE "http://www.freemap.co.il" ! !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Roadmap.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" --- 2,10 ---- ; HM NIS Edit Wizard helper defines ! !define PRODUCT_NAME "FreeMap" ! !define PRODUCT_VERSION "0.8" !define PRODUCT_PUBLISHER "FreeMap Israel" !define PRODUCT_WEB_SITE "http://www.freemap.co.il" ! !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\FreeMap.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" *************** *** 34,38 **** !insertmacro MUI_PAGE_INSTFILES ; Finish page ! !define MUI_FINISHPAGE_RUN "$INSTDIR\Roadmap.exe" !insertmacro MUI_PAGE_FINISH --- 34,38 ---- !insertmacro MUI_PAGE_INSTFILES ; Finish page ! !define MUI_FINISHPAGE_RUN "$INSTDIR\FreeMap.exe" !insertmacro MUI_PAGE_FINISH *************** *** 51,55 **** Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile "Setup.exe" ! InstallDir "$PROGRAMFILES\RoadMap" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show --- 51,55 ---- Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile "Setup.exe" ! InstallDir "$PROGRAMFILES\FreeMap" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show *************** *** 63,70 **** SetOutPath "$INSTDIR" SetOverwrite ifnewer ! File "L:\shared\roadmap_editor\src\win32\win32_env\roadmap\Release\Roadmap.exe" ! CreateDirectory "$SMPROGRAMS\RoadMap" ! CreateShortCut "$SMPROGRAMS\RoadMap\RoadMap.lnk" "$INSTDIR\Roadmap.exe" ! CreateShortCut "$DESKTOP\RoadMap.lnk" "$INSTDIR\Roadmap.exe" File "L:\shared\roadmap_editor\src\win32\win32_env\roadgps\Release\RoadGPS.exe" SectionEnd --- 63,70 ---- SetOutPath "$INSTDIR" SetOverwrite ifnewer ! File "L:\shared\roadmap_editor\src\win32\win32_env\roadmap\Release\FreeMap.exe" ! CreateDirectory "$SMPROGRAMS\FreeMap" ! CreateShortCut "$SMPROGRAMS\FreeMap\FreeMap.lnk" "$INSTDIR\FreeMap.exe" ! CreateShortCut "$DESKTOP\FreeMap.lnk" "$INSTDIR\FreeMap.exe" File "L:\shared\roadmap_editor\src\win32\win32_env\roadgps\Release\RoadGPS.exe" SectionEnd *************** *** 74,77 **** --- 74,78 ---- File "L:\shared\roadmap_editor\src\schema" File "L:\shared\roadmap_editor\src\objects" + File "L:\shared\roadmap_editor\src\quick.menu" File "L:\shared\roadmap_editor\src\lang" File "L:\shared\roadmap_editor\src\drivers" *************** *** 140,153 **** SetOutPath $INSTDIR WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" ! CreateShortCut "$SMPROGRAMS\RoadMap\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" ! CreateShortCut "$SMPROGRAMS\RoadMap\Uninstall.lnk" "$INSTDIR\uninst.exe" SectionEnd Section -Post WriteUninstaller "$INSTDIR\uninst.exe" ! WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Roadmap.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" ! WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Roadmap.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" --- 141,154 ---- SetOutPath $INSTDIR WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" ! CreateShortCut "$SMPROGRAMS\FreeMap\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" ! CreateShortCut "$SMPROGRAMS\FreeMap\Uninstall.lnk" "$INSTDIR\uninst.exe" SectionEnd Section -Post WriteUninstaller "$INSTDIR\uninst.exe" ! WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\FreeMap.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" ! WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\FreeMap.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" *************** *** 220,234 **** Delete "$INSTDIR\lang" Delete "$INSTDIR\objects" Delete "$INSTDIR\schema" Delete "$INSTDIR\sprites" Delete "$INSTDIR\RoadGPS.exe" ! Delete "$INSTDIR\Roadmap.exe" ! Delete "$SMPROGRAMS\RoadMap\Uninstall.lnk" ! Delete "$SMPROGRAMS\RoadMap\Website.lnk" ! Delete "$DESKTOP\RoadMap.lnk" ! Delete "$SMPROGRAMS\RoadMap\RoadMap.lnk" ! RMDir "$SMPROGRAMS\RoadMap" RMDir "$INSTDIR\sound" RMDir "$INSTDIR\maps" --- 221,236 ---- Delete "$INSTDIR\lang" Delete "$INSTDIR\objects" + Delete "$INSTDIR\quick.menu" Delete "$INSTDIR\schema" Delete "$INSTDIR\sprites" Delete "$INSTDIR\RoadGPS.exe" ! Delete "$INSTDIR\FreeMap.exe" ! Delete "$SMPROGRAMS\FreeMap\Uninstall.lnk" ! Delete "$SMPROGRAMS\FreeMap\Website.lnk" ! Delete "$DESKTOP\FreeMap.lnk" ! Delete "$SMPROGRAMS\FreeMap\FreeMap.lnk" ! RMDir "$SMPROGRAMS\FreeMap" RMDir "$INSTDIR\sound" RMDir "$INSTDIR\maps" |
|
From: Ehud S. <esh...@us...> - 2006-09-17 20:40:31
|
Update of /cvsroot/roadmap/roadmap_editor/src/icons/bmp In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30245 Modified Files: welcome.bmp Log Message: Add beta mark. Index: welcome.bmp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/icons/bmp/welcome.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsGIeXlF and /tmp/cvsQFHPhQ differ |
|
From: Ehud S. <esh...@us...> - 2006-09-17 20:38:14
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29373 Modified Files: editor_main.c Log Message: Bump version. Index: editor_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** editor_main.c 3 Sep 2006 18:07:08 -0000 1.17 --- editor_main.c 17 Sep 2006 20:38:12 -0000 1.18 *************** *** 47,51 **** int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.8.0 pre8"; void editor_main_check_map (void) { --- 47,51 ---- int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.8.0"; void editor_main_check_map (void) { |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:56:00
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22059 Modified Files: roadmap_main.cpp Log Message: First time wizard. Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** roadmap_main.cpp 4 Sep 2006 06:52:18 -0000 1.18 --- roadmap_main.cpp 17 Sep 2006 18:55:56 -0000 1.19 *************** *** 62,65 **** --- 62,67 ---- #include "../roadmap_download.h" #include "../roadmap_lang.h" + #include "../roadmap_dialog.h" + #include "../roadmap_gps.h" #include "wince_input_mon.h" #include "win32_serial.h" *************** *** 140,146 **** #endif static HANDLE g_hMutexAppRunning; ! BOOL AppInstanceExists() { BOOL bAppRunning = FALSE; --- 142,159 ---- #endif + static RoadMapConfigDescriptor RoadMapConfigFirstTime = + ROADMAP_CONFIG_ITEM("FreeMap", "First time"); + + static RoadMapConfigDescriptor RoadMapConfigUser = + ROADMAP_CONFIG_ITEM("FreeMap", "User Name"); + + static RoadMapConfigDescriptor RoadMapConfigPassword = + ROADMAP_CONFIG_ITEM("FreeMap", "Password"); + + static void first_time_wizard (void); + static HANDLE g_hMutexAppRunning; ! static BOOL AppInstanceExists() { BOOL bAppRunning = FALSE; *************** *** 161,190 **** ! #ifndef _ROADGPS ! ! static int roadmap_main_should_sync (void) { ! ! roadmap_config_declare ! ("session", &RoadMapConfigLastSync, "0"); ! ! if (roadmap_config_match(&RoadMapConfigAutoSync, "No")) { ! return 0; ! } else { ! unsigned int last_sync_time = ! roadmap_config_get_integer(&RoadMapConfigLastSync); ! ! if (last_sync_time && ! ((last_sync_time + MIN_SYNC_TIME) > time(NULL))) { ! ! return 0; ! } ! ! roadmap_config_set_integer (&RoadMapConfigLastSync, time(NULL)); ! roadmap_config_save (0); ! } ! ! return 1; ! } ! static void roadmap_main_start_sync (void) { --- 174,203 ---- ! #ifndef _ROADGPS ! #ifdef UNDER_CE ! static int roadmap_main_should_sync (void) { ! ! roadmap_config_declare ! ("session", &RoadMapConfigLastSync, "0"); ! ! if (roadmap_config_match(&RoadMapConfigAutoSync, "No")) { ! return 0; ! } else { ! unsigned int last_sync_time = ! roadmap_config_get_integer(&RoadMapConfigLastSync); ! ! if (last_sync_time && ! ((last_sync_time + MIN_SYNC_TIME) > time(NULL))) { ! ! return 0; ! } ! ! roadmap_config_set_integer (&RoadMapConfigLastSync, time(NULL)); ! roadmap_config_save (0); ! } ! ! return 1; ! } ! #endif static void roadmap_main_start_sync (void) { *************** *** 196,200 **** RoadMapMainSync = true; ! Sleep(1000); --- 209,213 ---- RoadMapMainSync = true; ! Sleep(1000); *************** *** 412,420 **** roadmap_config_declare_enumeration ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); ! if (!roadmap_main_should_sync ()) return 0; roadmap_lang_initialize (); roadmap_download_initialize (); ! editor_main_initialize (); editor_main_set (1); roadmap_main_start_sync (); --- 425,434 ---- roadmap_config_declare_enumeration ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); ! if (!roadmap_main_should_sync ()) return 0; roadmap_lang_initialize (); + roadmap_start_set_title (roadmap_lang_get ("RoadMap")); roadmap_download_initialize (); ! editor_main_initialize (); editor_main_set (1); roadmap_main_start_sync (); *************** *** 427,430 **** --- 441,456 ---- roadmap_start(0, args); + #ifndef _ROADGPS + #ifdef FREEMAP_IL + + roadmap_config_declare_enumeration + ("session", &RoadMapConfigFirstTime, "Yes", "No", NULL); + + if (roadmap_config_match(&RoadMapConfigFirstTime, "Yes")) { + first_time_wizard(); + } + + #endif + #endif return TRUE; } *************** *** 1316,1333 **** SendMessage(RoadMapMainWindow, WM_CLOSE, 0, 0); } ! ! void roadmap_main_set_cursor (int cursor) ! { ! switch (cursor) { ! ! case ROADMAP_CURSOR_NORMAL: ! SetCursor(NULL); ! break; ! ! case ROADMAP_CURSOR_WAIT: ! SetCursor(LoadCursor(NULL, IDC_WAIT)); ! break; ! } } } // extern "C" --- 1342,1401 ---- SendMessage(RoadMapMainWindow, WM_CLOSE, 0, 0); } ! ! void roadmap_main_set_cursor (int cursor) ! { ! switch (cursor) { ! ! case ROADMAP_CURSOR_NORMAL: ! SetCursor(NULL); ! break; ! ! case ROADMAP_CURSOR_WAIT: ! SetCursor(LoadCursor(NULL, IDC_WAIT)); ! break; ! } } } // extern "C" + /* first time wizard */ + + static void wizard_close (const char *name, void *context) { + + roadmap_config_set (&RoadMapConfigUser, + (char *)roadmap_dialog_get_data ("main", "User Name")); + + roadmap_config_set (&RoadMapConfigPassword, + (char *)roadmap_dialog_get_data ("main", "Password")); + + roadmap_config_set (&RoadMapConfigFirstTime, "No"); + + roadmap_dialog_hide (name); + } + + static void wizard_detect_gps (const char *name, void *context) { + roadmap_gps_detect_receiver (); + } + + void first_time_wizard (void) { + if (roadmap_dialog_activate ("Setup wizard", NULL)) { + + roadmap_config_declare ("preferences", &RoadMapConfigUser, ""); + roadmap_config_declare_password ("preferences", &RoadMapConfigPassword, ""); + roadmap_dialog_new_label ("main", ".Welcome to FreeMap!"); + roadmap_dialog_new_label ("main", ".Enter your user name if you registered one."); + roadmap_dialog_new_label ("main", ".Otherwise leave these fields empty."); + roadmap_dialog_new_entry ("main", "User Name", NULL); + roadmap_dialog_new_password ("main", "Password"); + roadmap_dialog_add_button ("Ok", wizard_close); + roadmap_dialog_add_button ("Detect GPS", wizard_detect_gps); + + roadmap_dialog_complete (0); + } + + roadmap_dialog_set_data ("main", "User Name", + roadmap_config_get (&RoadMapConfigUser)); + roadmap_dialog_set_data ("main", "Password", + roadmap_config_get (&RoadMapConfigPassword)); + + } + |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:51:27
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20538 Modified Files: roadmap_fileselection.c Log Message: indent Index: roadmap_fileselection.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_fileselection.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_fileselection.c 13 Jul 2006 06:48:17 -0000 1.4 --- roadmap_fileselection.c 17 Sep 2006 18:51:24 -0000 1.5 *************** *** 58,62 **** fltr = ConvertToWideChar(filter, CP_UTF8); _snwprintf(strFilter, sizeof(strFilter)/sizeof(strFilter[0]), ! TEXT("*.%s|*.%s\0"), fltr, fltr); strFilter[wcslen(fltr)+2] = 0; ofn.lpstrDefExt = fltr; --- 58,62 ---- fltr = ConvertToWideChar(filter, CP_UTF8); _snwprintf(strFilter, sizeof(strFilter)/sizeof(strFilter[0]), ! TEXT("*.%s|*.%s\0"), fltr, fltr); strFilter[wcslen(fltr)+2] = 0; ofn.lpstrDefExt = fltr; |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:36:26
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14773 Modified Files: roadmap_dialog.c Log Message: indent Fix sip button Index: roadmap_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_dialog.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** roadmap_dialog.c 18 Aug 2006 18:03:10 -0000 1.14 --- roadmap_dialog.c 17 Sep 2006 18:36:23 -0000 1.15 *************** *** 38,42 **** #include "../roadmap_types.h" #include "../roadmap_start.h" ! #include "../roadmap_lang.h" #include "../roadmap_canvas.h" --- 38,42 ---- #include "../roadmap_types.h" #include "../roadmap_start.h" ! #include "../roadmap_lang.h" #include "../roadmap_canvas.h" *************** *** 277,291 **** } ! ! static void show_sip_button (HWND parent) { ! ! HWND hWndSipButton; ! ! hWndSipButton = FindWindow(TEXT("MS_SIPBUTTON"), NULL); ! ! if (hWndSipButton) { ! SetWindowPos(hWndSipButton, parent, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_SHOWWINDOW); ! } ! } int roadmap_dialog_activate (const char *name, void *context) --- 277,291 ---- } ! ! static void show_sip_button (HWND parent) { ! ! HWND hWndSipButton; ! ! hWndSipButton = FindWindow(TEXT("MS_SIPBUTTON"), NULL); ! ! if (hWndSipButton) { ! SetWindowPos(hWndSipButton, parent, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_SHOWWINDOW); ! } ! } int roadmap_dialog_activate (const char *name, void *context) *************** *** 301,306 **** RoadMapDialogCurrent = dialog; ! ShowWindow(dialog->w, SW_SHOW); ! show_sip_button (dialog->w); #ifdef UNDER_CE --- 301,309 ---- RoadMapDialogCurrent = dialog; ! ShowWindow(dialog->w, SW_SHOW); ! ! if (dialog->use_keyboard) { ! show_sip_button (dialog->w); ! } #ifdef UNDER_CE *************** *** 594,599 **** SetWindowText(dialog->w, str); free(str); ! ! show_sip_button (dialog->w); if (count == 1) { --- 597,604 ---- SetWindowText(dialog->w, str); free(str); ! ! if (use_keyboard) { ! show_sip_button (dialog->w); ! } if (count == 1) { *************** *** 679,696 **** } ! ! void roadmap_dialog_set_focus (const char *frame, const char *name) ! { ! RoadMapDialogItem this_frame; ! RoadMapDialogItem this_item; ! ! this_frame = roadmap_dialog_get (RoadMapDialogCurrent, frame); ! this_item = roadmap_dialog_get (this_frame, name); ! ! if (this_item->w) { ! SetFocus (this_item->w); ! } ! } ! void *roadmap_dialog_get_data (const char *frame, const char *name) --- 684,701 ---- } ! ! void roadmap_dialog_set_focus (const char *frame, const char *name) ! { ! RoadMapDialogItem this_frame; ! RoadMapDialogItem this_item; ! ! this_frame = roadmap_dialog_get (RoadMapDialogCurrent, frame); ! this_item = roadmap_dialog_get (this_frame, name); ! ! if (this_item->w) { ! SetFocus (this_item->w); ! } ! } ! void *roadmap_dialog_get_data (const char *frame, const char *name) *************** *** 832,839 **** const char *name = item->name; - if (name[0] == '.') { - name++; - } - length = strlen(name); title = (char*)malloc (length + 6); --- 837,840 ---- *************** *** 842,852 **** title[0] = ' '; ! strcpy (title+1, name); ! if (name[length-1] != ':') { ! title[++length] = ':'; ! } title[++length] = ' '; title[++length] = 0; - } --- 843,860 ---- title[0] = ' '; ! ! if (name[0] == '.') { ! length--; ! name++; ! strcpy (title+1, name); ! } else { ! strcpy (title+1, name); ! if (name[length-1] != ':') { ! title[++length] = ':'; ! } ! } ! title[++length] = ' '; title[++length] = 0; } *************** *** 1137,1146 **** unsigned int second_column_width; int curr_y; ! int label_y_add; RECT rc; if (frame == NULL) return; ! ! GetWindowRect(hDlg, &rc); dc = GetDC(hDlg); --- 1145,1154 ---- unsigned int second_column_width; int curr_y; ! int label_y_add; RECT rc; if (frame == NULL) return; ! ! GetWindowRect(hDlg, &rc); dc = GetDC(hDlg); *************** *** 1239,1246 **** unsigned int widget_height = row_height; ! if (item->widget_type == ROADMAP_WIDGET_CHOICE) { - widget_height = roadmap_canvas_height () - rc.top - curr_y - 2; - if (widget_height > MAX_LIST_HEIGHT*2) { widget_height = MAX_LIST_HEIGHT*2; --- 1247,1254 ---- unsigned int widget_height = row_height; ! if (item->widget_type == ROADMAP_WIDGET_CHOICE) { ! ! widget_height = roadmap_canvas_height () - rc.top - curr_y - 2; if (widget_height > MAX_LIST_HEIGHT*2) { widget_height = MAX_LIST_HEIGHT*2; *************** *** 1317,1321 **** int num_buttons; int num_containers = 0; ! int min_height = 0; int has_cancel_button = 0; #ifdef UNDER_CE --- 1325,1329 ---- int num_buttons; int num_containers = 0; ! int min_height = 0; int has_cancel_button = 0; #ifdef UNDER_CE *************** *** 1332,1340 **** for (frame = dialog->children; frame != NULL; frame = frame->next) { if (frame->widget_type != ROADMAP_WIDGET_CONTAINER) { ! create_item(frame, hDlg); ! ! if (!strcmp(frame->name, roadmap_lang_get ("Cancel"))) { ! has_cancel_button = 1; ! } num_buttons++; --- 1340,1348 ---- for (frame = dialog->children; frame != NULL; frame = frame->next) { if (frame->widget_type != ROADMAP_WIDGET_CONTAINER) { ! create_item(frame, hDlg); ! ! if (!strcmp(frame->name, roadmap_lang_get ("Cancel"))) { ! has_cancel_button = 1; ! } num_buttons++; *************** *** 1347,1359 **** } } ! ! #ifdef UNDER_CE ! if (has_cancel_button) { ! SetWindowLong(hDlg, GWL_STYLE, ! GetWindowLong(hDlg, GWL_STYLE) | WS_NONAVDONEBUTTON); ! ! SHDoneButton(hDlg, SHDB_HIDE); ! } ! #endif if (num_containers == 1) { --- 1355,1367 ---- } } ! ! #ifdef UNDER_CE ! if (has_cancel_button) { ! SetWindowLong(hDlg, GWL_STYLE, ! GetWindowLong(hDlg, GWL_STYLE) | WS_NONAVDONEBUTTON); ! ! SHDoneButton(hDlg, SHDB_HIDE); ! } ! #endif if (num_containers == 1) { *************** *** 1370,1374 **** shidi.dwFlags = SHIDIF_FULLSCREENNOMENUBAR; } else { ! shidi.dwFlags = 0; SetWindowPos(hDlg, HWND_TOP, 10, 30, 220, min_height+30, SWP_DRAWFRAME); } --- 1378,1382 ---- shidi.dwFlags = SHIDIF_FULLSCREENNOMENUBAR; } else { ! shidi.dwFlags = 0; SetWindowPos(hDlg, HWND_TOP, 10, 30, 220, min_height+30, SWP_DRAWFRAME); } *************** *** 1378,1381 **** --- 1386,1391 ---- return (INT_PTR)TRUE; + #else + SetWindowPos(hDlg, HWND_TOP, 10, 30, 220, min_height+30, SWP_NOSIZE|SWP_DRAWFRAME); #endif *************** *** 1409,1412 **** --- 1419,1423 ---- int curr_x; int num_buttons = 0; + unsigned int cur_button_width = BUTTON_WIDTH; for (frame = dialog->children; frame != NULL; *************** *** 1417,1426 **** } ! if (((BUTTON_WIDTH + column_separator) * num_buttons) >= (unsigned)width) { ! curr_x = width - BUTTON_WIDTH - 1; } else { ! curr_x = width - BUTTON_WIDTH - ! (width - (BUTTON_WIDTH + column_separator) * num_buttons) / 2; } --- 1428,1438 ---- } ! if (num_buttons <= 2) cur_button_width = (int)(BUTTON_WIDTH * 1.5); ! if (((cur_button_width + column_separator) * num_buttons) >= (unsigned)width) { ! curr_x = width - cur_button_width - 1; } else { ! curr_x = width - cur_button_width - ! (width - (cur_button_width + column_separator) * num_buttons) / 2; } *************** *** 1430,1435 **** if (frame->widget_type != ROADMAP_WIDGET_CONTAINER) { MoveWindow(frame->w, ! curr_x, curr_y, BUTTON_WIDTH, row_height, TRUE); ! curr_x -= BUTTON_WIDTH + column_separator; } else { num_containers++; --- 1442,1447 ---- if (frame->widget_type != ROADMAP_WIDGET_CONTAINER) { MoveWindow(frame->w, ! curr_x, curr_y, cur_button_width, row_height, TRUE); ! curr_x -= cur_button_width + column_separator; } else { num_containers++; *************** *** 1461,1472 **** break; ! case WM_COMMAND: ! ! if (((HWND)lParam == hDlg) && (LOWORD(wParam) == IDOK)) { ! ! roadmap_dialog_hide_window ! ((RoadMapDialogItem)GetWindowLong((HWND)lParam, GWL_USERDATA)); ! return TRUE; ! } if ((HIWORD(wParam) == BN_CLICKED) || --- 1473,1484 ---- break; ! case WM_COMMAND: ! ! if (((HWND)lParam == hDlg) && (LOWORD(wParam) == IDOK)) { ! ! roadmap_dialog_hide_window ! ((RoadMapDialogItem)GetWindowLong((HWND)lParam, GWL_USERDATA)); ! return TRUE; ! } if ((HIWORD(wParam) == BN_CLICKED) || *************** *** 1496,1520 **** return TRUE; ! } ! return FALSE; case WM_CLOSE: EndDialog(hDlg, message); ! return TRUE; ! ! /* ! case WM_ERASEBKGND: ! { ! HDC hdc = (HDC)wParam; ! HBRUSH brush = CreateSolidBrush (RGB(255,255,224)); ! RECT rc; ! ! GetClientRect(hDlg, &rc); ! FillRect(hdc, &rc, brush); ! ! DeleteObject(brush); ! return TRUE; ! } */ } --- 1508,1532 ---- return TRUE; ! } ! return FALSE; case WM_CLOSE: EndDialog(hDlg, message); ! return TRUE; ! ! /* ! case WM_ERASEBKGND: ! { ! HDC hdc = (HDC)wParam; ! HBRUSH brush = CreateSolidBrush (RGB(255,255,224)); ! RECT rc; ! ! GetClientRect(hDlg, &rc); ! FillRect(hdc, &rc, brush); ! ! DeleteObject(brush); ! return TRUE; ! } */ } |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:25:05
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10215 Modified Files: roadmap_canvas_agg.cpp Log Message: indent Index: roadmap_canvas_agg.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_canvas_agg.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** roadmap_canvas_agg.cpp 9 Aug 2006 07:38:38 -0000 1.7 --- roadmap_canvas_agg.cpp 17 Sep 2006 18:24:58 -0000 1.8 *************** *** 188,194 **** if (tool_bar != NULL) { RECT tb_rect; ! GetClientRect(tool_bar, &tb_rect); if (tb_rect.bottom < (ClientRect.bottom-2)) { ! ClientRect.top += tb_rect.bottom + 2; } } --- 188,194 ---- if (tool_bar != NULL) { RECT tb_rect; ! GetClientRect(tool_bar, &tb_rect); if (tb_rect.bottom < (ClientRect.bottom-2)) { ! ClientRect.top += tb_rect.bottom + 2; } } |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:21:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/sound In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8646 Modified Files: 200.wav 800.wav Arrive.wav KeepLeft.wav KeepRight.wav m.wav Straight.wav TurnLeft.wav TurnRight.wav within.wav Log Message: Update voice files. Index: TurnRight.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/TurnRight.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsKovwSL and /tmp/cvsAkJPQc differ Index: Arrive.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/Arrive.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsKxAo4K and /tmp/cvs5ELj6b differ Index: KeepLeft.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/KeepLeft.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsDkEIgN and /tmp/cvsOUGBle differ Index: within.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/within.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsILHZgR and /tmp/cvsaGu1ni differ Index: Straight.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/Straight.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsnRem8P and /tmp/cvspIxlih differ Index: TurnLeft.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/TurnLeft.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvswionoV and /tmp/cvskFkiCm differ Index: 800.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/800.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsdaYvqU and /tmp/cvsICsKGl differ Index: m.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/m.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsUx9u2X and /tmp/cvswW3Skp differ Index: KeepRight.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/KeepRight.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsNq2v6W and /tmp/cvsOCEvro differ Index: 200.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/200.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsAJc5U0 and /tmp/cvsrSgmis differ |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:19:40
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/export In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8209 Modified Files: editor_upload.c Log Message: Add user agent. Index: editor_upload.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_upload.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** editor_upload.c 3 Sep 2006 18:09:39 -0000 1.6 --- editor_upload.c 17 Sep 2006 18:19:35 -0000 1.7 *************** *** 45,48 **** --- 45,49 ---- #include "md5.h" + #include "../editor_main.h" #include "editor_upload.h" *************** *** 256,259 **** --- 257,263 ---- goto send_error; + if (editor_http_send (fd, error, "User-Agent: FreeMap/%s\r\n", + editor_main_get_version() ) == -1) goto send_error; + send_auth (user, pw, fd, error); *************** *** 336,340 **** if (received <= 0) { error ("Receive error"); ! return 0; } total += received; --- 340,344 ---- if (received <= 0) { error ("Receive error"); ! return -1; } total += received; *************** *** 358,362 **** if (strstr (buffer, " 200 ") == NULL) { error ("received bad status: %s", buffer); ! return 0; } received_status = 1; --- 362,366 ---- if (strstr (buffer, " 200 ") == NULL) { error ("received bad status: %s", buffer); ! return -1; } received_status = 1; *************** *** 375,382 **** *sizeof_buffer = received; ! return size; } ! if (strncmp (buffer, "Content-Length", sizeof("Content-Length")-1) == 0) { --- 379,386 ---- *sizeof_buffer = received; ! return 0; } ! if (strncasecmp (buffer, "Content-Length", sizeof("Content-Length")-1) == 0) { *************** *** 384,388 **** if (p == NULL) { error ("bad formed header: %s", buffer); ! return 0; } --- 388,392 ---- if (p == NULL) { error ("bad formed header: %s", buffer); ! return -1; } *************** *** 391,395 **** if (size <= 0) { error ("bad formed header: %s", buffer); ! return 0; } } --- 395,399 ---- if (size <= 0) { error ("bad formed header: %s", buffer); ! return -1; } } *************** *** 407,411 **** error ("No valid header received"); ! return 0; } --- 411,415 ---- error ("No valid header received"); ! return -1; } *************** *** 422,426 **** int uploaded; char buffer[ROADMAP_HTTP_MAX_CHUNK]; ! char digest_hex[100]; RoadMapFile file; --- 426,431 ---- int uploaded; char buffer[ROADMAP_HTTP_MAX_CHUNK]; ! char user_digest_hex[100]; ! char pw_digest_hex[100]; RoadMapFile file; *************** *** 443,446 **** --- 448,452 ---- if (!user_name[0]) { + struct MD5Context context; unsigned char digest[16]; if (roadmap_net_unique_id (digest, sizeof(digest)) != sizeof(digest)) { *************** *** 448,456 **** return -1; } ! MD5Hex (digest, digest_hex); ! user_name = "anonymous"; ! password = digest_hex; } --- 454,469 ---- return -1; } + + strcpy(user_digest_hex, "anon_"); + MD5Hex (digest, user_digest_hex + strlen(user_digest_hex)); ! user_name = user_digest_hex; ! MD5Init (&context); ! MD5Update (&context, (unsigned char *)user_name, strlen(user_name)); ! MD5Final (digest, &context); ! MD5Hex (digest, pw_digest_hex); ! ! password = pw_digest_hex; } *************** *** 484,489 **** loaded = sizeof(buffer); ! if (!editor_http_decode_response ! (fd, buffer, &loaded, callbacks->error)) { goto cancel_upload; } --- 497,502 ---- loaded = sizeof(buffer); ! if (editor_http_decode_response ! (fd, buffer, &loaded, callbacks->error) < 0) { goto cancel_upload; } |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:18:53
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7816 Modified Files: roadmap_httpcopy.c Log Message: Add user agent. Index: roadmap_httpcopy.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_httpcopy.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_httpcopy.c 31 Dec 2005 09:57:09 -0000 1.2 --- roadmap_httpcopy.c 17 Sep 2006 18:18:50 -0000 1.3 *************** *** 51,61 **** #include "roadmap_file.h" #include "roadmap_httpcopy.h" ! #ifndef _WIN32 ! #define ROADMAP_HTTP_MAX_CHUNK 32768 ! #else ! #define ROADMAP_HTTP_MAX_CHUNK 4096 #endif --- 51,62 ---- #include "roadmap_file.h" + #include "editor/editor_main.h" #include "roadmap_httpcopy.h" ! #ifndef _WIN32 ! #define ROADMAP_HTTP_MAX_CHUNK 32768 ! #else ! #define ROADMAP_HTTP_MAX_CHUNK 4096 #endif *************** *** 129,132 **** --- 130,135 ---- roadmap_http_send (fd, error, "GET %s HTTP/1.1\r\n", path); + roadmap_http_send (fd, error, "User-Agent: FreeMap/%s\r\n", + editor_main_get_version() ); roadmap_http_send (fd, error, "Host: %s\r\n\r\n", host); } *************** *** 211,215 **** } ! if (strncmp (buffer, "Content-Length", sizeof("Content-Length")-1) == 0) { --- 214,218 ---- } ! if (strncasecmp (buffer, "Content-Length", sizeof("Content-Length")-1) == 0) { |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:18:38
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7804 Modified Files: roadmap_gps.c Log Message: I18n Index: roadmap_gps.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_gps.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** roadmap_gps.c 3 Sep 2006 17:59:12 -0000 1.12 --- roadmap_gps.c 17 Sep 2006 18:18:31 -0000 1.13 *************** *** 1030,1034 **** roadmap_dialog_set_data ("GPS Receiver Auto Detect", "Port", ""); roadmap_dialog_set_data ("GPS Receiver Auto Detect", "Speed", ""); ! roadmap_dialog_hide ("Auto Detect"); } --- 1030,1034 ---- roadmap_dialog_set_data ("GPS Receiver Auto Detect", "Port", ""); roadmap_dialog_set_data ("GPS Receiver Auto Detect", "Speed", ""); ! roadmap_dialog_hide ("Detect GPS receiver"); } *************** *** 1102,1107 **** SpeedIndex = -1; CurrentPort = -1; ! roadmap_messagebox("Failure", ! "GPS Receiver not found\nMake sure your receiver is connected and turned on"); return; } --- 1102,1107 ---- SpeedIndex = -1; CurrentPort = -1; ! roadmap_messagebox(roadmap_lang_get ("Error"), ! roadmap_lang_get ("GPS Receiver not found. Make sure your receiver is connected and turned on.")); return; } *************** *** 1132,1140 **** roadmap_gps_detect_finalize(); snprintf (Prompt, sizeof(Prompt), ! "Found GPS Receiver.\nPort: COM%d:\nSpeed: %s", CurrentPort, speeds[SpeedIndex]); SpeedIndex = -1; CurrentPort = -1; ! roadmap_messagebox("Success", Prompt); } } --- 1132,1141 ---- roadmap_gps_detect_finalize(); snprintf (Prompt, sizeof(Prompt), ! "%s\nPort: COM%d:\nSpeed: %s", ! roadmap_lang_get ("Found GPS Receiver."), CurrentPort, speeds[SpeedIndex]); SpeedIndex = -1; CurrentPort = -1; ! roadmap_messagebox(roadmap_lang_get ("Info"), Prompt); } } *************** *** 1144,1150 **** if (RoadMapGpsReception != 0) { ! roadmap_messagebox("Info","GPS already connected !"); } else { ! if (roadmap_dialog_activate ("Auto Detect", NULL)) { roadmap_dialog_new_label ("GPS Receiver Auto Detect", "Port"); --- 1145,1152 ---- if (RoadMapGpsReception != 0) { ! roadmap_messagebox(roadmap_lang_get ("Info"), ! roadmap_lang_get ("GPS already connected!")); } else { ! if (roadmap_dialog_activate ("Detect GPS receiver", NULL)) { roadmap_dialog_new_label ("GPS Receiver Auto Detect", "Port"); *************** *** 1156,1160 **** roadmap_dialog_set_data ("GPS Receiver Auto Detect", "Status", ! "Running, please wait..."); roadmap_main_set_periodic (200,roadmap_gps_detect_periodic); } --- 1158,1162 ---- roadmap_dialog_set_data ("GPS Receiver Auto Detect", "Status", ! roadmap_lang_get ("Running, please wait...")); roadmap_main_set_periodic (200,roadmap_gps_detect_periodic); } |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:18:14
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7782 Modified Files: md5.c Log Message: Fix hex output. Index: md5.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/md5.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** md5.c 16 Jul 2006 12:23:25 -0000 1.2 --- md5.c 17 Sep 2006 18:18:12 -0000 1.3 *************** *** 145,149 **** byteReverse((unsigned char *) ctx->buf, 4); memcpy(digest, ctx->buf, 16); ! memset((char *) ctx, 0, sizeof(ctx)); /* In case it's sensitive */ } --- 145,149 ---- byteReverse((unsigned char *) ctx->buf, 4); memcpy(digest, ctx->buf, 16); ! memset((char *) ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } *************** *** 259,263 **** 'c', 'd', 'e', 'f' }; ! for (i=0; i<sizeof(digest); i++) { *buffer = bin2hex[digest[i] >> 4]; buffer++; --- 259,263 ---- 'c', 'd', 'e', 'f' }; ! for (i=0; i<16; i++) { *buffer = bin2hex[digest[i] >> 4]; buffer++; |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:16:14
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6989 Modified Files: roadmap_start.c roadmap_start.h Log Message: Title i18n. Index: roadmap_start.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_start.h 29 Apr 2006 11:26:01 -0000 1.4 --- roadmap_start.h 17 Sep 2006 18:16:09 -0000 1.5 *************** *** 47,50 **** --- 47,51 ---- const RoadMapAction *roadmap_start_find_action (const char *name); + void roadmap_start_set_title (const char *title); #endif /* INCLUDE__ROADMAP_START__H */ Index: roadmap_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** roadmap_start.c 3 Sep 2006 18:05:25 -0000 1.29 --- roadmap_start.c 17 Sep 2006 18:16:09 -0000 1.30 *************** *** 1167,1170 **** --- 1167,1171 ---- roadmap_sound_initialize (); + roadmap_start_set_title (roadmap_lang_get ("RoadMap")); roadmap_gps_register_listener (&roadmap_gps_update); *************** *** 1248,1249 **** --- 1249,1255 ---- } + + void roadmap_start_set_title (const char *title) { + RoadMapMainTitle = title; + } + |
|
From: Ehud S. <esh...@us...> - 2006-09-17 18:15:45
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6588 Modified Files: lang Log Message: Fix translation. Index: lang =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/lang,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang 3 Sep 2006 17:57:55 -0000 1.2 --- lang 17 Sep 2006 18:15:41 -0000 1.3 *************** *** 39,43 **** Error=ש×××× Your map is not updated. Please synchronize.=× ×ª×× × ×××¤× ××× × ××¢×××× ××. ×× × ×צע ×¡× ×ר×× ××ק×× ××פשר×. ! Can't find a route.=×× × ××ª× ×××©× ×ס××× ×× ×××¢× ×רצ××. ×× × ×¤× × ××תר ×פר××××§× ×¢× ×× ×ª ××ª×§× ×ת ×××¢××. Route found=× ××¦× ×ס××× m=×' --- 39,43 ---- Error=ש×××× Your map is not updated. Please synchronize.=× ×ª×× × ×××¤× ××× × ××¢×××× ××. ×× × ×צע ×¡× ×ר×× ××ק×× ××פשר×. ! Can't find a route.=×× × ××ª× ×××©× ×ס××× ×× ×××¢× ×רצ×× ×¢×§× ××סר × ×ª×× ××. ×× × ×¤× × ××תר ×פר×××§× ××××× ×¢× ×××¢××. ×××××פ×× × ××ª× ××¢××× ×ת ×× ×ª×× ×× ××סר×× ×××שק ××¢×××× ×©××תר. Route found=× ××¦× ×ס××× m=×' *************** *** 88,92 **** Trails=×××ש עפר Error downloading map update=×¢×××× ×××¤× × ×ש×. ×× × ×××× ×©×××ש×ר ××××ר ×רשת ×××× ××¨× ×. ! No city with that name could be found=×× × ××ª× ××צ×× ×¢×ר ××©× ×× ! No street with that name could be found=×× × ××ª× ××צ×× ×¨××× ××©× ×× ! No such address could be found on that street=×ספר ×××ת ××× × ×§××× ×ר××× ×× --- 88,104 ---- Trails=×××ש עפר Error downloading map update=×¢×××× ×××¤× × ×ש×. ×× × ×××× ×©×××ש×ר ××××ר ×רשת ×××× ××¨× ×. ! No city with that name could be found=×× × ××ª× ××צ×× ×¢×ר ××©× ××. ! No street with that name could be found=×× × ××ª× ××צ×× ×¨××× ××©× ××. ! No such address could be found on that street=×ספר ×××ת ××× × ×§××× ×ר××× ××. × ×¡× ×ספר ××ר ×× ××ק ×ת ××ספר ×××ער×ת ×ª× ××× ×× ××× ×ק××¢× ×ר×××. ! Found GPS Receiver.=××ש×ר ×-GPS × ×צ×. ! GPS already connected!=××ש×ר ×-GPS ××××ר! ! Running, please wait...=×× × ××ת×... ! GPS Receiver not found. Make sure your receiver is connected and turned on.=××ש×ר ×-GPS ×× × ×צ×. ×××ק ש×-GPS ××××ר ×××פע×. ! Detect GPS=×פש GPS ! Setup wizard=×שף ××××ר×ת ! .Welcome to FreeMap!=.×ר×××× ××××× ×-FreeMap! ! .Enter your user name if you registered one.=.×× × ×¨×©×ת ××תר ××× ×ת ×פר×××. ! .Otherwise leave these fields empty.=.×× ×× × ×¨×©×ת ×ש×ר ×ת ×ש×× ×¨×ק. ! User Name=×©× ×שת×ש ! Password=ס×ס×× ! RoadMap=FreeMap |
