r17157 - in /branches/interatomic: ./ gui/input_elements/value.py -- July 03, 2012 - 14:27

Author: bugman
Date: Tue Jul  3 14:27:53 2012
New Revision: 17157

URL: http://svn.gna.org/viewcvs/relax?rev=17157&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/interatomic/   (props changed)
    branches/interatomic/gui/input_elements/value.py

Propchange: branches/interatomic/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul  3 14:27:53 2012
@@ -1,1 +1,1 @@
-/trunk:1-17144
+/trunk:1-17156

Modified: branches/interatomic/gui/input_elements/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/gui/input_elements/value.py?rev=17157&r1=17156&r2=17157&view=diff
==============================================================================
--- branches/interatomic/gui/input_elements/value.py (original)
+++ branches/interatomic/gui/input_elements/value.py Tue Jul  3 14:27:53 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)]