26186 Commits

Author SHA1 Message Date
Kovid Goyal
ef2d949347 Merge branch 'master' of https://github.com/cbhaley/calibre 2013-09-21 22:25:21 +05:30
GRiker
43908fd1cf Fixed three typos referencing a renamed method self.afc_error 2013-09-21 08:55:54 -07:00
Charles Haley
2bd608cbef Add ability to get more fields to ajax.ajax_books_in. The extra fields are returned in a separate dictionary named "additional_fields" to avoid any name collisions with other items in the dictionary. 2013-09-21 16:09:51 +02:00
Kovid Goyal
99f6040028 Merge pull request #93 from cbhaley/master
When editing custom comments from the spreadsheet, add the column name ...
2013-09-21 00:23:50 -07:00
Charles Haley
3db2d844cb When editing custom comments from the spreadsheet, add the column name to the title bar 2013-09-21 09:16:34 +02:00
Kovid Goyal
8b820767d0 Windows: Improved device ejection code
Eject individual drives before trying to eject the device. Hopefully,
this fixes incomplete ejection with the Nook devices.
2013-09-21 11:21:47 +05:30
Kovid Goyal
ae1d2874d8 Handle yet another amazon website change 2013-09-21 08:15:07 +05:30
Kovid Goyal
3d3cb1fdb9 ... 2013-09-21 07:52:27 +05:30
Kovid Goyal
9f1aceaf90 Merge pull request #92 from cbhaley/master
Fix longstanding bug in metadata deepcopy.
2013-09-20 10:14:10 -07:00
Charles Haley
1a2371ffe3 Works, and made it substantially faster too. 2013-09-20 19:05:59 +02:00
Charles Haley
b839a2b103 Fix longstanding bug in metadata deepcopy. 2013-09-20 18:37:42 +02:00
Kovid Goyal
b728d6c40a Add instructions to remove saved conv settings in bulk 2013-09-20 21:09:46 +05:30
Kovid Goyal
7105cc905b ... 2013-09-20 11:37:54 +05:30
Kovid Goyal
ab2b4d4abc When ejecting a device from the OS fails, do not think that the device
is still connected when performing various GUI actions, such as deleting
books.
2013-09-20 11:37:47 +05:30
Kovid Goyal
d8fef25259 version 1.4 v1.4.0 2013-09-20 08:59:23 +05:30
Kovid Goyal
276f8f725f Merge pull request #91 from cbhaley/master
Add in the stuff to age the smart device book cache, to avoid requiring ...
2013-09-19 08:39:57 -07:00
Charles Haley
d99c4fea8c Add in the stuff to age the smart device book cache, to avoid requiring conversion later. 2013-09-19 16:46:32 +02:00
Kovid Goyal
c480169ec5 Use the cache dir for device metadata cache 2013-09-19 19:17:59 +05:30
Kovid Goyal
2e99bf845e Merge branch 'master' of https://github.com/cbhaley/calibre 2013-09-19 18:36:00 +05:30
Charles Haley
2734241db9 Calibre-side code for caching metadata, to avoid needing to resend it from the device on each connect. The CC side code will go into beta test next week. 2013-09-19 13:11:05 +02:00
Kovid Goyal
e7c29dfa7d Merge pull request #89 from cbhaley/master
Two small changes ...
2013-09-19 01:25:50 -07:00
Kovid Goyal
ba8f9d10ca Conversion: Fix font subsetting not working for CJK fonts 2013-09-19 12:41:30 +05:30
Kovid Goyal
2bd084ba23 pep8 2013-09-19 12:34:59 +05:30
Kovid Goyal
85d09338d7 Fix cmap table generation not handling contiguous indices
Also fix tab indentation in code imported from fonttools.
2013-09-19 12:03:12 +05:30
Charles Haley
b075feb3d7 Make an uncomposed icon rule use all the icons from previous composed icon rules. Lets you express things like "compose icon a if XXX, compose icon b if YYY, icon c if ZZZ, icon d if WWW". This will result in categories icons a and b if their conditions match, then appended with one of: c if its condition matches, d if its condition matches, or nothing. 2013-09-19 08:04:49 +02:00
Charles Haley
1109b373a1 Fix formatter function "count" to return zero for an empty list 2013-09-19 07:54:44 +02:00
Kovid Goyal
46ed78b892 ... 2013-09-19 10:35:45 +05:30
Kovid Goyal
8ce8d331b6 pep8 2013-09-19 09:44:00 +05:30
Kovid Goyal
5d09bc1f79 Fix regression that broke html metadata
HTML Input: Fix a regression that broke processing of HTML files
that contain meta tags with dc: namespaced attribute values.
2013-09-19 09:04:02 +05:30
Kovid Goyal
4e35050879 ... 2013-09-19 08:49:49 +05:30
Kovid Goyal
f59d90e68e Fix switching to an empty virtual library not blanking the book details panel 2013-09-18 21:36:10 +05:30
Kovid Goyal
3ab5097788 Speed up the qhash implementation 2013-09-18 21:27:31 +05:30
David Forrester
c893f0de7e Add support for new cover handling in Kobo Aura
The new Kobo Aura has firmware version 2.9.0. The main change needed for
the driver is that cover images are stored in a different place.

