Merge branch 'release/2.2.3'

Author: guidotack

MiniZincIDE/CHANGES

@@ -1,4 +1,5 @@
-2017-05-17
+  v2.2.3
+  - Only run solution checker if it is enabled in the solver configuration dialog.
   v2.2.2
   - Add line/column display in status bar. Fixes #65.
   - Optional parameters don't have to be defined in input dialog.

MiniZincIDE/MiniZincIDE.pro

@@ -19,7 +19,7 @@ greaterThan(QT_MAJOR_VERSION, 4): {
 TARGET = MiniZincIDE
 TEMPLATE = app
 
-VERSION = 2.2.2
+VERSION = 2.2.3
 DEFINES += MINIZINC_IDE_VERSION=\\\"$$VERSION\\\"
 
 bundled {

MiniZincIDE/mainwindow.cpp

@@ -1369,7 +1369,7 @@ void MainWindow::tabChange(int tab) {
                 checkFile.replace(checkFile.length()-1,1,"c");
                 haveChecker = project.containsFile(checkFile) || project.containsFile(checkFile+".mzn");
             }
-            if (haveChecker && (ui->defaultBehaviourButton->isChecked() || ui->conf_check_solutions->isChecked())) {
+            if (haveChecker && ui->conf_check_solutions->isChecked()) {
                 ui->actionRun->setText("Run + check");
             } else {
                 ui->actionRun->setText("Run");
@@ -1454,7 +1454,7 @@ QStringList MainWindow::parseConf(const ConfMode& confMode, const QString& model
         ret << "-s";
     if ( (confMode==CONF_COMPILE || confMode==CONF_CHECKARGS) && !ui->conf_cmd_params->text().isEmpty())
         ret << "-D" << ui->conf_cmd_params->text();
-    if (confMode==CONF_COMPILE && (ui->defaultBehaviourButton->isChecked() || ui->conf_check_solutions->isChecked()) && haveCompilerCheck) {
+    if (confMode==CONF_COMPILE && ui->conf_check_solutions->isChecked() && haveCompilerCheck) {
         if (modelFile.endsWith(".mzn")) {
             QString checkFile = modelFile;
             checkFile.replace(checkFile.length()-1,1,"c");
@@ -4148,3 +4148,8 @@ void MainWindow::on_conf_dock_widget_visibilityChanged(bool visible)
         ui->actionEditSolverConfig->setText("Show configuration editor...");
     }
 }
+
+void MainWindow::on_conf_check_solutions_toggled(bool checked)
+{
+    tabChange(ui->tabWidget->currentIndex());
+}

MiniZincIDE/mainwindow.h

@@ -307,6 +307,8 @@ private slots:
     void on_conf_default_toggled(bool checked);
     void on_conf_dock_widget_visibilityChanged(bool visible);
 
+    void on_conf_check_solutions_toggled(bool checked);
+
 protected:
     virtual void closeEvent(QCloseEvent*);
     virtual void dragEnterEvent(QDragEnterEvent *);