[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [okular/KDE/4.14] /: Move focus to view when closing the find bar with the [x] button
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2014-09-30 21:15:24
Message-ID: E1XZ4lY-000882-Ee () scm ! kde ! org
[Download RAW message or body]

Git commit f62153231be89150b8a8ddea3da2f0828855d22b by Albert Astals Cid, on behalf of Nidhi Jain.
Committed on 30/09/2014 at 21:14.
Pushed by aacid into branch 'KDE/4.14'.

Move focus to view when closing the find bar with the [x] button

BUGS: 314251
REVIEW: 120307
FIXED-IN: 4.14.2

M  +1    -0    part.cpp
M  +1    -0    ui/findbar.cpp
M  +1    -0    ui/findbar.h

http://commits.kde.org/okular/f62153231be89150b8a8ddea3da2f0828855d22b

diff --git a/part.cpp b/part.cpp
index d07bed7..218aa0e 100644
--- a/part.cpp
+++ b/part.cpp
@@ -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*)));
diff --git a/ui/findbar.cpp b/ui/findbar.cpp
index f00f883..de7f0a6 100644
--- a/ui/findbar.cpp
+++ b/ui/findbar.cpp
@@ -179,6 +179,7 @@ void FindBar::closeAndStopSearch()
     {
         m_search->lineEdit()->stopSearch();
     }
+    emit onCloseButtonPressed();
     close();
 }
 
diff --git a/ui/findbar.h b/ui/findbar.h
index 4db2855..1166628 100644
--- a/ui/findbar.h
+++ b/ui/findbar.h
@@ -36,6 +36,7 @@ class FindBar
 
     signals:
         void forwardKeyPressEvent( QKeyEvent* );
+        void onCloseButtonPressed();
 
     public slots:
         void findNext();


[prev in list] [next in list] [prev in thread] [next in thread]