From e8a2d7b647cb814c98955ea0e6b830f3da78af28 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Jul 2010 11:56:48 -0600
Subject: [PATCH] Fix long series or publisher names causing convert dialog to
 become too wide

---
 src/calibre/gui2/convert/metadata.ui        | 51 ++++++++++-----------
 src/calibre/gui2/dialogs/metadata_single.ui |  9 ----
 src/calibre/gui2/widgets.py                 |  1 +
 3 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/src/calibre/gui2/convert/metadata.ui b/src/calibre/gui2/convert/metadata.ui
index ec5a913f18..7bc45e234e 100644
--- a/src/calibre/gui2/convert/metadata.ui
+++ b/src/calibre/gui2/convert/metadata.ui
@@ -20,6 +20,30 @@
       <string>Book Cover</string>
      </property>
      <layout class="QGridLayout" name="_2">
+      <item row="0" column="0">
+       <layout class="QHBoxLayout" name="_3">
+        <item>
+         <widget class="ImageView" name="cover" native="true">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="opt_prefer_metadata_cover">
+        <property name="text">
+         <string>Use cover from &amp;source file</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <layout class="QVBoxLayout" name="_4">
         <property name="spacing">
@@ -71,30 +95,6 @@
         </item>
        </layout>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="opt_prefer_metadata_cover">
-        <property name="text">
-         <string>Use cover from &amp;source file</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <layout class="QHBoxLayout" name="_3">
-        <item>
-         <widget class="ImageView" name="cover" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
      </layout>
      <zorder>opt_prefer_metadata_cover</zorder>
      <zorder></zorder>
@@ -232,9 +232,6 @@
          <property name="insertPolicy">
           <enum>QComboBox::InsertAlphabetically</enum>
          </property>
-         <property name="sizeAdjustPolicy">
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="6" column="1">
diff --git a/src/calibre/gui2/dialogs/metadata_single.ui b/src/calibre/gui2/dialogs/metadata_single.ui
index 4efb48d870..5da9d37d04 100644
--- a/src/calibre/gui2/dialogs/metadata_single.ui
+++ b/src/calibre/gui2/dialogs/metadata_single.ui
@@ -277,12 +277,6 @@
                     </property>
                     <item>
                      <widget class="EnComboBox" name="series">
-                      <property name="sizePolicy">
-                       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                       </sizepolicy>
-                      </property>
                       <property name="toolTip">
                        <string>List of known series. You can add new series.</string>
                       </property>
@@ -295,9 +289,6 @@
                       <property name="insertPolicy">
                        <enum>QComboBox::InsertAlphabetically</enum>
                       </property>
-                      <property name="sizeAdjustPolicy">
-                       <enum>QComboBox::AdjustToContents</enum>
-                      </property>
                      </widget>
                     </item>
                     <item>
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index 97758482fc..994fa4575f 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -490,6 +490,7 @@ class EnComboBox(QComboBox):
         QComboBox.__init__(self, *args)
         self.setLineEdit(EnLineEdit(self))
         self.setAutoCompletionCaseSensitivity(Qt.CaseSensitive)
+        self.setMinimumContentsLength(20)
 
     def text(self):
         return unicode(self.currentText())