From 7b3927381736d64a96f6db549eefd5da9d87c09d Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Mon, 24 Feb 2014 17:32:01 +0100
Subject: [PATCH] Make buttons in find tool bar accessible with tab

Task-number: QTCREATORBUG-4839

Change-Id: Ied26d48abaeb101b70c206a419716d2b84213726
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/coreplugin/find/findtoolbar.cpp |  4 +-
 src/plugins/coreplugin/find/findwidget.ui   | 41 +++++++++++++--------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index d4c2baa8a28..8ac3fa14067 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -686,10 +686,10 @@ void FindToolBar::findPreviousSelected()
 bool FindToolBar::focusNextPrevChild(bool next)
 {
     // close tab order change
-    if (next && m_ui.replaceAllButton->hasFocus())
+    if (next && m_ui.advancedButton->hasFocus())
         m_ui.findEdit->setFocus(Qt::TabFocusReason);
     else if (!next && m_ui.findEdit->hasFocus())
-        m_ui.replaceAllButton->setFocus(Qt::TabFocusReason);
+        m_ui.advancedButton->setFocus(Qt::TabFocusReason);
     else
         return Utils::StyledBar::focusNextPrevChild(next);
     return true;
diff --git a/src/plugins/coreplugin/find/findwidget.ui b/src/plugins/coreplugin/find/findwidget.ui
index 1278a8f8d7a..20e23b524f2 100644
--- a/src/plugins/coreplugin/find/findwidget.ui
+++ b/src/plugins/coreplugin/find/findwidget.ui
@@ -55,14 +55,20 @@
       <property name="spacing">
        <number>3</number>
       </property>
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
        <widget class="QToolButton" name="findPreviousButton">
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
         <property name="arrowType">
          <enum>Qt::LeftArrow</enum>
         </property>
@@ -73,9 +79,6 @@
         <property name="font">
          <font/>
         </property>
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
         <property name="arrowType">
          <enum>Qt::RightArrow</enum>
         </property>
@@ -181,14 +184,20 @@
         <property name="spacing">
          <number>3</number>
         </property>
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
          <widget class="QToolButton" name="replaceButton">
-          <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
-          </property>
           <property name="text">
            <string>Replace</string>
           </property>
@@ -205,9 +214,6 @@
           <property name="font">
            <font/>
           </property>
-          <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
-          </property>
           <property name="text">
            <string>Replace &amp;&amp; Find</string>
           </property>
@@ -279,8 +285,13 @@
  <tabstops>
   <tabstop>findEdit</tabstop>
   <tabstop>replaceEdit</tabstop>
-  <tabstop>close</tabstop>
+  <tabstop>replaceButton</tabstop>
+  <tabstop>replaceNextButton</tabstop>
   <tabstop>replaceAllButton</tabstop>
+  <tabstop>advancedButton</tabstop>
+  <tabstop>findPreviousButton</tabstop>
+  <tabstop>findNextButton</tabstop>
+  <tabstop>close</tabstop>
  </tabstops>
  <resources/>
  <connections/>