[Cmake-commits] [cmake-commits] clinton committed CMakeSetupDialog.cxx 1.43 1.44 CMakeSetupDialog.h 1.21 1.22

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv4658

Modified Files:
	CMakeSetupDialog.cxx CMakeSetupDialog.h 
Log Message:

ENH:  Allow cancelling the dialog that prompts for the generator.



Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** CMakeSetupDialog.cxx	28 Mar 2008 16:53:31 -0000	1.43
--- CMakeSetupDialog.cxx	2 Apr 2008 18:01:37 -0000	1.44
***************
*** 238,241 ****
--- 238,242 ----
      }
  
+   // make sure build directory exists
    QString bindir = this->CMakeThread->cmakeInstance()->binaryDirectory();
    QDir dir(bindir);
***************
*** 258,265 ****
      }
  
!   // prompt for generator if one doesn't exist
    if(this->CMakeThread->cmakeInstance()->generator().isEmpty())
      {
!     this->promptForGenerator();
      }
  
--- 259,269 ----
      }
  
!   // prompt for generator if it hasn't been set
    if(this->CMakeThread->cmakeInstance()->generator().isEmpty())
      {
!     if(!this->promptForGenerator())
!       {
!       return;
!       }
      }
  
***************
*** 521,525 ****
  }
  
! void CMakeSetupDialog::promptForGenerator()
  {
    QSettings settings;
--- 525,529 ----
  }
  
! bool CMakeSetupDialog::promptForGenerator()
  {
    QSettings settings;
***************
*** 541,547 ****
      combo->setCurrentIndex(idx);
      }
!   QDialogButtonBox* btns = new QDialogButtonBox(QDialogButtonBox::Ok,
                                                  Qt::Horizontal, &dialog);
    QObject::connect(btns, SIGNAL(accepted()), &dialog, SLOT(accept()));
    
    QVBoxLayout* l = new QVBoxLayout(&dialog);
--- 545,553 ----
      combo->setCurrentIndex(idx);
      }
!   QDialogButtonBox* btns = new QDialogButtonBox(QDialogButtonBox::Ok |
!                                                 QDialogButtonBox::Cancel,
                                                  Qt::Horizontal, &dialog);
    QObject::connect(btns, SIGNAL(accepted()), &dialog, SLOT(accept()));
+   QObject::connect(btns, SIGNAL(rejected()), &dialog, SLOT(reject()));
    
    QVBoxLayout* l = new QVBoxLayout(&dialog);
***************
*** 549,557 ****
    l->addWidget(combo);
    l->addWidget(btns);
!   dialog.exec();
!   
!   lastGen = combo->currentText();
!   settings.setValue("LastGenerator", lastGen);
!   this->CMakeThread->cmakeInstance()->setGenerator(combo->currentText());
  }
  
--- 555,567 ----
    l->addWidget(combo);
    l->addWidget(btns);
!   if(dialog.exec() == QDialog::Accepted)
!     {
!     lastGen = combo->currentText();
!     settings.setValue("LastGenerator", lastGen);
!     this->CMakeThread->cmakeInstance()->setGenerator(combo->currentText());
!     return true;
!     }
! 
!   return false;
  }
  

Index: CMakeSetupDialog.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** CMakeSetupDialog.h	12 Mar 2008 02:51:56 -0000	1.21
--- CMakeSetupDialog.h	2 Apr 2008 18:01:37 -0000	1.22
***************
*** 61,65 ****
    void showProgress(const QString& msg, float percent);
    void setEnabledState(bool);
!   void promptForGenerator();
    void updateGeneratorLabel(const QString& gen);
    void setExitAfterGenerate(bool);
--- 61,65 ----
    void showProgress(const QString& msg, float percent);
    void setEnabledState(bool);
!   bool promptForGenerator();
    void updateGeneratorLabel(const QString& gen);
    void setExitAfterGenerate(bool);