[Cmake-commits] [cmake-commits] hoffman committed CMakeSetupDialog.cxx 1.40.2.3 1.40.2.4 CMakeSetupDialog.h 1.21.2.1 1.21.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeSetupDialog.cxx CMakeSetupDialog.h 
Log Message:
ENH: merge in from main tree


Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.40.2.3
retrieving revision 1.40.2.4
diff -C 2 -d -r1.40.2.3 -r1.40.2.4
*** CMakeSetupDialog.cxx	8 Apr 2008 16:22:51 -0000	1.40.2.3
--- CMakeSetupDialog.cxx	21 Apr 2008 00:44:53 -0000	1.40.2.4
***************
*** 139,142 ****
--- 139,143 ----
    QFont outputFont("Courier");
    this->Output->setFont(outputFont);
+   this->ErrorFormat.setForeground(QBrush(Qt::red));
  
    // start the cmake worker thread
***************
*** 513,542 ****
    this->ProgressBar->setValue(qRound(percent * 100));
  }
!   
  void CMakeSetupDialog::error(const QString& message)
  {
!   QStringList messages = message.split('\n');
!   foreach(QString m, messages)
!     {
!     // make sure we escape html tags in the cmake messages
!     m.replace(QString("&"), QString("&"));
!     m.replace(QString("<"), QString("&lt;"));
!     m.replace(QString(">"), QString("&gt;"));
!     m.replace(QString(" "), QString("&nbsp;"));
!     this->Output->append(QString("<b><font color=red>%1</font></b>").arg(m));
!     }
  }
  
  void CMakeSetupDialog::message(const QString& message)
  {
!   QStringList messages = message.split('\n');
!   foreach(QString m, messages)
!     {
!     // make sure we escape html tags in the cmake messages
!     m.replace(QString("&"), QString("&amp;"));
!     m.replace(QString("<"), QString("&lt;"));
!     m.replace(QString(">"), QString("&gt;"));
!     this->Output->append(m);
!     }
  }
  
--- 514,528 ----
    this->ProgressBar->setValue(qRound(percent * 100));
  }
! 
  void CMakeSetupDialog::error(const QString& message)
  {
!   this->Output->setCurrentCharFormat(this->ErrorFormat);
!   this->Output->append(message);
  }
  
  void CMakeSetupDialog::message(const QString& message)
  {
!   this->Output->setCurrentCharFormat(this->MessageFormat);
!   this->Output->append(message);
  }
  

Index: CMakeSetupDialog.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.h,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C 2 -d -r1.21.2.1 -r1.21.2.2
*** CMakeSetupDialog.h	8 Apr 2008 16:22:51 -0000	1.21.2.1
--- CMakeSetupDialog.h	21 Apr 2008 00:44:54 -0000	1.21.2.2
***************
*** 100,103 ****
--- 100,106 ----
    State CurrentState;
  
+   QTextCharFormat ErrorFormat;
+   QTextCharFormat MessageFormat;
+ 
  };