[Thuban-commits] r2713 - in trunk/thuban: . Extensions/ogr Extensions/ogr/test

[scm-commit@wald.intevation.org]

Author: bernhard
Date: 2006-10-26 18:37:42 +0200 (Thu, 26 Oct 2006)
New Revision: 2713

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/Extensions/ogr/__init__.py
   trunk/thuban/Extensions/ogr/ogrdialog.py
   trunk/thuban/Extensions/ogr/ogrshapes.py
   trunk/thuban/Extensions/ogr/ogrstart.py
   trunk/thuban/Extensions/ogr/test/__init__.py
   trunk/thuban/Extensions/ogr/test/test_OGRShapestore.py
Log:
Moved ogr Extension to Extension menu.
Adding encoding information and made sure Autor's names
with an umlaut are actually written with an umlaut.


Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2006-10-15 23:27:05 UTC (rev 2712)
+++ trunk/thuban/ChangeLog	2006-10-26 16:37:42 UTC (rev 2713)
@@ -1,3 +1,17 @@
+2006-10-25 Bernhard Reiter <bernhard at intevation.de>
+	
+	Moved ogr Extension to Extension menu.
+
+	* Extensions/ogr/
+	__init__.py, ogrstart.py, ogrshapes.py, ogrdialog.py
+	test/test_OGRShapestore.py, test/__init__.py: 
+	adding encoding information and made sure Autor's names 
+	with an umlaut are actually written with an umlaut.
+
+	* Extensions/ogr/ogrstrat.py: now registering in menu "Extensions",
+	having a "(testing)" string before the submenu to prepare for 1.2.0
+	release.  Bumped copyright year to 2006.
+
 2006-10-15 Bernhard Reiter <bernhard at intevation.de>
 
 	* Thuban/UI/renderer.py: Added module variable verbose and

Modified: trunk/thuban/Extensions/ogr/__init__.py
===================================================================
--- trunk/thuban/Extensions/ogr/__init__.py	2006-10-15 23:27:05 UTC (rev 2712)
+++ trunk/thuban/Extensions/ogr/__init__.py	2006-10-26 16:37:42 UTC (rev 2713)
@@ -1,6 +1,6 @@
-# Copyright (C) 2004 by Intevation GmbH
+# Copyright (C) 2004 by Intevation GmbH     vim:encoding=latin-1:
 # Authors:
-# Nina Hueffmeyer <nhueffme at intevation.de>
+# Nina Hüffmeyer <nhueffme at intevation.de>
 #
 # This program is free software under the GPL (>=v2)
 # Read the file COPYING coming with the software for details.
@@ -25,12 +25,12 @@
          # in the global test routine.
 
 # perform the registration of the extension
-from Thuban import _
+from Thuban import _, internal_from_unicode
 from Thuban.UI.extensionregistry import ExtensionDesc, ext_registry
 
 ext_registry.add(ExtensionDesc(
     name = 'OGRstart',
     version = '0.9.0',
-    authors= [ 'Nina Hueffmeyer' ],
+    authors= [ internal_from_unicode(u'Nina H\xfcffmeyer') ],
     copyright = '2004 Intevation GmbH',
     desc = _("Open a file supported by ogr.")))

Modified: trunk/thuban/Extensions/ogr/ogrdialog.py
===================================================================
--- trunk/thuban/Extensions/ogr/ogrdialog.py	2006-10-15 23:27:05 UTC (rev 2712)
+++ trunk/thuban/Extensions/ogr/ogrdialog.py	2006-10-26 16:37:42 UTC (rev 2713)
@@ -1,6 +1,6 @@
-# Copyright (c) 2001, 2003, 2004 by Intevation GmbH
+# Copyright (c) 2001, 2003, 2004 by Intevation GmbH     vim:encoding=latin-1:
 # Authors:
-# Martin Mueller <mmueller at intevation.de>
+# Martin Müller <mmueller at intevation.de>
 # Bernhard Herzog <bh at intevation.de>
 #
 # This program is free software under the GPL (>=v2)

Modified: trunk/thuban/Extensions/ogr/ogrshapes.py
===================================================================
--- trunk/thuban/Extensions/ogr/ogrshapes.py	2006-10-15 23:27:05 UTC (rev 2712)
+++ trunk/thuban/Extensions/ogr/ogrshapes.py	2006-10-26 16:37:42 UTC (rev 2713)
@@ -1,6 +1,6 @@
-# Copyright (C) 2004 by Intevation GmbH
+# Copyright (C) 2004 by Intevation GmbH     vim:encoding=latin-1:
 # Authors:
-# Nina Hueffmeyer <nhueffme at intevation.de>
+# Nina Hüffmeyer <nhueffme at intevation.de>
 #
 # This program is free software under the GPL (>=v2)
 # Read the file COPYING coming with the software for details.

Modified: trunk/thuban/Extensions/ogr/ogrstart.py
===================================================================
--- trunk/thuban/Extensions/ogr/ogrstart.py	2006-10-15 23:27:05 UTC (rev 2712)
+++ trunk/thuban/Extensions/ogr/ogrstart.py	2006-10-26 16:37:42 UTC (rev 2713)
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 by Intevation GmbH
+# Copyright (c) 2004,2006 by Intevation GmbH    vim:encoding=latin-1:
 # Authors:
 # Nina Hüffmeyer <nhueffme at intevation.de>
 #
@@ -199,9 +199,13 @@
 
 
 # find the map menu (create a new if not found)
-map_menu = main_menu.FindOrInsertMenu('map', _('Map'))
-ogr_menu = Menu("ogr", _("Open layer via OGR"),[])
+#map_menu = main_menu.FindOrInsertMenu('map', _('Map'))
+#ogr_menu = Menu("ogr", _("Open layer via OGR"),[])
+# as long as there we are not stable, better add to "Extentions" marked "beta"
+map_menu = main_menu.FindOrInsertMenu('extensions', _('E&xtensions'))
+ogr_menu = Menu("ogr", _("(testing) Open layer via OGR"),[])
 
+
 ogrsupport = ogrshapes.has_ogr_support()
 
 # create new commands and register them

Modified: trunk/thuban/Extensions/ogr/test/__init__.py
===================================================================
--- trunk/thuban/Extensions/ogr/test/__init__.py	2006-10-15 23:27:05 UTC (rev 2712)
+++ trunk/thuban/Extensions/ogr/test/__init__.py	2006-10-26 16:37:42 UTC (rev 2713)
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: iso-8859-1 -*-    vim:encoding=latin-1:
 # Copyright (C) 2004 by Intevation GmbH
 # Authors:
 # Nina Hüffmeyer <nhueffme at intevation.de>

Modified: trunk/thuban/Extensions/ogr/test/test_OGRShapestore.py
===================================================================
--- trunk/thuban/Extensions/ogr/test/test_OGRShapestore.py	2006-10-15 23:27:05 UTC (rev 2712)
+++ trunk/thuban/Extensions/ogr/test/test_OGRShapestore.py	2006-10-26 16:37:42 UTC (rev 2713)
@@ -1,6 +1,6 @@
-# Copyright (C) 2004,2006 by Intevation GmbH
+# Copyright (C) 2004,2006 by Intevation GmbH        vim:encoding=latin-1:
 # Authors:
-# Nina Hueffmeyer <nhueffme at intevation.de>
+# Nina Hüffmeyer <nhueffme at intevation.de>
 #
 # This program is free software under the GPL (>=v2)
 # Read the file COPYING coming with the software for details.