[Cmake-commits] [cmake-commits] hoffman committed CMakeSetupDialog.cxx 1.40.2.6 1.40.2.7 CMakeSetupDialog.h 1.21.2.4 1.21.2.5 CMakeSetupDialog.ui 1.16.2.2 1.16.2.3 QCMakeCacheView.cxx 1.26.2.3 1.26.2.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Sun Jul 13 17:55:29 EDT 2008
Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv32502/Source/QtDialog
Modified Files:
Tag: CMake-2-6
CMakeSetupDialog.cxx CMakeSetupDialog.h CMakeSetupDialog.ui
QCMakeCacheView.cxx
Log Message:
ENH: Merge from head create RC7
Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.40.2.6
retrieving revision 1.40.2.7
diff -C 2 -d -r1.40.2.6 -r1.40.2.7
*** CMakeSetupDialog.cxx 25 Jun 2008 13:51:49 -0000 1.40.2.6
--- CMakeSetupDialog.cxx 13 Jul 2008 21:55:25 -0000 1.40.2.7
***************
*** 79,85 ****
bool groupView = settings.value("GroupView", false).toBool();
! this->CacheValues->cacheModel()->setViewType(groupView ?
! QCMakeCacheModel::GroupView : QCMakeCacheModel::FlatView);
! this->CacheValues->setRootIsDecorated(groupView);
QMenu* FileMenu = this->menuBar()->addMenu(tr("&File"));
--- 79,87 ----
bool groupView = settings.value("GroupView", false).toBool();
! if(groupView)
! {
! this->setViewType(2);
! this->ViewType->setCurrentIndex(2);
! }
QMenu* FileMenu = this->menuBar()->addMenu(tr("&File"));
***************
*** 119,127 ****
OptionsMenu->addSeparator();
- QAction* groupAction = OptionsMenu->addAction(tr("&Group Entries"));
- groupAction->setCheckable(true);
- groupAction->setChecked(this->CacheValues->cacheModel()->viewType() == QCMakeCacheModel::GroupView);
- QObject::connect(groupAction, SIGNAL(toggled(bool)),
- this, SLOT(toggleGroupView(bool)));
QAction* expandAction = OptionsMenu->addAction(tr("&Expand Grouped Entries"));
QObject::connect(expandAction, SIGNAL(triggered(bool)),
--- 121,124 ----
***************
*** 215,220 ****
this, SLOT(message(QString)));
! QObject::connect(this->Advanced, SIGNAL(clicked(bool)),
! this->CacheValues, SLOT(setShowAdvanced(bool)));
QObject::connect(this->Search, SIGNAL(textChanged(QString)),
this->CacheValues, SLOT(setSearchFilter(QString)));
--- 212,217 ----
this, SLOT(message(QString)));
! QObject::connect(this->ViewType, SIGNAL(currentIndexChanged(int)),
! this, SLOT(setViewType(int)));
QObject::connect(this->Search, SIGNAL(textChanged(QString)),
this->CacheValues, SLOT(setSearchFilter(QString)));
***************
*** 932,943 ****
}
! void CMakeSetupDialog::toggleGroupView(bool f)
{
! this->CacheValues->cacheModel()->setViewType(f ? QCMakeCacheModel::GroupView : QCMakeCacheModel::FlatView);
! this->CacheValues->setRootIsDecorated(f);
QSettings settings;
settings.beginGroup("Settings/StartPath");
! settings.setValue("GroupView", this->CacheValues->cacheModel()->viewType() == QCMakeCacheModel::GroupView);
}
--- 929,957 ----
}
! void CMakeSetupDialog::setViewType(int v)
{
! if(v == 0) // simple view
! {
! this->CacheValues->cacheModel()->setViewType(QCMakeCacheModel::FlatView);
! this->CacheValues->setRootIsDecorated(false);
! this->CacheValues->setShowAdvanced(false);
! }
! else if(v == 1) // advanced view
! {
! this->CacheValues->cacheModel()->setViewType(QCMakeCacheModel::FlatView);
! this->CacheValues->setRootIsDecorated(false);
! this->CacheValues->setShowAdvanced(true);
! }
! else if(v == 2) // grouped view
! {
! this->CacheValues->cacheModel()->setViewType(QCMakeCacheModel::GroupView);
! this->CacheValues->setRootIsDecorated(true);
! this->CacheValues->setShowAdvanced(true);
! }
QSettings settings;
settings.beginGroup("Settings/StartPath");
! settings.setValue("GroupView", v == 2);
!
}
Index: CMakeSetupDialog.ui
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.ui,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -C 2 -d -r1.16.2.2 -r1.16.2.3
*** CMakeSetupDialog.ui 25 Jun 2008 13:51:50 -0000 1.16.2.2
--- CMakeSetupDialog.ui 13 Jul 2008 21:55:25 -0000 1.16.2.3
***************
*** 128,135 ****
</item>
<item>
! <widget class="QCheckBox" name="Advanced" >
<property name="text" >
! <string>Show Ad&vanced Entries</string>
</property>
</widget>
</item>
--- 128,147 ----
</item>
<item>
! <widget class="QComboBox" name="ViewType" >
! <item>
<property name="text" >
! <string>Simple View</string>
! </property>
! </item>
! <item>
! <property name="text" >
! <string>Advanced View</string>
! </property>
! </item>
! <item>
! <property name="text" >
! <string>Grouped View</string>
</property>
+ </item>
</widget>
</item>
Index: CMakeSetupDialog.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.h,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -C 2 -d -r1.21.2.4 -r1.21.2.5
*** CMakeSetupDialog.h 25 Jun 2008 13:51:50 -0000 1.21.2.4
--- CMakeSetupDialog.h 13 Jul 2008 21:55:25 -0000 1.21.2.5
***************
*** 76,80 ****
void startSearch();
void setDebugOutput(bool);
! void toggleGroupView(bool);
protected:
--- 76,80 ----
void startSearch();
void setDebugOutput(bool);
! void setViewType(int);
protected:
Index: QCMakeCacheView.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMakeCacheView.cxx,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -C 2 -d -r1.26.2.3 -r1.26.2.4
*** QCMakeCacheView.cxx 25 Jun 2008 13:51:50 -0000 1.26.2.3
--- QCMakeCacheView.cxx 13 Jul 2008 21:55:25 -0000 1.26.2.4
***************
*** 152,156 ****
bool QCMakeCacheView::event(QEvent* e)
{
! if(e->type() == QEvent::Resize)
{
this->header()->setDefaultSectionSize(this->viewport()->width()/2);
--- 152,156 ----
bool QCMakeCacheView::event(QEvent* e)
{
! if(e->type() == QEvent::Show)
{
this->header()->setDefaultSectionSize(this->viewport()->width()/2);
More information about the Cmake-commits
mailing list