GeoView : Removing yahoo and microsoft maps.

javascript and css simplification.
          When possible, usage of python instead of javascript.
          Adding a menubar to manage place lists, years and pages.


svn: r13393
This commit is contained in:
Serge Noiraud 2009-10-22 19:52:27 +00:00
parent 4f55365e97
commit ed788f0507
4 changed files with 555 additions and 570 deletions

File diff suppressed because it is too large Load Diff

View File

@ -278,26 +278,9 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
1, 'preferences.geoview') 1, 'preferences.geoview')
self.add_text( self.add_text(
table, _('GeoView uses OpenStreetMap and one other map provider.\n' table, _('GeoView uses OpenStreetMap and Google maps provider.'),
'Choose one of the following map providers:'),
2) 2)
maps=self.add_radiobox(
table, _('Google Maps'),
3, 'preferences.googlemap', None, 1)
self.add_radiobox(
table, _('OpenLayers'),
3, 'preferences.openlayers', maps, 2)
self.add_radiobox(
table, _('Yahoo! Maps'),
4, 'preferences.yahoo', maps, 1)
self.add_radiobox(
table, _('Microsoft Maps'),
4, 'preferences.microsoft', maps, 2)
self.add_text( self.add_text(
table, _('You need to restart GRAMPS for above settings to take' table, _('You need to restart GRAMPS for above settings to take'
' effect'), 5) ' effect'), 5)

View File

@ -603,19 +603,16 @@ register('preferences.family-siblings', True)
register('preferences.family-warn', True) register('preferences.family-warn', True)
register('preferences.fprefix', 'F%04d') register('preferences.fprefix', 'F%04d')
register('preferences.geoview', False) register('preferences.geoview', False)
register('preferences.googlemap', True)
register('preferences.hide-ep-msg', False) register('preferences.hide-ep-msg', False)
register('preferences.invalid-date-format', "<b>%s</b>") register('preferences.invalid-date-format', "<b>%s</b>")
register('preferences.iprefix', 'I%04d') register('preferences.iprefix', 'I%04d')
register('preferences.last-view', 0) register('preferences.last-view', 0)
register('preferences.microsoft', False)
register('preferences.name-format', 1) register('preferences.name-format', 1)
register('preferences.no-given-text', "[%s]" % _("Missing Given Name")) register('preferences.no-given-text', "[%s]" % _("Missing Given Name"))
register('preferences.no-record-text', "[%s]" % _("Missing Record")) register('preferences.no-record-text', "[%s]" % _("Missing Record"))
register('preferences.no-surname-text', "[%s]" % _("Missing Surname")) register('preferences.no-surname-text', "[%s]" % _("Missing Surname"))
register('preferences.nprefix', 'N%04d') register('preferences.nprefix', 'N%04d')
register('preferences.online-maps', False) register('preferences.online-maps', False)
register('preferences.openlayers', False)
register('preferences.oprefix', 'O%04d') register('preferences.oprefix', 'O%04d')
register('preferences.paper-metric', 0) register('preferences.paper-metric', 0)
register('preferences.paper-preference', 'Letter') register('preferences.paper-preference', 'Letter')
@ -629,8 +626,6 @@ register('preferences.rprefix', 'R%04d')
register('preferences.sprefix', 'S%04d') register('preferences.sprefix', 'S%04d')
register('preferences.todo-color', '#ff0000') register('preferences.todo-color', '#ff0000')
register('preferences.use-last-view', True) register('preferences.use-last-view', True)
register('preferences.yahoo', False)
register('preferences.microsoft', False)
register('researcher.researcher-addr', '') register('researcher.researcher-addr', '')
register('researcher.researcher-city', '') register('researcher.researcher-city', '')

View File

@ -35,52 +35,14 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
GeoView Styles GeoView Styles
color:#2e3436; # tango color Aluminium
----------------------------------------------------- */ ----------------------------------------------------- */
#openstreetmap #geo-map
{ {
border: 3px black solid;
margin-left:auto; margin-left:auto;
margin-right:auto; margin-right:auto;
min-height:400px; min-height:100px;
min-width: 300px; min-width: 100px;
}
#google
{
border: 3px black solid;
margin-left:auto;
margin-right:auto;
min-height:400px;
min-width: 300px;
}
#openlayers
{
border: 3px black solid;
margin-left:auto;
margin-right:auto;
min-height:400px;
min-width: 300px;
}
#microsoft
{
border: 3px black solid;
margin-left:auto;
margin-right:auto;
min-height:400px;
min-width: 300px;
}
#yahoo
{
border: 3px black solid;
margin-left:auto;
margin-right:auto;
min-height:400px;
min-width: 300px;
} }
/* InfoWindow */ /* InfoWindow */
@ -95,88 +57,3 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
overflow-y: auto; overflow-y: auto;
} }
/* title and years selection */
#geo-content {
position:relative;
top:0;
left:0;
font-size:10pt;
height:90px;
overflow-y:auto;
}
#geo-theplaces ul {
list-style-type: none;
color:#2e3436;
font-size:16pt;
opacity:.90;
margin: 0;
padding: 0;
}
#geo-title {
list-style-type: none;
margin-left: 5px;
}
#geo-thetitle:hover li { display: block; }
#geo-thetitle li {
display: none;
font-size:12pt;
color:#2e3436;
white-space:nowrap;
}
#geo-liste li {
display: none;
color:#2e3436;
font-size:12pt;
}
#geo-liste:hover li {
}
#geo-theplaces {
position:absolute;
color:#2e3436;
top:120px;
left:100px;
width: 50%;
border: 0px;
overflow:auto;
max-height:50%;
z-index:800; /* must be greater than 748 to be visible on openlayers */
}
#geo-theplace {
display: block;
}
#geo-theplace a {
color: #2e3436;
display: block;
}
#geo-theplace a:visited {
color: #2e3436;
background-color: transparent;
text-decoration:none;
}
#geo-theplace a:active {
color: #2e3436;
background-color: transparent;
text-decoration:none;
}
#geo-theplaces a:hover {
color: #2e3436;
background-color: transparent;
text-decoration:none;
}
#geo-theplace a:hover {
color: #2e3436;
background-color: transparent;
text-decoration:none;
}