Author: bugman
Date: Tue May 22 10:44:50 2012
New Revision: 16367
URL: http://svn.gna.org/viewcvs/relax?rev=16367&view=rev
Log:
Import fixes for the change of r16366, whereby the gui.misc module was split
up.
Modified:
branches/uf_redesign/gui/analyses/base.py
branches/uf_redesign/gui/analyses/elements.py
branches/uf_redesign/gui/controller.py
branches/uf_redesign/gui/spin_viewer/containers.py
branches/uf_redesign/test_suite/gui_tests/model_free.py
branches/uf_redesign/test_suite/gui_tests/noe.py
branches/uf_redesign/test_suite/gui_tests/rx.py
branches/uf_redesign/test_suite/gui_tests/state.py
Modified: branches/uf_redesign/gui/analyses/base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/analyses/base.py?rev=16367&r1=16366&r2=16367&view=diff
==============================================================================
--- branches/uf_redesign/gui/analyses/base.py (original)
+++ branches/uf_redesign/gui/analyses/base.py Tue May 22 10:44:50 2012
@@ -1,7 +1,7 @@
###############################################################################
#
#
# Copyright (C) 2009 Michael Bieri
#
-# Copyright (C) 2010-2011 Edward d'Auvergne
#
+# Copyright (C) 2010-2012 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -37,7 +37,8 @@
from gui import paths
from gui.analyses.elements import Text_ctrl
from gui.fonts import font
-from gui.misc import add_border, int_to_gui, str_to_gui
+from gui.misc import add_border
+from gui.string_conv import int_to_gui, str_to_gui
from gui.wizard import Wiz_page
Modified: branches/uf_redesign/gui/analyses/elements.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/analyses/elements.py?rev=16367&r1=16366&r2=16367&view=diff
==============================================================================
--- branches/uf_redesign/gui/analyses/elements.py (original)
+++ branches/uf_redesign/gui/analyses/elements.py Tue May 22 10:44:50 2012
@@ -1,7 +1,7 @@
###############################################################################
#
#
# Copyright (C) 2009 Michael Bieri
#
-# Copyright (C) 2010-2011 Edward d'Auvergne
#
+# Copyright (C) 2010-2012 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -30,8 +30,8 @@
# relax GUI module imports.
from gui.fonts import font
-from gui.misc import str_to_gui
from gui.paths import icon_16x16
+from gui.string_conv import str_to_gui
class Spin_ctrl:
Modified: branches/uf_redesign/gui/controller.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/controller.py?rev=16367&r1=16366&r2=16367&view=diff
==============================================================================
--- branches/uf_redesign/gui/controller.py (original)
+++ branches/uf_redesign/gui/controller.py Tue May 22 10:44:50 2012
@@ -39,8 +39,9 @@
from gui.components.menu import build_menu_item
from gui.fonts import font
from gui.icons import relax_icons
-from gui.misc import add_border, str_to_gui
+from gui.misc import add_border
from gui.paths import IMAGE_PATH, icon_16x16
+from gui.string_conv import str_to_gui
from info import Info_box
Modified: branches/uf_redesign/gui/spin_viewer/containers.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/spin_viewer/containers.py?rev=16367&r1=16366&r2=16367&view=diff
==============================================================================
--- branches/uf_redesign/gui/spin_viewer/containers.py (original)
+++ branches/uf_redesign/gui/spin_viewer/containers.py Tue May 22 10:44:50
2012
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2010-2011 Edward d'Auvergne
#
+# Copyright (C) 2010-2012 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -34,7 +34,7 @@
# GUI module imports.
from gui import paths
-from gui.misc import str_to_gui
+from gui.string_conv import str_to_gui
Modified: branches/uf_redesign/test_suite/gui_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/model_free.py?rev=16367&r1=16366&r2=16367&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/gui_tests/model_free.py (original)
+++ branches/uf_redesign/test_suite/gui_tests/model_free.py Tue May 22
10:44:50 2012
@@ -34,7 +34,7 @@
# relax GUI imports.
from gui.analyses import auto_model_free
-from gui.misc import float_to_gui, str_to_gui
+from gui.string_conv import float_to_gui, str_to_gui
from gui.wizard import Wiz_window
Modified: branches/uf_redesign/test_suite/gui_tests/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/noe.py?rev=16367&r1=16366&r2=16367&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/gui_tests/noe.py (original)
+++ branches/uf_redesign/test_suite/gui_tests/noe.py Tue May 22 10:44:50 2012
@@ -33,7 +33,7 @@
# relax GUI imports.
from gui.interpreter import Interpreter; interpreter = Interpreter()
-from gui.misc import int_to_gui, str_to_gui
+from gui.string_conv import int_to_gui, str_to_gui
from gui.wizard import Wiz_window
Modified: branches/uf_redesign/test_suite/gui_tests/rx.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/rx.py?rev=16367&r1=16366&r2=16367&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/gui_tests/rx.py (original)
+++ branches/uf_redesign/test_suite/gui_tests/rx.py Tue May 22 10:44:50 2012
@@ -33,7 +33,7 @@
# relax GUI imports.
from gui.interpreter import Interpreter; interpreter = Interpreter()
-from gui.misc import bool_to_gui, float_to_gui, int_to_gui, float_to_gui,
str_to_gui
+from gui.string_conv import bool_to_gui, float_to_gui, int_to_gui,
float_to_gui, str_to_gui
from gui.wizard import Wiz_window
Modified: branches/uf_redesign/test_suite/gui_tests/state.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/state.py?rev=16367&r1=16366&r2=16367&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/gui_tests/state.py (original)
+++ branches/uf_redesign/test_suite/gui_tests/state.py Tue May 22 10:44:50
2012
@@ -32,7 +32,7 @@
from test_suite.gui_tests.base_classes import GuiTestCase
# relax GUI imports.
-from gui.misc import int_to_gui, str_to_gui
+from gui.string_conv import int_to_gui, str_to_gui
from gui.wizard import Wiz_window
r16367 - in /branches/uf_redesign: gui/ gui/analyses/ gui/spin_viewer/ test_suite/gui_tests/