diff widgets/PluginParameterDialog.cpp @ 1324:13d9b422f7fe zoom

Merge from default branch

--- a/widgets/PluginParameterDialog.cpp	Mon Dec 12 15:18:52 2016 +0000
+++ b/widgets/PluginParameterDialog.cpp	Mon Sep 17 13:51:31 2018 +0100
@@ -20,6 +20,7 @@
 
 #include "TextAbbrev.h"
 #include "IconLoader.h"
+#include "WidgetScale.h"
 
 #include <vamp-hostsdk/Plugin.h>
 #include <vamp-hostsdk/PluginHostAdapter.h>
@@ -43,7 +44,7 @@
 #include "base/Debug.h"
 
 PluginParameterDialog::PluginParameterDialog(Vamp::PluginBase *plugin,
-					     QWidget *parent) :
+                                             QWidget *parent) :
     QDialog(parent),
     m_plugin(plugin),
     m_channel(-1),
@@ -88,10 +89,6 @@
     QLabel *copyrightLabel = new QLabel(plugin->getCopyright().c_str());
     copyrightLabel->setWordWrap(true);
 
-//    QLabel *typeLabel = new QLabel(plugin->getType().c_str());
-//    typeLabel->setWordWrap(true);
-//    typeLabel->setFont(boldFont);
-
     QLabel *descriptionLabel = 0;
     if (plugin->getDescription() != "") {
         descriptionLabel = new QLabel(plugin->getDescription().c_str());
@@ -108,7 +105,7 @@
 
     m_moreInfo = new QPushButton;
     m_moreInfo->setIcon(IconLoader().load("info"));
-    m_moreInfo->setFixedSize(QSize(16, 16));
+    m_moreInfo->setFixedSize(WidgetScale::scaleQSize(QSize(16, 16)));
     connect(m_moreInfo, SIGNAL(clicked()), this, SLOT(moreInfo()));
     subgrid->addWidget(m_moreInfo, row, 2, Qt::AlignTop | Qt::AlignRight);
     m_moreInfo->hide();
@@ -116,9 +113,6 @@
     row++;
 
     if (descriptionLabel) {
-//        label = new QLabel(tr("Description:"));
-//        label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-//        subgrid->addWidget(label, row, 0);
         subgrid->addWidget(descriptionLabel, row, 1, 1, 2);
         row++;
     }
@@ -131,12 +125,6 @@
         row++;
     }
 
-//    label = new QLabel(tr("Type:"));
-//    label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-//    subgrid->addWidget(label, row, 0);
-//    subgrid->addWidget(typeLabel, row, 1);
-//    row++;
-
     label = new QLabel(tr("Maker:"));
     label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
     subgrid->addWidget(label, row, 0);
@@ -595,8 +583,6 @@
 void
 PluginParameterDialog::setAdvancedVisible(bool visible)
 {
-//    m_advanced->setVisible(visible);
-
     if (visible) {
         m_advancedButton->setText(tr("Advanced <<"));
         m_advancedButton->setChecked(true);
@@ -607,22 +593,14 @@
         m_advancedButton->setChecked(false);
     }
 
-//    cerr << "resize to " << sizeHint().width() << " x " << sizeHint().height() << endl;
-
-//    setMinimumHeight(sizeHint().height());
     adjustSize();
 
-//    (sizeHint());
-
     m_advancedVisible = visible;
 
     QSettings settings;
     settings.beginGroup("PluginParameterDialog");
     settings.setValue("advancedvisible", visible);
     settings.endGroup();
-
-//    if (visible) setMaximumHeight(sizeHint().height());
-//    adjustSize();
 }
 
 void