From 1067bc302565542066571ea829772f341facf061 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 1 May 2020 14:38:16 +0530
Subject: [PATCH] Fix #1876032 [Private
 bug](https://bugs.launchpad.net/calibre/+bug/1876032)

---
 .../gui2/preferences/metadata_sources.py      |   2 -
 .../gui2/preferences/metadata_sources.ui      | 107 ++++++++----------
 2 files changed, 50 insertions(+), 59 deletions(-)

diff --git a/src/calibre/gui2/preferences/metadata_sources.py b/src/calibre/gui2/preferences/metadata_sources.py
index ac350289d2..8bb556d645 100644
--- a/src/calibre/gui2/preferences/metadata_sources.py
+++ b/src/calibre/gui2/preferences/metadata_sources.py
@@ -304,8 +304,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         r('wait_after_first_cover_result', msprefs)
         r('swap_author_names', msprefs)
         r('fewer_tags', msprefs)
-        r('find_first_edition_date', msprefs)
-        self.opt_find_first_edition_date.setVisible(False)
         r('keep_dups', msprefs)
         r('append_comments', msprefs)
 
diff --git a/src/calibre/gui2/preferences/metadata_sources.ui b/src/calibre/gui2/preferences/metadata_sources.ui
index 10fc9a70e1..b70b6cf7fe 100644
--- a/src/calibre/gui2/preferences/metadata_sources.ui
+++ b/src/calibre/gui2/preferences/metadata_sources.ui
@@ -164,53 +164,6 @@
                </property>
               </widget>
              </item>
-             <item row="8" column="0">
-              <widget class="QLabel" name="label_2">
-               <property name="text">
-                <string>Max. &amp;number of tags to download:</string>
-               </property>
-               <property name="buddy">
-                <cstring>opt_max_tags</cstring>
-               </property>
-              </widget>
-             </item>
-             <item row="9" column="0">
-              <widget class="QLabel" name="label_3">
-               <property name="text">
-                <string>Max. &amp;time to wait after first match is found:</string>
-               </property>
-               <property name="buddy">
-                <cstring>opt_wait_after_first_identify_result</cstring>
-               </property>
-              </widget>
-             </item>
-             <item row="8" column="1">
-              <widget class="QSpinBox" name="opt_max_tags"/>
-             </item>
-             <item row="9" column="1">
-              <widget class="QSpinBox" name="opt_wait_after_first_identify_result">
-               <property name="suffix">
-                <string> secs</string>
-               </property>
-              </widget>
-             </item>
-             <item row="10" column="0">
-              <widget class="QLabel" name="label_4">
-               <property name="text">
-                <string>Max. time to wait after first &amp;cover is found:</string>
-               </property>
-               <property name="buddy">
-                <cstring>opt_wait_after_first_cover_result</cstring>
-               </property>
-              </widget>
-             </item>
-             <item row="10" column="1">
-              <widget class="QSpinBox" name="opt_wait_after_first_cover_result">
-               <property name="suffix">
-                <string> secs</string>
-               </property>
-              </widget>
-             </item>
              <item row="1" column="0" colspan="2">
               <widget class="QCheckBox" name="opt_swap_author_names">
                <property name="text">
@@ -232,13 +185,6 @@
               </widget>
              </item>
              <item row="3" column="0" colspan="2">
-              <widget class="QCheckBox" name="opt_find_first_edition_date">
-               <property name="text">
-                <string>Use &amp;published date of &quot;first edition&quot; (from worldcat.org)</string>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="0" colspan="2">
               <widget class="QCheckBox" name="opt_keep_dups">
                <property name="toolTip">
                 <string>&lt;p&gt;Normally, the metadata download system will keep only a single result per metadata source. This option will cause it to keep all results returned from every metadata source. Useful if you only use one or two sources and want to select individual results from them by hand. Note that result with identical title/author/identifiers are still merged.</string>
@@ -248,7 +194,7 @@
                </property>
               </widget>
              </item>
-             <item row="5" column="0" colspan="2">
+             <item row="4" column="0" colspan="2">
               <widget class="QCheckBox" name="opt_fewer_tags">
                <property name="toolTip">
                 <string>&lt;p&gt;Different metadata sources have different sets of tags for the same book. If this option is checked, then calibre will use the smaller tag sets. These tend to be more like genres, while the larger tag sets tend to describe the books content.
@@ -262,20 +208,67 @@
                </property>
               </widget>
              </item>
-             <item row="6" column="0" colspan="2">
+             <item row="5" column="0" colspan="2">
               <widget class="QPushButton" name="tag_map_rules_button">
                <property name="text">
                 <string>Create &amp;rules to filter/transform tags</string>
                </property>
               </widget>
              </item>
-             <item row="7" column="0" colspan="2">
+             <item row="6" column="0" colspan="2">
               <widget class="QPushButton" name="author_map_rules_button">
                <property name="text">
                 <string>Create rules to &amp;transform author names</string>
                </property>
               </widget>
              </item>
+             <item row="7" column="0">
+              <widget class="QLabel" name="label_2">
+               <property name="text">
+                <string>Max. &amp;number of tags to download:</string>
+               </property>
+               <property name="buddy">
+                <cstring>opt_max_tags</cstring>
+               </property>
+              </widget>
+             </item>
+             <item row="7" column="1">
+              <widget class="QSpinBox" name="opt_max_tags"/>
+             </item>
+             <item row="8" column="0">
+              <widget class="QLabel" name="label_3">
+               <property name="text">
+                <string>Max. &amp;time to wait after first match is found:</string>
+               </property>
+               <property name="buddy">
+                <cstring>opt_wait_after_first_identify_result</cstring>
+               </property>
+              </widget>
+             </item>
+             <item row="8" column="1">
+              <widget class="QSpinBox" name="opt_wait_after_first_identify_result">
+               <property name="suffix">
+                <string> secs</string>
+               </property>
+              </widget>
+             </item>
+             <item row="9" column="0">
+              <widget class="QLabel" name="label_4">
+               <property name="text">
+                <string>Max. time to wait after first &amp;cover is found:</string>
+               </property>
+               <property name="buddy">
+                <cstring>opt_wait_after_first_cover_result</cstring>
+               </property>
+              </widget>
+             </item>
+             <item row="9" column="1">
+              <widget class="QSpinBox" name="opt_wait_after_first_cover_result">
+               <property name="suffix">
+                <string> secs</string>
+               </property>
+              </widget>
+             </item>
             </layout>
            </widget>
           </widget>