Commit 875829bb authored by Kåre Särs's avatar Kåre Särs

S&R: Fix focus and stop problems

parent abbcd593
......@@ -271,6 +271,7 @@ m_projectPluginView(0)
connect(m_ui.matchCase, SIGNAL(stateChanged(int)), &m_changeTimer, SLOT(start()));
connect(m_ui.useRegExp, SIGNAL(stateChanged(int)), &m_changeTimer, SLOT(start()));
m_changeTimer.setInterval(300);
m_changeTimer.setSingleShot(true);
connect(&m_changeTimer, SIGNAL(timeout()), this, SLOT(searchPatternChanged()));
connect(m_ui.stopButton, SIGNAL(clicked()), &m_searchOpenFiles, SLOT(cancelSearch()));
......@@ -508,12 +509,11 @@ void KatePluginSearchView::startSearch()
m_ui.newTabButton->setDisabled(true);
m_ui.searchCombo->setDisabled(true);
m_ui.searchButton->setDisabled(true);
m_ui.nextAndStop->setCurrentIndex(1);
m_ui.displayOptions->setChecked (false);
m_ui.displayOptions->setDisabled(true);
m_ui.replaceCheckedBtn->setDisabled(true);
m_ui.replaceButton->setDisabled(true);
m_ui.nextButton->setDisabled(true);
m_ui.nextAndStop->setCurrentIndex(1);
QRegExp reg(m_ui.searchCombo->currentText(),
......@@ -1444,6 +1444,8 @@ void KatePluginSearchView::replaceChecked()
m_ui.replaceCombo->setCurrentIndex(0);
}
m_ui.nextAndStop->setCurrentIndex(1);
m_curResults->replace = m_ui.replaceCombo->currentText();
m_replacer.replaceChecked(m_curResults->tree,
......@@ -1453,7 +1455,7 @@ void KatePluginSearchView::replaceChecked()
void KatePluginSearchView::replaceDone()
{
m_ui.replaceBtnStack->setCurrentIndex(0);
m_ui.nextAndStop->setCurrentIndex(0);
m_ui.replaceCombo->setDisabled(false);
}
......
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>586</width>
<width>594</width>
<height>206</height>
</rect>
</property>
......@@ -322,53 +322,6 @@
</widget>
</widget>
</item>
<item row="1" column="5">
<widget class="QStackedWidget" name="replaceBtnStack">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="page">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="KPushButton" name="replaceCheckedBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Replace checked</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="stopButtonReplace">
<property name="text">
<string>stop</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="0" column="5">
<widget class="QStackedWidget" name="nextAndStop">
<property name="sizePolicy">
......@@ -451,6 +404,16 @@
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="KPushButton" name="replaceCheckedBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Replace checked</string>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
......@@ -492,6 +455,7 @@
<tabstop>replaceCombo</tabstop>
<tabstop>searchButton</tabstop>
<tabstop>nextButton</tabstop>
<tabstop>stopButton</tabstop>
<tabstop>replaceButton</tabstop>
<tabstop>replaceCheckedBtn</tabstop>
<tabstop>matchCase</tabstop>
......@@ -508,9 +472,7 @@
<tabstop>symLinkCheckBox</tabstop>
<tabstop>binaryCheckBox</tabstop>
<tabstop>displayOptions</tabstop>
<tabstop>stopButton</tabstop>
<tabstop>resultTabWidget</tabstop>
<tabstop>stopButtonReplace</tabstop>
</tabstops>
<resources/>
<connections/>
......
Markdown is supported
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