From 77e8bee44979457bb35a50a04445fcb1d69cd9a9 Mon Sep 17 00:00:00 2001 From: Serge Noiraud Date: Wed, 19 Sep 2012 14:10:56 +0000 Subject: [PATCH] Geography and Gtk3 : better options popup display. svn: r20418 --- src/plugins/lib/maps/geography.py | 14 +++++++------- src/plugins/view/geoclose.py | 2 +- src/plugins/view/geofamclose.py | 2 +- src/plugins/view/geomoves.py | 8 ++++---- src/plugins/view/geoperson.py | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/plugins/lib/maps/geography.py b/src/plugins/lib/maps/geography.py index bf67bd5b9..380bbf418 100644 --- a/src/plugins/lib/maps/geography.py +++ b/src/plugins/lib/maps/geography.py @@ -957,7 +957,7 @@ class GeoGraphyView(OsmGps, NavigationView): table.set_border_width(12) table.set_col_spacings(6) table.set_row_spacings(6) - configdialog.add_text(table, _('Nothing for this view.'), 1) + configdialog.add_text(table, _('Nothing for this view.'), 0) return _('Specific parameters'), table def map_options(self, configdialog): @@ -976,21 +976,21 @@ class GeoGraphyView(OsmGps, NavigationView): table.set_row_spacings(6) configdialog.add_text(table, _('Where to save the tiles for offline mode.'), - 1) + 0, line_wrap=False) configdialog.add_entry(table, '', - 2, 'geography.path') + 1, 'geography.path') configdialog.add_text(table, - _('If you have no more space in your file system\n' + _('If you have no more space in your file system. ' 'You can remove all tiles placed in the above path.\n' 'Be careful! If you have no internet, you\'ll get no map.'), - 3) + 2, line_wrap=False) configdialog.add_slider(table, _('Zoom used when centering'), - 4, 'geography.zoom_when_center', + 3, 'geography.zoom_when_center', (2, 16)) configdialog.add_slider(table, _('The maximum number of places to show'), - 5, 'geography.max_places', + 4, 'geography.max_places', (1000, 10000)) # there is no button. I need to found a solution for this. # it can be very dangerous ! if someone put / in geography.path ... diff --git a/src/plugins/view/geoclose.py b/src/plugins/view/geoclose.py index e029fae8d..362fd9368 100644 --- a/src/plugins/view/geoclose.py +++ b/src/plugins/view/geoclose.py @@ -518,7 +518,7 @@ class GeoClose(GeoGraphyView): 'The value 9 means about 42 miles or 67 kms.\n' 'The value 1 means about 4.6 miles or 7.5 kms.\n' 'The value is in tenth of degree.'), - 1) + 1, line_wrap=False) self.config_meeting_slider = configdialog.add_slider(table, "", 2, 'geography.maximum_meeting_zone', diff --git a/src/plugins/view/geofamclose.py b/src/plugins/view/geofamclose.py index 7207f146a..75e976013 100644 --- a/src/plugins/view/geofamclose.py +++ b/src/plugins/view/geofamclose.py @@ -707,7 +707,7 @@ class GeoFamClose(GeoGraphyView): 'The value 9 means about 42 miles or 67 kms.\n' 'The value 1 means about 4.6 miles or 7.5 kms.\n' 'The value is in tenth of degree.'), - 1) + 1, line_wrap=False) self.config_meeting_slider = configdialog.add_slider(table, "", 2, 'geography.maximum_meeting_zone', diff --git a/src/plugins/view/geomoves.py b/src/plugins/view/geomoves.py index b27a248e2..05a5a9209 100644 --- a/src/plugins/view/geomoves.py +++ b/src/plugins/view/geomoves.py @@ -635,15 +635,15 @@ class GeoMoves(GeoGraphyView): table.set_row_spacings(6) configdialog.add_text(table, _('The maximum number of generations.\n'), - 1) - self.max_generations = configdialog.add_slider(table, + 1, line_wrap=False) + configdialog.add_slider(table, "", 2, 'geography.maximum_generations', (1, 20)) configdialog.add_text(table, _('Time in milliseconds between drawing two generations.\n'), - 3) - self.max_generations = configdialog.add_slider(table, + 3, line_wrap=False) + configdialog.add_slider(table, "", 4, 'geography.generation_interval', (500, 3000)) diff --git a/src/plugins/view/geoperson.py b/src/plugins/view/geoperson.py index 541087a2b..bb45960a0 100644 --- a/src/plugins/view/geoperson.py +++ b/src/plugins/view/geoperson.py @@ -517,14 +517,14 @@ class GeoPerson(GeoGraphyView): table.set_row_spacings(6) configdialog.add_text(table, _('Animation speed in milliseconds (big value means slower)'), - 1) + 1, line_wrap=False) configdialog.add_slider(table, "", 2, 'geography.speed', (100, 1000)) configdialog.add_text(table, _('How many steps between two markers when we are on large move ?'), - 3) + 3, line_wrap=False) configdialog.add_slider(table, "", 4, 'geography.steps', @@ -532,7 +532,7 @@ class GeoPerson(GeoGraphyView): configdialog.add_text(table, _('The minimum latitude/longitude to select large move.\n' 'The value is in tenth of degree.'), - 5) + 5, line_wrap=False) configdialog.add_slider(table, "", 6, 'geography.maximum_lon_lat',