-                      r481ff26
+                      rf51ed67
 import functools
+from PyQt4 import QtGui
 import sas.sasview
 …
 import GuiUtils
 from UI.AboutUI import AboutUI
+from UI.AboutUI import Ui_AboutUI
 class AboutBox(AboutUI):
+class AboutBox(QtGui.QDialog, Ui_AboutUI):
     def __init__(self, parent=None):
         super(AboutBox, self).__init__(parent)
+        self.setupUi(self)
         self.setWindowTitle("About")

src/sas/qtgui/DroppableDataLoadWidget.py

-                      re540cd2
+                      rf51ed67
 # global
 from PyQt4 import QtCore
+from PyQt4 import QtGui, QtCore
 # UI
 from UI.DataExplorerUI import DataLoadWidget
+from UI.DataExplorerUI import Ui_DataLoadWidget
 class DroppableDataLoadWidget(DataLoadWidget):
+class DroppableDataLoadWidget(QtGui.QTabWidget, Ui_DataLoadWidget):
     """
     Overwrite drag and drop methods in the base class
 …
     def __init__(self, parent=None, guimanager=None):
         super(DroppableDataLoadWidget, self).__init__(parent)
+        self.setupUi(self)
         # Enable file drag-drop on treeView

src/sas/qtgui/GuiManager.py

-                      rff49d4d
+                      rf51ed67
 import LocalConfig
 import GuiUtils
 from UI.AcknowledgementsUI import Acknowledgements
+from UI.AcknowledgementsUI import Ui_Acknowledgements
 from AboutBox import AboutBox
 from IPythonWidget import IPythonWidget
+from WelcomePanel import WelcomePanel
 # Perspectives
 from Perspectives.Invariant.InvariantPerspective import InvariantWindow
 from DataExplorer import DataExplorerWindow
+from WelcomePanel import WelcomePanel
+class Acknowledgements(QtGui.QDialog, Ui_Acknowledgements):
+    def __init__(self, parent=None):
+        QtGui.QDialog.__init__(self, parent)
+        self.setupUi(self)
 class GuiManager(object):

-                      ra95260d
+                      rf51ed67
 # Local UI
 from UI.MainWindowUI import MainWindow
+from UI.MainWindowUI import Ui_MainWindow
 # Initialize logging
 import SasviewLogger
 class MainSasViewWindow(MainWindow):
+class MainSasViewWindow(QtGui.QMainWindow, Ui_MainWindow):
     # Main window of the application
     def __init__(self, reactor, parent=None):
         super(MainSasViewWindow, self).__init__(parent)
+        self.setupUi(self)
         # define workspace for dialogs.

src/sas/qtgui/UI/__init__.py
- Property mode changed from 100755 to 100644

-                      re540cd2
+                      rf51ed67
 import LocalConfig
 from UI.WelcomePanelUI import WelcomePanelUI
+from UI.WelcomePanelUI import Ui_WelcomePanelUI
 class WelcomePanel(WelcomePanelUI):
+class WelcomePanel(QtGui.QDialog, Ui_WelcomePanelUI):
     def __init__(self, parent=None):
         super(WelcomePanel, self).__init__(parent)
+        self.setupUi(self)
         self.setWindowTitle("Welcome")

Note: See TracChangeset for help on using the changeset viewer.