diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-03-09 14:13:10 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-03-09 14:13:10 +0900 |
| commit | 81515b6d1a00df00fadb0ff0748ca5faecf12ce7 (patch) | |
| tree | 271623b7da2ee1d12acde83e14ba1a9a4edf79e3 | |
| parent | a878d3ef3f87b6d971190423b7c70b1919c97a67 (diff) | |
| download | tdelibs-81515b6d1a00df00fadb0ff0748ca5faecf12ce7.tar.gz tdelibs-81515b6d1a00df00fadb0ff0748ca5faecf12ce7.zip | |
In KFindDialog/KReplaceDialog the option "use placeholders" only makes
sense and works when searching using regular expressions.
This resolves bug 1863.
| -rw-r--r-- | tdeutils/kfinddialog.cpp | 21 | ||||
| -rw-r--r-- | tdeutils/kfinddialog.h | 4 |
2 files changed, 20 insertions, 5 deletions
diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp index 718fdca2f..974e259b4 100644 --- a/tdeutils/kfinddialog.cpp +++ b/tdeutils/kfinddialog.cpp @@ -149,8 +149,9 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha m_replace->setMaxCount(10); m_replace->setDuplicatesEnabled(false); m_backRef = new TQCheckBox(i18n("Use p&laceholders"), m_replaceGrp); + m_backRef->setEnabled(m_regExp->isChecked()); m_backRefItem = new TQPushButton(i18n("Insert Place&holder"), m_replaceGrp); - m_backRefItem->setEnabled(false); + m_backRefItem->setEnabled(m_regExp->isChecked() && m_backRef->isChecked()); m_replaceLayout->addWidget(m_replaceLabel, 0, 0); m_replaceLayout->addMultiCellWidget(m_replace, 1, 1, 0, 1); @@ -193,8 +194,8 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha // signals and slots connections connect(m_selectedText, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectedTextToggled(bool))); - connect(m_regExp, TQT_SIGNAL(toggled(bool)), m_regExpItem, TQT_SLOT(setEnabled(bool))); - connect(m_backRef, TQT_SIGNAL(toggled(bool)), m_backRefItem, TQT_SLOT(setEnabled(bool))); + connect(m_regExp, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotRegexCheckBoxToggled(bool))); + connect(m_backRef, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPlaceholdersCheckBoxToggled(bool))); connect(m_regExpItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPatterns())); connect(m_backRefItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPlaceholders())); @@ -276,11 +277,23 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha "Ask before replacing each match found.") ); } -void KFindDialog::textSearchChanged( const TQString & text) +void KFindDialog::textSearchChanged(const TQString & text) { enableButtonOK( !text.isEmpty() ); } +void KFindDialog::slotRegexCheckBoxToggled(bool checked) +{ + m_regExpItem->setEnabled(checked); + m_backRef->setEnabled(checked); + m_backRefItem->setEnabled(checked && m_backRef->isChecked()); +} + +void KFindDialog::slotPlaceholdersCheckBoxToggled(bool checked) +{ + m_backRefItem->setEnabled(checked && m_regExp->isChecked()); +} + void KFindDialog::showEvent( TQShowEvent *e ) { if ( !d->m_initialShowDone ) diff --git a/tdeutils/kfinddialog.h b/tdeutils/kfinddialog.h index c616518fc..687939e05 100644 --- a/tdeutils/kfinddialog.h +++ b/tdeutils/kfinddialog.h @@ -250,7 +250,9 @@ protected slots: void slotSelectedTextToggled(bool); void showPatterns(); void showPlaceholders(); - void textSearchChanged( const TQString &); + void textSearchChanged(const TQString &); + void slotRegexCheckBoxToggled(bool checked); + void slotPlaceholdersCheckBoxToggled(bool checked); protected: virtual void showEvent ( TQShowEvent * ); |