[Cmake-commits] [cmake-commits] clinton committed CMakeSetupDialog.cxx 1.60 1.61 CMakeSetupDialog.h 1.30 1.31

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Sep 4 16:43:13 EDT 2009


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

Modified Files:
	CMakeSetupDialog.cxx CMakeSetupDialog.h 
Log Message:
fix focus fighting between search field and cache value editors


Index: CMakeSetupDialog.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C 2 -d -r1.30 -r1.31
*** CMakeSetupDialog.h	17 Jul 2009 18:38:36 -0000	1.30
--- CMakeSetupDialog.h	4 Sep 2009 20:43:07 -0000	1.31
***************
*** 78,81 ****
--- 78,82 ----
    void setViewType(int);
    void showUserChanges();
+   void setSearchFilter(const QString& str);
  
  protected:

Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.60
retrieving revision 1.61
diff -C 2 -d -r1.60 -r1.61
*** CMakeSetupDialog.cxx	17 Jul 2009 18:51:31 -0000	1.60
--- CMakeSetupDialog.cxx	4 Sep 2009 20:43:06 -0000	1.61
***************
*** 222,226 ****
                     this, SLOT(setViewType(int)));
    QObject::connect(this->Search, SIGNAL(textChanged(QString)), 
!                    this->CacheValues, SLOT(setSearchFilter(QString)));
    
    QObject::connect(this->CMakeThread->cmakeInstance(),
--- 222,226 ----
                     this, SLOT(setViewType(int)));
    QObject::connect(this->Search, SIGNAL(textChanged(QString)), 
!                    this, SLOT(setSearchFilter(QString)));
    
    QObject::connect(this->CMakeThread->cmakeInstance(),
***************
*** 1032,1033 ****
--- 1032,1040 ----
  }
  
+ void CMakeSetupDialog::setSearchFilter(const QString& str)
+ {
+   this->CacheValues->selectionModel()->clear();
+   this->CacheValues->setSearchFilter(str);
+ }
+ 
+ 



More information about the Cmake-commits mailing list