Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

use prefers for input format order instead of config.

Browse Source
This commit is contained in:
John Schember 2009-07-05 10:48:21 -04:00
parent a3361e36f6
commit 83abb08b90
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/gui2/__init__.py
View File

@ -51,9 +51,6 @@ def _config():
c.add_opt('internally_viewed_formats', default=['LRF', 'EPUB', 'LIT', c.add_opt('internally_viewed_formats', default=['LRF', 'EPUB', 'LIT',
'MOBI', 'PRC', 'HTML', 'FB2', 'PDB', 'RB'], 'MOBI', 'PRC', 'HTML', 'FB2', 'PDB', 'RB'],
help=_('Formats that are viewed using the internal viewer')) 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, c.add_opt('column_map', default=ALL_COLUMNS,
help=_('Columns to be displayed in the book list')) help=_('Columns to be displayed in the book list'))
c.add_opt('autolaunch_server', default=False, help=_('Automatically launch content server on application startup')) c.add_opt('autolaunch_server', default=False, help=_('Automatically launch content server on application startup'))

4
src/calibre/gui2/convert/single.py
View File

@ -10,7 +10,7 @@ import sys, cPickle
from PyQt4.Qt import QString, SIGNAL, QAbstractListModel, Qt, QVariant, QFont 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, \ from calibre.ebooks.conversion.config import GuiRecommendations, save_specifics, \
load_specifics load_specifics
from calibre.gui2.convert.single_ui import Ui_Dialog 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 = preferred_input_format if \
preferred_input_format in input_formats else \ preferred_input_format in input_formats else \
sort_formats_by_preference(input_formats, 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 = preferred_output_format if \
preferred_output_format in output_formats else \ preferred_output_format in output_formats else \
sort_formats_by_preference(output_formats, sort_formats_by_preference(output_formats,

4
src/calibre/gui2/dialogs/config.py
View File

@ -338,7 +338,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
self.connect(self.browse_button, SIGNAL('clicked(bool)'), self.browse) self.connect(self.browse_button, SIGNAL('clicked(bool)'), self.browse)
self.connect(self.compact_button, SIGNAL('clicked(bool)'), self.compact) 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() all_formats = set()
for fmt in all_input_formats(): for fmt in all_input_formats():
all_formats.add(fmt.upper()) all_formats.add(fmt.upper())
@ -681,7 +681,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
prefs['network_timeout'] = int(self.timeout.value()) prefs['network_timeout'] = int(self.timeout.value())
path = qstring_to_unicode(self.location.text()) 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())] 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] 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: if not cols:
cols = ['title'] cols = ['title']

2
src/calibre/utils/config.py
View File

@ -548,6 +548,8 @@ def _prefs():
help=_('The language in which to display the user interface')) help=_('The language in which to display the user interface'))
c.add_opt('output_format', default='EPUB', c.add_opt('output_format', default='EPUB',
help=_('The default output format for ebook conversions.')) 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, c.add_opt('read_file_metadata', default=True,
help=_('Read metadata from files')) help=_('Read metadata from files'))
c.add_opt('worker_process_priority', default='normal', c.add_opt('worker_process_priority', default='normal',