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

Sync to trunk.

Browse Source
This commit is contained in:
John Schember 2013-04-21 09:29:21 -04:00
commit 184dc60777
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/iso_639/da.po
View File

@ -10253,7 +10253,7 @@ msgstr ""
#. name for inh #. name for inh
msgid "Ingush" msgid "Ingush"
msgstr "Engelsk" msgstr "Ingush"
#. name for inj #. name for inj
msgid "Inga; Jungle" msgid "Inga; Jungle"

2
src/calibre/ebooks/pdf/render/links.py
View File

@ -51,7 +51,7 @@ class Links(object):
for link in self.links: for link in self.links:
path, href, frag = link[0] path, href, frag = link[0]
page, rect = link[1:] page, rect = link[1:]
combined_path = os.path.abspath(os.path.join(os.path.dirname(path), *href.split('/'))) combined_path = os.path.abspath(os.path.join(os.path.dirname(path), *unquote(href).split('/')))
is_local = not href or combined_path in self.anchors is_local = not href or combined_path in self.anchors
annot = Dictionary({ annot = Dictionary({
'Type':Name('Annot'), 'Subtype':Name('Link'), 'Type':Name('Annot'), 'Subtype':Name('Link'),

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

@ -75,7 +75,7 @@ class GroupModel(QAbstractListModel):
def get_preferred_input_format_for_book(db, book_id): def get_preferred_input_format_for_book(db, book_id):
recs = load_specifics(db, book_id) recs = load_specifics(db, book_id)
if recs: if recs:
return recs.get('gui_preferred_input_format', None) return recs.get('gui_preferred_input_format', None)
def get_available_formats_for_book(db, book_id): def get_available_formats_for_book(db, book_id):
available_formats = db.formats(book_id, index_is_id=True) available_formats = db.formats(book_id, index_is_id=True)
@ -147,6 +147,7 @@ class Config(ResizableDialog, Ui_Dialog):
self.connect(self.groups, SIGNAL('entered(QModelIndex)'), self.connect(self.groups, SIGNAL('entered(QModelIndex)'),
self.show_group_help) self.show_group_help)
rb = self.buttonBox.button(self.buttonBox.RestoreDefaults) rb = self.buttonBox.button(self.buttonBox.RestoreDefaults)
rb.setText(_('Restore &Defaults'))
self.connect(rb, SIGNAL('clicked()'), self.restore_defaults) self.connect(rb, SIGNAL('clicked()'), self.restore_defaults)
self.groups.setMouseTracking(True) self.groups.setMouseTracking(True)
geom = gprefs.get('convert_single_dialog_geom', None) geom = gprefs.get('convert_single_dialog_geom', None)
@ -188,7 +189,6 @@ class Config(ResizableDialog, Ui_Dialog):
return cls(self.stack, self.plumber.get_option_by_name, return cls(self.stack, self.plumber.get_option_by_name,
self.plumber.get_option_help, self.db, self.book_id) self.plumber.get_option_help, self.db, self.book_id)
self.mw = widget_factory(MetadataWidget) self.mw = widget_factory(MetadataWidget)
self.setWindowTitle(_('Convert')+ ' ' + unicode(self.mw.title.text())) self.setWindowTitle(_('Convert')+ ' ' + unicode(self.mw.title.text()))
lf = widget_factory(LookAndFeelWidget) lf = widget_factory(LookAndFeelWidget)
@ -209,7 +209,8 @@ class Config(ResizableDialog, Ui_Dialog):
self.plumber.get_option_help, self.db, self.book_id) self.plumber.get_option_help, self.db, self.book_id)
while True: while True:
c = self.stack.currentWidget() c = self.stack.currentWidget()
if not c: break if not c:
break
self.stack.removeWidget(c) self.stack.removeWidget(c)
widgets = [self.mw, lf, hw, ps, sd, toc, sr] widgets = [self.mw, lf, hw, ps, sd, toc, sr]
@ -234,7 +235,6 @@ class Config(ResizableDialog, Ui_Dialog):
except: except:
pass pass
def setup_input_output_formats(self, db, book_id, preferred_input_format, def setup_input_output_formats(self, db, book_id, preferred_input_format,
preferred_output_format): preferred_output_format):
if preferred_output_format: if preferred_output_format:

2
src/calibre/gui2/preferences/adding.ui
View File

@ -164,7 +164,7 @@ Author matching is exact.</string>
<item> <item>
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Ignore files with the following extensions when automatically adding </string> <string>&lt;b&gt;Ignore&lt;/b&gt; files with the following extensions when automatically adding </string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>