From 9601e8ad3452fbd3eaaf735442355defd76364f4 Mon Sep 17 00:00:00 2001
From: Carl Schwan <schwancarl@protonmail.com>
Date: Fri, 8 Mar 2019 22:30:49 +0100
Subject: [PATCH] Use a searchbar similar to the one in okular

Summary: {F6674717}

Reviewers: #falkon, #vdg, drosca

Reviewed By: #falkon, drosca

Subscribers: drosca, loh.tar, SGOrava, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D19625
---
 src/lib/webtab/searchtoolbar.cpp |  2 -
 src/lib/webtab/searchtoolbar.ui  | 73 ++++++++++++++------------------
 2 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/src/lib/webtab/searchtoolbar.cpp b/src/lib/webtab/searchtoolbar.cpp
index fc27ac270..5041175ff 100644
--- a/src/lib/webtab/searchtoolbar.cpp
+++ b/src/lib/webtab/searchtoolbar.cpp
@@ -35,9 +35,7 @@ SearchToolBar::SearchToolBar(WebView* view, QWidget* parent)
     ui->setupUi(this);
 
     ui->closeButton->setIcon(IconProvider::instance()->standardIcon(QStyle::SP_DialogCloseButton));
-    ui->next->setIcon(IconProvider::instance()->standardIcon(QStyle::SP_ArrowDown));
     ui->next->setShortcut(QKeySequence("Ctrl+G"));
-    ui->previous->setIcon(IconProvider::instance()->standardIcon(QStyle::SP_ArrowUp));
     ui->previous->setShortcut(QKeySequence("Ctrl+Shift+G"));
 
     connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(close()));
diff --git a/src/lib/webtab/searchtoolbar.ui b/src/lib/webtab/searchtoolbar.ui
index 5408f8675..519cace0a 100644
--- a/src/lib/webtab/searchtoolbar.ui
+++ b/src/lib/webtab/searchtoolbar.ui
@@ -30,13 +30,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Search: </string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="FocusSelectLineEdit" name="lineEdit">
      <property name="minimumSize">
@@ -47,43 +40,52 @@
      </property>
      <property name="maximumSize">
       <size>
-       <width>200</width>
+       <width>16777215</width>
        <height>16777215</height>
       </size>
      </property>
      <property name="placeholderText">
-      <string>Search...</string>
+      <string>Find...</string>
      </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="MacToolButton" name="previous">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="autoRaise">
+     <property name="clearButtonEnabled">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="MacToolButton" name="next">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="QToolButton" name="next">
+     <property name="toolTip">
+      <string>Find the next match for the current search phrase</string>
      </property>
-     <property name="autoRaise">
-      <bool>true</bool>
+     <property name="text">
+      <string>&amp;Next</string>
+     </property>
+     <property name="icon">
+      <iconset theme="go-down-search"/>
+     </property>
+     <property name="toolButtonStyle">
+      <enum>Qt::ToolButtonTextBesideIcon</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="MacToolButton" name="caseSensitive">
+    <widget class="QToolButton" name="previous">
+     <property name="toolTip">
+      <string>Find the previous match for the current search phrase</string>
+     </property>
+     <property name="text">
+      <string>&amp;Previous</string>
+     </property>
+     <property name="icon">
+      <iconset theme="go-up-search"/>
+     </property>
+     <property name="toolButtonStyle">
+      <enum>Qt::ToolButtonTextBesideIcon</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QToolButton" name="caseSensitive">
      <property name="text">
       <string>&amp;Match Case</string>
      </property>
@@ -99,19 +101,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>5</width>
-       <height>1</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>