Merge lp:dspatcher/1.01 into lp:dspatcher

[Marcus Tomlinson]

* Improved null / error checking
* Show construction menu when placing a component with constructor params
* Allow direct text input for Int, Float and FilePath parameter types
* Support for read-only component parameters
* Fixed component panel dynamic resizing
* Fixed build failures on Mac

[lp:dspatcher/1.01]

20. By Marcus Tomlinson on 2015-04-09

Disable auto loading of new plugins for now, somethings borked

21. By Marcus Tomlinson on 2015-04-09

Fixed Mac build

=== modified file 'dspatcher/CMakeLists.txt'
--- dspatcher/CMakeLists.txt	2015-04-07 15:48:58 +0000
+++ dspatcher/CMakeLists.txt	2015-04-09 13:24:26 +0000
@@ -21,6 +21,10 @@
   QtPatcher
 )
 
+if(APPLE)
+  execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/update_install_names.sh)
+endif(APPLE)
+
 if(WIN32)
   add_custom_command(
     TARGET ${PROJECT_NAME} POST_BUILD
 
=== modified file 'dspatcher/include/DsprController.h'
--- dspatcher/include/DsprController.h	2015-04-06 14:19:57 +0000
+++ dspatcher/include/DsprController.h	2015-04-09 13:24:26 +0000
@@ -29,14 +29,17 @@
 #include <DsprParam.h>
 #include <QtpMain.h>
 
+#include <QFileSystemWatcher>
 #include <QObject>
 
+#include <set>
+
 class DsprController : public QObject
 {
     Q_OBJECT
 
 public:
-    DsprController(QtpDiag* diagram, std::vector<DspPluginLoader> const& pluginLoaders);
+    DsprController(QtpMain& mainWindow);
     ~DsprController();
 
 signals:
@@ -61,6 +64,8 @@
     void triggerUpdated();
 
 private slots:
+    void _loadPlugins();
+
     void _inputAdded(DspComponent* component, int index);
     void _inputRemoved(DspComponent* component, int index);
     void _outputAdded(DspComponent* component, int index);
@@ -70,7 +75,9 @@
     void _parameterUpdated(DspComponent* component, int index);
 
 private:
-    bool _settingParam;
+    QFileSystemWatcher _fileWatcher;
+    QtpMain& _mainWindow;
+    std::set<int> _settingParams;
     std::vector<DspPluginLoader> _pluginLoaders;
 
     std::map<DspComponent const*, QtpComp*> _qtpComps;
 
=== modified file 'dspatcher/include/DsprParam.h'
--- dspatcher/include/DsprParam.h	2015-04-06 16:59:42 +0000
+++ dspatcher/include/DsprParam.h	2015-04-09 13:24:26 +0000
@@ -49,10 +49,11 @@
 public:
     DsprParam(int compId, int paramId, std::string const& name, DspParameter const& param, QMenu* contextMenu);
     QWidgetAction* action();
-    DspParameter& param();
+    DspParameter const& param();
 
-    int compId();
-    int paramId();
+    int compId() const;
+    int paramId() const;
+    std::string name() const;
 
     bool SetBool(bool const& value);
     bool SetInt(int const& value);
@@ -70,17 +71,19 @@
     void triggerUpdated();
 
 private slots:
+    void paramChanged(bool value);
     void paramChanged(int value);
     void paramChanged(QString const&);
     void paramChanged();
 
-    void updateFloatSlider(int value);
+    void updateSlider(int value);
     void browseForFile();
 
 private:
     bool _settingParam;
     int _compId;
     int _paramId;
+    std::string _name;
     DspParameter _param;
     QMenu* _contextMenu;
     QWidgetAction* _action;
@@ -90,7 +93,6 @@
     QLineEdit* _textBox;
     QComboBox* _listBox;
     QPushButton* _button;
-    QLabel* _vlabel;
 };
 
 #endif  // DSPRPARAM_H
 
=== removed directory 'dspatcher/link/Debug'
=== renamed file 'dspatcher/link/Debug/libDSPatch.dylib' => 'dspatcher/link/libDSPatch.dylib'
=== modified file 'dspatcher/src/DsprController.cpp'
--- dspatcher/src/DsprController.cpp	2015-04-06 14:19:57 +0000
+++ dspatcher/src/DsprController.cpp	2015-04-09 13:24:26 +0000
@@ -24,19 +24,26 @@
 
 #include <DsprController.h>
 
+#include <DSPatch.h>
 #include <QtpDiag.h>
 
-DsprController::DsprController(QtpDiag* diagram, std::vector<DspPluginLoader> const& pluginLoaders)
-    : _settingParam(false)
-    , _pluginLoaders(pluginLoaders)
+#include <QDir>
+
+DsprController::DsprController(QtpMain& mainWindow)
+    : _mainWindow(mainWindow)
 {
+    _fileWatcher.addPath(PLUGIN_DIR);
+    ///!connect(&_fileWatcher, SIGNAL(directoryChanged(QString const&)), this, SLOT(_loadPlugins()));
+
+    _loadPlugins();
+
     _circuit.SetThreadCount(2);
     _circuit.StartAutoTick();
 
-    connect(diagram, &QtpDiag::compInserted, this, &DsprController::compInserted);
-    connect(diagram, &QtpDiag::compRemoved, this, &DsprController::compRemoved);
-    connect(diagram, &QtpDiag::wireConnected, this, &DsprController::wireConnected);
-    connect(diagram, &QtpDiag::wireDisconnected, this, &DsprController::wireDisconnected);
+    connect(_mainWindow.diagram(), &QtpDiag::compInserted, this, &DsprController::compInserted);
+    connect(_mainWindow.diagram(), &QtpDiag::compRemoved, this, &DsprController::compRemoved);
+    connect(_mainWindow.diagram(), &QtpDiag::wireConnected, this, &DsprController::wireConnected);
+    connect(_mainWindow.diagram(), &QtpDiag::wireDisconnected, this, &DsprController::wireDisconnected);
 
     connect(this, &DsprController::inputAdded, this, &DsprController::_inputAdded);
     connect(this, &DsprController::inputRemoved, this, &DsprController::_inputRemoved);
@@ -108,7 +115,46 @@
 {
     DspPluginLoader loader = _pluginLoaders[qtpComp->compInfo().typeId];
     std::map<std::string, DspParameter> params = loader.GetCreateParams();
+
+    // Show construction menu
+    std::vector<DsprParam*> dsprParams;
+    typedef std::map<std::string, DspParameter>::iterator it_type;
+    for (it_type iterator = params.begin(); iterator != params.end(); iterator++)
+    {
+        DsprParam* param = new DsprParam(qtpComp->id(), 0, iterator->first,
+                                         iterator->second, qtpComp->contextMenu());
+        qtpComp->contextMenu()->addAction(param->action());
+        dsprParams.push_back(param);
+    }
+    if (params.size() > 0)
+    {
+        qtpComp->contextMenu()->exec(QCursor::pos());
+    }
+
+    // Construct component with values from menu
+    foreach (DsprParam* dsprParam, dsprParams)
+    {
+        params[dsprParam->name()] = dsprParam->param();
+        delete dsprParam;
+    }
+    qtpComp->contextMenu()->clear();
+
     DspComponent* component = loader.Create(params);
+    if (component == NULL)
+    {
+        return;
+    }
+
+    qtpComp->removeInPins();
+    qtpComp->removeOutPins();
+    for (int i = 0; i < component->GetInputCount(); ++i)
+    {
+        qtpComp->addInPin(component->GetInputName(i).c_str());
+    }
+    for (int i = 0; i < component->GetOutputCount(); ++i)
+    {
+        qtpComp->addOutPin(component->GetOutputName(i).c_str());
+    }
 
     component->SetCallback(callback, this);
     _circuit.AddComponent(component);
@@ -162,42 +208,54 @@
 
 void DsprController::boolUpdated(bool value)
 {
-    _settingParam = true;
     DsprParam* param = dynamic_cast<DsprParam*>(sender());
-    _components[param->compId()]->SetParameter(param->paramId(), DspParameter(DspParameter::Bool, value));
-    _settingParam = false;
+    _settingParams.insert(param->paramId());
+    if (!_components[param->compId()]->SetParameter(param->paramId(), DspParameter(DspParameter::Bool, value)))
+    {
+        param->SetBool(*(_components[param->compId()]->GetParameter(param->paramId())->GetBool()));
+    }
+    _settingParams.erase(param->paramId());
 }
 
 void DsprController::intUpdated(int value)
 {
-    _settingParam = true;
     DsprParam* param = dynamic_cast<DsprParam*>(sender());
-    _components[param->compId()]->SetParameter(param->paramId(), DspParameter(DspParameter::Int, value));
-    _settingParam = false;
+    _settingParams.insert(param->paramId());
+    if (!_components[param->compId()]->SetParameter(param->paramId(), DspParameter(DspParameter::Int, value)))
+    {
+        param->SetInt(*(_components[param->compId()]->GetParameter(param->paramId())->GetInt()));
+    }
+    _settingParams.erase(param->paramId());
 }
 
 void DsprController::floatUpdated(float value)
 {
-    _settingParam = true;
     DsprParam* param = dynamic_cast<DsprParam*>(sender());
-    _components[param->compId()]->SetParameter(param->paramId(), DspParameter(DspParameter::Float, value));
-    _settingParam = false;
+    _settingParams.insert(param->paramId());
+    if (!_components[param->compId()]->SetParameter(param->paramId(), DspParameter(DspParameter::Float, value)))
+    {
+        param->SetFloat(*(_components[param->compId()]->GetParameter(param->paramId())->GetFloat()));
+    }
+    _settingParams.erase(param->paramId());
 }
 
 void DsprController::stringUpdated(std::string const& value)
 {
-    _settingParam = true;
     DsprParam* param = dynamic_cast<DsprParam*>(sender());
-    _components[param->compId()]->SetParameter(param->paramId(), DspParameter(DspParameter::String, value));
-    _settingParam = false;
+    _settingParams.insert(param->paramId());
+    if (!_components[param->compId()]->SetParameter(param->paramId(), DspParameter(DspParameter::String, value)))
+    {
+        param->SetString(*(_components[param->compId()]->GetParameter(param->paramId())->GetString()));
+    }
+    _settingParams.erase(param->paramId());
 }
 
 void DsprController::triggerUpdated()
 {
-    _settingParam = true;
     DsprParam* param = dynamic_cast<DsprParam*>(sender());
+    _settingParams.insert(param->paramId());
     _components[param->compId()]->SetParameter(param->paramId(), DspParameter(DspParameter::Trigger));
-    _settingParam = false;
+    _settingParams.erase(param->paramId());
 }
 
 void DsprController::_inputAdded(DspComponent* component, int index)
@@ -275,7 +333,8 @@
 
 void DsprController::_parameterUpdated(DspComponent* component, int index)
 {
-    if (_settingParam)
+    // don't react if we are the one setting the parameter
+    if (_settingParams.find(index) != _settingParams.end())
     {
         return;
     }
@@ -314,3 +373,49 @@
             break;
     }
 }
+
+void DsprController::_loadPlugins()
+{
+    _mainWindow.unregisterComponents();
+
+    // Load DSPatch plugins from "dspatchables" folder
+    QDir dir(PLUGIN_DIR);
+    QFileInfoList files = dir.entryInfoList();
+    foreach(QFileInfo const& file, files)
+    {
+        #ifdef _WIN32
+        if (file.isFile() && file.fileName().endsWith(".dll"))
+        #else
+        if (file.isFile())
+        #endif
+        {
+            QString path = file.absoluteFilePath();
+            DspPluginLoader loader(path.toUtf8().constData());
+            if (loader.IsLoaded())
+            {
+                _pluginLoaders.push_back(loader);
+                std::map<std::string, DspParameter> params = loader.GetCreateParams();
+                DspComponent* comp = loader.Create(params);
+
+                QtpComp::CompInfo compInfo;
+                compInfo.typeId = _pluginLoaders.size() - 1;
+                compInfo.typeName = file.baseName().mid(0, 3) == "lib" ? file.baseName().mid(3) : file.baseName();
+
+                if (comp)
+                {
+                    for (int i = 0; i < comp->GetInputCount(); ++i)
+                    {
+                        compInfo.inPins.append(comp->GetInputName(i).c_str());
+                    }
+                    for (int i = 0; i < comp->GetOutputCount(); ++i)
+                    {
+                        compInfo.outPins.append(comp->GetOutputName(i).c_str());
+                    }
+                }
+
+                _mainWindow.registerComponent(compInfo);
+                delete comp;
+            }
+        }
+    }
+}
 
=== modified file 'dspatcher/src/DsprParam.cpp'
--- dspatcher/src/DsprParam.cpp	2015-04-06 16:59:42 +0000
+++ dspatcher/src/DsprParam.cpp	2015-04-09 13:24:26 +0000
@@ -28,18 +28,25 @@
     : _settingParam(false)
     , _compId(compId)
     , _paramId(paramId)
+    , _name(name)
     , _param(param)
     , _contextMenu(contextMenu)
 {
     if (_param.Type() == DspParameter::Bool)
     {
         _checkbox = new QCheckBox(_contextMenu);
+
+        if (_param.GetBool())
+        {
+            _checkbox->setChecked(*_param.GetBool());
+        }
+
         _checkbox->setText(name.c_str());
         QWidgetAction* customAction = new QWidgetAction(_contextMenu);
         customAction->setDefaultWidget(_checkbox);
         _action = customAction;
 
-        connect(_checkbox, SIGNAL(stateChanged(int)), this, SLOT(paramChanged(int)));
+        connect(_checkbox, SIGNAL(toggled(bool)), this, SLOT(paramChanged(bool)));
     }
     else if (_param.Type() == DspParameter::Int)
     {
@@ -50,31 +57,43 @@
         {
             _slider->setRange(_param.GetIntRange()->first, _param.GetIntRange()->second);
         }
-        else
+        else if (_param.GetInt())
         {
             _slider->setRange(0, *_param.GetInt() * 2);
         }
-        _slider->setValue(*_param.GetInt());
+        else
+        {
+            _slider->setRange(0, 10000);
+        }
+
+        if (_param.GetInt())
+        {
+            _slider->setValue(*_param.GetInt());
+        }
+        else
+        {
+            _slider->setValue(5000);
+        }
 
         QLabel* label = new QLabel(intSlider);
         label->setText(name.c_str());
 
-        _vlabel = new QLabel(intSlider);
-        _vlabel->setNum(_slider->sliderPosition());
-        _vlabel->setFixedWidth(45);
+        _textBox = new QLineEdit(intSlider);
+        _textBox->setText(QString::number(_slider->sliderPosition()));
+        _textBox->setFixedWidth(65);
 
-        connect(_slider, SIGNAL(valueChanged(int)), _vlabel, SLOT(setNum(int)));
+        connect(_slider, SIGNAL(valueChanged(int)), this, SLOT(updateSlider(int)));
 
         QHBoxLayout* layout = new QHBoxLayout(intSlider);
         layout->addWidget(label);
         layout->addWidget(_slider);
-        layout->addWidget(_vlabel);
+        layout->addWidget(_textBox);
 
         QWidgetAction* intSliderAction = new QWidgetAction(_contextMenu);
         intSliderAction->setDefaultWidget(intSlider);
         _action = intSliderAction;
 
-        connect(_slider, SIGNAL(valueChanged(int)), this, SLOT(paramChanged(int)));
+        connect(_textBox, SIGNAL(textChanged(QString const&)), this, SLOT(paramChanged(QString const&)));
     }
     else if (_param.Type() == DspParameter::Float)
     {
@@ -85,31 +104,43 @@
         {
             _slider->setRange(_param.GetFloatRange()->first * 100, _param.GetFloatRange()->second * 100);
         }
-        else
+        else if (_param.GetFloat())
         {
             _slider->setRange(0, *_param.GetFloat() * 200);
         }
-        _slider->setValue(*_param.GetFloat() * 100);
+        else
+        {
+            _slider->setRange(0, 10000 * 100);
+        }
+
+        if (_param.GetFloat())
+        {
+            _slider->setValue(*_param.GetFloat() * 100);
+        }
+        else
+        {
+            _slider->setValue(5000 * 100);
+        }
 
         QLabel* label = new QLabel(floatSlider);
         label->setText(name.c_str());
 
-        _vlabel = new QLabel(floatSlider);
-        _vlabel->setNum(_slider->sliderPosition() / 100);
-        _vlabel->setFixedWidth(45);
+        _textBox = new QLineEdit(floatSlider);
+        _textBox->setText(QString::number((float)_slider->sliderPosition() / 100));
+        _textBox->setFixedWidth(65);
 
-        connect(_slider, SIGNAL(valueChanged(int)), this, SLOT(updateFloatSlider(int)));
+        connect(_slider, SIGNAL(valueChanged(int)), this, SLOT(updateSlider(int)));
 
         QHBoxLayout* layout = new QHBoxLayout(floatSlider);
         layout->addWidget(label);
         layout->addWidget(_slider);
-        layout->addWidget(_vlabel);
+        layout->addWidget(_textBox);
 
         QWidgetAction* intSliderAction = new QWidgetAction(_contextMenu);
         intSliderAction->setDefaultWidget(floatSlider);
         _action = intSliderAction;
 
-        connect(_slider, SIGNAL(valueChanged(int)), this, SLOT(paramChanged(int)));
+        connect(_textBox, SIGNAL(textChanged(QString const&)), this, SLOT(paramChanged(QString const&)));
     }
     else if (_param.Type() == DspParameter::String)
     {
@@ -119,7 +150,11 @@
         label->setText(name.c_str());
 
         _textBox = new QLineEdit(textBox);
-        _textBox->setText(_param.GetString()->c_str());
+
+        if (_param.GetString())
+        {
+            _textBox->setText(_param.GetString()->c_str());
+        }
 
         QHBoxLayout* layout = new QHBoxLayout(textBox);
         layout->addWidget(label);
@@ -139,8 +174,11 @@
         label->setText(name.c_str());
 
         _textBox = new QLineEdit(fileBrowser);
-        _textBox->setEnabled(false);
-        _textBox->setText(_param.GetString()->c_str());
+
+        if (_param.GetString())
+        {
+            _textBox->setText(_param.GetString()->c_str());
+        }
 
         QPushButton* btnBrowse = new QPushButton(fileBrowser);
         btnBrowse->setText("Browse");
@@ -165,9 +203,13 @@
         label->setText(name.c_str());
 
         _listBox = new QComboBox(listBox);
-        for (size_t i = 0; i < _param.GetList()->size(); ++i)
+
+        if (_param.GetList())
         {
-            _listBox->addItem((*_param.GetList())[i].c_str());
+            for (size_t i = 0; i < _param.GetList()->size(); ++i)
+            {
+                _listBox->addItem((*_param.GetList())[i].c_str());
+            }
         }
 
         QHBoxLayout* layout = new QHBoxLayout(listBox);
@@ -198,21 +240,26 @@
     return _action;
 }
 
-DspParameter& DsprParam::param()
+DspParameter const& DsprParam::param()
 {
     return _param;
 }
 
-int DsprParam::compId()
+int DsprParam::compId() const
 {
     return _compId;
 }
 
-int DsprParam::paramId()
+int DsprParam::paramId() const
 {
     return _paramId;
 }
 
+std::string DsprParam::name() const
+{
+    return _name;
+}
+
 bool DsprParam::SetBool(bool const& value)
 {
     _settingParam = true;
@@ -320,26 +367,28 @@
     return result;
 }
 
+void DsprParam::paramChanged(bool value)
+{
+    if (_settingParam)
+    {
+        return;
+    }
+    if (_param.Type() == DspParameter::Bool)
+    {
+        _param.SetBool(value != 0);
+        emit boolUpdated(value != 0);
+    }
+}
+
 void DsprParam::paramChanged(int value)
 {
     if (_settingParam)
     {
         return;
     }
-    if (_param.Type() == DspParameter::Bool)
-    {
-        emit boolUpdated(value != 0);
-    }
-    else if (_param.Type() == DspParameter::Int)
-    {
-        emit intUpdated(value);
-    }
-    else if (_param.Type() == DspParameter::Float)
-    {
-        emit floatUpdated((float)value / 100.f);
-    }
-    else if (_param.Type() == DspParameter::List)
-    {
+    if (_param.Type() == DspParameter::List)
+    {
+        _param.SetInt(value);
         emit intUpdated(value);
     }
 }
@@ -350,12 +399,46 @@
     {
         return;
     }
-    if (_param.Type() == DspParameter::String)
-    {
+    if (_param.Type() == DspParameter::Int)
+    {
+        int value = newString.toInt();
+
+        _settingParam = true;
+        _slider->setValue(value);
+        if (value < _slider->minimum() || value > _slider->maximum())
+        {
+            value = _slider->sliderPosition();
+            _textBox->setText(QString::number(value));
+        }
+        _settingParam = false;
+
+        _param.SetInt(value);
+        emit intUpdated(value);
+    }
+    else if (_param.Type() == DspParameter::Float)
+    {
+        float value = newString.toFloat();
+
+        _settingParam = true;
+        _slider->setValue(value * 100);
+        if (value * 100 < _slider->minimum() || value * 100 > _slider->maximum())
+        {
+            value = (float)_slider->sliderPosition() / 100;
+            _textBox->setText(QString::number(value));
+        }
+        _settingParam = false;
+
+        _param.SetFloat(value);
+        emit floatUpdated(value);
+    }
+    else if (_param.Type() == DspParameter::String)
+    {
+        _param.SetString(newString.toUtf8().constData());
         emit stringUpdated(newString.toUtf8().constData());
     }
     else if (_param.Type() == DspParameter::FilePath)
     {
+        _param.SetString(newString.toUtf8().constData());
         emit stringUpdated(newString.toUtf8().constData());
     }
 }
@@ -372,9 +455,16 @@
     }
 }
 
-void DsprParam::updateFloatSlider(int value)
+void DsprParam::updateSlider(int value)
 {
-    _vlabel->setNum((float)value / 100);
+    if (_param.Type() == DspParameter::Int)
+    {
+        _textBox->setText(QString::number(value));
+    }
+    else if (_param.Type() == DspParameter::Float)
+    {
+        _textBox->setText(QString::number((float)value / 100));
+    }
 }
 
 void DsprParam::browseForFile()
 
=== modified file 'dspatcher/src/main.cpp'
--- dspatcher/src/main.cpp	2015-04-06 17:02:27 +0000
+++ dspatcher/src/main.cpp	2015-04-09 13:24:26 +0000
@@ -22,12 +22,10 @@
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 ************************************************************************/
 
-#include <DSPatch.h>
 #include <DsprController.h>
 #include <QtpMain.h>
 
 #include <QApplication>
-#include <QDir>
 
 int main(int argv, char* args[])
 {
@@ -35,46 +33,7 @@
     QtpMain mainWindow;
     mainWindow.show();
 
-    std::vector<DspPluginLoader> pluginLoaders;
-
-    // Load DSPatch plugins from "dspatchables" folder
-    QDir dir(PLUGIN_DIR);
-    QFileInfoList files = dir.entryInfoList();
-    foreach(QFileInfo const& file, files)
-    {
-        #ifdef _WIN32
-        if (file.isFile() && file.fileName().endsWith(".dll"))
-        #else
-        if (file.isFile())
-        #endif
-        {
-            QString path = file.absoluteFilePath();
-            DspPluginLoader loader(path.toUtf8().constData());
-            if (loader.IsLoaded())
-            {
-                pluginLoaders.push_back(loader);
-                std::map<std::string, DspParameter> params = loader.GetCreateParams();
-                DspComponent* comp = loader.Create(params);
-
-                QtpComp::CompInfo compInfo;
-                compInfo.typeId = pluginLoaders.size() - 1;
-                compInfo.typeName = file.baseName().mid(0, 3) == "lib" ? file.baseName().mid(3) : file.baseName();
-                for (int i = 0; i < comp->GetInputCount(); ++i)
-                {
-                    compInfo.inPins.append(comp->GetInputName(i).c_str());
-                }
-                for (int i = 0; i < comp->GetOutputCount(); ++i)
-                {
-                    compInfo.outPins.append(comp->GetOutputName(i).c_str());
-                }
-                mainWindow.registerComponent(compInfo);
-
-                delete comp;
-            }
-        }
-    }
-
-    DsprController controller(mainWindow.diagram(), pluginLoaders);
+    DsprController controller(mainWindow);
 
     return app.exec();
 }
 
=== added file 'dspatcher/update_install_names.sh'
--- dspatcher/update_install_names.sh	1970-01-01 00:00:00 +0000
+++ dspatcher/update_install_names.sh	2015-04-09 13:24:26 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+
+install_name_tool -id $dir/link/libDSPatch.dylib $dir/link/libDSPatch.dylib
+
+for file in $dir/dspatchables/*.dylib; do
+    install_name_tool -id $file $file
+    install_name_tool -change $(cut -d ' ' -f 1 <<< $(otool -L $file | grep libDSPatch.dylib)) $dir/link/libDSPatch.dylib $file
+done
 \ No newline at end of file
 
=== modified file 'qtpatcher/include/QtpMain.h'
--- qtpatcher/include/QtpMain.h	2015-04-07 16:21:36 +0000
+++ qtpatcher/include/QtpMain.h	2015-04-09 13:24:26 +0000
@@ -46,6 +46,7 @@
     QtpDiag* diagram();
 
     void registerComponent(QtpComp::CompInfo const& compInfo);
+    void unregisterComponents();
 
 private slots:
     void buttonGroupClicked(int id);
 
=== modified file 'qtpatcher/src/QtpMain.cpp'
--- qtpatcher/src/QtpMain.cpp	2015-04-07 16:21:36 +0000
+++ qtpatcher/src/QtpMain.cpp	2015-04-09 13:24:26 +0000
@@ -71,8 +71,7 @@
 
     _toolBox->deleteLater();
     _toolBox = new QToolBox;
-    _toolBox->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Ignored));
-    _toolBox->setMinimumWidth(_compWidget->sizeHint().width() + 15);
+    _toolBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Ignored);
     _toolBox->addItem(_compWidget, tr("Components"));
 
     centralWidget()->layout()->removeWidget(_view);
@@ -80,6 +79,19 @@
     centralWidget()->layout()->addWidget(_view);
 }
 
+void QtpMain::unregisterComponents()
+{
+    _buttonGroup->deleteLater();
+    _compWidget->deleteLater();
+    _toolBox->deleteLater();
+
+    createToolBox();
+
+    centralWidget()->layout()->removeWidget(_view);
+    centralWidget()->layout()->addWidget(_toolBox);
+    centralWidget()->layout()->addWidget(_view);
+}
+
 void QtpMain::buttonGroupClicked(int id)
 {
     QList<QAbstractButton*> buttons = _buttonGroup->buttons();
@@ -128,8 +140,7 @@
     _compWidget->setLayout(compLayout);
 
     _toolBox = new QToolBox;
-    _toolBox->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Ignored));
-    _toolBox->setMinimumWidth(150);
+    _toolBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Ignored);
     _toolBox->addItem(_compWidget, tr("Components"));
 }