ENH: Prompt user for generator when there is none.

      Many minor improvements, bug fixes, and style fixes.

1 files changed, 133 insertions, 72 deletions

diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index e718bc5..3a39c81 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -18,32 +18,46 @@
 #include "CMakeSetupDialog.h"
 
 #include <QFileDialog>
-#include <QThread>
 #include <QProgressBar>
 #include <QMessageBox>
 #include <QStatusBar>
 #include <QToolButton>
 #include <QDialogButtonBox>
 #include <QCloseEvent>
+#include <QCoreApplication>
 
 #include "QCMake.h"
 #include "QCMakeCacheView.h"
 
-// QCMake instance on a thread
-class QCMakeThread : public QThread
+QCMakeThread::QCMakeThread(QObject* p) 
+  : QThread(p), CMakeInstance(NULL)
 {
-public:
-  QCMakeThread(QObject* p) : QThread(p) { }
-  QCMake* CMakeInstance;
-
-protected:
-  virtual void run()
-  {
-    this->CMakeInstance = new QCMake;
-    this->exec();
-    delete this->CMakeInstance;
-  }
-};
+}
+
+QCMake* QCMakeThread::cmakeInstance() const
+{
+  return this->CMakeInstance;
+}
+
+void QCMakeThread::processEvents()
+{
+  QCoreApplication::processEvents();
+}
+
+void QCMakeThread::run()
+{
+  this->CMakeInstance = new QCMake;
+  // make the cmake thread to process events it receives from the GUI thread
+  QObject::connect(this->CMakeInstance, SIGNAL(progressChanged(QString, float)),
+                   this, SLOT(processEvents()), Qt::DirectConnection);
+  QObject::connect(this->CMakeInstance, SIGNAL(outputMessage(QString)),
+                   this, SLOT(processEvents()), Qt::DirectConnection);
+  // emit that this cmake thread is ready for use
+  emit this->cmakeInitialized();
+  this->exec();
+  delete this->CMakeInstance;
+  this->CMakeInstance = NULL;
+}
 
 CMakeSetupDialog::CMakeSetupDialog()
 {
@@ -65,25 +79,26 @@ CMakeSetupDialog::CMakeSetupDialog()
   
   // start the cmake worker thread
   this->CMakeThread = new QCMakeThread(this);
-  // TODO does this guarantee the QCMake instance is created before initialize is called?
-  QObject::connect(this->CMakeThread, SIGNAL(started()),
-                   this, SLOT(initialize()));  
+  QObject::connect(this->CMakeThread, SIGNAL(cmakeInitialized()),
+                   this, SLOT(initialize()), Qt::QueuedConnection);  
   this->CMakeThread->start();
 }
 
 void CMakeSetupDialog::initialize()
 {
   // now the cmake worker thread is running, lets make our connections to it
-  QObject::connect(this->CMakeThread->CMakeInstance, 
+  QObject::connect(this->CMakeThread->cmakeInstance(), 
       SIGNAL(propertiesChanged(const QCMakeCachePropertyList&)),
       this->CacheValues->cacheModel(),
       SLOT(setProperties(const QCMakeCachePropertyList&)));
 
   QObject::connect(this->ConfigureButton, SIGNAL(clicked(bool)),
                    this, SLOT(doConfigure()));
-  QObject::connect(this->CMakeThread->CMakeInstance, SIGNAL(configureDone(int)),
+  QObject::connect(this->CMakeThread->cmakeInstance(), 
+                   SIGNAL(configureDone(int)),
                    this, SLOT(finishConfigure(int)));
-  QObject::connect(this->CMakeThread->CMakeInstance, SIGNAL(generateDone(int)),
+  QObject::connect(this->CMakeThread->cmakeInstance(),
+                   SIGNAL(generateDone(int)),
                    this, SLOT(finishGenerate(int)));
 
   QObject::connect(this->GenerateButton, SIGNAL(clicked(bool)),
@@ -98,25 +113,31 @@ void CMakeSetupDialog::initialize()
                    this, SLOT(doBinaryBrowse()));
   
   QObject::connect(this->BinaryDirectory, SIGNAL(editTextChanged(QString)),
-                   this->CMakeThread->CMakeInstance, SLOT(setBinaryDirectory(QString)));
+                   this, SLOT(setBinaryDirectory(QString)));
   QObject::connect(this->SourceDirectory, SIGNAL(textChanged(QString)),
-                   this->CMakeThread->CMakeInstance, SLOT(setSourceDirectory(QString)));
+                   this->CMakeThread->cmakeInstance(),
+                   SLOT(setSourceDirectory(QString)));
 
-  QObject::connect(this->CMakeThread->CMakeInstance, SIGNAL(sourceDirChanged(QString)),
+  QObject::connect(this->CMakeThread->cmakeInstance(),
+                   SIGNAL(sourceDirChanged(QString)),
                    this, SLOT(updateSourceDirectory(QString)));
  
-  QObject::connect(this->CMakeThread->CMakeInstance, SIGNAL(progressChanged(QString, float)),
+  QObject::connect(this->CMakeThread->cmakeInstance(),
+                   SIGNAL(progressChanged(QString, float)),
                    this, SLOT(showProgress(QString,float)));
   
-  QObject::connect(this->CMakeThread->CMakeInstance, SIGNAL(error(QString, QString, bool*)),
-                   this, SLOT(error(QString,QString,bool*)), Qt::BlockingQueuedConnection);
+  QObject::connect(this->CMakeThread->cmakeInstance(),
+                   SIGNAL(error(QString, QString, bool*)),
+                   this, SLOT(error(QString,QString,bool*)),
+                   Qt::BlockingQueuedConnection);
 
   QObject::connect(this->InterruptButton, SIGNAL(clicked(bool)),
-                   this->CMakeThread->CMakeInstance, SLOT(interrupt()));
+                   this->CMakeThread->cmakeInstance(), SLOT(interrupt()));
   QObject::connect(this->InterruptButton, SIGNAL(clicked(bool)),
                    this, SLOT(doInterrupt()));
   
-  QObject::connect(this->CMakeThread->CMakeInstance, SIGNAL(outputMessage(QString)),
+  QObject::connect(this->CMakeThread->cmakeInstance(),
+                   SIGNAL(outputMessage(QString)),
                    this->Output, SLOT(append(QString)));
   
   QObject::connect(this->HelpButton, SIGNAL(clicked(bool)),
@@ -135,36 +156,45 @@ void CMakeSetupDialog::doConfigure()
   QDir dir(this->BinaryDirectory->currentText());
   if(!dir.exists())
     {
-    QString message = tr("Build directory does not exist, should I create it?\n\n"
+    QString message = tr("Build directory does not exist, "
+                         "should I create it?\n\n"
                          "Directory: ");
     message += this->BinaryDirectory->currentText();
     QString title = tr("Create Directory");
-    QMessageBox::StandardButton btn =
-      QMessageBox::information(this, title, message, QMessageBox::Yes | QMessageBox::No);
+    QMessageBox::StandardButton btn;
+    btn = QMessageBox::information(this, title, message, 
+                                   QMessageBox::Yes | QMessageBox::No);
     if(btn == QMessageBox::No)
       {
       return;
       }
     dir.mkpath(".");
     }
+
+  // prompt for generator if one doesn't exist
+  if(this->CMakeThread->cmakeInstance()->generator().isEmpty())
+    {
+    this->promptForGenerator();
+    }
+
   this->InterruptButton->setEnabled(true);
   this->setEnabledState(false);
   this->Output->clear();
-  QMetaObject::invokeMethod(this->CMakeThread->CMakeInstance,
+  QMetaObject::invokeMethod(this->CMakeThread->cmakeInstance(),
     "setProperties", Qt::QueuedConnection, 
     Q_ARG(QCMakeCachePropertyList,
       this->CacheValues->cacheModel()->properties()));
-  QMetaObject::invokeMethod(this->CMakeThread->CMakeInstance,
+  QMetaObject::invokeMethod(this->CMakeThread->cmakeInstance(),
     "configure", Qt::QueuedConnection);
 }
 
-void CMakeSetupDialog::finishConfigure(int error)
+void CMakeSetupDialog::finishConfigure(int err)
 {
   this->InterruptButton->setEnabled(false);
   this->setEnabledState(true);
   this->ProgressBar->reset();
   this->statusBar()->showMessage(tr("Configure Done"), 2000);
-  if(error != 0)
+  if(err != 0)
     {
     QMessageBox::critical(this, tr("Error"), 
       tr("Error in configuration process, project files may be invalid"), 
@@ -172,13 +202,13 @@ void CMakeSetupDialog::finishConfigure(int error)
     }
 }
 
-void CMakeSetupDialog::finishGenerate(int error)
+void CMakeSetupDialog::finishGenerate(int err)
 {
   this->InterruptButton->setEnabled(false);
   this->setEnabledState(true);
   this->ProgressBar->reset();
   this->statusBar()->showMessage(tr("Generate Done"), 2000);
-  if(error != 0)
+  if(err != 0)
     {
     QMessageBox::critical(this, tr("Error"), 
       tr("Error in generation process, project files may be invalid"),
@@ -195,19 +225,27 @@ void CMakeSetupDialog::doOk()
   this->InterruptButton->setEnabled(true);
   this->setEnabledState(false);
   this->Output->clear();
-  QMetaObject::invokeMethod(this->CMakeThread->CMakeInstance,
+  QMetaObject::invokeMethod(this->CMakeThread->cmakeInstance(),
     "generate", Qt::QueuedConnection);
 }
   
 void CMakeSetupDialog::closeEvent(QCloseEvent* e)
 {
+  // don't close if we're busy
+  if(this->InterruptButton->isEnabled())
+    {
+    e->ignore();
+    }
+  
+  // prompt for close if there are unsaved changes
   if(this->CacheValues->cacheModel()->isDirty())
     {
     QString message = tr("You have changed options but not rebuilt, "
                     "are you sure you want to exit?");
     QString title = tr("Confirm Exit");
-    QMessageBox::StandardButton btn =
-      QMessageBox::critical(this, title, message, QMessageBox::Yes | QMessageBox::No);
+    QMessageBox::StandardButton btn;
+    btn = QMessageBox::critical(this, title, message,
+                                QMessageBox::Yes | QMessageBox::No);
     if(btn == QMessageBox::No)
       {
       e->ignore();
@@ -217,30 +255,31 @@ void CMakeSetupDialog::closeEvent(QCloseEvent* e)
 
 void CMakeSetupDialog::doHelp()
 {
-  QString msg = tr("CMake is used to configure and generate build files for"
-    "software projects.   The basic steps for configuring a project are as"
-    "follows:\r\n\r\n1. Select the source directory for the project.  This should"
-    "contain the CMakeLists.txt files for the project.\r\n\r\n2. Select the build"
-    "directory for the project.   This is the directory where the project will be"
-    "built.  It can be the same or a different directory than the source"
-    "directory.   For easy clean up, a separate build directory is recommended."
-    "CMake will create the directory if it does not exist.\r\n\r\n3. Once the"
-    "source and binary directories are selected, it is time to press the"
-    "Configure button.  This will cause CMake to read all of the input files and"
-    "discover all the variables used by the project.   The first time a variable"
-    "is displayed it will be in Red.   Users should inspect red variables making"
-    "sure the values are correct.   For some projects the Configure process can"
-    "be iterative, so continue to press the Configure button until there are no"
-    "longer red entries.\r\n\r\n4. Once there are no longer red entries, you"
-    "should click the OK button.  This will write the build files to the build"
+  QString msg = tr("CMake is used to configure and generate build files for "
+    "software projects.   The basic steps for configuring a project are as "
+    "follows:\r\n\r\n1. Select the source directory for the project.  This should "
+    "contain the CMakeLists.txt files for the project.\r\n\r\n2. Select the build "
+    "directory for the project.   This is the directory where the project will be "
+    "built.  It can be the same or a different directory than the source "
+    "directory.   For easy clean up, a separate build directory is recommended. "
+    "CMake will create the directory if it does not exist.\r\n\r\n3. Once the "
+    "source and binary directories are selected, it is time to press the "
+    "Configure button.  This will cause CMake to read all of the input files and "
+    "discover all the variables used by the project.   The first time a variable "
+    "is displayed it will be in Red.   Users should inspect red variables making "
+    "sure the values are correct.   For some projects the Configure process can "
+    "be iterative, so continue to press the Configure button until there are no "
+    "longer red entries.\r\n\r\n4. Once there are no longer red entries, you "
+    "should click the OK button.  This will write the build files to the build "
     "directory and exit CMake.");
 
   QDialog dialog;
+  dialog.setWindowTitle(tr("CMakeSetup Help"));
   QVBoxLayout* l = new QVBoxLayout(&dialog);
-  QLabel* label = new QLabel(&dialog);
-  l->addWidget(label);
-  label->setText(msg);
-  label->setWordWrap(true);
+  QLabel* lab = new QLabel(&dialog);
+  l->addWidget(lab);
+  lab->setText(msg);
+  lab->setWordWrap(true);
   QDialogButtonBox* btns = new QDialogButtonBox(QDialogButtonBox::Ok,
                                                 Qt::Horizontal, &dialog);
   QObject::connect(btns, SIGNAL(accepted()), &dialog, SLOT(accept()));
@@ -276,7 +315,7 @@ void CMakeSetupDialog::doBinaryBrowse()
 {
   QString dir = QFileDialog::getExistingDirectory(this, 
     tr("Enter Path to Build"), this->BinaryDirectory->currentText());
-  if(!dir.isEmpty())
+  if(!dir.isEmpty() && dir != this->BinaryDirectory->currentText())
     {
     this->setBinaryDirectory(dir);
     }
@@ -284,12 +323,11 @@ void CMakeSetupDialog::doBinaryBrowse()
 
 void CMakeSetupDialog::setBinaryDirectory(const QString& dir)
 {
-  if(dir != this->BinaryDirectory->currentText())
-    {
-    this->CacheValues->cacheModel()->setProperties(QCMakeCachePropertyList());
-    this->Output->clear();
-    this->BinaryDirectory->setEditText(dir);
-    }
+  this->CacheValues->cacheModel()->clear();
+  this->Output->clear();
+  this->BinaryDirectory->setEditText(dir);
+  QMetaObject::invokeMethod(this->CMakeThread->cmakeInstance(),
+    "setBinaryDirectory", Qt::QueuedConnection, Q_ARG(QString, dir));
 }
 
 void CMakeSetupDialog::showProgress(const QString& msg, float percent)
@@ -298,10 +336,12 @@ void CMakeSetupDialog::showProgress(const QString& msg, float percent)
   this->ProgressBar->setValue(qRound(percent * 100));
 }
   
-void CMakeSetupDialog::error(const QString& title, const QString& message, bool* cancel)
+void CMakeSetupDialog::error(const QString& title, const QString& message, 
+                             bool* cancel)
 {
-  QMessageBox::StandardButton btn =
-    QMessageBox::critical(this, title, message, QMessageBox::Ok | QMessageBox::Cancel);
+  QMessageBox::StandardButton btn;
+  btn = QMessageBox::critical(this, title, message,
+                              QMessageBox::Ok | QMessageBox::Cancel);
   if(btn == QMessageBox::Cancel)
     {
     *cancel = false;
@@ -318,7 +358,28 @@ void CMakeSetupDialog::setEnabledState(bool enabled)
   this->ConfigureButton->setEnabled(enabled);
   this->GenerateButton->setEnabled(enabled);
   this->CancelButton->setEnabled(enabled);
-  this->HelpButton->setEnabled(enabled);
 }
 
+void CMakeSetupDialog::promptForGenerator()
+{
+  QStringList gens = this->CMakeThread->cmakeInstance()->availableGenerators();
+  QDialog dialog;
+  dialog.setWindowTitle(tr("CMakeSetup choose generator"));
+  QLabel* lab = new QLabel(&dialog);
+  lab->setText(tr("Please select what build system you want CMake to generate files for.\n"
+                    "You should select the tool that you will use to build the project.\n"
+                    "Press OK once you have made your selection."));
+  QComboBox* combo = new QComboBox(&dialog);
+  combo->addItems(gens);
+  QDialogButtonBox* btns = new QDialogButtonBox(QDialogButtonBox::Ok,
+                                                Qt::Horizontal, &dialog);
+  QObject::connect(btns, SIGNAL(accepted()), &dialog, SLOT(accept()));
+  
+  QVBoxLayout* l = new QVBoxLayout(&dialog);
+  l->addWidget(lab);
+  l->addWidget(combo);
+  l->addWidget(btns);
+  dialog.exec();
+  this->CMakeThread->cmakeInstance()->setGenerator(combo->currentText());
+}