changeset 1812:0fa6b7896968 plugin-path-config

Toward allowing the user to see (at least, and maybe change) the plugin path
author Chris Cannam
date Fri, 11 May 2018 17:02:53 +0100
parents 10b1af167576
children 2ca1c39c144b
files main/PreferencesDialog.cpp main/PreferencesDialog.h repoint-lock.json
diffstat 3 files changed, 31 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/main/PreferencesDialog.cpp	Fri May 11 16:59:57 2018 +0100
+++ b/main/PreferencesDialog.cpp	Fri May 11 17:02:53 2018 +0100
@@ -40,6 +40,8 @@
 #include "widgets/IconLoader.h"
 #include "widgets/ColourMapComboBox.h"
 #include "widgets/ColourComboBox.h"
+#include "widgets/PluginPathConfigurator.h"
+#include "widgets/WidgetScale.h"
 #include "base/Preferences.h"
 #include "base/ResourceFinder.h"
 #include "layer/ColourMapper.h"
@@ -276,7 +278,7 @@
     tempDirButton->setIcon(IconLoader().load("fileopen"));
     connect(tempDirButton, SIGNAL(clicked()),
             this, SLOT(tempDirButtonClicked()));
-    tempDirButton->setFixedSize(QSize(24, 24));
+    tempDirButton->setFixedSize(WidgetScale::scaleQSize(QSize(24, 24)));
 
     QCheckBox *showSplash = new QCheckBox;
     m_showSplash = prefs->getShowSplash();
@@ -576,7 +578,27 @@
     
     m_tabOrdering[AudioIOTab] = m_tabs->count();
     m_tabs->addTab(frame, tr("A&udio I/O"));
- 
+
+    // Plugins tab
+
+    frame = new QFrame;
+    subgrid = new QGridLayout;
+    frame->setLayout(subgrid);
+    row = 0;
+
+    PluginPathConfigurator *pathConfig = new PluginPathConfigurator(this);
+    QStringList path;
+    path << "/usr/lib/vamp";
+    path << "/usr/local/lib/vamp";
+    pathConfig->setPath(path, "VAMP_PATH");
+    
+    subgrid->addWidget(pathConfig, row++, 0, 1, 2);
+
+    subgrid->setRowStretch(row, 10);
+
+    m_tabOrdering[PluginTab] = m_tabs->count();
+    m_tabs->addTab(frame, tr("&Plugins"));
+    
     // General tab
 
     frame = new QFrame;
--- a/main/PreferencesDialog.h	Fri May 11 16:59:57 2018 +0100
+++ b/main/PreferencesDialog.h	Fri May 11 17:02:53 2018 +0100
@@ -41,7 +41,8 @@
         AudioIOTab,
         AppearanceTab,
         AnalysisTab,
-        TemplateTab
+        TemplateTab,
+        PluginTab
     };
     void switchToTab(Tab tab);
 
--- a/repoint-lock.json	Fri May 11 16:59:57 2018 +0100
+++ b/repoint-lock.json	Fri May 11 17:02:53 2018 +0100
@@ -1,13 +1,13 @@
 {
   "libraries": {
     "vamp-plugin-sdk": {
-      "pin": "8742125177ae"
+      "pin": "328cb056da44"
     },
     "svcore": {
-      "pin": "2b2b58ae8b59"
+      "pin": "91bb68146dfc"
     },
     "svgui": {
-      "pin": "51e6125627fa"
+      "pin": "abd52bd8d435"
     },
     "svapp": {
       "pin": "f03bc1d38cac"
@@ -19,7 +19,7 @@
       "pin": "dde809643316e7bb606fc14d66e55f07059bcf36"
     },
     "piper-cpp": {
-      "pin": "d81b56f1c7372ccf9d21f726d0fc122c2bf93484"
+      "pin": "cdd4160248d805872f99562ede541f3b2d175397"
     },
     "dataquay": {
       "pin": "807b55408d9e"
@@ -40,7 +40,7 @@
       "pin": "a69c1527268d"
     },
     "icons/scalable": {
-      "pin": "a0a78163e88e"
+      "pin": "42521013b9b1"
     }
   }
 }