feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix exclusion pattern tooltip text

Browse Source 
It says "included" instead of "excluded".

Change-Id: Ib74f2adbc6e6f10a9ff79662e5be609a89fe89d6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Mitch Curtis
2023-05-19 16:55:46 +08:00
parent 861b98a76a
commit 00d156c8ca
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/filesearch.cpp
View File

@@ -540,10 +540,12 @@ QString msgExclusionPatternLabel()
return Tr::tr("Excl&usion pattern:"); return Tr::tr("Excl&usion pattern:");
} }
QString msgFilePatternToolTip() QString msgFilePatternToolTip(InclusionType inclusionType)
{ {
return Tr::tr("List of comma separated wildcard filters. " return Tr::tr("List of comma separated wildcard filters. ")
"Files with file name or full file path matching any filter are included."); + (inclusionType == InclusionType::Included
? Tr::tr("Files with file name or full file path matching any filter are included.")
: Tr::tr("Files with file name or full file path matching any filter are excluded."));
} }
QString matchCaseReplacement(const QString &originalText, const QString &replaceText) QString matchCaseReplacement(const QString &originalText, const QString &replaceText)

7
src/libs/utils/filesearch.h
View File

@@ -40,8 +40,13 @@ QString msgFilePatternLabel();
QTCREATOR_UTILS_EXPORT QTCREATOR_UTILS_EXPORT
QString msgExclusionPatternLabel(); QString msgExclusionPatternLabel();
enum class InclusionType {
Included,
Excluded
};
QTCREATOR_UTILS_EXPORT QTCREATOR_UTILS_EXPORT
QString msgFilePatternToolTip(); QString msgFilePatternToolTip(InclusionType inclusionType = InclusionType::Included);
class QTCREATOR_UTILS_EXPORT FileIterator class QTCREATOR_UTILS_EXPORT FileIterator
{ {

2
src/plugins/coreplugin/locator/directoryfilter.cpp
View File

@@ -316,7 +316,7 @@ bool DirectoryFilter::openConfigDialog(QWidget *parent, bool &needsRefresh)
m_dialog->filePattern->setText(Utils::transform(m_filters, &QDir::toNativeSeparators).join(',')); m_dialog->filePattern->setText(Utils::transform(m_filters, &QDir::toNativeSeparators).join(','));
m_dialog->exclusionPatternLabel->setText(Utils::msgExclusionPatternLabel()); m_dialog->exclusionPatternLabel->setText(Utils::msgExclusionPatternLabel());
m_dialog->exclusionPatternLabel->setBuddy(m_dialog->exclusionPattern); m_dialog->exclusionPatternLabel->setBuddy(m_dialog->exclusionPattern);
m_dialog->exclusionPattern->setToolTip(Utils::msgFilePatternToolTip()); m_dialog->exclusionPattern->setToolTip(Utils::msgFilePatternToolTip(InclusionType::Excluded));
m_dialog->exclusionPattern->setText( m_dialog->exclusionPattern->setText(
Utils::transform(m_exclusionFilters, &QDir::toNativeSeparators).join(',')); Utils::transform(m_exclusionFilters, &QDir::toNativeSeparators).join(','));
m_dialog->shortcutEdit->setText(shortcutString()); m_dialog->shortcutEdit->setText(shortcutString());

2
src/plugins/texteditor/basefilefind.cpp
View File

@@ -345,7 +345,7 @@ QList<QPair<QWidget *, QWidget *>> BaseFileFind::createPatternWidgets()
syncComboWithSettings(d->m_filterCombo, d->m_filterSetting); syncComboWithSettings(d->m_filterCombo, d->m_filterSetting);
QLabel *exclusionLabel = createLabel(msgExclusionPatternLabel()); QLabel *exclusionLabel = createLabel(msgExclusionPatternLabel());
d->m_exclusionCombo = createCombo(&d->m_exclusionStrings); d->m_exclusionCombo = createCombo(&d->m_exclusionStrings);
d->m_exclusionCombo->setToolTip(msgFilePatternToolTip()); d->m_exclusionCombo->setToolTip(msgFilePatternToolTip(Utils::InclusionType::Excluded));
exclusionLabel->setBuddy(d->m_exclusionCombo); exclusionLabel->setBuddy(d->m_exclusionCombo);
syncComboWithSettings(d->m_exclusionCombo, d->m_exclusionSetting); syncComboWithSettings(d->m_exclusionCombo, d->m_exclusionSetting);
return {{filterLabel, d->m_filterCombo}, {exclusionLabel, d->m_exclusionCombo}}; return {{filterLabel, d->m_filterCombo}, {exclusionLabel, d->m_exclusionCombo}};