[Greater-commits] r3677 - branches/3.0.0-all-models/GREAT-ER

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 11:14:40 +0200 (Tue, 26 Jul 2011)
New Revision: 3677

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/ChangeLog
Log:
Not Merged revisions 3577
Thuban Changes

Also revert the accidental changelog message in the last commit
........
  r3577 | aheinecke | 2011-07-14 14:58:15 +0200 (Thu, 14 Jul 2011) | 10 lines
  
  LabelListCtrl: Return the value of the selected list element as a string.
      Since it will be used as a Label it needs to be a string representable
      object. When a "non str" object is added to the Layer as a label
      the Viewport throws an exception.
  
  LabelDialog:
      Change the Layout to have a larger default size (350x350) and remove
      the size setting from the LabelListCtrl since the list is automatically
      expanded to fit the size of the dialog anyway.
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410,412-431,434-448
   + /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410,412-431,434-448,3577

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:09:38 UTC (rev 3676)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:14:40 UTC (rev 3677)
@@ -1,13 +1,3 @@
-2011-07-26  Andre Heinecke <aheinecke at intevation.de>
-
-	* GREAT-ER/Thuban/UI/labeldialog.py:
-		(LabelListCtrl): 
-			Return the value of the selected list element as a string.
-		(LabelDialog):
-			Change the Layout to have a larger default size (350x350) and
-			remove the size setting from the LabelListCtrl since the list is
-			automatically expanded to fit the size of the dialog anyway.
-
 2011-07-25  Andre Heinecke <aheinecke at intevation.de>
 
 	* Greater/UI/application.py:
@@ -89,6 +79,7 @@
 		- Fix alpha mode tables by using the "newer" QueryTableFrame
 		  which inherits from Table Frame and adds some nice features
 
+
 2006-05-10  Frank Koormann   <frank at intevation.de>
 
 	* Greater/version.py: Updated version to 2.1.0.