bh: thuban/Thuban/UI viewport.py, 1.16, 1.16.2.1 multiplechoicedialog.py, 1.1, 1.1.2.1 exceptiondialog.py, 1.1, 1.1.2.1 about.py, 1.11.2.1, 1.11.2.2

[cvs@intevation.de]

Author: bh

Update of /thubanrepository/thuban/Thuban/UI
In directory doto:/tmp/cvs-serv30160/Thuban/UI

Modified Files:
      Tag: thuban-1-0-branch
	viewport.py multiplechoicedialog.py exceptiondialog.py 
	about.py 
Log Message:
Backports from HEAD

* Thuban/UI/about.py (About.__init__): Add the
thuban at intevation.de address and rephrase the email address
section as in HEAD

* Thuban/UI/exceptiondialog.py (ExceptionDialog.dialog_layout):
Improved button string to stronger clearify that Thuban will be
closed when hitting the button.

* Thuban/UI/multiplechoicedialog.py: Add missing import of
wxPython.wx itself (as opposed to the contents of wxPython.wx).
For some reason wxPython.wx is available as wxPython.wx.wx in at
least some 2.4 releases.  Fixes RT#2482 wrt. wxPython 2.4.

* Thuban/UI/viewport.py (ViewPort.map_projection_changed): Only
try to keep the same region visible when the map actually contains
something

* test/test_viewport.py
(ViewPortTest.test_changing_map_projection): Check that changing
the projection of an empty map shown in a viewport doesn't lead to
exceptions in the viewport's handler for the
MAP_PROJECTION_CHANGED messages


Index: viewport.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/UI/viewport.py,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- viewport.py	27 Nov 2003 16:04:42 -0000	1.16
+++ viewport.py	15 Dec 2004 14:49:55 -0000	1.16.2.1
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, 2002, 2003 by Intevation GmbH
+# Copyright (c) 2001, 2002, 2003, 2004 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh at intevation.de>
 # Frank Koormann <frank at intevation.de>
@@ -327,12 +327,17 @@
         return self.map
 
     def map_projection_changed(self, map, old_proj):
-        """Subscribed to the map's MAP_PROJECTION_CHANGED message"""
+        """Subscribed to the map's MAP_PROJECTION_CHANGED message
+
+        If the projection changes, the region shown is probably not
+        meaningful anymore in the new projection.  Therefore this method
+        tries to keep the same region visible as before.
+        """
         proj = self.map.GetProjection()
 
         bbox = None
 
-        if old_proj is not None and proj is not None:
+        if old_proj is not None and proj is not None and self.map.HasLayers():
             width, height = self.GetPortSizeTuple()
             llx, lly = self.win_to_proj(0, height)
             urx, ury = self.win_to_proj(width, 0)

Index: multiplechoicedialog.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/UI/multiplechoicedialog.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- multiplechoicedialog.py	12 Jun 2003 12:14:19 -0000	1.1
+++ multiplechoicedialog.py	15 Dec 2004 14:49:55 -0000	1.1.2.1
@@ -1,4 +1,4 @@
-# Copyright (c) 2003 by Intevation GmbH
+# Copyright (c) 2003, 2004 by Intevation GmbH
 # Authors:
 # Jan-Oliver Wagner <jan at intevation.de>
 #
@@ -17,6 +17,7 @@
 __version__ = "$Revision$"
 
 from wxPython.wx import *
+from wxPython import wx
 from wxPython.lib.layoutf import Layoutf
 
 class wxMultipleChoiceDialog(wx.wxDialog):

Index: exceptiondialog.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/UI/exceptiondialog.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- exceptiondialog.py	3 Sep 2003 06:58:47 -0000	1.1
+++ exceptiondialog.py	15 Dec 2004 14:49:55 -0000	1.1.2.1
@@ -1,4 +1,4 @@
-# Copyright (c) 2003 by Intevation GmbH
+# Copyright (c) 2003, 2004 by Intevation GmbH
 # Authors:
 # Jan-Oliver Wagnber <jan at intevation.de>
 #
@@ -41,7 +41,7 @@
 
         box = wxBoxSizer(wxHORIZONTAL)
         box.Add(wxButton(self, wxID_OK, _("Proceed")), 0, wxALL, 4) 
-        box.Add(wxButton(self, wxID_CANCEL, _("Exit")), 0, wxALL, 4) 
+        box.Add(wxButton(self, wxID_CANCEL, _("Exit Thuban now")), 0, wxALL, 4) 
         top_box.Add(box, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 10)
 
         EVT_BUTTON(self, wxID_OK, self.OnOK)

Index: about.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/UI/about.py,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- about.py	27 Nov 2004 21:30:38 -0000	1.11.2.1
+++ about.py	15 Dec 2004 14:49:55 -0000	1.11.2.2
@@ -93,8 +93,9 @@
 
         text += \
             _("Questions and comments can be sent to the following addresses:\n"
-            "\tThuban developers:\n\t\t<thuban at intevation.de>\n"
-            "\tThuban mailing list:\n\t\t<thuban-list at intevation.de>")
+            "\tGeneral list (public):\n\t\t<thuban-list at intevation.de>\n"
+            "\tDevelopers list (public):\n\t\t<thuban-devel at intevation.de>\n"
+            "\tThuban team at Intevation:\n\t\t<thuban at intevation.de>\n")
 
         self.text = text