r22540 - in /branches/double_rotor: ./ gui/wizards/wiz_objects.py -- March 26, 2014 - 18:00

Author: bugman
Date: Wed Mar 26 18:00:58 2014
New Revision: 22540

URL: http://svn.gna.org/viewcvs/relax?rev=22540&view=rev
Log:
Merged revisions 22539 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r22539 | bugman | 2014-03-26 17:59:15 +0100 (Wed, 26 Mar 2014) | 7 lines
  
  Improved the user feedback when executing a user function in the GUI.
  
  The busy cursor is now turned on at the start of the user function wizard 
page method _apply() and
  turned off again at the end.  This would avoid user confusion, thinking 
that the program has frozen
  (as was the case in bug #21862, https://gna.org/bugs/?21862).
........

Modified:
    branches/double_rotor/   (props changed)
    branches/double_rotor/gui/wizards/wiz_objects.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 26 18:00:58 2014
@@ -1 +1 @@
-/trunk:1-22537
+/trunk:1-22539

Modified: branches/double_rotor/gui/wizards/wiz_objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/gui/wizards/wiz_objects.py?rev=22540&r1=22539&r2=22540&view=diff
==============================================================================
--- branches/double_rotor/gui/wizards/wiz_objects.py    (original)
+++ branches/double_rotor/gui/wizards/wiz_objects.py    Wed Mar 26 18:00:58 
2014
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2010-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2010-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -157,11 +157,16 @@
         @type event:    wx event
         """
 
+        # A bit of user feedback.
+        wx.BeginBusyCursor()
+
         # Execute.
         self.exec_status = self.on_execute()
 
         # Execution failure.
         if not self.exec_status:
+            if wx.IsBusy():
+                wx.EndBusyCursor()
             return
 
         # Finished.
@@ -169,6 +174,10 @@
 
         # Execute the on_apply() method.
         self.on_apply()
+
+        # Turn off the busy cursor if needed.
+        if wx.IsBusy():
+            wx.EndBusyCursor()
 
 
     def _build_main_section(self, sizer):