[Greater-commits] r3681 - in branches/3.0.0-all-models/GREAT-ER: . Greater/UI

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 11:29:00 +0200 (Tue, 26 Jul 2011)
New Revision: 3681

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/ChangeLog
   branches/3.0.0-all-models/GREAT-ER/Greater/UI/application.py
Log:
Merged revisions 3606 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r3606 | aheinecke | 2011-07-18 11:31:46 +0200 (Mon, 18 Jul 2011) | 2 lines
  
  Use Thuban extentions if available
........



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,3577-3578,3604-3605
   + /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-3578,3604-3606

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:26:43 UTC (rev 3680)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:29:00 UTC (rev 3681)
@@ -1,8 +1,11 @@
 2011-07-26  Andre Heinecke <aheinecke at intevation.de>
 
 	* Greater/UI/mainwindow.py:
-		Increase default size of the greter window to fit a third of
-		the screen.
+		- Increase default size of the greter window to fit a third of
+		  the screen.
+	* Greater/UI/application.py:
+		- Read Thuban Startup Files to enable Thuban extentions if they
+		  are available.
 
 2011-07-25  Andre Heinecke <aheinecke at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/UI/application.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/UI/application.py	2011-07-26 09:26:43 UTC (rev 3680)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/UI/application.py	2011-07-26 09:29:00 UTC (rev 3681)
@@ -107,8 +107,7 @@
     """
 
     def read_startup_files(self):
-        """Do nothing for now."""
-        pass
+        ThubanApplication.read_startup_files(self)
 
     def ResourceDir(self):
         """Return the directory containing resources such as bitmaps"""