Revert "Revert "Fix squish tests""

Code/Mantid/MantidPlot/test/squish_test_suites/refl_gui_tests/tst_basic_operation/test.py

@@ -72,7 +72,7 @@ def do_test_minimal(test_harness):
     column_index = 0
     
     # Fetch the table
-    tbl = waitForObject(":splitterList.tableMain_QTableWidget")
+    tbl = waitForObject("{name='tableMain' type='QTableWidget'}")
     
     # Set the run number
     tbl.item(row_index, column_index).setText(str(run_number))
@@ -102,7 +102,7 @@ def do_test_transmission(test_harness):
     row_index = 0
     
     # Fetch the table
-    tbl = waitForObject(":splitterList.tableMain_QTableWidget")
+    tbl = waitForObject("{name='tableMain' type='QTableWidget'}")
     
     # Set the run number
     tbl.item(row_index, 0).setText(str(run_number))
@@ -131,7 +131,7 @@ def do_test_reuse_transmission(test_harness):
     row_index = 0
     
     # Fetch the table
-    tbl = waitForObject(":splitterList.tableMain_QTableWidget")
+    tbl = waitForObject("{name='tableMain' type='QTableWidget'}")
     
     # Set the first run number
     tbl.item(row_index, 0).setText(str(run_number1))
@@ -166,7 +166,7 @@ def do_test_stitch_output(test_harness):
     row_index = 0
     
     # Fetch the table
-    tbl = waitForObject(":splitterList.tableMain_QTableWidget")
+    tbl = waitForObject("{name='tableMain' type='QTableWidget'}")
     
     # Set the stitched state
     ck_stitched = waitForObject(':tableMain_QCheckBox')
@@ -207,7 +207,7 @@ def do_test_three_runs(test_harness):
     row_index = 0
     
     # Fetch the table
-    tbl = waitForObject(":splitterList.tableMain_QTableWidget")
+    tbl = waitForObject("{name='tableMain' type='QTableWidget'}")
     
     # Set the first run number
     tbl.item(row_index, 0).setText(str(run_number1))

Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py

@@ -32,7 +32,7 @@ except ImportError:
 
 
 
-class ReflGui(QtGui.QMainWindow, refl_window.Ui_windowRefl):
+class ReflGui(QtGui.QMainWindow, ui_refl_window.Ui_windowRefl):
 
     current_instrument = None
     current_table = None