Merge pull request #432 from mattgibbs/fix_about_tools

Fix 'About' Screen Crash

pydm/about_pydm/about.py

@@ -13,7 +13,6 @@
 class AboutWindow(QWidget):
     def __init__(self, parent=None):
         super(AboutWindow, self).__init__(parent, Qt.Window)
-        self.app = QApplication.instance()
         self.ui = Ui_Form()
         self.ui.setupUi(self)
         self.ui.pydmVersionLabel.setText(str(self.ui.pydmVersionLabel.text()).format(version=pydm.__version__))
@@ -33,7 +32,7 @@ def populate_external_tools_list(self):
         self.ui.externalToolsTableWidget.setHorizontalHeaderLabels(col_labels)
         self.ui.externalToolsTableWidget.horizontalHeader().setStretchLastSection(True)
         self.ui.externalToolsTableWidget.verticalHeader().setVisible(False)
-        self.add_tools_to_list(self.app.tools)
+        self.add_tools_to_list(pydm.tools.ext_tools)
 
     def add_tools_to_list(self, tools):
         for (name, tool) in tools.items():
@@ -58,7 +57,7 @@ def populate_plugin_list(self):
         self.ui.dataPluginsTableWidget.setHorizontalHeaderLabels(col_labels)
         self.ui.dataPluginsTableWidget.horizontalHeader().setStretchLastSection(True)
         self.ui.dataPluginsTableWidget.verticalHeader().setVisible(False)
-        for (protocol, plugin) in self.app.plugins.items():
+        for (protocol, plugin) in pydm.data_plugins.plugin_modules.items():
             protocol_item = QTableWidgetItem(protocol)
             file_item = QTableWidgetItem(inspect.getfile(plugin.__class__))
             new_row = self.ui.dataPluginsTableWidget.rowCount()

pydm/tests/test_about_screen.py

@@ -0,0 +1,6 @@
+from pydm.about_pydm import AboutWindow
+def test_about_window_launches(qtbot):
+    """Make sure the About window doesn't crash."""
+    a = AboutWindow(parent=None)
+    qtbot.addWidget(a)
+    a.show()