From 29eb5753227651b70dcdcb282739955a66c5974b Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Wed, 2 Mar 2011 17:54:22 +0100
Subject: [PATCH] Some focus fixes

---
 src/navigation/locationbar.cpp  | 3 +++
 src/navigation/websearchbar.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/navigation/locationbar.cpp b/src/navigation/locationbar.cpp
index a02e82e5f..c2c5a5eb8 100644
--- a/src/navigation/locationbar.cpp
+++ b/src/navigation/locationbar.cpp
@@ -25,6 +25,7 @@ LocationBar::LocationBar(QupZilla* mainClass, QWidget *parent)
     m_siteIcon->setMinimumSize(35, 25);
     m_siteIcon->setToolTip(tr("Show informations about this page"));
     m_siteIcon->setStyleSheet("QToolButton{border-image: url(:/icons/locationbar/searchchoose.png); margin-left:2px;}");
+    m_siteIcon->setFocusPolicy(Qt::ClickFocus);
 
     m_rssIcon = new QToolButton(this);
     m_rssIcon->setIcon(QIcon(":/icons/menu/rss.png"));
@@ -35,6 +36,7 @@ LocationBar::LocationBar(QupZilla* mainClass, QWidget *parent)
     m_rssIcon->setPopupMode(QToolButton::InstantPopup);
     m_rssIcon->setToolTip(tr("Add RSS from this page..."));
     m_rssIcon->setStyleSheet("margin-bottom:2px");
+    m_rssIcon->setFocusPolicy(Qt::ClickFocus);
     m_rssMenu = new QMenu(this);
 
     m_goButton = new ClickableLabel(this);
@@ -48,6 +50,7 @@ LocationBar::LocationBar(QupZilla* mainClass, QWidget *parent)
     m_bookmarkButton->setCursor(Qt::PointingHandCursor);
     m_bookmarkButton->setStyleSheet("margin-bottom: 2px;");
     m_bookmarkButton->setToolTip(tr("Bookmark this Page"));
+    m_bookmarkButton->setFocusPolicy(Qt::ClickFocus);
 
     ClickableLabel* down = new ClickableLabel(this);
     down->setPixmap(QPixmap(":icons/locationbar/arrow-down.gif"));
diff --git a/src/navigation/websearchbar.cpp b/src/navigation/websearchbar.cpp
index 1df7b50fa..427632329 100644
--- a/src/navigation/websearchbar.cpp
+++ b/src/navigation/websearchbar.cpp
@@ -11,12 +11,14 @@ WebSearchBar::WebSearchBar(QupZilla* mainClass, QWidget *parent)
     m_buttonSearch->setPixmap(QPixmap(":/icons/locationbar/search.png"));
     m_buttonSearch->setCursor(QCursor(Qt::PointingHandCursor));
     m_buttonSearch->setStyleSheet("QLabel{margin-bottom:2px;}");
+    m_buttonSearch->setFocusPolicy(Qt::ClickFocus);
 
     m_boxSearchType = new QToolButton(this);
     m_boxSearchType->setPopupMode(QToolButton::InstantPopup);
     m_boxSearchType->setCursor(Qt::ArrowCursor);
     m_boxSearchType->setMaximumSize(35, 25);
     m_boxSearchType->setMinimumSize(35, 25);
+    m_boxSearchType->setFocusPolicy(Qt::ClickFocus);
 
     this->setMinimumHeight(25);
     this->setMaximumHeight(25);
@@ -68,6 +70,7 @@ void WebSearchBar::searchChanged()
             m_boxSearchType->setIcon(QIcon(":/icons/menu/youtube.png"));
 
         m_boxSearchType->setToolTip(action->data().toString());
+        setPlaceholderText(action->data().toString());
     }
 }