Fix import error and plugin load widget error

roam-qgis · Jul 19, 2015 · 414a53a · 414a53a
1 parent 1b30b8d
commit 414a53a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/roam/api/featureform.py b/src/roam/api/featureform.py
@@ -26,7 +26,6 @@
  QFormLayout,
  QSpinBox,
  QDoubleSpinBox)
-from matplotlib.sphinxext.plot_directive import out_of_date
 
 from qgis.core import QgsFields, QgsFeature, QgsGPSConnectionRegistry, QGis, QgsGeometry, QgsPoint
 from qgis.gui import QgsMessageBar

diff --git a/src/roam/mainwindow.py b/src/roam/mainwindow.py
@@ -613,6 +613,10 @@ def _readProject(self, doc):
  self.projectOpened()
  GPS.crs = crs
 
+ @property
+ def enabled_plugins(self):
+ return self.settings.get('plugins', [])
+
  @roam.utils.timeit
  def projectOpened(self):
  """
@@ -669,7 +673,8 @@ def clear_plugins(self):
  # Remove the page widget, because we make it on each load
  widget = self.stackedWidget.widget(action.property("page"))
  self.stackedWidget.removeWidget(widget)
- widget.deleteLater()
+ if widget:
+ widget.deleteLater()
 
  self.menutoolbar.removeAction(action)
  self.pluginactions = []