From fb7154b67ce3133bbab39b63936acd647927f98b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 24 Dec 2019 14:02:44 +0530
Subject: [PATCH] Fix #1857415 [Move clear button inside text
 field](https://bugs.launchpad.net/calibre/+bug/1857415)

---
 src/calibre/gui2/convert/debug.py |  4 ---
 src/calibre/gui2/convert/debug.ui | 44 +++++++++++++------------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/calibre/gui2/convert/debug.py b/src/calibre/gui2/convert/debug.py
index b382f567fd..49bd3624bf 100644
--- a/src/calibre/gui2/convert/debug.py
+++ b/src/calibre/gui2/convert/debug.py
@@ -27,10 +27,6 @@ class DebugWidget(Widget, Ui_Form):
         self.db, self.book_id = db, book_id
         self.initialize_options(get_option, get_help, db, book_id)
         self.button_debug_dir.clicked.connect(self.set_debug_dir)
-        self.button_clear.clicked.connect(self.clear_debug_dir)
-
-    def clear_debug_dir(self):
-        self.opt_debug_pipeline.setText('')
 
     def set_debug_dir(self):
         x = choose_dir(self, 'conversion debug dir', _('Choose debug folder'))
diff --git a/src/calibre/gui2/convert/debug.ui b/src/calibre/gui2/convert/debug.ui
index a6db339844..3e3fb7f638 100644
--- a/src/calibre/gui2/convert/debug.ui
+++ b/src/calibre/gui2/convert/debug.ui
@@ -14,24 +14,7 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="3">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Choose a folder to put the debug output into. If you specify a folder, calibre will place a lot of debug output into it. This will be useful in understanding the conversion process and figuring out the correct values for conversion parameters like Table of Contents and Chapter Detection.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLineEdit" name="opt_debug_pipeline">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
+   <item row="1" column="1">
     <widget class="QToolButton" name="button_debug_dir">
      <property name="toolTip">
       <string>Choose debug folder</string>
@@ -40,7 +23,7 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset resource="../../../work/calibre/resources/images.qrc">
+      <iconset resource="../../../../resources/images.qrc">
        <normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
      </property>
     </widget>
@@ -58,14 +41,13 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="1">
-    <widget class="QToolButton" name="button_clear">
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label">
      <property name="text">
-      <string>...</string>
+      <string>Choose a folder to put the debug output into. If you specify a folder, calibre will place a lot of debug output into it. This will be useful in understanding the conversion process and figuring out the correct values for conversion parameters like Table of Contents and Chapter Detection.</string>
      </property>
-     <property name="icon">
-      <iconset resource="../../../work/calibre/resources/images.qrc">
-       <normaloff>:/images/clear_left.png</normaloff>:/images/clear_left.png</iconset>
+     <property name="wordWrap">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
@@ -79,10 +61,20 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QLineEdit" name="opt_debug_pipeline">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>
-  <include location="../../../work/calibre/resources/images.qrc"/>
+  <include location="../../../../resources/images.qrc"/>
  </resources>
  <connections/>
 </ui>