From 2d6669b88d2e022f9e1ff806d0072f9895df681a Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Mon, 28 Mar 2016 18:22:01 +0800
Subject: [PATCH] [Search] minor cleanups

---
 src/gui/search/pluginselectdlg.ui |   7 +-
 src/gui/search/pluginsourcedlg.ui |  27 +++----
 src/gui/search/searchwidget.cpp   |   1 -
 src/gui/search/searchwidget.ui    | 117 +++++++++++++++---------------
 4 files changed, 74 insertions(+), 78 deletions(-)

diff --git a/src/gui/search/pluginselectdlg.ui b/src/gui/search/pluginselectdlg.ui
index a87d23c6c..8f9ff31e8 100644
--- a/src/gui/search/pluginselectdlg.ui
+++ b/src/gui/search/pluginselectdlg.ui
@@ -16,7 +16,7 @@
   <property name="windowTitle">
    <string>Search plugins</string>
   </property>
-  <layout class="QVBoxLayout">
+  <layout class="QVBoxLayout" name="pluginSelectLayout">
    <item>
     <widget class="QLabel" name="lbl_plugins">
      <property name="font">
@@ -82,16 +82,13 @@
      <property name="text">
       <string>You can get new search engine plugins here: &lt;a href=&quot;http://plugins.qbittorrent.org&quot;&gt;http://plugins.qbittorrent.org&lt;/a&gt;</string>
      </property>
-     <property name="textFormat">
-      <enum>Qt::AutoText</enum>
-     </property>
      <property name="openExternalLinks">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout">
+    <layout class="QHBoxLayout" name="layout1">
      <item>
       <widget class="QPushButton" name="installButton">
        <property name="text">
diff --git a/src/gui/search/pluginsourcedlg.ui b/src/gui/search/pluginsourcedlg.ui
index a2ca22d95..9b0411e1d 100644
--- a/src/gui/search/pluginsourcedlg.ui
+++ b/src/gui/search/pluginsourcedlg.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>PluginSourceDlg</class>
- <widget class="QDialog" name="PluginSourceDlg" >
-  <property name="geometry" >
+ <widget class="QDialog" name="PluginSourceDlg">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,36 +10,36 @@
     <height>76</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Plugin source</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="pluginSourceLayout">
    <item>
-    <widget class="QLabel" name="source_lbl" >
-     <property name="font" >
+    <widget class="QLabel" name="source_lbl">
+     <property name="font">
       <font>
        <weight>75</weight>
        <bold>true</bold>
        <underline>true</underline>
       </font>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Search plugin source:</string>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout" name="layout1">
      <item>
-      <widget class="QPushButton" name="localButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="localButton">
+       <property name="text">
         <string>Local file</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="urlButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="urlButton">
+       <property name="text">
         <string>Web link</string>
        </property>
       </widget>
diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp
index 63008b11d..e5c1ec796 100644
--- a/src/gui/search/searchwidget.cpp
+++ b/src/gui/search/searchwidget.cpp
@@ -108,7 +108,6 @@ SearchWidget::SearchWidget(MainWindow *mainWindow)
     goToDescBtn->setIcon(GuiIconProvider::instance()->getIcon("application-x-mswinurl"));
     pluginsButton->setIcon(GuiIconProvider::instance()->getIcon("preferences-system-network"));
     copyURLBtn->setIcon(GuiIconProvider::instance()->getIcon("edit-copy"));
-    tabWidget->setTabsClosable(true);
     connect(tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int)));
 
     m_searchEngine = new SearchEngine;
diff --git a/src/gui/search/searchwidget.ui b/src/gui/search/searchwidget.ui
index e3d539135..c2641f19e 100644
--- a/src/gui/search/searchwidget.ui
+++ b/src/gui/search/searchwidget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1382</width>
+    <width>843</width>
     <height>669</height>
    </rect>
   </property>
@@ -24,6 +24,12 @@
      </item>
      <item>
       <widget class="QPushButton" name="searchButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Search</string>
        </property>
@@ -33,69 +39,62 @@
    </item>
    <item>
     <widget class="QTabWidget" name="tabWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-       <horstretch>0</horstretch>
-       <verstretch>1</verstretch>
-      </sizepolicy>
+     <property name="tabsClosable">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QVBoxLayout">
+    <layout class="QHBoxLayout" name="layout2">
+     <item>
+      <widget class="QPushButton" name="downloadButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Download</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="goToDescBtn">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Go to description page</string>
+       </property>
+      </widget>
+     </item>
      <item>
-      <layout class="QHBoxLayout">
-       <item>
-        <widget class="QPushButton" name="downloadButton">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string>Download</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="goToDescBtn">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string>Go to description page</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="copyURLBtn">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string>Copy description page URL</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>601</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pluginsButton">
-         <property name="text">
-          <string>Search plugins...</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <widget class="QPushButton" name="copyURLBtn">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Copy description page URL</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pluginsButton">
+       <property name="text">
+        <string>Search plugins...</string>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>