r17198 - in /branches/frame_order_testing: ./ gui/input_elements/value.py -- July 04, 2012 - 12:48

Author: bugman
Date: Wed Jul  4 12:48:40 2012
New Revision: 17198

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

........
  r17156 | bugman | 2012-07-03 14:20:16 +0200 (Tue, 03 Jul 2012) | 6 lines
  
  Bug fix for the Value GUI input element for integer values.
  
  This is only uncovered when remotely running the GUI - e.g. through the 
test suite - and an integer
  value is set.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/gui/input_elements/value.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul  4 12:48:40 2012
@@ -1,1 +1,1 @@
-/trunk:1-17117,17139-17142
+/trunk:1-17117,17139-17142,17156

Modified: branches/frame_order_testing/gui/input_elements/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/input_elements/value.py?rev=17198&r1=17197&r2=17198&view=diff
==============================================================================
--- branches/frame_order_testing/gui/input_elements/value.py (original)
+++ branches/frame_order_testing/gui/input_elements/value.py Wed Jul  4 
12:48:40 2012
@@ -368,10 +368,10 @@
             if sel == None and combo_default != None:
                 # Translate if needed.
                 if combo_default in combo_choices:
-                    string = combo_default
+                    string = str_to_gui(str(combo_default))
                     set_sel = True
                 elif combo_default not in combo_data:
-                    string = combo_default
+                    string = str_to_gui(str(combo_default))
                     set_sel = False
                 else:
                     string = combo_choices[combo_data.index(combo_default)]