# HG changeset patch
# User Chris Cannam
# Date 1453206893 0
# Node ID 57001443887ae1b31a829ff86f1bdf688bccfaca
# Parent  a83baa05a7012a249b6e4f57c1ffc56f553457f4# Parent  36de09aaa614e00d1501fbb57753b4db9c9daa74
Merge from branch 3.0-integration

diff -r a83baa05a701 -r 57001443887a .hgsubstate
--- a/.hgsubstate	Wed Dec 02 15:01:38 2015 +0000
+++ b/.hgsubstate	Tue Jan 19 12:34:53 2016 +0000
@@ -5,5 +5,5 @@
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 39e94df71d24b92f30f8215cb542d6e481e42281 svapp
-1309b66eff5372e435ebb12b8629b60221548fe4 svcore
+afed8be790321ebc805b2620bcddb91405886c8d svcore
 2a85ab180d08d990d778ae9c9f3be5cca4a5adb1 svgui
diff -r a83baa05a701 -r 57001443887a main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed Dec 02 15:01:38 2015 +0000
+++ b/main/MainWindow.cpp	Tue Jan 19 12:34:53 2016 +0000
@@ -300,6 +300,7 @@
     connect(this, SIGNAL(activity(QString)),
             m_activityLog, SLOT(activityHappened(QString)));
     connect(this, SIGNAL(replacedDocument()), this, SLOT(documentReplaced()));
+
     m_activityLog->hide();
 
     m_unitConverter->hide();
@@ -328,6 +329,9 @@
         m_surveyer = 0;
         m_versionTester = 0;
     }
+
+    QString warning = TransformFactory::getInstance()->getPluginPopulationWarning();
+    if (warning != "") pluginPopulationWarning(warning);
 }
 
 MainWindow::~MainWindow()
@@ -4137,6 +4141,12 @@
 }
 
 void
+MainWindow::pluginPopulationWarning(QString warning)
+{
+    QMessageBox::warning(this, tr("Problems loading plugins"), warning);
+}
+
+void
 MainWindow::midiEventsAvailable()
 {
     Pane *currentPane = 0;
diff -r a83baa05a701 -r 57001443887a main/MainWindow.h
--- a/main/MainWindow.h	Wed Dec 02 15:01:38 2015 +0000
+++ b/main/MainWindow.h	Tue Jan 19 12:34:53 2016 +0000
@@ -147,6 +147,8 @@
     virtual void midiEventsAvailable();
     virtual void playStatusChanged(bool);
 
+    virtual void pluginPopulationWarning(QString);
+
     virtual void saveSessionAsTemplate();
     virtual void manageSavedTemplates();