comparison widgets/PluginParameterDialog.cpp @ 282:4edaff85875d

* Add mouse actions to key and mouse reference dialog
* Use QDialogButtonBox in all dialogs, for proper button ordering across
  platforms (requires Qt 4.2)
* Fix #1733610 program does not exit if preferences dialog visible on close

 #include <QScrollArea>
 #include <QPushButton>
 #include <QMessageBox>
 #include <QComboBox>
 #include <QSettings>
+#include <QDialogButtonBox>
 
 PluginParameterDialog::PluginParameterDialog(Vamp::PluginBase *plugin,
 					     QWidget *parent) :
     QDialog(parent),
     m_plugin(plugin),

     m_advanced->setVisible(false);
 
     hbox->addWidget(m_advancedButton);
     m_advancedButton->hide();
 
-    QPushButton *ok = new QPushButton(tr("OK"));
-    QPushButton *cancel = new QPushButton(tr("Cancel"));
-    ok->setDefault(true);
-    hbox->addStretch(10);
-    hbox->addWidget(ok);
-    hbox->addWidget(cancel);
-    connect(ok, SIGNAL(clicked()), this, SLOT(accept()));
-    connect(cancel, SIGNAL(clicked()), this, SLOT(reject()));
+    QDialogButtonBox *bb = new QDialogButtonBox(QDialogButtonBox::Ok |
+                                                QDialogButtonBox::Cancel);
+    hbox->addWidget(bb);
+    connect(bb, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(bb, SIGNAL(rejected()), this, SLOT(reject()));
 
     setAdvancedVisible(m_advancedVisible);
 }
 
 PluginParameterDialog::~PluginParameterDialog()

         }
         if (!found) {
             blockSizeCombo->addItem(QString("%1").arg(size));
             blockSizeCombo->setCurrentIndex(blockSizeCombo->count() - 1);
         }
-        blockSizeCombo->setValidator(new QIntValidator(1, pow(2, 18), this));
+        blockSizeCombo->setValidator(new QIntValidator(1, int(pow(2, 18)), this));
         connect(blockSizeCombo, SIGNAL(editTextChanged(const QString &)),
                 this, SLOT(blockSizeComboChanged(const QString &)));
         windowLayout->addWidget(blockSizeCombo, 0, 1);
 
         windowLayout->addWidget(new QLabel(tr("Window increment:")), 1, 0);

         }
         if (!found) {
             incrementCombo->addItem(QString("%1").arg(increment));
             incrementCombo->setCurrentIndex(incrementCombo->count() - 1);
         }
-        incrementCombo->setValidator(new QIntValidator(1, pow(2, 18), this));
+        incrementCombo->setValidator(new QIntValidator(1, int(pow(2, 18)), this));
         connect(incrementCombo, SIGNAL(editTextChanged(const QString &)),
                 this, SLOT(incrementComboChanged(const QString &)));
         windowLayout->addWidget(incrementCombo, 1, 1);
         
         if (showFrequencyDomainOptions) {