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

[scm-commit@wald.intevation.org]

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

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/mainwindow.py
Log:
Merged revisions 3617 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

Not merged 3614,3615,3616,3618

........
  r3614 | aheinecke | 2011-07-18 16:59:06 +0200 (Mon, 18 Jul 2011) | 4 lines
  
  Change the default size of the identifydialog to make it
  the same as the labeldialog. Again use the dialog size to
  set the size since the list is set to autofill / expand
........
  r3615 | aheinecke | 2011-07-18 17:34:33 +0200 (Mon, 18 Jul 2011) | 4 lines
  
  Create the session after the MainWindow is created this gives the
  MainWindow the chance to handle the initial SESSION_REPLACED message
  and register for further Messages from that initial session.
........
  r3616 | aheinecke | 2011-07-18 17:52:01 +0200 (Mon, 18 Jul 2011) | 2 lines
  
  Check if there is a Map before trying to access it's Layers
........
  r3617 | aheinecke | 2011-07-18 17:52:20 +0200 (Mon, 18 Jul 2011) | 2 lines
  
  Enable coordinates
........
  r3618 | aheinecke | 2011-07-19 18:00:28 +0200 (Tue, 19 Jul 2011) | 5 lines
  
  Use str text factory for sqlite since we internally
  use UTF-8 Encoding for everything.
  
  Needs review before it can be placed into thuban upstream
........



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-3606,3611,3613
   + /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,3611,3613-3618

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:32:20 UTC (rev 3683)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:37:40 UTC (rev 3684)
@@ -5,6 +5,8 @@
 		  the screen.
 		- Fix menubar activations by matching them to specific items
 		  and not relavtive positons
+		- Enable coordinates by calling the update_status_bar function
+		  of the parents mainwindow.
 	* Greater/UI/application.py:
 		- Read Thuban Startup Files to enable Thuban extentions if they
 		  are available.

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/UI/mainwindow.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/UI/mainwindow.py	2011-07-26 09:32:20 UTC (rev 3683)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/UI/mainwindow.py	2011-07-26 09:37:40 UTC (rev 3684)
@@ -252,3 +252,4 @@
                     mod_text += '/needs simulation'
         self.SetStatusText(db_text, 1)
         self.SetStatusText(mod_text, 2)
+        MainWindow.update_status_bar(self, args)