In KFindDialog/KReplaceDialog the option "use placeholders" only makes

sense and works when searching using regular expressions.
This resolves bug 1863.
pull/16/head
Michele Calgaro 11 years ago
parent a878d3ef3f
commit 81515b6d1a

@ -149,8 +149,9 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha
m_replace->setMaxCount(10); m_replace->setMaxCount(10);
m_replace->setDuplicatesEnabled(false); m_replace->setDuplicatesEnabled(false);
m_backRef = new TQCheckBox(i18n("Use p&laceholders"), m_replaceGrp); 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 = 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->addWidget(m_replaceLabel, 0, 0);
m_replaceLayout->addMultiCellWidget(m_replace, 1, 1, 0, 1); 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 // signals and slots connections
connect(m_selectedText, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectedTextToggled(bool))); 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_regExp, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotRegexCheckBoxToggled(bool)));
connect(m_backRef, TQT_SIGNAL(toggled(bool)), m_backRefItem, TQT_SLOT(setEnabled(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_regExpItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPatterns()));
connect(m_backRefItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPlaceholders())); 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.") ); "Ask before replacing each match found.") );
} }
void KFindDialog::textSearchChanged( const TQString & text) void KFindDialog::textSearchChanged(const TQString & text)
{ {
enableButtonOK( !text.isEmpty() ); 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 ) void KFindDialog::showEvent( TQShowEvent *e )
{ {
if ( !d->m_initialShowDone ) if ( !d->m_initialShowDone )

@ -250,7 +250,9 @@ protected slots:
void slotSelectedTextToggled(bool); void slotSelectedTextToggled(bool);
void showPatterns(); void showPatterns();
void showPlaceholders(); void showPlaceholders();
void textSearchChanged( const TQString &); void textSearchChanged(const TQString &);
void slotRegexCheckBoxToggled(bool checked);
void slotPlaceholdersCheckBoxToggled(bool checked);
protected: protected:
virtual void showEvent ( TQShowEvent * ); virtual void showEvent ( TQShowEvent * );

Loading…
Cancel
Save