From 272e163e129cc2aa67746773130d9da3b87b37d9 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Fri, 8 May 2009 06:55:39 -0400
Subject: [PATCH] cleanup. Pdb config honor defaults.

---
 src/calibre/devices/usbms/deviceconfig.py       | 2 +-
 src/calibre/gui2/convert/bulk.py                | 1 +
 src/calibre/gui2/convert/pdb_output.py          | 5 +++++
 src/calibre/gui2/convert/single.ui              | 6 +++---
 src/calibre/gui2/device_drivers/configwidget.py | 6 +++---
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/calibre/devices/usbms/deviceconfig.py b/src/calibre/devices/usbms/deviceconfig.py
index 50d548b823..bf955e1cee 100644
--- a/src/calibre/devices/usbms/deviceconfig.py
+++ b/src/calibre/devices/usbms/deviceconfig.py
@@ -23,7 +23,7 @@ class DeviceConfig(object):
     @classmethod
     def config_widget(cls):
         from calibre.gui2.device_drivers.configwidget import ConfigWidget
-        cw = ConfigWidget(cls._configProxy(), cls.FORMATS)
+        cw = ConfigWidget(cls.settings(), cls.FORMATS)
         return cw
 
     @classmethod
diff --git a/src/calibre/gui2/convert/bulk.py b/src/calibre/gui2/convert/bulk.py
index 7bdacc26ee..10910f20a8 100644
--- a/src/calibre/gui2/convert/bulk.py
+++ b/src/calibre/gui2/convert/bulk.py
@@ -30,6 +30,7 @@ class BulkConfig(Config):
 
         self.setup_pipeline()
 
+        self.input_label.hide()
         self.input_formats.hide()
 
         self.connect(self.output_formats, SIGNAL('currentIndexChanged(QString)'),
diff --git a/src/calibre/gui2/convert/pdb_output.py b/src/calibre/gui2/convert/pdb_output.py
index db52db8f46..66563c3b24 100644
--- a/src/calibre/gui2/convert/pdb_output.py
+++ b/src/calibre/gui2/convert/pdb_output.py
@@ -20,9 +20,14 @@ class PluginWidget(Widget, Ui_Form):
         self.db, self.book_id = db, book_id
         self.initialize_options(get_option, get_help, db, book_id)
 
+        default = self.opt_format.currentText()
+
         global format_model
         if format_model is None:
             format_model = BasicComboModel(FORMAT_WRITERS.keys())
         self.format_model = format_model
         self.opt_format.setModel(self.format_model)
 
+        default_index = self.opt_format.findText(default)
+        self.opt_format.setCurrentIndex(default_index if default_index != -1 else 0)
+
diff --git a/src/calibre/gui2/convert/single.ui b/src/calibre/gui2/convert/single.ui
index 713f7471f3..63c9e5084d 100644
--- a/src/calibre/gui2/convert/single.ui
+++ b/src/calibre/gui2/convert/single.ui
@@ -21,7 +21,7 @@
    <item row="0" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="input_label">
        <property name="text">
         <string>&amp;Input format:</string>
        </property>
@@ -108,8 +108,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>810</width>
-        <height>492</height>
+        <width>800</width>
+        <height>471</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_3">
diff --git a/src/calibre/gui2/device_drivers/configwidget.py b/src/calibre/gui2/device_drivers/configwidget.py
index 6c144d16c4..79b370d0bb 100644
--- a/src/calibre/gui2/device_drivers/configwidget.py
+++ b/src/calibre/gui2/device_drivers/configwidget.py
@@ -10,14 +10,14 @@ from calibre.gui2.device_drivers.configwidget_ui import Ui_ConfigWidget
 
 class ConfigWidget(QWidget, Ui_ConfigWidget):
 
-    def __init__(self, config, all_formats):
+    def __init__(self, settings, all_formats):
         QWidget.__init__(self)
         Ui_ConfigWidget.__init__(self)
         self.setupUi(self)
         
-        self.config = config
+        self.settings = settings
         
-        format_map = config['format_map']
+        format_map = settings.format_map
         disabled_formats = list(set(all_formats).difference(format_map))
         for format in format_map + disabled_formats:
             item = QListWidgetItem(format, self.columns)