[Greater-commits] r3673 - in branches/3.0.0-all-models/GREAT-ER: . Greater/Modules

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 16:54:37 +0200 (Mon, 25 Jul 2011)
New Revision: 3673

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

........
  r447 | aheinecke | 2011-07-14 11:55:31 +0200 (Thu, 14 Jul 2011) | 2 lines
  
  Resolve fixme by bringing already opened dialogs to front
........



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-446
   + /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-447

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 14:51:12 UTC (rev 3672)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 14:54:37 UTC (rev 3673)
@@ -74,6 +74,8 @@
 		- In wxWidgets 2.8.12  dlg.Update returns a tuple
 		  where the first value is set to False if the dialog is canceled.
 		  Use this to a abort a simulation now
+	* Greater/Modules/alpha.py:
+		- Resolve fixme to bring already opened dialogs to front
 
 2006-05-10  Frank Koormann   <frank at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Modules/alpha.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/alpha.py	2011-07-25 14:51:12 UTC (rev 3672)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/alpha.py	2011-07-25 14:54:37 UTC (rev 3673)
@@ -30,8 +30,7 @@
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
-        # FIXME: bring dialog to front here
-        pass
+        dialog.Raise()
 
 def show_session_discharge_table(context):
     window = context.mainwindow
@@ -46,8 +45,7 @@
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
-        # FIXME: bring dialog to front here
-        pass
+        dialog.Raise()
 
 def show_market_discharge_table(context):
     window = context.mainwindow
@@ -62,8 +60,7 @@
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
-        # FIXME: bring dialog to front here
-        pass
+        dialog.Raise()
 
 def show_stretch_table(context):
     window = context.mainwindow
@@ -76,8 +73,7 @@
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
-        # FIXME: bring dialog to front here
-        pass
+        dialog.Raise()
 
 def show_discharge_results_table(context):
     window = context.mainwindow
@@ -90,8 +86,7 @@
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
-        # FIXME: bring dialog to front here
-        pass
+        dialog.Raise()
 
 def show_stretch_results_table(context):
     window = context.mainwindow
@@ -104,10 +99,8 @@
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
-        # FIXME: bring dialog to front here
-        pass
+        dialog.Raise()
 
-
 registry.Add(Command("show_discharge_table", "Show &Discharge Table",
                      show_discharge_table, helptext = "Show discharge table",
                      sensitive = context_catchment_open))