From 83abb08b90b4141ecc1699d7b8c2ffa7bf157e31 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 5 Jul 2009 10:48:21 -0400 Subject: [PATCH] use prefers for input format order instead of config. --- src/calibre/gui2/__init__.py | 3 --- src/calibre/gui2/convert/single.py | 4 ++-- src/calibre/gui2/dialogs/config.py | 4 ++-- src/calibre/utils/config.py | 2 ++ 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 934d0b8f2f..af4ca16eac 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -51,9 +51,6 @@ def _config(): c.add_opt('internally_viewed_formats', default=['LRF', 'EPUB', 'LIT', 'MOBI', 'PRC', 'HTML', 'FB2', 'PDB', 'RB'], help=_('Formats that are viewed using the internal viewer')) - c.add_opt('input_format_order', default=['EPUB', 'MOBI', 'PRC', 'LIT', - 'HTML', 'FB2', 'PDB', 'RB'], - help=_('Order list of formats to prefer for input.')) c.add_opt('column_map', default=ALL_COLUMNS, help=_('Columns to be displayed in the book list')) c.add_opt('autolaunch_server', default=False, help=_('Automatically launch content server on application startup')) diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py index 6d04c7ab04..b995c3e3a2 100644 --- a/src/calibre/gui2/convert/single.py +++ b/src/calibre/gui2/convert/single.py @@ -10,7 +10,7 @@ import sys, cPickle from PyQt4.Qt import QString, SIGNAL, QAbstractListModel, Qt, QVariant, QFont -from calibre.gui2 import ResizableDialog, NONE, config +from calibre.gui2 import ResizableDialog, NONE from calibre.ebooks.conversion.config import GuiRecommendations, save_specifics, \ load_specifics from calibre.gui2.convert.single_ui import Ui_Dialog @@ -205,7 +205,7 @@ class Config(ResizableDialog, Ui_Dialog): preferred_input_format = preferred_input_format if \ preferred_input_format in input_formats else \ sort_formats_by_preference(input_formats, - config['input_format_order'])[0] + prefs['input_format_order'])[0] preferred_output_format = preferred_output_format if \ preferred_output_format in output_formats else \ sort_formats_by_preference(output_formats, diff --git a/src/calibre/gui2/dialogs/config.py b/src/calibre/gui2/dialogs/config.py index 20ade05846..1c337788c6 100644 --- a/src/calibre/gui2/dialogs/config.py +++ b/src/calibre/gui2/dialogs/config.py @@ -338,7 +338,7 @@ class ConfigDialog(QDialog, Ui_Dialog): self.connect(self.browse_button, SIGNAL('clicked(bool)'), self.browse) self.connect(self.compact_button, SIGNAL('clicked(bool)'), self.compact) - input_map = config['input_format_order'] + input_map = prefs['input_format_order'] all_formats = set() for fmt in all_input_formats(): all_formats.add(fmt.upper()) @@ -681,7 +681,7 @@ class ConfigDialog(QDialog, Ui_Dialog): prefs['network_timeout'] = int(self.timeout.value()) path = qstring_to_unicode(self.location.text()) input_cols = [unicode(self.input_order.item(i).data(Qt.UserRole).toString()) for i in range(self.input_order.count())] - config['input_format_order'] = input_cols + prefs['input_format_order'] = input_cols cols = [unicode(self.columns.item(i).data(Qt.UserRole).toString()) for i in range(self.columns.count()) if self.columns.item(i).checkState()==Qt.Checked] if not cols: cols = ['title'] diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py index 0925d8667d..e225406dff 100644 --- a/src/calibre/utils/config.py +++ b/src/calibre/utils/config.py @@ -548,6 +548,8 @@ def _prefs(): help=_('The language in which to display the user interface')) c.add_opt('output_format', default='EPUB', help=_('The default output format for ebook conversions.')) + c.add_opt('input_format_order', default=['EPUB', 'MOBI', 'PRC', 'LIT'], + help=_('Order list of formats to prefer for input.')) c.add_opt('read_file_metadata', default=True, help=_('Read metadata from files')) c.add_opt('worker_process_priority', default='normal',