Commit 188476de authored by Albert Astals Cid's avatar Albert Astals Cid

Merge remote-tracking branch 'origin/KDE/4.14'

parents 8365cf28 f6215323
......@@ -473,6 +473,7 @@ m_cliPresentation(false), m_cliPrint(false), m_embedMode(detectEmbedMode(parentW
m_pageNumberTool = new MiniBar( 0, m_miniBarLogic );
connect( m_findBar, SIGNAL(forwardKeyPressEvent(QKeyEvent*)), m_pageView, SLOT(externalKeyPressEvent(QKeyEvent*)));
connect( m_findBar, SIGNAL(onCloseButtonPressed()), m_pageView, SLOT(setFocus()));
connect( m_miniBar, SIGNAL(forwardKeyPressEvent(QKeyEvent*)), m_pageView, SLOT(externalKeyPressEvent(QKeyEvent*)));
connect( m_pageView, SIGNAL(escPressed()), m_findBar, SLOT(resetSearch()) );
connect( m_pageNumberTool, SIGNAL(forwardKeyPressEvent(QKeyEvent*)), m_pageView, SLOT(externalKeyPressEvent(QKeyEvent*)));
......
......@@ -179,6 +179,7 @@ void FindBar::closeAndStopSearch()
{
m_search->lineEdit()->stopSearch();
}
emit onCloseButtonPressed();
close();
}
......
......@@ -36,6 +36,7 @@ class FindBar
signals:
void forwardKeyPressEvent( QKeyEvent* );
void onCloseButtonPressed();
public slots:
void findNext();
......
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