From eacc71f544f03bc5e31bc2463f51728dd5cfe2a1 Mon Sep 17 00:00:00 2001 From: Zsolt Foldvari Date: Sat, 17 Mar 2007 20:07:11 +0000 Subject: [PATCH] 2007-03-17 Zsolt Foldvari * src/Editors/_EditPlace.py: better tooltip for coordinates; fix position of those tooltip. svn: r8301 --- ChangeLog | 4 ++++ src/Editors/_EditPlace.py | 23 ++++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index a29338699..8c9567edd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-03-17 Zsolt Foldvari + * src/Editors/_EditPlace.py: better tooltip for coordinates; fix position + of those tooltip. + 2007-03-14 Brian Matherly * src/Editors/_EditPlace.py: Add the following comment at the top of the file: diff --git a/src/Editors/_EditPlace.py b/src/Editors/_EditPlace.py index c3175e92b..336cc740c 100644 --- a/src/Editors/_EditPlace.py +++ b/src/Editors/_EditPlace.py @@ -139,11 +139,8 @@ class EditPlace(EditPrimary): entry = ValidatableMaskedEntry() entry.connect("validate", self._validate_coordinate, "lon") - tip = gtk.Tooltips() - tip.set_tip(entry, "East/West position, eg -2.88589, 2°53'" + - '9.23" W or -2:53:9.23') entry.show() - table.attach(entry, 3, 4, 1, 2) + table.attach(entry, 3, 4, 1, 2, yoptions=gtk.EXPAND) self.longitude = MonitoredEntry( entry, @@ -152,11 +149,8 @@ class EditPlace(EditPrimary): entry = ValidatableMaskedEntry() entry.connect("validate", self._validate_coordinate, "lat") - tip = gtk.Tooltips() - tip.set_tip(entry, "North/South position, eg 50.84988, 50°50'" + - '59.60"N or 50:50:59.60') entry.show() - table.attach(entry, 1, 2, 1, 2) + table.attach(entry, 1, 2, 1, 2, yoptions=gtk.EXPAND) self.latitude = MonitoredEntry( entry, @@ -164,13 +158,12 @@ class EditPlace(EditPrimary): self.db.readonly) def _validate_coordinate(self, widget, text, typedeg): - if typedeg == 'lat': - result = conv_lat_lon(text, "0", "ISO-D") - elif typedeg == 'lon': - result = conv_lat_lon("0", text, "ISO-D") - - if not result: - return ValidationError("Wrong coordinate") + if (typedeg == 'lat') and not conv_lat_lon(text, "0", "ISO-D"): + return ValidationError(_("Invalid latitude (syntax: 18°9'" + + '48.21"S, -18.2412 or -18:9:48.21)')) + elif (typedeg == 'lon') and not conv_lat_lon("0", text, "ISO-D"): + return ValidationError(_("Invalid longitude (syntax: 18°9'" + + '48.21"E, -18.2412 or -18:9:48.21)')) def build_menu_names(self,place): return (_('Edit Place'), self.get_menu_title())