Verified Commit 25a030bd authored by Alexander Lohnau's avatar Alexander Lohnau 💬
Browse files

Disable binary checkbox for search in projects

As discussed on #kate its usefulness is also questionable, because we
can't do anything with binary files.

If one wants to search binary files (usually some build/install dir) they
are in the vast majority of cases not part of the project anyways.
parent 834e06e7
...@@ -848,8 +848,6 @@ void KatePluginSearchView::searchPlaceChanged() ...@@ -848,8 +848,6 @@ void KatePluginSearchView::searchPlaceChanged()
{ {
int searchPlace = m_ui.searchPlaceCombo->currentIndex(); int searchPlace = m_ui.searchPlaceCombo->currentIndex();
const bool inFolder = (searchPlace == MatchModel::Folder); const bool inFolder = (searchPlace == MatchModel::Folder);
const bool inCurrentProject = searchPlace == MatchModel::Project;
const bool inAllOpenProjects = searchPlace == MatchModel::AllProjects;
m_ui.filterCombo->setEnabled(searchPlace >= MatchModel::Folder); m_ui.filterCombo->setEnabled(searchPlace >= MatchModel::Folder);
m_ui.excludeCombo->setEnabled(searchPlace >= MatchModel::Folder); m_ui.excludeCombo->setEnabled(searchPlace >= MatchModel::Folder);
...@@ -859,7 +857,7 @@ void KatePluginSearchView::searchPlaceChanged() ...@@ -859,7 +857,7 @@ void KatePluginSearchView::searchPlaceChanged()
m_ui.recursiveCheckBox->setEnabled(inFolder); m_ui.recursiveCheckBox->setEnabled(inFolder);
m_ui.hiddenCheckBox->setEnabled(inFolder); m_ui.hiddenCheckBox->setEnabled(inFolder);
m_ui.symLinkCheckBox->setEnabled(inFolder); m_ui.symLinkCheckBox->setEnabled(inFolder);
m_ui.binaryCheckBox->setEnabled(inFolder || inCurrentProject || inAllOpenProjects); m_ui.binaryCheckBox->setEnabled(inFolder);
if (inFolder && sender() == m_ui.searchPlaceCombo) { if (inFolder && sender() == m_ui.searchPlaceCombo) {
setCurrentFolder(); setCurrentFolder();
...@@ -1119,7 +1117,9 @@ void KatePluginSearchView::startSearch() ...@@ -1119,7 +1117,9 @@ void KatePluginSearchView::startSearch()
if (!openList.empty()) { if (!openList.empty()) {
m_searchOpenFiles.startSearch(openList, m_curResults->regExp); m_searchOpenFiles.startSearch(openList, m_curResults->regExp);
} }
startDiskFileSearch(files, m_curResults->regExp, m_ui.binaryCheckBox->isChecked()); // We don't want to search for binary files in the project, so false is used instead of the checkbox
// which is disabled in this case
startDiskFileSearch(files, m_curResults->regExp, false);
} else { } else {
qDebug() << "Case not handled:" << m_ui.searchPlaceCombo->currentIndex(); qDebug() << "Case not handled:" << m_ui.searchPlaceCombo->currentIndex();
Q_ASSERT_X(false, "KatePluginSearchView::startSearch", "case not handled"); Q_ASSERT_X(false, "KatePluginSearchView::startSearch", "case not handled");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment