From 983f2f1af4afeaa0539ffe533626233becf28a75 Mon Sep 17 00:00:00 2001 From: Yoann Laissus Date: Fri, 19 Feb 2010 15:10:40 +0100 Subject: Workaround the bug of qtwebkit in the function findText(). An empty string doesn't clear the selection. --- src/findbar.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/findbar.cpp') diff --git a/src/findbar.cpp b/src/findbar.cpp index 1cb16e3f..d8ae08cc 100644 --- a/src/findbar.cpp +++ b/src/findbar.cpp @@ -64,6 +64,7 @@ FindBar::FindBar(KMainWindow *mainwindow) hideButton->setAutoRaise(true); hideButton->setIcon(KIcon("dialog-close")); connect(hideButton, SIGNAL(clicked()), this, SLOT(hide())); + connect(hideButton, SIGNAL(clicked()), this, SLOT(findNext())); layout->addWidget(hideButton); layout->setAlignment(hideButton, Qt::AlignLeft | Qt::AlignTop); @@ -138,6 +139,11 @@ void FindBar::show() QWidget::show(); m_hideTimer->start(60000); + + // emit a new find signal with the current text + QString temp = m_lineEdit->text(); + m_lineEdit->setText(""); + m_lineEdit->setText(m_lineEdit->text()); } -- cgit v1.2.1 From e88fc26105ce8ba41ac988ff428596baefd443d7 Mon Sep 17 00:00:00 2001 From: Yoann Laissus Date: Fri, 19 Feb 2010 15:27:58 +0100 Subject: The text is now instantly checked when the checkbox match case is toggled Fix the selected text when the findBar is closed and open --- src/findbar.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/findbar.cpp') diff --git a/src/findbar.cpp b/src/findbar.cpp index d8ae08cc..2b464978 100644 --- a/src/findbar.cpp +++ b/src/findbar.cpp @@ -64,7 +64,7 @@ FindBar::FindBar(KMainWindow *mainwindow) hideButton->setAutoRaise(true); hideButton->setIcon(KIcon("dialog-close")); connect(hideButton, SIGNAL(clicked()), this, SLOT(hide())); - connect(hideButton, SIGNAL(clicked()), this, SLOT(findNext())); + connect(hideButton, SIGNAL(clicked()), mainwindow, SLOT(findNext())); layout->addWidget(hideButton); layout->setAlignment(hideButton, Qt::AlignLeft | Qt::AlignTop); @@ -92,6 +92,7 @@ FindBar::FindBar(KMainWindow *mainwindow) // Case sensitivity. Deliberately set so this is off by default. m_matchCase->setCheckState(Qt::Unchecked); m_matchCase->setTristate(false); + connect(m_matchCase, SIGNAL(toggled(bool)), mainwindow, SLOT(findNext())); layout->addWidget(m_matchCase); // stretching widget on the left @@ -143,7 +144,7 @@ void FindBar::show() // emit a new find signal with the current text QString temp = m_lineEdit->text(); m_lineEdit->setText(""); - m_lineEdit->setText(m_lineEdit->text()); + m_lineEdit->setText(temp); } -- cgit v1.2.1 From 8f9db7ef7ce4116c3ea7a34a49d5db04602b4c06 Mon Sep 17 00:00:00 2001 From: Yoann Laissus Date: Fri, 19 Feb 2010 22:27:05 +0100 Subject: Get rid of the selection of the next found expression when the checkbox matchCase is toggled --- src/findbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/findbar.cpp') diff --git a/src/findbar.cpp b/src/findbar.cpp index 2b464978..6b92f130 100644 --- a/src/findbar.cpp +++ b/src/findbar.cpp @@ -92,7 +92,7 @@ FindBar::FindBar(KMainWindow *mainwindow) // Case sensitivity. Deliberately set so this is off by default. m_matchCase->setCheckState(Qt::Unchecked); m_matchCase->setTristate(false); - connect(m_matchCase, SIGNAL(toggled(bool)), mainwindow, SLOT(findNext())); + connect(m_matchCase, SIGNAL(toggled(bool)), mainwindow, SLOT(matchCaseUpdate())); layout->addWidget(m_matchCase); // stretching widget on the left -- cgit v1.2.1