roadnav-commits Mailing List for Roadnav (Page 74)
Status: Inactive
Brought to you by:
rllynch
Menu
▾
▴
roadnav-commits — Maintains a log of all Roadnav commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(164) |
Jun
(168) |
Jul
(161) |
Aug
(52) |
Sep
(109) |
Oct
(63) |
Nov
(86) |
Dec
(53) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(20) |
Feb
(3) |
Mar
(17) |
Apr
(57) |
May
(21) |
Jun
(6) |
Jul
(77) |
Aug
(83) |
Sep
(83) |
Oct
(72) |
Nov
(92) |
Dec
(69) |
| 2007 |
Jan
(33) |
Feb
(15) |
Mar
(4) |
Apr
(15) |
May
(18) |
Jun
(50) |
Jul
(5) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(10) |
Dec
(9) |
| 2008 |
Jan
|
Feb
|
Mar
(29) |
Apr
(26) |
May
(5) |
Jun
(6) |
Jul
(57) |
Aug
(25) |
Sep
(4) |
Oct
(11) |
Nov
(16) |
Dec
(28) |
| 2009 |
Jan
(3) |
Feb
|
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Richard L. <rl...@us...> - 2005-05-05 22:51:51
|
Update of /cvsroot/roadnav/roadnav/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9737/src Modified Files: Frame.cpp Log Message: Improved default night/photo color theme Index: Frame.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/Frame.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Frame.cpp 5 May 2005 21:15:39 -0000 1.64 --- Frame.cpp 5 May 2005 22:51:43 -0000 1.65 *************** *** 1978,1991 **** Theme cThemeDefaultNight; ! cThemeDefaultNight.SetBackgroundColor( ParseColor("#FFFAB2") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceDefaultColor"], ParseColor("#C0C0C0") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceOneWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayLargeRoadColor"], ParseColor("#827000") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayLargeRoadColor"], ParseColor("#827000") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayHighwayColor"], ParseColor("#B68628") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayHighwayColor"], ParseColor("#B68628") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceRailroadColor"], ParseColor("#808080") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceWaterColor"], ParseColor("#0000ff") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleLandBoundaryColor"], ParseColor("#A0A0A0") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleWaterBoundaryColor"], ParseColor("#C0C0FF") ); --- 1978,1991 ---- Theme cThemeDefaultNight; ! cThemeDefaultNight.SetBackgroundColor( ParseColor("#000000") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceDefaultColor"], ParseColor("#C0C0C0") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceOneWaySmallRoadColor"], ParseColor("#d0d0d0") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWaySmallRoadColor"], ParseColor("#d0d0d0") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayLargeRoadColor"], ParseColor("#cccc00") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayLargeRoadColor"], ParseColor("#cccc00") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayHighwayColor"], ParseColor("#B68628") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayHighwayColor"], ParseColor("#B68628") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceRailroadColor"], ParseColor("#808080") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceWaterColor"], ParseColor("#6060ff") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleLandBoundaryColor"], ParseColor("#A0A0A0") ); cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleWaterBoundaryColor"], ParseColor("#C0C0FF") ); *************** *** 1998,2009 **** Theme cThemeDefaultPhoto; ! cThemeDefaultPhoto.SetBackgroundColor( ParseColor("#FFFAB2") ); cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceDefaultColor"], ParseColor("#C0C0C0") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceOneWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayLargeRoadColor"], ParseColor("#827000") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayLargeRoadColor"], ParseColor("#827000") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayHighwayColor"], ParseColor("#B68628") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayHighwayColor"], ParseColor("#B68628") ); cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceRailroadColor"], ParseColor("#808080") ); cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceWaterColor"], ParseColor("#0000ff") ); --- 1998,2009 ---- Theme cThemeDefaultPhoto; ! cThemeDefaultPhoto.SetBackgroundColor( ParseColor("#808080") ); cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceDefaultColor"], ParseColor("#C0C0C0") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceOneWaySmallRoadColor"], ParseColor("#40ffff") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWaySmallRoadColor"], ParseColor("#40ffff") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayLargeRoadColor"], ParseColor("#ffff00") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayLargeRoadColor"], ParseColor("#ffff00") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayHighwayColor"], ParseColor("#00ff00") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayHighwayColor"], ParseColor("#00ff00") ); cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceRailroadColor"], ParseColor("#808080") ); cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceWaterColor"], ParseColor("#0000ff") ); *************** *** 2015,2019 **** cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTownOrCityColor"], ParseColor("#E5E5E5") ); cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceStateBoundaryColor"], ParseColor("#FF0000") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceCountyBoundaryColor"], ParseColor("#00FF00") ); m_ThemeManager.AddTheme("Default-Day", cThemeDefaultDay); --- 2015,2019 ---- cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTownOrCityColor"], ParseColor("#E5E5E5") ); cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceStateBoundaryColor"], ParseColor("#FF0000") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceCountyBoundaryColor"], ParseColor("#00ffff") ); m_ThemeManager.AddTheme("Default-Day", cThemeDefaultDay); |
|
From: Richard L. <rl...@us...> - 2005-05-05 21:15:49
|
Update of /cvsroot/roadnav/roadnav/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18031/src Modified Files: Frame.cpp PreferencesPageThemes.cpp ThemeManager.cpp Log Message: Adds separate default day, night, and photo themes Index: PreferencesPageThemes.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/PreferencesPageThemes.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PreferencesPageThemes.cpp 5 May 2005 20:54:40 -0000 1.4 --- PreferencesPageThemes.cpp 5 May 2005 21:15:40 -0000 1.5 *************** *** 214,218 **** // // After edited, need to update combo boxes ! Theme& default_theme = m_ThemeManager.GetTheme("Default"); Theme new_theme = default_theme; --- 214,218 ---- // // After edited, need to update combo boxes ! Theme& default_theme = m_ThemeManager.GetTheme("Default-Day"); Theme new_theme = default_theme; Index: Frame.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/Frame.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** Frame.cpp 5 May 2005 20:29:08 -0000 1.63 --- Frame.cpp 5 May 2005 21:15:39 -0000 1.64 *************** *** 1957,1984 **** // This is the one and only hard coded theme.... all the rest are // read from the configuration object ! Theme defaultTheme; ! defaultTheme.SetBackgroundColor( ParseColor("#FFFAB2") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceDefaultColor"], ParseColor("#C0C0C0") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceOneWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayLargeRoadColor"], ParseColor("#827000") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayLargeRoadColor"], ParseColor("#827000") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayHighwayColor"], ParseColor("#B68628") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayHighwayColor"], ParseColor("#B68628") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceRailroadColor"], ParseColor("#808080") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceWaterColor"], ParseColor("#0000ff") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleLandBoundaryColor"], ParseColor("#A0A0A0") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleWaterBoundaryColor"], ParseColor("#C0C0FF") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleMiscBoundaryColor"], ParseColor("#C0C0FF") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceLandmarkColor"], ParseColor("#2FAF41") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearancePhysicalFeatureColor"], ParseColor("#000000") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceTownOrCityColor"], ParseColor("#E5E5E5") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceStateBoundaryColor"], ParseColor("#FF0000") ); ! defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceCountyBoundaryColor"], ParseColor("#00FF00") ); ! m_ThemeManager.AddTheme("Default",defaultTheme); ! m_ThemeManager.SetNightTheme("Default"); ! m_ThemeManager.SetDayTheme("Default"); ! m_ThemeManager.SetPhotoTheme("Default"); // Load other themes from config --- 1957,2027 ---- // This is the one and only hard coded theme.... all the rest are // read from the configuration object ! Theme cThemeDefaultDay; ! cThemeDefaultDay.SetBackgroundColor( ParseColor("#FFFAB2") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceDefaultColor"], ParseColor("#C0C0C0") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceOneWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayLargeRoadColor"], ParseColor("#827000") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayLargeRoadColor"], ParseColor("#827000") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayHighwayColor"], ParseColor("#B68628") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayHighwayColor"], ParseColor("#B68628") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceRailroadColor"], ParseColor("#808080") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceWaterColor"], ParseColor("#0000ff") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleLandBoundaryColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleWaterBoundaryColor"], ParseColor("#C0C0FF") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleMiscBoundaryColor"], ParseColor("#C0C0FF") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceLandmarkColor"], ParseColor("#2FAF41") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearancePhysicalFeatureColor"], ParseColor("#000000") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceTownOrCityColor"], ParseColor("#E5E5E5") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceStateBoundaryColor"], ParseColor("#FF0000") ); ! cThemeDefaultDay.SetColor( m_mapAppearanceToRecordType["AppearanceCountyBoundaryColor"], ParseColor("#00FF00") ); ! Theme cThemeDefaultNight; ! cThemeDefaultNight.SetBackgroundColor( ParseColor("#FFFAB2") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceDefaultColor"], ParseColor("#C0C0C0") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceOneWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayLargeRoadColor"], ParseColor("#827000") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayLargeRoadColor"], ParseColor("#827000") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayHighwayColor"], ParseColor("#B68628") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayHighwayColor"], ParseColor("#B68628") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceRailroadColor"], ParseColor("#808080") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceWaterColor"], ParseColor("#0000ff") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleLandBoundaryColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleWaterBoundaryColor"], ParseColor("#C0C0FF") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleMiscBoundaryColor"], ParseColor("#C0C0FF") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceLandmarkColor"], ParseColor("#2FAF41") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearancePhysicalFeatureColor"], ParseColor("#000000") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceTownOrCityColor"], ParseColor("#E5E5E5") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceStateBoundaryColor"], ParseColor("#FF0000") ); ! cThemeDefaultNight.SetColor( m_mapAppearanceToRecordType["AppearanceCountyBoundaryColor"], ParseColor("#00FF00") ); ! ! Theme cThemeDefaultPhoto; ! cThemeDefaultPhoto.SetBackgroundColor( ParseColor("#FFFAB2") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceDefaultColor"], ParseColor("#C0C0C0") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceOneWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWaySmallRoadColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayLargeRoadColor"], ParseColor("#827000") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayLargeRoadColor"], ParseColor("#827000") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayHighwayColor"], ParseColor("#B68628") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayHighwayColor"], ParseColor("#B68628") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceRailroadColor"], ParseColor("#808080") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceWaterColor"], ParseColor("#0000ff") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleLandBoundaryColor"], ParseColor("#A0A0A0") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleWaterBoundaryColor"], ParseColor("#C0C0FF") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleMiscBoundaryColor"], ParseColor("#C0C0FF") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceLandmarkColor"], ParseColor("#2FAF41") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearancePhysicalFeatureColor"], ParseColor("#000000") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceTownOrCityColor"], ParseColor("#E5E5E5") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceStateBoundaryColor"], ParseColor("#FF0000") ); ! cThemeDefaultPhoto.SetColor( m_mapAppearanceToRecordType["AppearanceCountyBoundaryColor"], ParseColor("#00FF00") ); ! ! m_ThemeManager.AddTheme("Default-Day", cThemeDefaultDay); ! m_ThemeManager.AddTheme("Default-Night", cThemeDefaultNight); ! m_ThemeManager.AddTheme("Default-Photo", cThemeDefaultPhoto); ! ! m_ThemeManager.SetNightTheme("Default-Night"); ! m_ThemeManager.SetDayTheme("Default-Day"); ! m_ThemeManager.SetPhotoTheme("Default-Photo"); // Load other themes from config *************** *** 1986,1990 **** // Configure MapDetailSettings from themes // (Use default for now, but change based on time of day, etc) ! defaultTheme.SetColors(m_MapDetailSettings); } --- 2029,2033 ---- // Configure MapDetailSettings from themes // (Use default for now, but change based on time of day, etc) ! cThemeDefaultDay.SetColors(m_MapDetailSettings); } Index: ThemeManager.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/ThemeManager.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ThemeManager.cpp 5 May 2005 20:29:09 -0000 1.1 --- ThemeManager.cpp 5 May 2005 21:15:40 -0000 1.2 *************** *** 284,290 **** pConfig->Read("ThemeUsage",&iUsage,0); m_ThemeUsage = (ThemeUsage)iUsage; ! pConfig->Read("NightTheme",&m_strNightTheme,"Default"); ! pConfig->Read("DayTheme", &m_strDayTheme, "Default"); ! pConfig->Read("PhotoTheme",&m_strPhotoTheme,"Default"); wxString strGroup; --- 284,290 ---- pConfig->Read("ThemeUsage",&iUsage,0); m_ThemeUsage = (ThemeUsage)iUsage; ! pConfig->Read("NightTheme",&m_strNightTheme,"Default-Night"); ! pConfig->Read("DayTheme", &m_strDayTheme, "Default-Day"); ! pConfig->Read("PhotoTheme",&m_strPhotoTheme,"Default-Photo"); wxString strGroup; |
|
From: Richard L. <rl...@us...> - 2005-05-05 21:01:07
|
Update of /cvsroot/roadnav/roadnav In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14920 Modified Files: roadnav.prj Log Message: Updates makefiles, eliminates GCC warnings Index: roadnav.prj =================================================================== RCS file: /cvsroot/roadnav/roadnav/roadnav.prj,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** roadnav.prj 1 May 2005 04:52:19 -0000 1.32 --- roadnav.prj 5 May 2005 21:00:53 -0000 1.33 *************** *** 161,166 **** SerialIO-Win32.cpp\ SerialIO-POSIX.cpp\ - PreferencesPageColors.cpp\ - PreferencesPageColors.h\ ColorPickerControl.cpp\ ColorPickerControl.h\ --- 161,164 ---- *************** *** 229,233 **** MapTrack.h\ DirectionsFrame.cpp\ ! DirectionsFrame.h module.pixmap.name=pixmaps --- 227,243 ---- MapTrack.h\ DirectionsFrame.cpp\ ! DirectionsFrame.h\ ! MapDetailSettings.cpp\ ! MapDetailSettings.h\ ! PreferencesPageThemes.cpp\ ! PreferencesPageThemes.h\ ! Theme.cpp\ ! Theme.h\ ! ThemeManager.cpp\ ! ThemeManager.h\ ! ThemeColorsDialog.cpp\ ! ThemeColorsDialog.h\ ! SolarTimer.cpp\ ! SolarTimer.h module.pixmap.name=pixmaps |
|
From: Richard L. <rl...@us...> - 2005-05-05 21:01:02
|
Update of /cvsroot/roadnav/roadnav/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14920/src Modified Files: Makefile.am Makefile.in MapDetailSettings.cpp SolarTimer.cpp Log Message: Updates makefiles, eliminates GCC warnings Index: Makefile.in =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/Makefile.in,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Makefile.in 1 May 2005 04:52:19 -0000 1.27 --- Makefile.in 5 May 2005 21:00:53 -0000 1.28 *************** *** 117,121 **** bin_PROGRAMS = roadnav ! roadnav_SOURCES = AddressDialog.cpp AddressDialog.h App.cpp App.h Constants.h CountyDialog.cpp CountyDialog.h Frame.cpp Frame.h GPSMonitorThread.cpp GPSMonitorThread.h Map.cpp Map.h MapAbbreviations.cpp MapAbbreviations.h MapControl.cpp MapControl.h MapCounty.cpp MapCounty.h MapDrawing.cpp MapDrawing.h MapLookup.cpp MapLookup.h MapState.cpp MapState.h MapSupport.cpp MapSupport.h MapZip.cpp MapZip.h Point.cpp Point.h Portability.cpp Portability.h Printout.cpp Printout.h ProgressDialog.cpp ProgressDialog.h SerialIO.h filesave.xpm getdirections.xpm print.xpm setaddress.xpm splash.xpm zoomin.xpm zoomout.xpm StateDialog.cpp StateDialog.h MapMarker.cpp MapMarker.h appicon.xpm appicon.ico PreferencesDialog.cpp PreferencesDialog.h PreferencesPageGPS.cpp PreferencesPageGPS.h PreferencesPageGeneral.cpp PreferencesPageGeneral.h SerialIO-Generic.cpp SerialIO-Win32.cpp SerialIO-POSIX.cpp PreferencesPageColors.cpp PreferencesPageColors.h ColorPickerControl.cpp ColorPickerControl.h GPSFrame.cpp GPSFrame.h GPSControl.cpp GPSControl.h Zip.cpp Zip.h SaveAsSettingsDialog.cpp SaveAsSettingsDialog.h WhatsNearByFrame.cpp WhatsNearByFrame.h wxAntiAliasedDC.h Support.cpp Support.h Terraserver.cpp Terraserver.h UTM.cpp UTM.h PreferencesPageURLs.cpp PreferencesPageURLs.h URLs.cpp URLs.h DownloadThread.cpp DownloadThread.h TTS-Generic.cpp TTS-Win32.cpp TTS.h TTS-Festival.cpp Angle.cpp Angle.h Direction.cpp Direction.h MapEventExtender.cpp MapEventExtender.h PreferencesPageUnits.cpp PreferencesPageUnits.h MapControlData.h MapControlDataEntry.h MapControlDataImporter.cpp MapControlDataImporter.h MapControlDataImporter_GNIS.cpp MapControlDataImporter_GNIS.h MapControlDataImporter_StateBoundaries.cpp MapControlDataImporter_StateBoundaries.h MapControlDataImporter_TigerLine.cpp MapControlDataImporter_TigerLine.h MapControlData.cpp MapControlDataEntry.cpp MapControlDataEntry_Std.cpp MapControlDataEntry_Std.h MapControlData_Foundation.cpp MapControlData_Foundation.h MapControlData_Tiles.cpp MapControlData_Tiles.h MapControlDataImporter_CountyBoundaries.cpp MapControlDataImporter_CountyBoundaries.h UniqueID.cpp UniqueID.h UniqueIDGenerator.cpp UniqueIDGenerator.h Serialization.cpp Serialization.h MapTrack.cpp MapTrack.h DirectionsFrame.cpp DirectionsFrame.h --- 117,121 ---- bin_PROGRAMS = roadnav ! roadnav_SOURCES = AddressDialog.cpp AddressDialog.h App.cpp App.h Constants.h CountyDialog.cpp CountyDialog.h Frame.cpp Frame.h GPSMonitorThread.cpp GPSMonitorThread.h Map.cpp Map.h MapAbbreviations.cpp MapAbbreviations.h MapControl.cpp MapControl.h MapCounty.cpp MapCounty.h MapDrawing.cpp MapDrawing.h MapLookup.cpp MapLookup.h MapState.cpp MapState.h MapSupport.cpp MapSupport.h MapZip.cpp MapZip.h Point.cpp Point.h Portability.cpp Portability.h Printout.cpp Printout.h ProgressDialog.cpp ProgressDialog.h SerialIO.h filesave.xpm getdirections.xpm print.xpm setaddress.xpm splash.xpm zoomin.xpm zoomout.xpm StateDialog.cpp StateDialog.h MapMarker.cpp MapMarker.h appicon.xpm appicon.ico PreferencesDialog.cpp PreferencesDialog.h PreferencesPageGPS.cpp PreferencesPageGPS.h PreferencesPageGeneral.cpp PreferencesPageGeneral.h SerialIO-Generic.cpp SerialIO-Win32.cpp SerialIO-POSIX.cpp ColorPickerControl.cpp ColorPickerControl.h GPSFrame.cpp GPSFrame.h GPSControl.cpp GPSControl.h Zip.cpp Zip.h SaveAsSettingsDialog.cpp SaveAsSettingsDialog.h WhatsNearByFrame.cpp WhatsNearByFrame.h wxAntiAliasedDC.h Support.cpp Support.h Terraserver.cpp Terraserver.h UTM.cpp UTM.h PreferencesPageURLs.cpp PreferencesPageURLs.h URLs.cpp URLs.h DownloadThread.cpp DownloadThread.h TTS-Generic.cpp TTS-Win32.cpp TTS.h TTS-Festival.cpp Angle.cpp Angle.h Direction.cpp Direction.h MapEventExtender.cpp MapEventExtender.h PreferencesPageUnits.cpp PreferencesPageUnits.h MapControlData.h MapControlDataEntry.h MapControlDataImporter.cpp MapControlDataImporter.h MapControlDataImporter_GNIS.cpp MapControlDataImporter_GNIS.h MapControlDataImporter_StateBoundaries.cpp MapControlDataImporter_StateBoundaries.h MapControlDataImporter_TigerLine.cpp MapControlDataImporter_TigerLine.h MapControlData.cpp MapControlDataEntry.cpp MapControlDataEntry_Std.cpp MapControlDataEntry_Std.h MapControlData_Foundation.cpp MapControlData_Foundation.h MapControlData_Tiles.cpp MapControlData_Tiles.h MapControlDataImporter_CountyBoundaries.cpp MapControlDataImporter_CountyBoundaries.h UniqueID.cpp UniqueID.h UniqueIDGenerator.cpp UniqueIDGenerator.h Serialization.cpp Serialization.h MapTrack.cpp MapTrack.h DirectionsFrame.cpp DirectionsFrame.h MapDetailSettings.cpp MapDetailSettings.h PreferencesPageThemes.cpp PreferencesPageThemes.h Theme.cpp Theme.h ThemeManager.cpp ThemeManager.h ThemeColorsDialog.cpp ThemeColorsDialog.h SolarTimer.cpp SolarTimer.h *************** *** 145,151 **** PreferencesPageGeneral.$(OBJEXT) SerialIO-Generic.$(OBJEXT) \ SerialIO-Win32.$(OBJEXT) SerialIO-POSIX.$(OBJEXT) \ ! PreferencesPageColors.$(OBJEXT) ColorPickerControl.$(OBJEXT) \ ! GPSFrame.$(OBJEXT) GPSControl.$(OBJEXT) Zip.$(OBJEXT) \ ! SaveAsSettingsDialog.$(OBJEXT) WhatsNearByFrame.$(OBJEXT) \ Support.$(OBJEXT) Terraserver.$(OBJEXT) UTM.$(OBJEXT) \ PreferencesPageURLs.$(OBJEXT) URLs.$(OBJEXT) DownloadThread.$(OBJEXT) \ --- 145,150 ---- PreferencesPageGeneral.$(OBJEXT) SerialIO-Generic.$(OBJEXT) \ SerialIO-Win32.$(OBJEXT) SerialIO-POSIX.$(OBJEXT) \ ! ColorPickerControl.$(OBJEXT) GPSFrame.$(OBJEXT) GPSControl.$(OBJEXT) \ ! Zip.$(OBJEXT) SaveAsSettingsDialog.$(OBJEXT) WhatsNearByFrame.$(OBJEXT) \ Support.$(OBJEXT) Terraserver.$(OBJEXT) UTM.$(OBJEXT) \ PreferencesPageURLs.$(OBJEXT) URLs.$(OBJEXT) DownloadThread.$(OBJEXT) \ *************** *** 160,164 **** MapControlDataImporter_CountyBoundaries.$(OBJEXT) UniqueID.$(OBJEXT) \ UniqueIDGenerator.$(OBJEXT) Serialization.$(OBJEXT) MapTrack.$(OBJEXT) \ ! DirectionsFrame.$(OBJEXT) roadnav_DEPENDENCIES = CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --- 159,165 ---- MapControlDataImporter_CountyBoundaries.$(OBJEXT) UniqueID.$(OBJEXT) \ UniqueIDGenerator.$(OBJEXT) Serialization.$(OBJEXT) MapTrack.$(OBJEXT) \ ! DirectionsFrame.$(OBJEXT) MapDetailSettings.$(OBJEXT) \ ! PreferencesPageThemes.$(OBJEXT) Theme.$(OBJEXT) ThemeManager.$(OBJEXT) \ ! ThemeColorsDialog.$(OBJEXT) SolarTimer.$(OBJEXT) roadnav_DEPENDENCIES = CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) *************** *** 190,204 **** .deps/MapControlDataImporter_TigerLine.P \ .deps/MapControlData_Foundation.P .deps/MapControlData_Tiles.P \ ! .deps/MapCounty.P .deps/MapDrawing.P .deps/MapEventExtender.P \ ! .deps/MapLookup.P .deps/MapMarker.P .deps/MapState.P .deps/MapSupport.P \ ! .deps/MapTrack.P .deps/MapZip.P .deps/Point.P .deps/Portability.P \ ! .deps/PreferencesDialog.P .deps/PreferencesPageColors.P \ .deps/PreferencesPageGPS.P .deps/PreferencesPageGeneral.P \ ! .deps/PreferencesPageURLs.P .deps/PreferencesPageUnits.P \ ! .deps/Printout.P .deps/ProgressDialog.P .deps/SaveAsSettingsDialog.P \ ! .deps/SerialIO-Generic.P .deps/SerialIO-POSIX.P .deps/SerialIO-Win32.P \ ! .deps/Serialization.P .deps/StateDialog.P .deps/Support.P \ .deps/TTS-Festival.P .deps/TTS-Generic.P .deps/TTS-Win32.P \ ! .deps/Terraserver.P .deps/URLs.P .deps/UTM.P .deps/UniqueID.P \ .deps/UniqueIDGenerator.P .deps/WhatsNearByFrame.P .deps/Zip.P SOURCES = $(roadnav_SOURCES) --- 191,207 ---- .deps/MapControlDataImporter_TigerLine.P \ .deps/MapControlData_Foundation.P .deps/MapControlData_Tiles.P \ ! .deps/MapCounty.P .deps/MapDetailSettings.P .deps/MapDrawing.P \ ! .deps/MapEventExtender.P .deps/MapLookup.P .deps/MapMarker.P \ ! .deps/MapState.P .deps/MapSupport.P .deps/MapTrack.P .deps/MapZip.P \ ! .deps/Point.P .deps/Portability.P .deps/PreferencesDialog.P \ .deps/PreferencesPageGPS.P .deps/PreferencesPageGeneral.P \ ! .deps/PreferencesPageThemes.P .deps/PreferencesPageURLs.P \ ! .deps/PreferencesPageUnits.P .deps/Printout.P .deps/ProgressDialog.P \ ! .deps/SaveAsSettingsDialog.P .deps/SerialIO-Generic.P \ ! .deps/SerialIO-POSIX.P .deps/SerialIO-Win32.P .deps/Serialization.P \ ! .deps/SolarTimer.P .deps/StateDialog.P .deps/Support.P \ .deps/TTS-Festival.P .deps/TTS-Generic.P .deps/TTS-Win32.P \ ! .deps/Terraserver.P .deps/Theme.P .deps/ThemeColorsDialog.P \ ! .deps/ThemeManager.P .deps/URLs.P .deps/UTM.P .deps/UniqueID.P \ .deps/UniqueIDGenerator.P .deps/WhatsNearByFrame.P .deps/Zip.P SOURCES = $(roadnav_SOURCES) Index: MapDetailSettings.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/MapDetailSettings.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MapDetailSettings.cpp 5 May 2005 20:29:09 -0000 1.1 --- MapDetailSettings.cpp 5 May 2005 21:00:53 -0000 1.2 *************** *** 136,140 **** { std::vector<double>::const_iterator iter; ! wxInt16 detailLevel; for ( iter = m_vDetailLevelToScale.begin(); iter != m_vDetailLevelToScale.end(); iter++ ) { --- 136,140 ---- { std::vector<double>::const_iterator iter; ! wxInt16 detailLevel = 0; for ( iter = m_vDetailLevelToScale.begin(); iter != m_vDetailLevelToScale.end(); iter++ ) { Index: Makefile.am =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/Makefile.am,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Makefile.am 1 May 2005 04:52:19 -0000 1.26 --- Makefile.am 5 May 2005 21:00:53 -0000 1.27 *************** *** 75,80 **** SerialIO-Win32.cpp\ SerialIO-POSIX.cpp\ - PreferencesPageColors.cpp\ - PreferencesPageColors.h\ ColorPickerControl.cpp\ ColorPickerControl.h\ --- 75,78 ---- *************** *** 143,147 **** MapTrack.h\ DirectionsFrame.cpp\ ! DirectionsFrame.h roadnav_LDFLAGS = --- 141,157 ---- MapTrack.h\ DirectionsFrame.cpp\ ! DirectionsFrame.h\ ! MapDetailSettings.cpp\ ! MapDetailSettings.h\ ! PreferencesPageThemes.cpp\ ! PreferencesPageThemes.h\ ! Theme.cpp\ ! Theme.h\ ! ThemeManager.cpp\ ! ThemeManager.h\ ! ThemeColorsDialog.cpp\ ! ThemeColorsDialog.h\ ! SolarTimer.cpp\ ! SolarTimer.h roadnav_LDFLAGS = Index: SolarTimer.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/SolarTimer.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SolarTimer.cpp 5 May 2005 20:29:09 -0000 1.1 --- SolarTimer.cpp 5 May 2005 21:00:53 -0000 1.2 *************** *** 282,288 **** // Compute day of year ! int N1 = floor((double) 275 * month / 9); ! int N2 = floor((double) (month + 9) / 12); ! int N3 = (1 + floor((double) (year - 4 * floor((double) year / 4) + 2) / 3)); int N = N1 - (N2 * N3) + day - 30; --- 282,288 ---- // Compute day of year ! int N1 = (int) (floor((double) 275 * month / 9)); ! int N2 = (int) (floor((double) (month + 9) / 12)); ! int N3 = (int) (1 + floor((double) (year - 4 * floor((double) year / 4) + 2) / 3)); int N = N1 - (N2 * N3) + day - 30; *************** *** 385,398 **** } ! int h = floor(LT_rise); double m = 60 * (LT_rise - h); double s = floor(60 * (m - floor(m))); m = floor(m); ! m_Sunrise.Set(h, m, s, 0); ! h = floor(LT_set); m = 60 * (LT_set - h); s = floor(60 * (m - floor(m))); m = floor(m); ! m_Sunset.Set(h, m, s, 0); } --- 385,398 ---- } ! int h = (int) floor(LT_rise); double m = 60 * (LT_rise - h); double s = floor(60 * (m - floor(m))); m = floor(m); ! m_Sunrise.Set((int) h, (int) m, (int) s, 0); ! h = (int) floor(LT_set); m = 60 * (LT_set - h); s = floor(60 * (m - floor(m))); m = floor(m); ! m_Sunset.Set((int) h, (int) m, (int) s, 0); } |
|
From: Richard L. <rl...@us...> - 2005-05-05 20:54:50
|
Update of /cvsroot/roadnav/roadnav/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13458/src Modified Files: PreferencesPageThemes.cpp ThemeColorsDialog.cpp Log Message: Eliminates another call to wxComboBox::Append(wxArrayString x) since that doesn't exist in 2.4.2 Fixes compiler warning Index: PreferencesPageThemes.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/PreferencesPageThemes.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PreferencesPageThemes.cpp 5 May 2005 20:52:11 -0000 1.3 --- PreferencesPageThemes.cpp 5 May 2005 20:54:40 -0000 1.4 *************** *** 161,165 **** m_pctlPhotoTheme->Append(strThemes); #else ! int i; for (i = 0; i < strThemes.Count(); i++) --- 161,165 ---- m_pctlPhotoTheme->Append(strThemes); #else ! unsigned int i; for (i = 0; i < strThemes.Count(); i++) *************** *** 307,311 **** m_pctlPhotoTheme->Append(strThemes); #else ! int i; for (i = 0; i < strThemes.Count(); i++) --- 307,311 ---- m_pctlPhotoTheme->Append(strThemes); #else ! unsigned int i; for (i = 0; i < strThemes.Count(); i++) Index: ThemeColorsDialog.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/ThemeColorsDialog.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ThemeColorsDialog.cpp 5 May 2005 20:41:16 -0000 1.1 --- ThemeColorsDialog.cpp 5 May 2005 20:54:40 -0000 1.2 *************** *** 111,115 **** --- 111,122 ---- m_pctlSelection = new wxComboBox(this, idSelection, "", wxDefaultPosition, wxSize(200, -1), 0, NULL, wxCB_READONLY); wxArrayString strRecordTypes = GetRecordTypeNames(); + #if wxCHECK_VERSION(2, 6, 0) m_pctlSelection->Append(strRecordTypes); + #else + unsigned int iRT; + + for (iRT = 0; iRT < strRecordTypes.Count(); iRT++) + m_pctlSelection->Append(strRecordTypes[iRT]); + #endif m_pctlSelection->SetSelection(0); |
|
From: Richard L. <rl...@us...> - 2005-05-05 20:52:19
|
Update of /cvsroot/roadnav/roadnav/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12767/src Modified Files: PreferencesPageThemes.cpp Log Message: Eliminates another call to wxComboBox::Append(wxArrayString x) since that doesn't exist in 2.4.2 Index: PreferencesPageThemes.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/PreferencesPageThemes.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PreferencesPageThemes.cpp 5 May 2005 20:51:06 -0000 1.2 --- PreferencesPageThemes.cpp 5 May 2005 20:52:11 -0000 1.3 *************** *** 300,306 **** wxArrayString strThemes = m_ThemeManager.GetThemeNames(); ! m_pctlNightTheme->Append(strThemes); ! m_pctlDayTheme->Append(strThemes); ! m_pctlPhotoTheme->Append(strThemes); m_pctlNightTheme->SetStringSelection(strNightTheme); --- 300,320 ---- wxArrayString strThemes = m_ThemeManager.GetThemeNames(); ! ! #if wxCHECK_VERSION(2, 6, 0) ! m_pctlThemeList->Append(strThemes); ! m_pctlNightTheme->Append(strThemes); ! m_pctlDayTheme->Append(strThemes); ! m_pctlPhotoTheme->Append(strThemes); ! #else ! int i; ! ! for (i = 0; i < strThemes.Count(); i++) ! { ! m_pctlThemeList->Append(strThemes[i]); ! m_pctlNightTheme->Append(strThemes[i]); ! m_pctlDayTheme->Append(strThemes[i]); ! m_pctlPhotoTheme->Append(strThemes[i]); ! } ! #endif m_pctlNightTheme->SetStringSelection(strNightTheme); |
|
From: Richard L. <rl...@us...> - 2005-05-05 20:51:14
|
Update of /cvsroot/roadnav/roadnav/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12439/src Modified Files: PreferencesPageThemes.cpp Log Message: Eliminates calls to wxComboBox::Append(wxArrayString x) since that doesn't exist in 2.4.2 Index: PreferencesPageThemes.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/PreferencesPageThemes.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PreferencesPageThemes.cpp 5 May 2005 20:29:09 -0000 1.1 --- PreferencesPageThemes.cpp 5 May 2005 20:51:06 -0000 1.2 *************** *** 155,162 **** --- 155,174 ---- wxArrayString strThemes = m_ThemeManager.GetThemeNames(); + #if wxCHECK_VERSION(2, 6, 0) m_pctlThemeList->Append(strThemes); m_pctlNightTheme->Append(strThemes); m_pctlDayTheme->Append(strThemes); m_pctlPhotoTheme->Append(strThemes); + #else + int i; + + for (i = 0; i < strThemes.Count(); i++) + { + m_pctlThemeList->Append(strThemes[i]); + m_pctlNightTheme->Append(strThemes[i]); + m_pctlDayTheme->Append(strThemes[i]); + m_pctlPhotoTheme->Append(strThemes[i]); + } + #endif ////////////////////////////////////////////////////////////////////////// |
|
From: Richard L. <rl...@us...> - 2005-05-05 20:41:26
|
Update of /cvsroot/roadnav/roadnav/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9513/src Added Files: ThemeColorsDialog.cpp ThemeColorsDialog.h Log Message: Applies patch #1194510 from Rick Brice, https://sourceforge.net/tracker/index.php?func=detail&aid=1194510&group_id=119594&atid=684488 - adds theme management. Quote from patch description: "This patch adds theme management to roadnav. Users can create and manage color configurations known as themes. Themes can be associated with nighttime, daytime, and aerial photo viewing. When auto-theme selection is enabled the theme will automatically switch between the daytime and nighttime themes at sunrise and sunset respectivly." --- NEW FILE: ThemeColorsDialog.h --- /* * Roadnav * * ThemeColorsDialog.h * * Copyright (c) 2004 - 2005 Richard L. Lynch <rl...@us...> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public License * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ////////////////////////////////////////////////////////////////////////////// /// \file /// /// Contains the colors dialog for theme editing /// ////////////////////////////////////////////////////////////////////////////// #ifndef PREFERENCESPAGECOLORS_H #define PREFERENCESPAGECOLORS_H #include <wx/notebook.h> #include <vector> #include "ColorPickerControl.h" #include "Theme.h" ////////////////////////////////////////////////////////////////////////////// /// /// \brief Implements the colors dialog for theme editing /// ////////////////////////////////////////////////////////////////////////////// class ThemeColorsDialog : public wxDialog { public: ThemeColorsDialog(wxWindow *parent,const wxString& strTheme,const Theme& theme); void OnOk(wxCommandEvent& event); void OnSelectionChange(wxCommandEvent & event); void OnColorChange(wxCommandEvent & event); Theme GetTheme(); wxString GetThemeName(); private: wxArrayString GetRecordTypeNames(); Theme m_Theme; wxString m_strTheme; wxTextCtrl* m_pctlThemeName; /// which setting is being changed wxComboBox * m_pctlSelection; /// color selected ColorPickerControl * m_pctlColor; DECLARE_EVENT_TABLE() }; #endif --- NEW FILE: ThemeColorsDialog.cpp --- /* * Roadnav * ThemeColorsDialog.cpp * * Copyright (c) 2004 - 2005 Richard L. Lynch <rl...@us...> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public License * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ////////////////////////////////////////////////////////////////////////////// /// \file /// /// Contains the colors page of the preferences dialog box. /// ////////////////////////////////////////////////////////////////////////////// #ifdef HAVE_CONFIG_H # include <config.h> #endif #ifdef _MSC_VER #pragma warning(disable: 4786) #pragma warning(disable: 4800) #endif #include <wx/wx.h> #include "App.h" #include "ThemeColorsDialog.h" #include "MapSupport.h" #include "Frame.h" using namespace std; ////////////////////////////////////////////////////////////////////////////// /// /// IDs for ThemeColorsDialog.cpp /// ////////////////////////////////////////////////////////////////////////////// enum { idName, idSelection, idColor }; ////////////////////////////////////////////////////////////////////////////// /// /// ThemeColorsDialog event table /// ////////////////////////////////////////////////////////////////////////////// BEGIN_EVENT_TABLE(ThemeColorsDialog, wxDialog) EVT_TEXT(idSelection, ThemeColorsDialog::OnSelectionChange) EVT_BUTTON(idColor, ThemeColorsDialog::OnColorChange) EVT_BUTTON(wxID_OK, ThemeColorsDialog::OnOk) END_EVENT_TABLE() ////////////////////////////////////////////////////////////////////////////// /// /// \brief ThemeColorsDialog constructor - create and initialize controls /// ////////////////////////////////////////////////////////////////////////////// ThemeColorsDialog::ThemeColorsDialog(wxWindow *parent,const wxString& strTheme,const Theme& theme) : wxDialog(parent, -1, "Colors", wxDefaultPosition, wxDefaultSize), m_Theme(theme), m_strTheme(strTheme) { wxBoxSizer * psizerWnd; wxFlexGridSizer * psizerGrid; wxString strSel; psizerGrid = new wxFlexGridSizer(2, 4, 10); ////////////////////////////////////////////////////////////////////////// // Theme Name ////////////////////////////////////////////////////////////////////////// psizerGrid->Add( new wxStaticText(this, idName, "Theme Name"), 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT, 0 ); m_pctlThemeName = new wxTextCtrl(this, idName, m_strTheme); psizerGrid->Add ( m_pctlThemeName, 0, wxGROW, 0 ); ////////////////////////////////////////////////////////////////////////// // Feature type text ////////////////////////////////////////////////////////////////////////// psizerGrid->Add( new wxStaticText(this, -1, "Feature Type"), 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT, 0 ); ////////////////////////////////////////////////////////////////////////// // Feature type combo box ////////////////////////////////////////////////////////////////////////// m_pctlSelection = new wxComboBox(this, idSelection, "", wxDefaultPosition, wxSize(200, -1), 0, NULL, wxCB_READONLY); wxArrayString strRecordTypes = GetRecordTypeNames(); m_pctlSelection->Append(strRecordTypes); m_pctlSelection->SetSelection(0); // add to the sizer psizerGrid->Add(m_pctlSelection, 0, wxGROW, 0 ); ////////////////////////////////////////////////////////////////////////// // Color text ////////////////////////////////////////////////////////////////////////// psizerGrid->Add( new wxStaticText(this, -1, "Color"), 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT, 0 ); ////////////////////////////////////////////////////////////////////////// // Color selection control ////////////////////////////////////////////////////////////////////////// m_pctlColor = new ColorPickerControl(this, idColor, wxDefaultPosition, wxSize(40, 30)); m_pctlColor->SetColor(m_Theme.GetBackgroundColor()); // add to the sizer psizerGrid->Add(m_pctlColor, 0, #if wxCHECK_VERSION(2, 5, 0) wxFIXED_MINSIZE, #else 0, #endif 0 ); ////////////////////////////////////////////////////////////////////////// // psizerWnd just adds a border to psizerGrid ////////////////////////////////////////////////////////////////////////// psizerWnd = new wxBoxSizer(wxVERTICAL); psizerWnd->Add( psizerGrid, 0, wxALL | wxGROW, 10 ); ////////////////////////////////////////////////////////////////////////// // ok and cancel button ////////////////////////////////////////////////////////////////////////// #if wxCHECK_VERSION(2, 6, 0) wxStdDialogButtonSizer* psizerButton = CreateStdDialogButtonSizer(wxOK | wxCANCEL); psizerWnd->Add(psizerButton, 0, wxALL | wxALIGN_CENTER, 5); #else wxBoxSizer * sizerBottom = new wxBoxSizer(wxHORIZONTAL); wxButton * btnOk = new wxButton(this, wxID_OK, _T("&OK")); sizerBottom->Add(btnOk, 0, wxALIGN_CENTER | wxALL, 5); wxButton * btnCancel = new wxButton(this, wxID_CANCEL, _T("&Cancel")); sizerBottom->Add(btnCancel, 0, wxALIGN_CENTER | wxALL, 5); psizerWnd->Add(sizerBottom, 0, wxALIGN_CENTER, 0); #endif ////////////////////////////////////////////////////////////////////////// // Set up the sizer ////////////////////////////////////////////////////////////////////////// m_pctlSelection->SetFocus(); psizerWnd->Fit(this); SetSizer(psizerWnd); Layout(); psizerWnd->SetSizeHints(this); } void ThemeColorsDialog::OnOk(wxCommandEvent& event) { wxDialog::OnOK(event); m_strTheme = m_pctlThemeName->GetValue(); } ////////////////////////////////////////////////////////////////////////////// /// /// \brief User changed feature types /// ////////////////////////////////////////////////////////////////////////////// void ThemeColorsDialog::OnSelectionChange(wxCommandEvent & event) { int iSel; iSel = m_pctlSelection->GetSelection(); if (iSel < 0) return; if ( iSel == 0 ) m_pctlColor->SetColor( m_Theme.GetBackgroundColor() ); else m_pctlColor->SetColor( m_Theme.GetColor(iSel-1) ); } ////////////////////////////////////////////////////////////////////////////// /// /// \brief User changed the color selection .. record the new color /// ////////////////////////////////////////////////////////////////////////////// void ThemeColorsDialog::OnColorChange(wxCommandEvent & event) { int iSel; iSel = m_pctlSelection->GetSelection(); if (iSel < 0) return; if ( iSel == 0 ) m_Theme.SetBackgroundColor( m_pctlColor->GetColor() ); else m_Theme.SetColor( iSel-1, m_pctlColor->GetColor() ); } ////////////////////////////////////////////////////////////////////////////// /// /// \brief Creates a wxArrayString of record type names /// ////////////////////////////////////////////////////////////////////////////// wxArrayString ThemeColorsDialog::GetRecordTypeNames() { wxArrayString strNames; MapApp& app = wxGetApp(); MapFrame* pFrame = (MapFrame*)app.GetTopWindow(); IMapControlData& mapControlData = pFrame->GetMapControlData(); strNames.Add("Background"); wxInt16 nRecordTypes = mapControlData.GetNumRecordTypes(); for ( wxInt16 iRecordType = 0; iRecordType < nRecordTypes; iRecordType++ ) { strNames.Add( mapControlData.GetRecordTypeDisplayName(iRecordType) ); } return strNames; } ////////////////////////////////////////////////////////////////////////////// /// /// \brief Returns the theme object /// ////////////////////////////////////////////////////////////////////////////// Theme ThemeColorsDialog::GetTheme() { return m_Theme; } ////////////////////////////////////////////////////////////////////////////// /// /// \brief Returns the theme name /// ////////////////////////////////////////////////////////////////////////////// wxString ThemeColorsDialog::GetThemeName() { return m_strTheme; } |
Update of /cvsroot/roadnav/roadnav/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5986/src Modified Files: App.h DirectionsFrame.cpp Frame.cpp Frame.h MapControl.cpp MapControl.h MapControlData.h MapControlData_Foundation.cpp MapControlData_Foundation.h PreferencesDialog.cpp PreferencesDialog.h PreferencesPageGeneral.cpp PreferencesPageGeneral.h Support.cpp Support.h Added Files: MapDetailSettings.cpp MapDetailSettings.h PreferencesPageThemes.cpp PreferencesPageThemes.h SolarTimer.cpp SolarTimer.h Theme.cpp Theme.h ThemeManager.cpp ThemeManager.h Removed Files: PreferencesPageColors.cpp PreferencesPageColors.h Log Message: Applies patch #1194510 from Rick Brice, https://sourceforge.net/tracker/index.php?func=detail&aid=1194510&group_id=119594&atid=684488 - adds theme management. Quote from patch description: "This patch adds theme management to roadnav. Users can create and manage color configurations known as themes. Themes can be associated with nighttime, daytime, and aerial photo viewing. When auto-theme selection is enabled the theme will automatically switch between the daytime and nighttime themes at sunrise and sunset respectivly." --- NEW FILE: MapDetailSettings.cpp --- /* * Roadnav * MapDetailSettings.cpp * * Copyright (c) 2004 - 2005 Richard L. Lynch <rl...@us...> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public License * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ////////////////////////////////////////////////////////////////////////////// /// \file /// /// /// ////////////////////////////////////////////////////////////////////////////// #ifdef HAVE_CONFIG_H # include <config.h> #endif #ifdef _MSC_VER #pragma warning(disable: 4786) #endif #include <wx/wx.h> #include "App.h" #include "MapDetailSettings.h" #include "MapSupport.h" #define MAPINDEX(dl,rt) ((dl+1)*100 + rt) ////////////////////////////////////////////////////////////////////////////// /// /// Constructor /// ////////////////////////////////////////////////////////////////////////////// MapDetailSettings::MapDetailSettings() { } ////////////////////////////////////////////////////////////////////////////// /// /// /// ////////////////////////////////////////////////////////////////////////////// void MapDetailSettings::ClearDetailLevels() { m_mapDetailSettings.clear(); m_vDetailLevelToScale.clear(); } ////////////////////////////////////////////////////////////////////////////// /// /// /// ////////////////////////////////////////////////////////////////////////////// void MapDetailSettings::AddDetailLevel(double scale) { m_vDetailLevelToScale.push_back(scale); wxInt16 iDetailLevel = m_vDetailLevelToScale.size()-1; for ( wxInt16 iRecordType = FIRST_RECORD_TYPE; iRecordType <= LAST_RECORD_TYPE; iRecordType++) { SDetailSettings settings; wxInt16 iMapIndex = MAPINDEX(iDetailLevel,iRecordType); m_mapDetailSettings[iMapIndex] = settings; } } ////////////////////////////////////////////////////////////////////////////// /// /// /// ////////////////////////////////////////////////////////////////////////////// wxInt16 MapDetailSettings::GetDetailLevelCount() const { return m_vDetailLevelToScale.size(); } ////////////////////////////////////////////////////////////////////////////// /// /// /// ////////////////////////////////////////////////////////////////////////////// const SDetailSettings& MapDetailSettings::GetDetailSettings(wxInt16 detailLevel,wxInt16 iRT) const { wxInt16 iMapIndex = MAPINDEX(detailLevel,iRT); std::map<wxInt16,SDetailSettings>::const_iterator found; found = m_mapDetailSettings.find(iMapIndex); wxASSERT( found != m_mapDetailSettings.end() ); return (*found).second; } ////////////////////////////////////////////////////////////////////////////// /// /// /// ////////////////////////////////////////////////////////////////////////////// SDetailSettings& MapDetailSettings::GetDetailSettings(wxInt16 detailLevel,wxInt16 iRT) { wxInt16 iMapIndex = MAPINDEX(detailLevel,iRT); std::map<wxInt16,SDetailSettings>::iterator found; found = m_mapDetailSettings.find(iMapIndex); wxASSERT( found != m_mapDetailSettings.end() ); return (*found).second; } ////////////////////////////////////////////////////////////////////////////// /// /// /// ////////////////////////////////////////////////////////////////////////////// double MapDetailSettings::GetScale(wxInt16 detailLevel) const { return m_vDetailLevelToScale[detailLevel]; } ////////////////////////////////////////////////////////////////////////////// /// /// /// ////////////////////////////////////////////////////////////////////////////// wxInt16 MapDetailSettings::GetBestDetailLevel(double scale) const { std::vector<double>::const_iterator iter; wxInt16 detailLevel; for ( iter = m_vDetailLevelToScale.begin(); iter != m_vDetailLevelToScale.end(); iter++ ) { double s = *iter; if ( s < scale ) { detailLevel = iter - m_vDetailLevelToScale.begin(); break; } } if ( iter == m_vDetailLevelToScale.end() ) { detailLevel = m_vDetailLevelToScale.size()-1; } return detailLevel; } ////////////////////////////////////////////////////////////////////////////// /// /// /// ////////////////////////////////////////////////////////////////////////////// void MapDetailSettings::SetBackgroundColor(const wxColor& clrBkGround) { m_clrBackground = clrBkGround; } ////////////////////////////////////////////////////////////////////////////// /// /// /// ////////////////////////////////////////////////////////////////////////////// const wxColor& MapDetailSettings::GetBackgroundColor() const { return m_clrBackground; } Index: Frame.h =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/Frame.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Frame.h 2 May 2005 03:03:06 -0000 1.26 --- Frame.h 5 May 2005 20:29:08 -0000 1.27 *************** *** 40,43 **** --- 40,46 ---- #include "DirectionsFrame.h" #include "MapEventExtender.h" + #include "MapDetailSettings.h" + #include "ThemeManager.h" + #include "SolarTimer.h" #define SBSLOT_GPS 0 *************** *** 67,71 **** EToolMode GetToolMode() const; void SetToolMode(EToolMode mode); ! /// Text control in the directions miniframe wxTextCtrl * m_ctlText; --- 70,79 ---- EToolMode GetToolMode() const; void SetToolMode(EToolMode mode); ! ! void SetThemeManager(const ThemeManager& themeMgr); ! const ThemeManager& GetThemeManager() const; ! MapDetailSettings& GetMapDetailSettings(); ! IMapControlData& GetMapControlData(); ! /// Text control in the directions miniframe wxTextCtrl * m_ctlText; *************** *** 124,127 **** --- 132,137 ---- void OnHelpAbout(wxCommandEvent & event); + void OnSolarTimerTest(wxCommandEvent& event); + // misc events void OnMapRecentered(wxCommandEvent & event); *************** *** 129,132 **** --- 139,143 ---- void OnClose(wxCloseEvent & event); void OnIdle(wxIdleEvent & event); + void OnSolarEvent(SolarEvent& event); *************** *** 139,142 **** --- 150,161 ---- wxMenu * m_menuMap; + // Manages the drawing details + MapDetailSettings m_MapDetailSettings; + void InitializeMapDetailSettings(); + ThemeManager m_ThemeManager; + std::map<wxString,ERecordType> m_mapAppearanceToRecordType; + void InitializeThemes(); + + /// View menu wxMenu * m_menuView; *************** *** 166,170 **** EToolMode m_ToolMode; ! DECLARE_EVENT_TABLE() }; --- 185,192 ---- EToolMode m_ToolMode; ! ! SolarTimer m_SolarTimer; ! void UpdateTheme(); ! DECLARE_EVENT_TABLE() }; Index: PreferencesDialog.h =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/PreferencesDialog.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PreferencesDialog.h 17 Apr 2005 16:03:00 -0000 1.10 --- PreferencesDialog.h 5 May 2005 20:29:09 -0000 1.11 *************** *** 31,35 **** #include "PreferencesPageGeneral.h" #include "PreferencesPageGPS.h" ! #include "PreferencesPageColors.h" #include "PreferencesPageURLs.h" #include "PreferencesPageUnits.h" --- 31,35 ---- #include "PreferencesPageGeneral.h" #include "PreferencesPageGPS.h" ! #include "PreferencesPageThemes.h" #include "PreferencesPageURLs.h" #include "PreferencesPageUnits.h" *************** *** 49,53 **** PreferencesPageGeneral * m_pwndGeneral; PreferencesPageGPS * m_pwndGPS; ! PreferencesPageColors * m_pwndColors; PreferencesPageURLs * m_pwndURLs; PreferencesPageUnits * m_pwndUnits; --- 49,53 ---- PreferencesPageGeneral * m_pwndGeneral; PreferencesPageGPS * m_pwndGPS; ! PreferencesPageThemes* m_pwndThemes; PreferencesPageURLs * m_pwndURLs; PreferencesPageUnits * m_pwndUnits; Index: DirectionsFrame.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/DirectionsFrame.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DirectionsFrame.cpp 4 May 2005 19:09:02 -0000 1.3 --- DirectionsFrame.cpp 5 May 2005 20:29:08 -0000 1.4 *************** *** 231,235 **** m_pfrmMap->GetMapControl()->SetCenterCoordinates((m_sStart.ptCoordinates + m_sEnd.ptCoordinates) / 2); ! m_pfrmMap->GetMapControl()->SetDetailLevel(MAX_DETAIL_LEVEL); m_pfrmMap->GetMapControl()->AutoScale(); --- 231,235 ---- m_pfrmMap->GetMapControl()->SetCenterCoordinates((m_sStart.ptCoordinates + m_sEnd.ptCoordinates) / 2); ! m_pfrmMap->GetMapControl()->SetDetailLevel( m_pfrmMap->GetMapControlData().GetNumRecordTypes()-1 ); m_pfrmMap->GetMapControl()->AutoScale(); --- NEW FILE: ThemeManager.cpp --- /* * Roadnav * ThemeManager.cpp * * Copyright (c) 2004 - 2005 Richard L. Lynch <rl...@us...> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public License * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ////////////////////////////////////////////////////////////////////////////// /// \file /// /// Contains the ThemeManager class - a class to manage the color attribute /// themes. /// ////////////////////////////////////////////////////////////////////////////// #ifdef HAVE_CONFIG_H # include <config.h> #endif #ifdef _MSC_VER #pragma warning(disable: 4786) #endif #include <wx/wx.h> #include "ThemeManager.h" ////////////////////////////////////////////////////////////////////////////// /// /// Default constructor /// ////////////////////////////////////////////////////////////////////////////// ThemeManager::ThemeManager() { m_pMapControlData = 0; m_ThemeUsage = AutoSwap; } ////////////////////////////////////////////////////////////////////////////// /// /// Associates map control data with the theme manager. The theme manager /// sets this control data onto every theme that is added /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::SetMapControlData(IMapControlData* pMapControlData) { m_pMapControlData = pMapControlData; } ////////////////////////////////////////////////////////////////////////////// /// /// Adds a new theme and associates it with map control data /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::AddTheme(const wxString& strTheme,Theme& theme) { theme.SetMapControlData(m_pMapControlData); m_mapThemes.insert( std::make_pair(strTheme,theme) ); } ////////////////////////////////////////////////////////////////////////////// /// /// Updates a theme /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::UpdateTheme(const wxString& strTheme, Theme& theme) { theme.SetMapControlData(m_pMapControlData); m_mapThemes[strTheme] = theme; } ////////////////////////////////////////////////////////////////////////////// /// /// Returns a constant reference to a theme /// ////////////////////////////////////////////////////////////////////////////// const Theme& ThemeManager::GetTheme(const wxString& strTheme) const { std::map<wxString,Theme>::const_iterator found; found = m_mapThemes.find(strTheme); wxASSERT(found != m_mapThemes.end() ); return (*found).second; } ////////////////////////////////////////////////////////////////////////////// /// /// Returns a reference to a theme /// ////////////////////////////////////////////////////////////////////////////// Theme& ThemeManager::GetTheme(const wxString& strTheme) { std::map<wxString,Theme>::iterator found; found = m_mapThemes.find(strTheme); wxASSERT(found != m_mapThemes.end() ); return (*found).second; } ////////////////////////////////////////////////////////////////////////////// /// /// Removes a theme /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::RemoveTheme(const wxString& strTheme) { std::map<wxString,Theme>::iterator found; found = m_mapThemes.find(strTheme); wxASSERT(found != m_mapThemes.end() ); m_mapThemes.erase(found); } ////////////////////////////////////////////////////////////////////////////// /// /// Returns the number of themes /// ////////////////////////////////////////////////////////////////////////////// wxInt16 ThemeManager::GetThemeCount() const { return m_mapThemes.size(); } ////////////////////////////////////////////////////////////////////////////// /// /// Renames a theme /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::RenameTheme(const wxString& strOldName,const wxString& strNewName) { Theme& theme = GetTheme(strOldName); RemoveTheme(strOldName); AddTheme(strNewName,theme); } ////////////////////////////////////////////////////////////////////////////// /// /// Returns an array of theme names /// ////////////////////////////////////////////////////////////////////////////// wxArrayString ThemeManager::GetThemeNames() const { wxArrayString themes; std::map<wxString,Theme>::const_iterator iter; for (iter = m_mapThemes.begin(); iter != m_mapThemes.end(); iter++ ) { themes.Add((*iter).first); } return themes; } ////////////////////////////////////////////////////////////////////////////// /// /// Sets the theme usage /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::SetThemeUsage(ThemeManager::ThemeUsage usage) { m_ThemeUsage = usage; } ////////////////////////////////////////////////////////////////////////////// /// /// Returns theme usage /// ////////////////////////////////////////////////////////////////////////////// ThemeManager::ThemeUsage ThemeManager::GetThemeUsage() const { return m_ThemeUsage; } ////////////////////////////////////////////////////////////////////////////// /// /// Sets the name of the nighttime theme /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::SetNightTheme(const wxString& strTheme) { m_strNightTheme = strTheme; } ////////////////////////////////////////////////////////////////////////////// /// /// Returns the name of the nighttime theme /// ////////////////////////////////////////////////////////////////////////////// wxString ThemeManager::GetNightThemeName() const { return m_strNightTheme; } ////////////////////////////////////////////////////////////////////////////// /// /// Returns the nighttime theme /// ////////////////////////////////////////////////////////////////////////////// const Theme& ThemeManager::GetNightTheme() const { return GetTheme(m_strNightTheme); } ////////////////////////////////////////////////////////////////////////////// /// /// Sets the name of the daytime theme /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::SetDayTheme(const wxString& strTheme) { m_strDayTheme = strTheme; } ////////////////////////////////////////////////////////////////////////////// /// /// Returns the name of the daytime theme /// ////////////////////////////////////////////////////////////////////////////// wxString ThemeManager::GetDayThemeName() const { return m_strDayTheme; } ////////////////////////////////////////////////////////////////////////////// /// /// Returns the daytime theme /// ////////////////////////////////////////////////////////////////////////////// const Theme& ThemeManager::GetDayTheme() const { return GetTheme(m_strDayTheme); } ////////////////////////////////////////////////////////////////////////////// /// /// Sets the name of the photo theme /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::SetPhotoTheme(const wxString& strTheme) { m_strPhotoTheme = strTheme; } ////////////////////////////////////////////////////////////////////////////// /// /// Returns the name of the photo theme /// ////////////////////////////////////////////////////////////////////////////// wxString ThemeManager::GetPhotoThemeName() const { return m_strPhotoTheme; } ////////////////////////////////////////////////////////////////////////////// /// /// Returns the photo theme /// ////////////////////////////////////////////////////////////////////////////// const Theme& ThemeManager::GetPhotoTheme() const { return GetTheme(m_strPhotoTheme); } ////////////////////////////////////////////////////////////////////////////// /// /// Loads the theme settings from the registry/config file /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::Load(wxConfigBase* pConfig) { wxString strOldPath = pConfig->GetPath(); pConfig->SetPath("Themes"); int iUsage; pConfig->Read("ThemeUsage",&iUsage,0); m_ThemeUsage = (ThemeUsage)iUsage; pConfig->Read("NightTheme",&m_strNightTheme,"Default"); pConfig->Read("DayTheme", &m_strDayTheme, "Default"); pConfig->Read("PhotoTheme",&m_strPhotoTheme,"Default"); wxString strGroup; long key; bool bContinue = pConfig->GetFirstGroup(strGroup,key); while ( bContinue ) { pConfig->SetPath(strGroup); Theme theme; theme.Load(pConfig); AddTheme(strGroup,theme); pConfig->SetPath(".."); bContinue = pConfig->GetNextGroup(strGroup,key); } pConfig->SetPath(strOldPath); } ////////////////////////////////////////////////////////////////////////////// /// /// Saves the theme settings to the registry/config file /// ////////////////////////////////////////////////////////////////////////////// void ThemeManager::Save(wxConfigBase* pConfig) const { wxString strOldPath = pConfig->GetPath(); // remove all the existing theme entries // (this is easier than trying to figure out if any were // renamed or deleted) pConfig->DeleteGroup("Themes"); // Creates a new group pConfig->SetPath("Themes"); pConfig->Write("ThemeUsage",m_ThemeUsage); // Save current theme selections pConfig->Write("NightTheme",m_strNightTheme); pConfig->Write("DayTheme", m_strDayTheme); pConfig->Write("PhotoTheme",m_strPhotoTheme); // Save all the theme details std::map<wxString,Theme>::const_iterator iter; for ( iter = m_mapThemes.begin(); iter != m_mapThemes.end(); iter++ ) { const wxString& strThemeName = (*iter).first; const Theme& theme = (*iter).second; pConfig->SetPath(strThemeName); theme.Save(pConfig); pConfig->SetPath(".."); // back up to the Themes level } pConfig->SetPath(strOldPath); } Index: MapControlData_Foundation.h =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/MapControlData_Foundation.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MapControlData_Foundation.h 23 Apr 2005 19:39:20 -0000 1.4 --- MapControlData_Foundation.h 5 May 2005 20:29:09 -0000 1.5 *************** *** 63,66 **** --- 63,69 ---- virtual void IntersectionInformation(tRecordID iPreviousRec, tRecordID iRec, double & fDeltaAngle, int & iVertex, int & iPathsLeavingVertex, wxString & strDirectionChange, bool & bSharpTurn); + virtual wxInt16 GetNumRecordTypes(); + virtual wxString GetRecordTypeDisplayName(wxInt16 iRecordType); + protected: void CalculateNameTypeInstances(); --- NEW FILE: ThemeManager.h --- /* * Roadnav * ThemeManager.h * * Copyright (c) 2004 - 2005 Richard L. Lynch <rl...@us...> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public License * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ////////////////////////////////////////////////////////////////////////////// /// \file /// /// Class used to manage themes /// ////////////////////////////////////////////////////////////////////////////// #ifndef THEMEMANAGER_H #define THEMEMANAGER_H #include "Theme.h" #include <map> #include <wx/config.h> class ThemeManager { public: enum ThemeUsage { AutoSwap, // Day/Night themes swap at sunrise/set Night, // Use only night theme Day }; // Use only day theme ThemeManager(); void SetMapControlData(IMapControlData* pMapControlData); void AddTheme(const wxString& strTheme,Theme& theme); void UpdateTheme(const wxString& strTheme, Theme& theme); const Theme& GetTheme(const wxString& strTheme) const; Theme& GetTheme(const wxString& strTheme); void RemoveTheme(const wxString& strTheme); wxInt16 GetThemeCount() const; void RenameTheme(const wxString& strOldName,const wxString& strNewName); void SetThemeUsage(ThemeUsage usage); ThemeUsage GetThemeUsage() const; wxArrayString GetThemeNames() const; void SetNightTheme(const wxString& strTheme); wxString GetNightThemeName() const; const Theme& GetNightTheme() const; void SetDayTheme(const wxString& strTheme); wxString GetDayThemeName() const; const Theme& GetDayTheme() const; void SetPhotoTheme(const wxString& strTheme); wxString GetPhotoThemeName() const; const Theme& GetPhotoTheme() const; void Load(wxConfigBase* pConfig); void Save(wxConfigBase* pConfig) const; private: IMapControlData* m_pMapControlData; std::map<wxString,Theme> m_mapThemes; wxString m_strNightTheme; wxString m_strDayTheme; wxString m_strPhotoTheme; ThemeUsage m_ThemeUsage; }; #endif // THEMEMANAGER_H Index: Frame.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/Frame.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** Frame.cpp 2 May 2005 03:03:06 -0000 1.62 --- Frame.cpp 5 May 2005 20:29:08 -0000 1.63 *************** *** 66,69 **** --- 66,70 ---- #include "MapControlDataImporter_GNIS.h" #include "MapControlDataImporter_TigerLine.h" + #include "MapZip.h" #include "filesave.xpm" *************** *** 77,80 **** --- 78,84 ---- #include <vector> + #define MIN_DETAIL_LEVEL 0 + #define MAX_DETAIL_LEVEL 14 + using namespace std; *************** *** 123,127 **** idToolsPreferences, ! idHelpAbout }; --- 127,133 ---- idToolsPreferences, ! idHelpAbout, ! ! idSolarTimerTest }; *************** *** 170,176 **** --- 176,185 ---- EVT_MENU(idHelpAbout, MapFrame::OnHelpAbout) + EVT_MENU(idSolarTimerTest, MapFrame::OnSolarTimerTest) + EVT_BUTTON(idWhatsNearBy, MapFrame::OnWhatsNearbyDoubleClick) EVT_BUTTON(idMapControl, MapFrame::OnMapRecentered) + EVT_SOLAR(MapFrame::OnSolarEvent) EVT_IDLE(MapFrame::OnIdle) *************** *** 238,241 **** --- 247,253 ---- m_ToolMode = toolNone; + InitializeMapDetailSettings(); + InitializeThemes(); + ////////////////////////////////////////////////////////////////////////// // Create the "What's Nearby" miniframe *************** *** 247,251 **** // Create controls ////////////////////////////////////////////////////////////////////////////// ! m_ctlMap = new MapControl(&g_cRecords, this, idMapControl, wxDefaultPosition, wxDefaultSize); ////////////////////////////////////////////////////////////////////////////// --- 259,263 ---- // Create controls ////////////////////////////////////////////////////////////////////////////// ! m_ctlMap = new MapControl(&g_cRecords, &m_MapDetailSettings, this, idMapControl, wxDefaultPosition, wxDefaultSize); ////////////////////////////////////////////////////////////////////////////// *************** *** 378,382 **** ////////////////////////////////////////////////////////////////////////// ! wxAcceleratorEntry entries[13]; entries[0].Set(wxACCEL_NORMAL, (int) '+', idViewZoomIn); entries[1].Set(wxACCEL_NORMAL, (int) '=', idViewZoomIn); --- 390,394 ---- ////////////////////////////////////////////////////////////////////////// ! wxAcceleratorEntry entries[14]; entries[0].Set(wxACCEL_NORMAL, (int) '+', idViewZoomIn); entries[1].Set(wxACCEL_NORMAL, (int) '=', idViewZoomIn); *************** *** 392,396 **** entries[11].Set(wxACCEL_CTRL, (int) 'S', idFileSaveAs); entries[12].Set(wxACCEL_CTRL, (int) 'P', idFilePrint); ! wxAcceleratorTable accel(13, entries); SetAcceleratorTable(accel); --- 404,410 ---- entries[11].Set(wxACCEL_CTRL, (int) 'S', idFileSaveAs); entries[12].Set(wxACCEL_CTRL, (int) 'P', idFilePrint); ! entries[13].Set(wxACCEL_CTRL, (int) 'T', idSolarTimerTest); ! ! wxAcceleratorTable accel(sizeof(entries)/sizeof(wxAcceleratorEntry), entries); SetAcceleratorTable(accel); *************** *** 445,449 **** m_ctlMap->SetMarker(cMarker); } ! m_ctlMap->ClearMarker("GPS Position"); m_ctlMap->ClearMarker("Starting Address"); --- 459,463 ---- m_ctlMap->SetMarker(cMarker); } ! m_ctlMap->ClearMarker("GPS Position"); m_ctlMap->ClearMarker("Starting Address"); *************** *** 515,518 **** --- 529,547 ---- m_ctlMap->ShowAerialPhotos(m_menuView->IsChecked(idViewAerialPhotos)); + ////////////////////////////////////////////////////////////////////////////// + // Load up the theme definitions + ////////////////////////////////////////////////////////////////////////////// + m_ThemeManager.Load(g_pConfig); + + ////////////////////////////////////////////////////////////////////////////// + // Attach to the solar timer, set the current position, and updated the + // theme to match the time of day + ////////////////////////////////////////////////////////////////////////////// + int zipHome; + g_pConfig->Read("HomeZipCode", &zipHome, 20001); + Point ptHome = GetZipCodeCoordinates(zipHome); + m_SolarTimer.SetOwner(this,ptHome.m_fLong,ptHome.m_fLat,SolarTimer::Official); + UpdateTheme(); + Layout(); } *************** *** 525,529 **** MapFrame::~MapFrame() { ! } --- 554,558 ---- MapFrame::~MapFrame() { ! m_ThemeManager.Save(g_pConfig); } *************** *** 548,551 **** --- 577,614 ---- } + void MapFrame::SetThemeManager(const ThemeManager& themeMgr) + { + m_ThemeManager = themeMgr; + + if ( m_SolarTimer.IsDaytime() ) + { + const Theme& theme = m_ThemeManager.GetDayTheme(); + theme.SetColors(m_MapDetailSettings); + } + else + { + const Theme& theme = m_ThemeManager.GetNightTheme(); + theme.SetColors(m_MapDetailSettings); + } + } + + const ThemeManager& MapFrame::GetThemeManager() const + { + return m_ThemeManager; + } + + // Sorry, I hate using global data... + // I think the records should be a data member of the frame + // or even better as an element of a Doc/View model + IMapControlData& MapFrame::GetMapControlData() + { + return g_cRecords; + } + + MapDetailSettings& MapFrame::GetMapDetailSettings() + { + return m_MapDetailSettings; + } + ////////////////////////////////////////////////////////////////////////////// /// *************** *** 566,569 **** --- 629,670 ---- } + void MapFrame::OnSolarEvent(SolarEvent& event) + { + UpdateTheme(); + m_ctlMap->MapUpdated(); + } + + void MapFrame::UpdateTheme() + { + bool bViewPhotos; + g_pConfig->Read("AerialPhotosVisible", &bViewPhotos, false); + if ( bViewPhotos ) + { + m_ThemeManager.GetPhotoTheme().SetColors(m_MapDetailSettings); + return; + } + + switch( m_ThemeManager.GetThemeUsage() ) + { + case ThemeManager::AutoSwap: + m_SolarTimer.Start(); + if ( m_SolarTimer.IsDaytime() ) + m_ThemeManager.GetDayTheme().SetColors(m_MapDetailSettings); + else + m_ThemeManager.GetNightTheme().SetColors(m_MapDetailSettings); + break; + + case ThemeManager::Night: + m_SolarTimer.Stop(); + m_ThemeManager.GetNightTheme().SetColors(m_MapDetailSettings); + break; + + case ThemeManager::Day: + m_SolarTimer.Stop(); + m_ThemeManager.GetDayTheme().SetColors(m_MapDetailSettings); + break; + } + } + ////////////////////////////////////////////////////////////////////////////// /// *************** *** 640,643 **** --- 741,746 ---- } } + + m_SolarTimer.SetPosition(pt.m_fLong,pt.m_fLat); } *************** *** 811,817 **** void MapFrame::OnViewAerialPhotos(wxCommandEvent & event) { - m_ctlMap->ShowAerialPhotos(m_menuView->IsChecked(idViewAerialPhotos)); - g_pConfig->Write("AerialPhotosVisible", m_menuView->IsChecked(idViewAerialPhotos)); } --- 914,920 ---- void MapFrame::OnViewAerialPhotos(wxCommandEvent & event) { g_pConfig->Write("AerialPhotosVisible", m_menuView->IsChecked(idViewAerialPhotos)); + UpdateTheme(); + m_ctlMap->ShowAerialPhotos(m_menuView->IsChecked(idViewAerialPhotos)); } *************** *** 866,870 **** void MapFrame::OnViewZoomMax(wxCommandEvent& event) { ! m_ctlMap->SetDetailLevel(MAX_DETAIL_LEVEL); } --- 969,973 ---- void MapFrame::OnViewZoomMax(wxCommandEvent& event) { ! m_ctlMap->SetDetailLevel(m_MapDetailSettings.GetDetailLevelCount()); } *************** *** 876,880 **** void MapFrame::OnViewZoomMin(wxCommandEvent& event) { ! m_ctlMap->SetDetailLevel(MIN_DETAIL_LEVEL); } --- 979,983 ---- void MapFrame::OnViewZoomMin(wxCommandEvent& event) { ! m_ctlMap->SetDetailLevel(0); } *************** *** 1031,1038 **** } else ! { m_pfrmDirections->Close(); } - } ////////////////////////////////////////////////////////////////////////////// --- 1134,1141 ---- } else ! { m_pfrmDirections->Close(); + } } ////////////////////////////////////////////////////////////////////////////// *************** *** 1043,1049 **** ////////////////////////////////////////////////////////////////////////////// void MapFrame::OnMapGetDirectionsAccel(wxCommandEvent & event) - { - if (m_menuMap->IsChecked(idMapGetDirections)) { // first uncheck m_menuMap->Check(idMapGetDirections, 0); --- 1146,1152 ---- ////////////////////////////////////////////////////////////////////////////// void MapFrame::OnMapGetDirectionsAccel(wxCommandEvent & event) { + if (m_menuMap->IsChecked(idMapGetDirections)) + { // first uncheck m_menuMap->Check(idMapGetDirections, 0); *************** *** 1217,1221 **** m_ctlMap->SetDrawingScaleFactor(fDrawingScaleFactor); ! m_ctlMap->LoadAppearanceSettings(); m_ctlMap->MapUpdated(); } --- 1320,1330 ---- m_ctlMap->SetDrawingScaleFactor(fDrawingScaleFactor); ! int zipHome; ! g_pConfig->Read("HomeZipCode", &zipHome, 20001); ! Point ptHome = GetZipCodeCoordinates(zipHome); ! m_SolarTimer.SetPosition(ptHome.m_fLong,ptHome.m_fLat); ! ! UpdateTheme(); ! m_ctlMap->MapUpdated(); } *************** *** 1290,1293 **** --- 1399,1418 ---- } + void MapFrame::OnSolarTimerTest(wxCommandEvent& event) + { + wxDateTime sunrise = m_SolarTimer.GetSunrise(); + wxDateTime sunset = m_SolarTimer.GetSunset(); + + double lat,lon; + m_SolarTimer.GetPosition(lon,lat); + + wxString msg = wxString::Format("Lat %f, Long %f\nSunrise %s\nSunset %s", + lat,lon, + sunrise.FormatTime().c_str(), + sunset.FormatTime().c_str()); + + wxMessageBox(msg); + } + ////////////////////////////////////////////////////////////////////////////// /// *************** *** 1401,1402 **** --- 1526,1990 ---- return m_ctlMap; } + + void MapFrame::InitializeMapDetailSettings() + { + m_MapDetailSettings.ClearDetailLevels(); + + ERecordType eRT; + wxUint16 iDetailLevel; + + std::vector<double> scales; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + m_MapDetailSettings.AddDetailLevel( 65536. / 1e6 * ::pow(0.5, iDetailLevel+1) ); + + eRT = RecordTypeDefault; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 2; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 11 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 11 ? true : false; + settings.iFontSize = 8; + settings.iArrowSpacing = 0; + } + + eRT = RecordTypeTwoWaySmallRoad; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 2; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 8 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 10 ? true : false; + settings.iFontSize = 12; + settings.iArrowSpacing = 0; + + if (iDetailLevel == 11) + { + settings.iFontSize = 8; + } + if (iDetailLevel == 10) + { + settings.iFontSize = 6; + } + if (iDetailLevel == 8) + { + settings.iWidth = 1; + } + } + + eRT = RecordTypeOneWaySmallRoad; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 2; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 8 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 10 ? true : false; + settings.iFontSize = 12; + settings.iArrowSpacing = 10; + + if (iDetailLevel == 11) + { + settings.iFontSize = 8; + } + if (iDetailLevel == 10) + { + settings.iFontSize = 6; + } + if (iDetailLevel == 8) + { + settings.iWidth = 1; + } + } + + eRT = RecordTypeTwoWayLargeRoad; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 4; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 7 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 7 ? true : false; + settings.iFontSize = 16; + settings.iArrowSpacing = 0; + + if (iDetailLevel == 10) + { + settings.iFontSize = 12; + settings.iWidth = 3; + } + if (iDetailLevel == 9) + { + settings.iFontSize = 10; + settings.iWidth = 2; + } + if (iDetailLevel == 8) + { + settings.iFontSize = 8; + settings.iWidth = 2; + } + if (iDetailLevel == 7) + { + settings.iFontSize = 8; + settings.iWidth = 1; + } + } + + eRT = RecordTypeOneWayLargeRoad; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 4; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 7 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 9 ? true : false; + settings.iFontSize = 16; + settings.iArrowSpacing = 10; + + if (iDetailLevel == 10) + { + settings.iFontSize = 12; + settings.iWidth = 3; + } + if (iDetailLevel == 9) + { + settings.iFontSize = 10; + settings.iWidth = 2; + } + if (iDetailLevel == 8) + { + settings.iWidth = 2; + } + if (iDetailLevel == 7) + { + settings.iWidth = 1; + } + } + + eRT = RecordTypeTwoWayHighway; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 6; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 6 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 6 ? true : false; + settings.iFontSize = 16; + settings.iArrowSpacing = 0; + + if (iDetailLevel == 9) + { + settings.iFontSize = 12; + settings.iWidth = 5; + } + if (iDetailLevel == 8) + { + settings.iFontSize = 8; + settings.iWidth = 4; + } + if (iDetailLevel == 7) + { + settings.iFontSize = 8; + settings.iWidth = 2; + } + if (iDetailLevel == 6) + { + settings.iFontSize = 8; + settings.iWidth = 1; + } + } + + eRT = RecordTypeOneWayHighway; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 6; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 6 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 6 ? true : false; + settings.iFontSize = 16; + settings.iArrowSpacing = 10; + + if (iDetailLevel == 9) + { + settings.iFontSize = 12; + settings.iWidth = 5; + } + if (iDetailLevel == 8) + { + settings.iFontSize = 8; + settings.iWidth = 4; + } + if (iDetailLevel == 7) + { + settings.iFontSize = 8; + settings.iWidth = 2; + } + if (iDetailLevel == 6) + { + settings.iFontSize = 8; + settings.iWidth = 1; + } + } + + eRT = RecordTypeRailroad; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 2; + settings.iStyle = wxSHORT_DASH; + settings.bLineVisible = iDetailLevel >= 9 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 10 ? true : false; + settings.iFontSize = 10; + settings.iArrowSpacing = 0; + } + + eRT = RecordTypeWater; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 1; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 8 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 10 ? true : false; + settings.iFontSize = 10; + settings.iArrowSpacing = 0; + } + eRT = RecordTypeInvisibleLandBoundary; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = iDetailLevel >= 9 ? 3 : 1; + settings.iStyle = wxSOLID; + // settings.bLineVisible = iDetailLevel >= 1 ? true : false; + settings.bLineVisible = iDetailLevel >= 4 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 7 ? true : false; + settings.iFontSize = 16; + settings.iArrowSpacing = 0; + } + + eRT = RecordTypeInvisibleWaterBoundary; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = iDetailLevel >= 9 ? 3 : 1; + settings.iStyle = wxSOLID; + // settings.bLineVisible = iDetailLevel >= 1 ? true : false; + settings.bLineVisible = iDetailLevel >= 4 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 7 ? true : false; + settings.iFontSize = 16; + settings.iArrowSpacing = 0; + } + + eRT = RecordTypeInvisibleMiscBoundary; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = iDetailLevel >= 9 ? 3 : 1; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 12 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 12 ? true : false; + settings.iFontSize = 16; + settings.iArrowSpacing = 0; + } + + eRT = RecordTypeLandmark; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 3; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 12 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 12 ? true : false; + settings.iFontSize = 10; + settings.iArrowSpacing = 0; + } + + eRT = RecordTypePhysicalFeature; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = 6; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 6 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = iDetailLevel >= 8 ? true : false; + settings.iFontSize = 16; + settings.iArrowSpacing = 0; + + if (iDetailLevel == 9) + { + settings.iFontSize = 12; + settings.iWidth = 5; + } + if (iDetailLevel == 8) + { + settings.iFontSize = 8; + settings.iWidth = 4; + } + if (iDetailLevel == 7) + { + settings.iWidth = 2; + } + if (iDetailLevel == 6) + { + settings.iWidth = 1; + } + } + + eRT = RecordTypeTownOrCity; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + wxColor clr; + + settings.iWidth = 2; + settings.iStyle = wxTRANSPARENT; + settings.bLineVisible = (iDetailLevel >= 3 && iDetailLevel <= 9) ? true : false; + settings.bFastLine = false; + settings.bTextVisible = (iDetailLevel >= 3 && iDetailLevel <= 9) ? true : false; + /* + if (iDetailLevel >= 8) + clr.Set(192, 0, 0); + else + clr.Set(160, 160, 160); + + settings.clrLine = clr; + settings.clrText = clr; + */ + settings.iFontSize = 14; + settings.iArrowSpacing = 0; + + if (iDetailLevel < 6) + { + settings.iFontSize = 6; + } + else if (iDetailLevel < 7) + { + settings.iFontSize = 8; + } + else if (iDetailLevel < 8) + { + settings.iFontSize = 10; + } + else if (iDetailLevel < 9) + { + settings.iFontSize = 14; + } + } + + eRT = RecordTypeStateBoundary; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = iDetailLevel >= 9 ? 3 : 1; + settings.iStyle = wxSOLID; + settings.bLineVisible = true; + settings.bFastLine = false; + settings.bTextVisible = true; + settings.iFontSize = 16; + settings.iArrowSpacing = 0; + } + + eRT = RecordTypeCountyBoundary; + for (iDetailLevel = MIN_DETAIL_LEVEL; iDetailLevel <= MAX_DETAIL_LEVEL; iDetailLevel++) + { + SDetailSettings& settings = m_MapDetailSettings.GetDetailSettings(iDetailLevel,eRT); + + settings.iWidth = iDetailLevel >= 9 ? 3 : 1; + settings.iStyle = wxSOLID; + settings.bLineVisible = iDetailLevel >= 3 ? true : false; + settings.bFastLine = false; + settings.bTextVisible = false; + settings.iFontSize = 16; + settings.iArrowSpacing = 0; + } + } + + void MapFrame::InitializeThemes() + { + m_ThemeManager.SetMapControlData(&g_cRecords); + + m_mapAppearanceToRecordType["AppearanceDefaultColor"] = RecordTypeDefault; + m_mapAppearanceToRecordType["AppearanceOneWaySmallRoadColor"] = RecordTypeOneWaySmallRoad; + m_mapAppearanceToRecordType["AppearanceOneWayLargeRoadColor"] = RecordTypeOneWayLargeRoad; + m_mapAppearanceToRecordType["AppearanceOneWayHighwayColor"] = RecordTypeOneWayHighway; + m_mapAppearanceToRecordType["AppearanceTwoWaySmallRoadColor"] = RecordTypeTwoWaySmallRoad; + m_mapAppearanceToRecordType["AppearanceTwoWayLargeRoadColor"] = RecordTypeTwoWayLargeRoad; + m_mapAppearanceToRecordType["AppearanceTwoWayHighwayColor"] = RecordTypeTwoWayHighway; + m_mapAppearanceToRecordType["AppearanceRailroadColor"] = RecordTypeRailroad; + m_mapAppearanceToRecordType["AppearanceWaterColor"] = RecordTypeWater; + m_mapAppearanceToRecordType["AppearanceInvisibleLandBoundaryColor"] = RecordTypeInvisibleLandBoundary; + m_mapAppearanceToRecordType["AppearanceInvisibleWaterBoundaryColor"] = RecordTypeInvisibleWaterBoundary; + m_mapAppearanceToRecordType["AppearanceInvisibleMiscBoundaryColor"] = RecordTypeInvisibleMiscBoundary; + m_mapAppearanceToRecordType["AppearanceLandmarkColor"] = RecordTypeLandmark; + m_mapAppearanceToRecordType["AppearancePhysicalFeatureColor"] = RecordTypePhysicalFeature; + m_mapAppearanceToRecordType["AppearanceTownOrCityColor"] = RecordTypeTownOrCity; + m_mapAppearanceToRecordType["AppearanceStateBoundaryColor"] = RecordTypeStateBoundary; + m_mapAppearanceToRecordType["AppearanceCountyBoundaryColor"] = RecordTypeCountyBoundary; + + // Create default theme + // This is the one and only hard coded theme.... all the rest are + // read from the configuration object + Theme defaultTheme; + defaultTheme.SetBackgroundColor( ParseColor("#FFFAB2") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceDefaultColor"], ParseColor("#C0C0C0") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceOneWaySmallRoadColor"], ParseColor("#A0A0A0") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWaySmallRoadColor"], ParseColor("#A0A0A0") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayLargeRoadColor"], ParseColor("#827000") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayLargeRoadColor"], ParseColor("#827000") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceOneWayHighwayColor"], ParseColor("#B68628") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceTwoWayHighwayColor"], ParseColor("#B68628") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceRailroadColor"], ParseColor("#808080") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceWaterColor"], ParseColor("#0000ff") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleLandBoundaryColor"], ParseColor("#A0A0A0") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleWaterBoundaryColor"], ParseColor("#C0C0FF") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceInvisibleMiscBoundaryColor"], ParseColor("#C0C0FF") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceLandmarkColor"], ParseColor("#2FAF41") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearancePhysicalFeatureColor"], ParseColor("#000000") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceTownOrCityColor"], ParseColor("#E5E5E5") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceStateBoundaryColor"], ParseColor("#FF0000") ); + defaultTheme.SetColor( m_mapAppearanceToRecordType["AppearanceCountyBoundaryColor"], ParseColor("#00FF00") ); + + m_ThemeManager.AddTheme("Default",defaultTheme); + m_ThemeManager.SetNightTheme("Default"); + m_ThemeManager.SetDayTheme("Default"); + m_ThemeManager.SetPhotoTheme("Default"); + + // Load other themes from config + + // Configure MapDetailSettings from themes + // (Use default for now, but change based on time of day, etc) + defaultTheme.SetColors(m_MapDetailSettings); + + } Index: App.h =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/App.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** App.h 17 Apr 2005 16:02:59 -0000 1.6 --- App.h 5 May 2005 20:29:08 -0000 1.7 *************** *** 51,53 **** --- 51,55 ---- + DECLARE_APP(MapApp) + #endif --- PreferencesPageColors.h DELETED --- Index: MapControlData_Foundation.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/MapControlData_Foundation.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MapControlData_Foundation.cpp 27 Apr 2005 03:35:57 -0000 1.6 --- MapControlData_Foundation.cpp 5 May 2005 20:29:08 -0000 1.7 *************** *** 437,440 **** --- 437,522 ---- } + wxInt16 MapControlData_Foundation::GetNumRecordTypes() + { + return LAST_RECORD_TYPE+1; + } + + wxString MapControlData_Foundation::GetRecordTypeDisplayName(wxInt16 iRecordType) + { + wxString strName; + ERecordType eRT = (ERecordType)iRecordType; + switch( eRT ) + { + case RecordTypeDefault: + strName = "Default"; + break; + + case RecordTypeOneWaySmallRoad: + strName = "One Way Small Road"; + break; + + case RecordTypeOneWayLargeRoad: + strName = "One Way Large Road"; + break; + + case RecordTypeOneWayHighway: + strName = "One Way Highway"; + break; + + case RecordTypeTwoWaySmallRoad: + strName = "Two Way Small Road"; + break; + + case RecordTypeTwoWayLargeRoad: + strName = "Two Way Large Road"; + break; + + case RecordTypeTwoWayHighway: + strName = "Two Way Highway"; + break; + + case RecordTypeRailroad: + strName = "Railroad"; + break; + + case RecordTypeWater: + strName = "Water"; + break; + + case RecordTypeInvisibleLandBoundary: + strName = "Invisible Land Boundary"; + break; + + case RecordTypeInvisibleWaterBoundary: + strName = "Invisible Water Boundary"; + break; + + case RecordTypeInvisibleMiscBoundary: + strName = "Invisible Misc Boundary"; + break; + + case RecordTypeLandmark: + strName = "Landmark"; + break; + + case RecordTypePhysicalFeature: + strName = "Physical Feature"; + break; + + case RecordTypeTownOrCity: + strName = "Town or City"; + break; + + case RecordTypeCountyBoundary: + strName = "County Boundary"; + break; + + case RecordTypeStateBoundary: + strName = "State Boundary"; + break; + } + return strName; + } + ////////////////////////////////////////////////////////////////////////////// /// Index: PreferencesPageGeneral.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/PreferencesPageGeneral.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PreferencesPageGeneral.cpp 24 Apr 2005 13:51:55 -0000 1.13 --- PreferencesPageGeneral.cpp 5 May 2005 20:29:09 -0000 1.14 *************** *** 167,170 **** --- 167,196 ---- 0 ); + + ////////////////////////////////////////////////////////////////////////// + // Home zip code label + ////////////////////////////////////////////////////////////////////////// + psizerGrid->Add( + new wxStaticText(this, -1, "Home Zip Code"), + 0, + wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT, + 0 + ); + + ////////////////////////////////////////////////////////////////////////// + // Home zip code + ////////////////////////////////////////////////////////////////////////// + + int zipHome; + g_pConfig->Read("HomeZipCode", &zipHome, 20001); + + m_pctlHomeZip = new wxTextCtrl(this, -1, wxString::Format("%05d", zipHome), wxDefaultPosition, wxSize(250, -1)); + + psizerGrid->Add( + m_pctlHomeZip, + 0, + wxALIGN_LEFT, + 0 + ); ////////////////////////////////////////////////////////////////////////// *************** *** 215,217 **** --- 241,247 ---- g_pConfig->Write("DrawingScaleFactor", fDrawingScaleFactor); + + long lHomeZip; + m_pctlHomeZip->GetValue().ToLong(&lHomeZip); + g_pConfig->Write("HomeZipCode", lHomeZip); } --- NEW FILE: PreferencesPageThemes.h --- /* * Roadnav * * PreferencesPageThemes.h * * Copyright (c) 2004 - 2005 Richard L. Lynch <rl...@us...> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public License * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ////////////////////////////////////////////////////////////////////////////// /// \file /// /// Contains the themes page of the preferences dialog box. /// ////////////////////////////////////////////////////////////////////////////// #ifndef PREFERENCESPAGETHEMES_H #define PREFERENCESPAGETHEMES_H #include <wx/notebook.h> #include "ThemeManager.h" ////////////////////////////////////////////////////////////////////////////// /// /// \brief Implements the Themes page of the preferences dialog box /// ////////////////////////////////////////////////////////////////////////////// class PreferencesPageThemes : public wxNotebookPage { public: PreferencesPageThemes(wxWindow *parent); void OnOk(wxCommandEvent& event); void OnAdd(wxCommandEvent& event); void OnEdit(wxCommandEvent& event); void OnRemove(wxCommandEvent& event); private: wxListBox* m_pctlThemeList; wxComboBox* m_pctlNightTheme; wxComboBox* m_pctlDayTheme; wxComboBox* m_pctlPhotoTheme; wxRadioBox* m_pctlThemeUsage; ThemeManager m_ThemeManager; void EditTheme(wxString& strTheme,Theme& theme); void RefreshComboBoxes(); DECLARE_EVENT_TABLE() }; #endif Index: MapControlData.h =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/MapControlData.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MapControlData.h 27 Apr 2005 03:35:57 -0000 1.9 --- MapControlData.h 5 May 2005 20:29:08 -0000 1.10 *************** *** 70,73 **** --- 70,76 ---- virtual bool Save(MapControlDataImporter * pImporter) = 0; + + virtual wxInt16 GetNumRecordTypes() = 0; + virtual wxString GetRecordTypeDisplayName(wxInt16 iRecordType) = 0; public: // public member variables Index: PreferencesDialog.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/PreferencesDialog.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PreferencesDialog.cpp 24 Apr 2005 13:51:55 -0000 1.13 --- PreferencesDialog.cpp 5 May 2005 20:29:09 -0000 1.14 *************** *** 33,36 **** --- 33,40 ---- #include <wx/notebook.h> + #ifdef _MSC_VER + #pragma warning(disable: 4786) + #endif + #include "PreferencesDialog.h" *************** *** 82,89 **** ////////////////////////////////////////////////////////////////////////// ! // Colors settings page ////////////////////////////////////////////////////////////////////////// ! m_pwndColors = new PreferencesPageColors(pctlNotebook); ! pctlNotebook->AddPage(m_pwndColors, "Colors"); ////////////////////////////////////////////////////////////////////////// --- 86,93 ---- ////////////////////////////////////////////////////////////////////////// ! // Themes settings page ////////////////////////////////////////////////////////////////////////// ! m_pwndThemes = new PreferencesPageThemes(pctlNotebook); ! pctlNotebook->AddPage(m_pwndThemes, "Themes"); ////////////////////////////////////////////////////////////////////////// *************** *** 102,105 **** --- 106,113 ---- // ok and cancel button ////////////////////////////////////////////////////////////////////////// + #if wxCHECK_VERSION(2, 6, 0) + wxStdDialogButtonSizer* psizerButton = CreateStdDialogButtonSizer(wxOK | wxCANCEL); + sizerWnd->Add(psizerButton, 0, wxALL | wxALIGN_CENTER, 5); + #else wxBoxSizer * sizerBottom = new wxBoxSizer(wxHORIZONTAL); *************** *** 111,115 **** sizerWnd->Add(sizerBottom, 0, wxALIGN_CENTER, 0); ! sizerWnd->Fit(this); --- 119,123 ---- sizerWnd->Add(sizerBottom, 0, wxALIGN_CENTER, 0); ! #endif sizerWnd->Fit(this); *************** *** 129,135 **** m_pwndGeneral->OnOk(event); m_pwndGPS->OnOk(event); ! m_pwndColors->OnOk(event); m_pwndURLs->OnOk(event); ! m_pwndUnits->OnOk(event); EndModal(wxID_OK); --- 137,143 ---- m_pwndGeneral->OnOk(event); m_pwndGPS->OnOk(event); ! m_pwndThemes->OnOk(event); m_pwndURLs->OnOk(event); ! m_pwndUnits->OnOk(event); EndModal(wxID_OK); Index: MapControl.h =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/MapControl.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** MapControl.h 25 Apr 2005 02:07:36 -0000 1.23 --- MapControl.h 5 May 2005 20:29:08 -0000 1.24 *************** *** 37,87 **** #include "Constants.h" #include "MapControlData.h" #include <map> #include <vector> ! #define MIN_DETAIL_LEVEL 1 ! #define MAX_DETAIL_LEVEL 15 ! ! ////////////////////////////////////////////////////////////////////////////// ! /// ! /// \brief Specifies various appearance settings ! /// ! ////////////////////////////////////////////////////////////////////////////// ! struct SDetailSettings ! { ! /// Line/dot color ! wxColour clrLine; ! ! /// Line/dot width in pixels ! int iWidth; ! ! /// Line style (wxSOLID, etc.) ! int iStyle; ! ! /// true = only use the start and end points of a polygon, false = draw all lines of the polygon ! bool bFastLine; ! ! ! ! /// Text color ! wxColour clrText; ! ! /// Label font size ! int iFontSize; ! ! ! /// Boolean - should the text be visible? ! bool bTextVisible; ! ! /// Boolean - should the line/dot be visible? ! bool bLineVisible; ! ! ! ! /// This is used with one-way roads to specify how far ! /// apart the arrow heads should be. ! int iArrowSpacing; ! }; ////////////////////////////////////////////////////////////////////////////// --- 37,46 ---- #include "Constants.h" #include... [truncated message content] |
|
From: Richard L. <rl...@us...> - 2005-05-05 20:29:18
|
Update of /cvsroot/roadnav/roadnav/win32/MSVC7 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5986/win32/MSVC7 Modified Files: roadnav.vcproj Log Message: Applies patch #1194510 from Rick Brice, https://sourceforge.net/tracker/index.php?func=detail&aid=1194510&group_id=119594&atid=684488 - adds theme management. Quote from patch description: "This patch adds theme management to roadnav. Users can create and manage color configurations known as themes. Themes can be associated with nighttime, daytime, and aerial photo viewing. When auto-theme selection is enabled the theme will automatically switch between the daytime and nighttime themes at sunrise and sunset respectivly." Index: roadnav.vcproj =================================================================== RCS file: /cvsroot/roadnav/roadnav/win32/MSVC7/roadnav.vcproj,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** roadnav.vcproj 4 May 2005 19:09:56 -0000 1.19 --- roadnav.vcproj 5 May 2005 20:29:09 -0000 1.20 *************** *** 436,439 **** --- 436,445 ---- </File> <File + RelativePath="..\..\src\MapDetailSettings.cpp"> + </File> + <File + RelativePath="..\..\src\MapDetailSettings.h"> + </File> + <File RelativePath="..\..\src\MapDrawing.cpp"> <FileConfiguration *************** *** 622,645 **** </File> <File - RelativePath="..\..\src\PreferencesPageColors.cpp"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - </File> - <File RelativePath="..\..\src\PreferencesPageGeneral.cpp"> <FileConfiguration --- 628,631 ---- *************** *** 682,685 **** --- 668,677 ---- </File> <File + RelativePath="..\..\src\PreferencesPageThemes.cpp"> + </File> + <File + RelativePath="..\..\src\PreferencesPageThemes.h"> + </File> + <File RelativePath="..\..\src\PreferencesPageUnits.cpp"> </File> *************** *** 811,814 **** --- 803,812 ---- </File> <File + RelativePath="..\..\src\SolarTimer.cpp"> + </File> + <File + RelativePath="..\..\src\SolarTimer.h"> + </File> + <File RelativePath="..\..\src\StateDialog.cpp"> <FileConfiguration *************** *** 871,874 **** --- 869,887 ---- </File> <File + RelativePath="..\..\src\Theme.cpp"> + </File> + <File + RelativePath="..\..\src\Theme.h"> + </File> + <File + RelativePath="..\..\src\ThemeColorsDialog.cpp"> + </File> + <File + RelativePath="..\..\src\ThemeManager.cpp"> + </File> + <File + RelativePath="..\..\src\ThemeManager.h"> + </File> + <File RelativePath="..\..\src\TTS-Festival.cpp"> </File> *************** *** 1067,1073 **** </File> <File - RelativePath="..\..\src\PreferencesPageColors.h"> - </File> - <File RelativePath="..\..\src\PreferencesPageGeneral.h"> </File> --- 1080,1083 ---- *************** *** 1106,1109 **** --- 1116,1122 ---- </File> <File + RelativePath="..\..\src\ThemeColorsDialog.h"> + </File> + <File RelativePath="..\..\src\TTS.h"> </File> |
|
From: Richard L. <rl...@us...> - 2005-05-05 20:29:18
|
Update of /cvsroot/roadnav/roadnav/win32/MSVC6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5986/win32/MSVC6 Modified Files: roadnav.dsp Log Message: Applies patch #1194510 from Rick Brice, https://sourceforge.net/tracker/index.php?func=detail&aid=1194510&group_id=119594&atid=684488 - adds theme management. Quote from patch description: "This patch adds theme management to roadnav. Users can create and manage color configurations known as themes. Themes can be associated with nighttime, daytime, and aerial photo viewing. When auto-theme selection is enabled the theme will automatically switch between the daytime and nighttime themes at sunrise and sunset respectivly." Index: roadnav.dsp =================================================================== RCS file: /cvsroot/roadnav/roadnav/win32/MSVC6/roadnav.dsp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** roadnav.dsp 4 May 2005 19:09:56 -0000 1.17 --- roadnav.dsp 5 May 2005 20:29:09 -0000 1.18 *************** *** 43,46 **** --- 43,49 ---- # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + F90=df.exe + # ADD BASE F90 /include:"Release/" + # ADD F90 /include:"Release/" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W3 /WX /GX /O2 /I "." /D "NDEBUG" /D "HAVE_CONFIG_H" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FD /c *************** *** 70,73 **** --- 73,79 ---- # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + F90=df.exe + # ADD BASE F90 /include:"Debug/" + # ADD F90 /include:"Debug/" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /WX /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /GZ /c *************** *** 199,202 **** --- 205,212 ---- # Begin Source File + SOURCE=..\..\src\MapDetailSettings.cpp + # End Source File + # Begin Source File + SOURCE=..\..\src\MapDrawing.cpp # End Source File *************** *** 243,255 **** # Begin Source File ! SOURCE=..\..\src\PreferencesPageColors.cpp # End Source File # Begin Source File ! SOURCE=..\..\src\PreferencesPageGeneral.cpp # End Source File # Begin Source File ! SOURCE=..\..\src\PreferencesPageGPS.cpp # End Source File # Begin Source File --- 253,265 ---- # Begin Source File ! SOURCE=..\..\src\PreferencesPageGeneral.cpp # End Source File # Begin Source File ! SOURCE=..\..\src\PreferencesPageGPS.cpp # End Source File # Begin Source File ! SOURCE=..\..\src\PreferencesPageThemes.cpp # End Source File # Begin Source File *************** *** 291,294 **** --- 301,308 ---- # Begin Source File + SOURCE=..\..\src\SolarTimer.cpp + # End Source File + # Begin Source File + SOURCE=..\..\src\StateDialog.cpp # End Source File *************** *** 303,306 **** --- 317,332 ---- # Begin Source File + SOURCE=..\..\src\Theme.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\ThemeColorsDialog.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\ThemeManager.cpp + # End Source File + # Begin Source File + SOURCE="..\..\src\TTS-Festival.cpp" # End Source File *************** *** 455,458 **** --- 481,488 ---- # Begin Source File + SOURCE=..\..\src\MapDetailSettings.h + # End Source File + # Begin Source File + SOURCE=..\..\src\MapDrawing.h # End Source File *************** *** 499,511 **** # Begin Source File ! SOURCE=..\..\src\PreferencesPageColors.h # End Source File # Begin Source File ! SOURCE=..\..\src\PreferencesPageGeneral.h # End Source File # Begin Source File ! SOURCE=..\..\src\PreferencesPageGPS.h # End Source File # Begin Source File --- 529,541 ---- # Begin Source File ! SOURCE=..\..\src\PreferencesPageGeneral.h # End Source File # Begin Source File ! SOURCE=..\..\src\PreferencesPageGPS.h # End Source File # Begin Source File ! SOURCE=..\..\src\PreferencesPageThemes.h # End Source File # Begin Source File *************** *** 539,542 **** --- 569,576 ---- # Begin Source File + SOURCE=..\..\src\SolarTimer.h + # End Source File + # Begin Source File + SOURCE=..\..\src\StateDialog.h # End Source File *************** *** 551,554 **** --- 585,600 ---- # Begin Source File + SOURCE=..\..\src\Theme.h + # End Source File + # Begin Source File + + SOURCE=..\..\src\ThemeColorsDialog.h + # End Source File + # Begin Source File + + SOURCE=..\..\src\ThemeManager.h + # End Source File + # Begin Source File + SOURCE=..\..\src\TTS.h # End Source File |
|
From: Richard L. <rl...@us...> - 2005-05-05 20:29:16
|
Update of /cvsroot/roadnav/roadnav In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5986 Modified Files: ChangeLog Log Message: Applies patch #1194510 from Rick Brice, https://sourceforge.net/tracker/index.php?func=detail&aid=1194510&group_id=119594&atid=684488 - adds theme management. Quote from patch description: "This patch adds theme management to roadnav. Users can create and manage color configurations known as themes. Themes can be associated with nighttime, daytime, and aerial photo viewing. When auto-theme selection is enabled the theme will automatically switch between the daytime and nighttime themes at sunrise and sunset respectivly." Index: ChangeLog =================================================================== RCS file: /cvsroot/roadnav/roadnav/ChangeLog,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ChangeLog 2 May 2005 03:03:04 -0000 1.25 --- ChangeLog 5 May 2005 20:29:07 -0000 1.26 *************** *** 1,2 **** --- 1,5 ---- + *** Version 0.8 - No Date Set *** + - Adds themes + *** Version 0.7 - 5/6/05 *** - Adds measure and zoom tool |
|
From: Richard L. <rl...@us...> - 2005-05-05 00:52:40
|
Update of /cvsroot/roadnav/roadnav/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13646/src Modified Files: MapLookup.cpp MapState.cpp Log Message: More comments Index: MapState.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/MapState.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MapState.cpp 21 Mar 2005 01:59:34 -0000 1.6 --- MapState.cpp 5 May 2005 00:52:31 -0000 1.7 *************** *** 57,63 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// Load the state information from a file. /// /// Format should be: /// Field #1: State FIPS code /// Field #2: State two letter abbreviation --- 57,64 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief Load the state information from a file. /// /// Format should be: + /// /// Field #1: State FIPS code /// Field #2: State two letter abbreviation *************** *** 114,118 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// Obtain the array of state abbreviations /// ////////////////////////////////////////////////////////////////////////////// --- 115,119 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief Obtain the array of state abbreviations /// ////////////////////////////////////////////////////////////////////////////// *************** *** 124,128 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// Obtain the array of state names /// ////////////////////////////////////////////////////////////////////////////// --- 125,129 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief Obtain the array of state names /// ////////////////////////////////////////////////////////////////////////////// *************** *** 134,138 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// Returns the state abbreviation given the state name. /// /// Returns "" for invalid abbreviations --- 135,139 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief Returns the state abbreviation given the state name. /// /// Returns "" for invalid abbreviations *************** *** 151,155 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// Returns the state abbreviation given the state's FIPS code. /// /// Returns "" for invalid codes --- 152,156 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief Returns the state abbreviation given the state's FIPS code. /// /// Returns "" for invalid codes *************** *** 169,173 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// Returns the full name of a state given the state abbreviation. /// /// Returns "" for invalid abbreviations --- 170,174 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief Returns the full name of a state given the state abbreviation. /// /// Returns "" for invalid abbreviations *************** *** 185,189 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// Returns the state code given either the state name or abbreviations. /// ////////////////////////////////////////////////////////////////////////////// --- 186,190 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief Returns the state code given either the state name or abbreviations. /// ////////////////////////////////////////////////////////////////////////////// *************** *** 205,209 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// Returns the state name given the FIPS code. /// ////////////////////////////////////////////////////////////////////////////// --- 206,210 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief Returns the state name given the FIPS code. /// ////////////////////////////////////////////////////////////////////////////// Index: MapLookup.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/MapLookup.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MapLookup.cpp 23 Apr 2005 17:20:43 -0000 1.10 --- MapLookup.cpp 5 May 2005 00:52:31 -0000 1.11 *************** *** 50,54 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// Locate the record cooresponding to an address. /// /// iSearchNumber - street number --- 50,54 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief Locate the record cooresponding to an address. /// /// iSearchNumber - street number *************** *** 261,265 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// Find the closest thing to a set of coordinates /// ////////////////////////////////////////////////////////////////////////////// --- 261,265 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief Find the closest thing to a set of coordinates /// ////////////////////////////////////////////////////////////////////////////// |
|
From: Richard L. <rl...@us...> - 2005-05-04 23:23:03
|
Update of /cvsroot/roadnav/roadnav/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21246/src Modified Files: MapControlData.cpp Log Message: More comments Index: MapControlData.cpp =================================================================== RCS file: /cvsroot/roadnav/roadnav/src/MapControlData.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MapControlData.cpp 23 Apr 2005 04:56:28 -0000 1.3 --- MapControlData.cpp 4 May 2005 23:22:52 -0000 1.4 *************** *** 42,46 **** ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief IMapControlData destructor /// ////////////////////////////////////////////////////////////////////////////// --- 42,46 ---- ////////////////////////////////////////////////////////////////////////////// /// ! /// \brief IMapControlData destructor - does nothing /// ////////////////////////////////////////////////////////////////////////////// |
|
From: Richard L. <rl...@us...> - 2005-05-04 22:06:11
|
Update of /cvsroot/roadnav/roadnav In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2126 Modified Files: README Log Message: Readme tweak Index: README =================================================================== RCS file: /cvsroot/roadnav/roadnav/README,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** README 23 Apr 2005 04:29:43 -0000 1.8 --- README 4 May 2005 22:06:02 -0000 1.9 *************** *** 29,35 **** If you would like to compile using Microsoft Visual Studio under Windows, ! open the Roadnav project file in the win32 directory and build it. You will ! then need to manually copy the files from the data directory to ! "c:\Program Files\Roadnav\Data". ----------------------------------------------------------------------------- --- 29,35 ---- If you would like to compile using Microsoft Visual Studio under Windows, ! open the Roadnav project file in the Win32\MSVC6 or Win32\MSVC7 directory ! and build it. You will then need to manually copy the files from the data ! directory to "c:\Program Files\Roadnav\Data". ----------------------------------------------------------------------------- |