Version number is set to 2.9.1 to handle the later release for other
Kobo devices.
2013-09-18 21:18:29 +05:30
Kovid Goyal
07547628cc pep8 2013-09-18 17:00:59 +05:30
Kovid Goyal
455afaa08f Allow multiple icons for column icons
Column icons: Allow the use of multiple icons with column icon rules.
You can now have column icon rules display multiple icons in a single
column, side by side. There are two ways to do this, either specify
multiple icons when creating the rule, or create multiple rules that
match the same book and specify the icon type to be 'composed' for every
rule. See Preferences->Look & Feel->Column icons for details.

Merge branch 'master' of https://github.com/cbhaley/calibre
2013-09-18 16:24:14 +05:30
Charles Haley
5acef6ba2f Get rid of over-elaborate cache naming 2013-09-17 15:29:13 +02:00
Charles Haley
2fe01db004 Make icon rules composable. 2013-09-17 14:29:08 +02:00
Charles Haley
9c3e61cee2 Merge branch 'kovidgoyal/master' 2013-09-17 14:28:09 +02:00
Kovid Goyal
7d61da1ab6 Update Liberation
Fixes #1226391 [Private bug](https://bugs.launchpad.net/calibre/+bug/1226391)
2013-09-17 16:19:31 +05:30
Charles Haley
aea90e5c03 Fill with transparent instead of white, and fix silly typo. 2013-09-17 12:03:11 +02:00
Kovid Goyal
fe26aea85a Keep position when deleting tags in the tag editor
Fixes #1226093 [[Enhancement] Tag editor should remember place](https://bugs.launchpad.net/calibre/+bug/1226093)
2013-09-17 15:27:43 +05:30
Kovid Goyal
7c101e4e09 pep8 2013-09-17 15:26:10 +05:30
Kovid Goyal
64d62847e3 Driver for Icarus Essence
Fixes #1226304 [request of support for new device](https://bugs.launchpad.net/calibre/+bug/1226304)
2013-09-17 15:20:23 +05:30
Charles Haley
089d6c172f Allow an icon rule to put multiple icons on a column 2013-09-17 10:25:32 +02:00
Kovid Goyal
b78885e01f Sage News - Opinion by Brian Hahn
Fixes #1226420 [[ENHANCEMENT] New Publication Recipe - The Sage News - Opinion](https://bugs.launchpad.net/calibre/+bug/1226420)
2013-09-17 11:57:03 +05:30
Kovid Goyal
aca89b8540 Sage News - Satire by Brian Hahn
Fixes #1226417 [[Enhancement] New Publication Recipe - The Sage News - Satire](https://bugs.launchpad.net/calibre/+bug/1226417)
2013-09-17 11:53:39 +05:30
Kovid Goyal
50d619d471 Book details: Render custom comments fields correctly
Book details panel: Render custom comments fields the same as the builtin
comments field. In particular this fixes problems caused by wide text and
images in custom comments fields. Fixes #1226350 [Image in Custom Comments Column](https://bugs.launchpad.net/calibre/+bug/1226350)
2013-09-17 11:35:51 +05:30
Kovid Goyal
aca201d3d9 Merge branch 'master' of https://github.com/cbhaley/calibre 2013-09-17 11:05:14 +05:30
Charles Haley
56eefcf43e Clear custom number columns to undefined when space is pressed 2013-09-17 07:25:26 +02:00
Kovid Goyal
cffaa528f2 Metadata jackets: Use a safe formatter
Metadata jackets: Do not error out when using a custom template with
some custom fields that are not present. Fixes #1225357 [polish fails when adding jacket to epub](https://bugs.launchpad.net/calibre/+bug/1225357)
2013-09-17 10:36:10 +05:30