forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/2.5'
This commit is contained in:
@@ -75,6 +75,8 @@ FindToolWindow::FindToolWindow(FindPlugin *plugin, QWidget *parent)
|
||||
layout->setSpacing(0);
|
||||
m_ui.configWidget->setLayout(layout);
|
||||
updateButtonStates();
|
||||
|
||||
connect(m_plugin, SIGNAL(findFlagsChanged()), this, SLOT(updateFindFlags()));
|
||||
}
|
||||
|
||||
FindToolWindow::~FindToolWindow()
|
||||
@@ -131,6 +133,14 @@ void FindToolWindow::updateButtonStates()
|
||||
m_ui.searchTerm->setEnabled(filterEnabled);
|
||||
}
|
||||
|
||||
void FindToolWindow::updateFindFlags()
|
||||
{
|
||||
m_ui.matchCase->setChecked(m_plugin->hasFindFlag(Find::FindCaseSensitively));
|
||||
m_ui.wholeWords->setChecked(m_plugin->hasFindFlag(Find::FindWholeWords));
|
||||
m_ui.regExp->setChecked(m_plugin->hasFindFlag(Find::FindRegularExpression));
|
||||
}
|
||||
|
||||
|
||||
void FindToolWindow::setFindFilters(const QList<IFindFilter *> &filters)
|
||||
{
|
||||
qDeleteAll(m_configWidgets);
|
||||
@@ -160,10 +170,7 @@ void FindToolWindow::setCurrentFilter(IFindFilter *filter)
|
||||
if (index >= 0) {
|
||||
setCurrentFilter(index);
|
||||
}
|
||||
m_ui.matchCase->setChecked(m_plugin->hasFindFlag(Find::FindCaseSensitively));
|
||||
m_ui.wholeWords->setChecked(m_plugin->hasFindFlag(Find::FindWholeWords));
|
||||
m_ui.regExp->setChecked(m_plugin->hasFindFlag(Find::FindRegularExpression));
|
||||
|
||||
updateFindFlags();
|
||||
m_ui.searchTerm->setFocus();
|
||||
m_ui.searchTerm->selectAll();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user