[cmake-commits] clinton committed CMakeSetupDialog.cxx 1.31 1.32 QCMakeCacheView.cxx 1.23 1.24

[cmake-commits at cmake.org]

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

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

ENH: Remove CurrentChanged from the table view's edit triggers.
     It results in editor issues when modifying the view.
     Remove workarounds for some of those issues.



Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- CMakeSetupDialog.cxx	8 Feb 2008 18:47:08 -0000	1.31
+++ CMakeSetupDialog.cxx	13 Feb 2008 18:58:35 -0000	1.32
@@ -695,7 +695,6 @@
     {
     pidxs.append(i);
     }
-  this->CacheValues->selectionModel()->clear();
   foreach(QPersistentModelIndex pi, pidxs)
     {
     this->CacheValues->model()->removeRow(pi.row());

Index: QCMakeCacheView.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMakeCacheView.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- QCMakeCacheView.cxx	8 Feb 2008 15:42:14 -0000	1.23
+++ QCMakeCacheView.cxx	13 Feb 2008 18:58:35 -0000	1.24
@@ -70,7 +70,10 @@
   QCMakeCacheModelDelegate* delegate = new QCMakeCacheModelDelegate(this);
   this->setItemDelegate(delegate);
   
-  this->setEditTriggers(QAbstractItemView::AllEditTriggers);
+  this->setEditTriggers(QAbstractItemView::DoubleClicked |
+                        QAbstractItemView::SelectedClicked |
+                        QAbstractItemView::EditKeyPressed |
+                        QAbstractItemView::AnyKeyPressed);
 
   // set up headers and sizes
   int h = 0;
@@ -146,7 +149,6 @@
 
 void QCMakeCacheView::setSearchFilter(const QString& s)
 {
-  this->selectionModel()->clear();
   this->SearchFilter->setFilterFixedString(s);
 }