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

sync to trunk.

Browse Source
This commit is contained in:
John Schember 2009-06-25 20:51:57 -04:00
commit aaae0efc4c
6 changed files with 329 additions and 563 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/constants.py
View File

@ -2,7 +2,7 @@ __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
__appname__ = 'calibre' __appname__ = 'calibre'
__version__ = '0.6.0b8' __version__ = '0.6.0b9'
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>" __author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
import re import re

4
src/calibre/ebooks/oeb/transforms/structure.py
View File

@ -149,7 +149,7 @@ class DetectStructure(object):
#node.add(_('Top'), _href) #node.add(_('Top'), _href)
if self.opts.level2_toc is not None: if self.opts.level2_toc is not None:
added2 = {} added2 = {}
level2 = list(XPath(self.opts.level2_toc)(item.data)) level2 = list(XPath(self.opts.level2_toc)(document.data))
for elem in level2: for elem in level2:
level1 = None level1 = None
for item in document.data.iterdescendants(): for item in document.data.iterdescendants():
@ -162,7 +162,7 @@ class DetectStructure(object):
added2[elem] = level1.add(text, _href, added2[elem] = level1.add(text, _href,
play_order=self.oeb.toc.next_play_order()) play_order=self.oeb.toc.next_play_order())
if self.opts.level3_toc is not None: if self.opts.level3_toc is not None:
level3 = list(XPath(self.opts.level3_toc)(item.data)) level3 = list(XPath(self.opts.level3_toc)(document.data))
for elem in level3: for elem in level3:
level2 = None level2 = None
for item in document.data.iterdescendants(): for item in document.data.iterdescendants():

427
src/calibre/gui2/images/back.svg
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448) --> <!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg <svg
xmlns:ns="http://ns.adobe.com/SaveForWeb/1.0/"
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/" xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@ -10,289 +9,163 @@
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0" width="48"
id="Livello_1" height="48"
width="128" id="svg2"
height="128"
viewBox="0 0 112 116"
overflow="visible"
enable-background="new 0 0 112 116"
xml:space="preserve"
sodipodi:version="0.32" sodipodi:version="0.32"
inkscape:version="0.45.1" inkscape:version="0.45"
sodipodi:docname="back.svg" version="1.0"
sodipodi:docbase="/home/kovid/work/calibre/src/calibre/gui2/images" sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"
inkscape:output_extension="org.inkscape.output.svg.inkscape"><defs sodipodi:docname="go-previous.svg"
id="defs22"><linearGradient inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-icon-theme/16x16/actions/go-previous.png"
id="linearGradient3291"><stop inkscape:export-xdpi="90"
style="stop-color:black;stop-opacity:1" inkscape:export-ydpi="90"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
inkscape:collect="always"
id="linearGradient5105">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0" offset="0"
id="stop3293" /><stop id="stop5107" />
style="stop-color:black;stop-opacity:0" <stop
style="stop-color:black;stop-opacity:0;"
offset="1" offset="1"
id="stop3295" /></linearGradient><radialGradient id="stop5109" />
</linearGradient>
<linearGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#linearGradient3291" id="linearGradient5113">
id="radialGradient3336" <stop
gradientUnits="userSpaceOnUse" style="stop-color:white;stop-opacity:1;"
gradientTransform="matrix(0.7619049,-1.2561704e-5,5.4771697e-7,0.197802,15.217123,92.822463)"
cx="63.912209"
cy="115.71336"
fx="63.912209"
fy="115.71346"
r="63.912209" /><linearGradient
id="linearGradient5108"><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0" offset="0"
id="stop5110" /><stop id="stop5115" />
style="stop-color:#a4c0e4;stop-opacity:0;" <stop
style="stop-color:white;stop-opacity:0;"
offset="1" offset="1"
id="stop5112" /></linearGradient><linearGradient id="stop5117" />
</linearGradient>
<radialGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#XMLID_4_" xlink:href="#linearGradient5105"
id="linearGradient3154" id="radialGradient4354"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
x1="76.351051" gradientTransform="matrix(1,0,0,0.282946,0,13.64644)"
y1="-0.079502821" cx="11.25"
x2="76.351051" cy="19.03125"
y2="59.811054" fx="11.25"
gradientTransform="matrix(0.7767937,0,0,0.7463278,12.500306,-3.8620683e-8)" /><linearGradient fy="19.03125"
r="8.0625" />
<linearGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#XMLID_3_" xlink:href="#linearGradient5113"
id="linearGradient4130" id="linearGradient5315"
x1="56.210979" x1="30.376583"
y1="36.192463" y1="11.133182"
x2="56.210979" x2="11.726276"
y2="101.57672" y2="41.418934"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient5106"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
x1="56.210979" gradientTransform="matrix(-1.004639,0,0,1,48.04405,7.875191e-3)" />
y1="36.192463" </defs>
x2="56.210979" <sodipodi:namedview
y2="101.57672"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785357,2.0903527e-2)" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient5212"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785357,2.0903527e-2)"
x1="56.210979"
y1="36.192463"
x2="56.210979"
y2="101.57672" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient5214"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,0.7463278,12.500306,-3.8620683e-8)"
x1="76.351051"
y1="-0.079502821"
x2="76.351051"
y2="59.811054" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient5217"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,0.7463278,12.500306,7.25)"
x1="76.351051"
y1="-0.079502821"
x2="76.351051"
y2="59.811054" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient5220"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785357,7.2709035)"
x1="56.210979"
y1="36.192463"
x2="56.210979"
y2="101.57672" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient5229"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,0.7463278,12.500306,7.25)"
x1="76.351051"
y1="-0.079502821"
x2="76.351051"
y2="59.811054" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5108"
id="radialGradient6213"
cx="63.984375"
cy="15.937865"
fx="63.984375"
fy="15.937865"
r="26.234375"
gradientTransform="matrix(1.5421216,0,0,0.7628522,-34.687314,3.8800689)"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient6221"
gradientUnits="userSpaceOnUse"
x1="56.210979"
y1="36.192463"
x2="56.210979"
y2="101.57672" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient6223"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785357,7.2709035)"
x1="56.210979"
y1="36.192463"
x2="56.210979"
y2="101.57672" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient6225"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,0.7463278,12.500306,7.25)"
x1="76.351051"
y1="-0.079502821"
x2="76.351051"
y2="59.811054" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5108"
id="radialGradient6227"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.5421216,0,0,0.7628522,-34.687314,3.8800689)"
cx="63.984375"
cy="15.937865"
fx="63.984375"
fy="15.937865"
r="26.234375" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient6233"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,-0.7463278,12.500306,101.5)"
x1="55.999031"
y1="-2.0290324e-07"
x2="55.999031"
y2="136.20563" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient6239"
gradientUnits="userSpaceOnUse"
x1="56.210983"
y1="7.2360544"
x2="56.210983"
y2="108.98789"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785356,-108.7291)" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient3664"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785356,-108.7291)"
x1="56.210983"
y1="7.2360544"
x2="56.210983"
y2="108.98789" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient3666"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,-0.7463278,12.500306,101.5)"
x1="55.999031"
y1="-2.0290324e-07"
x2="55.999031"
y2="136.20563" /></defs><sodipodi:namedview
inkscape:window-height="694"
inkscape:window-width="1018"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base" id="base"
width="128px" pagecolor="#ffffff"
height="128px" bordercolor="#666"
showguides="true" borderopacity="0.17254902"
inkscape:guide-bbox="true" inkscape:pageopacity="0.0"
showgrid="true" inkscape:pageshadow="2"
gridspacingx="8px" inkscape:zoom="16"
gridspacingy="8px" inkscape:cx="25.17045"
gridempspacing="0" inkscape:cy="24.64375"
inkscape:zoom="1.8175359" inkscape:document-units="px"
inkscape:cx="52.949756" inkscape:current-layer="layer1"
inkscape:cy="63.375" width="48px"
inkscape:window-x="658" height="48px"
inkscape:window-y="31" inkscape:showpageshadow="false"
inkscape:current-layer="Livello_1" /> showgrid="false"
<metadata inkscape:window-width="1680"
id="metadata3"> inkscape:window-height="973"
<ns:sfw> inkscape:window-x="0"
<ns:slices /> inkscape:window-y="27" />
<ns:sliceSourceBounds <metadata
y="8" id="metadata7">
x="8" <rdf:RDF>
height="116" <cc:Work
width="112" rdf:about="">
bottomLeftOrigin="true" /> <dc:format>image/svg+xml</dc:format>
</ns:sfw> <dc:type
<rdf:RDF><cc:Work rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type <dc:title>Go previous</dc:title>
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata> <dc:date>August 2006</dc:date>
<linearGradient <dc:creator>
id="XMLID_3_" <cc:Agent>
gradientUnits="userSpaceOnUse" <dc:title>Andreas Nilsson</dc:title>
x1="55.9995" </cc:Agent>
y1="26.105" </dc:creator>
x2="55.9995" <dc:contributor>
y2="116.0005"> <cc:Agent>
<stop <dc:title>Jakub Steiner</dc:title>
offset="0" </cc:Agent>
style="stop-color:#2C72C7" </dc:contributor>
id="stop6" /><stop <dc:source>http://www.gnome.org</dc:source>
id="stop5117" <dc:subject>
style="stop-color:#568cd0;stop-opacity:1;" <rdf:Bag>
offset="0.34999999" /> <rdf:li>previous</rdf:li>
<stop <rdf:li>arrow</rdf:li>
offset="0.59611648" <rdf:li>go</rdf:li>
style="stop-color:#80a7da;stop-opacity:1;" </rdf:Bag>
id="stop8" /> </dc:subject>
<stop <cc:license
offset="1" rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
style="stop-color:#bdd2ec;stop-opacity:0.22360249;" <dc:description />
id="stop10" /> </cc:Work>
</linearGradient> <cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<linearGradient <cc:permits
id="XMLID_4_" rdf:resource="http://web.resource.org/cc/Reproduction" />
gradientUnits="userSpaceOnUse" <cc:permits
x1="56.0005" rdf:resource="http://web.resource.org/cc/Distribution" />
y1="69.249001" <cc:requires
x2="56.0005" rdf:resource="http://web.resource.org/cc/Notice" />
y2="-1.8726"> <cc:permits
<stop rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
offset="0" <cc:requires
style="stop-color:#2C72C7" rdf:resource="http://web.resource.org/cc/ShareAlike" />
id="stop15" /> <cc:requires
<stop rdf:resource="http://web.resource.org/cc/SourceCode" />
offset="1" </cc:License>
style="stop-color:#A4C0E4" </rdf:RDF>
id="stop17" /> </metadata>
</linearGradient> <g
inkscape:label="Layer 1"
<g inkscape:groupmode="layer"
id="g3660" id="layer1">
transform="matrix(0,-1,-1,0,110.375,110.375)"><rect <path
transform="scale(1,-1)" sodipodi:type="arc"
ry="4.0150175" style="opacity:0.16292138;color:black;fill:url(#radialGradient4354);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
rx="3.9052353" id="path4346"
y="-87" sodipodi:cx="11.25"
x="48.75" sodipodi:cy="19.03125"
height="79.75" sodipodi:rx="8.0625"
width="14.5" sodipodi:ry="2.28125"
id="rect4128" d="M 19.3125 19.03125 A 8.0625 2.28125 0 1 1 3.1875,19.03125 A 8.0625 2.28125 0 1 1 19.3125 19.03125 z"
style="fill:url(#linearGradient3664);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path transform="matrix(2.48062,0,0,2.410961,-3.906976,-5.38361)" />
id="path19" <path
d="M 53.792326,100.56112 L 13.270107,57.687568 C 12.184927,56.538971 12.254838,54.77092 13.427797,53.704417 L 15.814883,51.534095 C 16.895404,50.551928 18.567841,50.484012 19.730702,51.378112 C 19.730702,51.378112 52.627136,76.666686 55.999973,79.260176 C 59.373588,76.666686 92.269247,51.378112 92.269247,51.378112 C 93.431329,50.484012 95.103764,50.551928 96.184287,51.534095 L 98.57215,53.704417 C 99.745886,54.77092 99.815024,56.538971 98.728286,57.686823 L 58.209175,100.56187 C 57.644446,101.15893 56.84124,101.5 56.000749,101.5 C 55.159483,101.5 54.357055,101.15893 53.792326,100.56112 z " style="opacity:1;color:black;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
style="fill:url(#linearGradient3666)" /></g></svg> d="M 24.504161,9.4999998 L 5.5000172,26.006024 L 24.504161,42.429315 L 24.504161,34.55948 L 39.5,34.55948 L 39.5,17.504348 L 24.504161,17.504348 L 24.504161,9.4999998 z "
id="path4348"
sodipodi:nodetypes="cccccccc" />
<path
style="opacity:0.35393258;color:black;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 39.006365,18.007932 L 39.006365,25.960194 L 6.2374992,25.936091 L 23.852103,10.591567 L 23.852103,18.007932 L 39.006365,18.007932 z "
id="path4352"
sodipodi:nodetypes="cccccc" />
<path
style="opacity:0.35400002;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5315);stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 23.433312,11.641057 L 6.9166742,26.02733 L 23.433312,40.226631 L 23.433312,33.488262 L 38.499995,33.488262 L 38.499995,18.509928 L 23.433312,18.509928 L 23.433312,11.641057 z "
id="path4360"
sodipodi:nodetypes="cccccccc" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

409
src/calibre/gui2/images/forward.svg
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448) --> <!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg <svg
xmlns:ns="http://ns.adobe.com/SaveForWeb/1.0/"
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/" xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@ -10,271 +9,163 @@
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0" width="48"
id="Livello_1" height="48"
width="128" id="svg2"
height="128"
viewBox="0 0 112 116"
overflow="visible"
enable-background="new 0 0 112 116"
xml:space="preserve"
sodipodi:version="0.32" sodipodi:version="0.32"
inkscape:version="0.45.1" inkscape:version="0.45"
sodipodi:docname="forward.svg" version="1.0"
sodipodi:docbase="/home/kovid/work/calibre/src/calibre/gui2/images" sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"
inkscape:output_extension="org.inkscape.output.svg.inkscape"><defs sodipodi:docname="go-next.svg"
id="defs22"><linearGradient inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-icon-theme/16x16/actions/go-previous.png"
id="linearGradient3291"><stop inkscape:export-xdpi="90"
style="stop-color:black;stop-opacity:1" inkscape:export-ydpi="90"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
inkscape:collect="always"
id="linearGradient5105">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0" offset="0"
id="stop3293" /><stop id="stop5107" />
style="stop-color:black;stop-opacity:0" <stop
style="stop-color:black;stop-opacity:0;"
offset="1" offset="1"
id="stop3295" /></linearGradient><radialGradient id="stop5109" />
</linearGradient>
<linearGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#linearGradient3291" id="linearGradient5113">
id="radialGradient3336" <stop
gradientUnits="userSpaceOnUse" style="stop-color:white;stop-opacity:1;"
gradientTransform="matrix(0.7619049,-1.2561704e-5,5.4771697e-7,0.197802,15.217123,92.822463)"
cx="63.912209"
cy="115.71336"
fx="63.912209"
fy="115.71346"
r="63.912209" /><linearGradient
id="linearGradient5108"><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0" offset="0"
id="stop5110" /><stop id="stop5115" />
style="stop-color:#a4c0e4;stop-opacity:0;" <stop
style="stop-color:white;stop-opacity:0;"
offset="1" offset="1"
id="stop5112" /></linearGradient><linearGradient id="stop5117" />
</linearGradient>
<radialGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#XMLID_4_" xlink:href="#linearGradient5105"
id="linearGradient3154" id="radialGradient4354"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
x1="76.351051" gradientTransform="matrix(1,0,0,0.282946,0,13.64644)"
y1="-0.079502821" cx="11.25"
x2="76.351051" cy="19.03125"
y2="59.811054" fx="11.25"
gradientTransform="matrix(0.7767937,0,0,0.7463278,12.500306,-3.8620683e-8)" /><linearGradient fy="19.03125"
r="8.0625" />
<linearGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#XMLID_3_" xlink:href="#linearGradient5113"
id="linearGradient4130" id="linearGradient5315"
x1="56.210979" x1="17.498823"
y1="36.192463" y1="10.445395"
x2="56.210979" x2="34.744495"
y2="101.57672" y2="40.231434"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient5106"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
x1="56.210979" gradientTransform="matrix(1.004639,0,0,1,-1.037685,4.7681e-2)" />
y1="36.192463" </defs>
x2="56.210979" <sodipodi:namedview
y2="101.57672"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785357,2.0903527e-2)" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient5212"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785357,2.0903527e-2)"
x1="56.210979"
y1="36.192463"
x2="56.210979"
y2="101.57672" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient5214"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,0.7463278,12.500306,-3.8620683e-8)"
x1="76.351051"
y1="-0.079502821"
x2="76.351051"
y2="59.811054" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient5217"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,0.7463278,12.500306,7.25)"
x1="76.351051"
y1="-0.079502821"
x2="76.351051"
y2="59.811054" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient5220"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785357,7.2709035)"
x1="56.210979"
y1="36.192463"
x2="56.210979"
y2="101.57672" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient5229"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,0.7463278,12.500306,7.25)"
x1="76.351051"
y1="-0.079502821"
x2="76.351051"
y2="59.811054" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5108"
id="radialGradient6213"
cx="63.984375"
cy="15.937865"
fx="63.984375"
fy="15.937865"
r="26.234375"
gradientTransform="matrix(1.5421216,0,0,0.7628522,-34.687314,3.8800689)"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient6221"
gradientUnits="userSpaceOnUse"
x1="56.210979"
y1="36.192463"
x2="56.210979"
y2="101.57672" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient6223"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785357,7.2709035)"
x1="56.210979"
y1="36.192463"
x2="56.210979"
y2="101.57672" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient6225"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,0.7463278,12.500306,7.25)"
x1="76.351051"
y1="-0.079502821"
x2="76.351051"
y2="59.811054" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5108"
id="radialGradient6227"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.5421216,0,0,0.7628522,-34.687314,3.8800689)"
cx="63.984375"
cy="15.937865"
fx="63.984375"
fy="15.937865"
r="26.234375" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_4_"
id="linearGradient6233"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7767937,0,0,-0.7463278,12.500306,101.5)"
x1="55.999031"
y1="-2.0290324e-07"
x2="55.999031"
y2="136.20563" /><linearGradient
inkscape:collect="always"
xlink:href="#XMLID_3_"
id="linearGradient6239"
gradientUnits="userSpaceOnUse"
x1="56.210983"
y1="7.2360544"
x2="56.210983"
y2="108.98789"
gradientTransform="matrix(0.9717223,0,0,0.9990389,1.3785356,-108.7291)" /></defs><sodipodi:namedview
inkscape:window-height="694"
inkscape:window-width="1018"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base" id="base"
width="128px" pagecolor="#ffffff"
height="128px" bordercolor="#666"
showguides="true" borderopacity="0.17254902"
inkscape:guide-bbox="true" inkscape:pageopacity="0.0"
showgrid="true" inkscape:pageshadow="2"
gridspacingx="8px" inkscape:zoom="16"
gridspacingy="8px" inkscape:cx="25.17045"
gridempspacing="0" inkscape:cy="24.64375"
inkscape:zoom="1.8175359" inkscape:document-units="px"
inkscape:cx="52.949756" inkscape:current-layer="layer1"
inkscape:cy="63.375" width="48px"
inkscape:window-x="658" height="48px"
inkscape:window-y="31" inkscape:showpageshadow="false"
inkscape:current-layer="Livello_1" /> showgrid="false"
<metadata inkscape:window-width="1680"
id="metadata3"> inkscape:window-height="973"
<ns:sfw> inkscape:window-x="0"
<ns:slices /> inkscape:window-y="27" />
<ns:sliceSourceBounds <metadata
y="8" id="metadata7">
x="8" <rdf:RDF>
height="116" <cc:Work
width="112" rdf:about="">
bottomLeftOrigin="true" /> <dc:format>image/svg+xml</dc:format>
</ns:sfw> <dc:type
<rdf:RDF><cc:Work rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type <dc:title>Go next</dc:title>
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata> <dc:date>August 2006</dc:date>
<linearGradient <dc:creator>
id="XMLID_3_" <cc:Agent>
gradientUnits="userSpaceOnUse" <dc:title>Andreas Nilsson</dc:title>
x1="55.9995" </cc:Agent>
y1="26.105" </dc:creator>
x2="55.9995" <dc:contributor>
y2="116.0005"> <cc:Agent>
<stop <dc:title>Jakub Steiner</dc:title>
offset="0" </cc:Agent>
style="stop-color:#2C72C7" </dc:contributor>
id="stop6" /><stop <dc:source>http://www.gnome.org</dc:source>
id="stop5117" <dc:subject>
style="stop-color:#568cd0;stop-opacity:1;" <rdf:Bag>
offset="0.34999999" /> <rdf:li>next</rdf:li>
<stop <rdf:li>arrow</rdf:li>
offset="0.59611648" <rdf:li>go</rdf:li>
style="stop-color:#80a7da;stop-opacity:1;" </rdf:Bag>
id="stop8" /> </dc:subject>
<stop <cc:license
offset="1" rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
style="stop-color:#bdd2ec;stop-opacity:0.22360249;" <dc:description />
id="stop10" /> </cc:Work>
</linearGradient> <cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<linearGradient <cc:permits
id="XMLID_4_" rdf:resource="http://web.resource.org/cc/Reproduction" />
gradientUnits="userSpaceOnUse" <cc:permits
x1="56.0005" rdf:resource="http://web.resource.org/cc/Distribution" />
y1="69.249001" <cc:requires
x2="56.0005" rdf:resource="http://web.resource.org/cc/Notice" />
y2="-1.8726"> <cc:permits
<stop rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
offset="0" <cc:requires
style="stop-color:#2C72C7" rdf:resource="http://web.resource.org/cc/ShareAlike" />
id="stop15" /> <cc:requires
<stop rdf:resource="http://web.resource.org/cc/SourceCode" />
offset="1" </cc:License>
style="stop-color:#A4C0E4" </rdf:RDF>
id="stop17" /> </metadata>
</linearGradient> <g
inkscape:label="Layer 1"
<g inkscape:groupmode="layer"
id="g3660" id="layer1">
transform="matrix(0,-1,1,0,1.6249999,110.375)"><rect <path
transform="scale(1,-1)" sodipodi:type="arc"
ry="4.0150175" style="opacity:0.16292138;color:black;fill:url(#radialGradient4354);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
rx="3.9052353" id="path4346"
y="-87" sodipodi:cx="11.25"
x="48.75" sodipodi:cy="19.03125"
height="79.75" sodipodi:rx="8.0625"
width="14.5" sodipodi:ry="2.28125"
id="rect4128" d="M 19.3125 19.03125 A 8.0625 2.28125 0 1 1 3.1875,19.03125 A 8.0625 2.28125 0 1 1 19.3125 19.03125 z"
style="fill:url(#linearGradient6239);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path transform="matrix(2.48062,0,0,2.410961,-3.906976,-5.38361)" />
id="path19" <path
d="M 53.792326,100.56112 L 13.270107,57.687568 C 12.184927,56.538971 12.254838,54.77092 13.427797,53.704417 L 15.814883,51.534095 C 16.895404,50.551928 18.567841,50.484012 19.730702,51.378112 C 19.730702,51.378112 52.627136,76.666686 55.999973,79.260176 C 59.373588,76.666686 92.269247,51.378112 92.269247,51.378112 C 93.431329,50.484012 95.103764,50.551928 96.184287,51.534095 L 98.57215,53.704417 C 99.745886,54.77092 99.815024,56.538971 98.728286,57.686823 L 58.209175,100.56187 C 57.644446,101.15893 56.84124,101.5 56.000749,101.5 C 55.159483,101.5 54.357055,101.15893 53.792326,100.56112 z " style="opacity:1;color:black;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
style="fill:url(#linearGradient6233)" /></g></svg> d="M 22.502204,9.5398056 L 41.506348,26.04583 L 22.502204,42.469121 L 22.502204,34.599286 L 7.506365,34.599286 L 7.506365,17.544154 L 22.502204,17.544154 L 22.502204,9.5398056 z "
id="path4348"
sodipodi:nodetypes="cccccccc" />
<path
style="opacity:0.35393258;color:black;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 8,18.047738 L 8,26 L 40.768866,25.975897 L 23.154262,10.631373 L 23.154262,18.047738 L 8,18.047738 z "
id="path4352"
sodipodi:nodetypes="cccccc" />
<path
style="opacity:0.35400002;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5315);stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 23.573053,11.680863 L 40.089691,26.067136 L 23.573053,40.266437 L 23.573053,33.528068 L 8.50637,33.528068 L 8.50637,18.549734 L 23.573053,18.549734 L 23.573053,11.680863 z "
id="path4360"
sodipodi:nodetypes="cccccccc" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

8
src/calibre/gui2/main.py
View File

@ -477,8 +477,9 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
else: else:
self.status_bar.cover_flow_button.disable(pictureflowerror) self.status_bar.cover_flow_button.disable(pictureflowerror)
self._calculated_available_height = min(max_available_height()-15,
self.setMaximumHeight(max_available_height()) self.height())
self.resize(self.width(), self._calculated_available_height)
if config['autolaunch_server']: if config['autolaunch_server']:
@ -610,7 +611,8 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
else: else:
self.cover_flow.setVisible(False) self.cover_flow.setVisible(False)
#self.status_bar.book_info.book_data.setMaximumHeight(1000) #self.status_bar.book_info.book_data.setMaximumHeight(1000)
self.setMaximumHeight(available_height()) self.resize(self.width(), self._calculated_available_height)
#self.setMaximumHeight(available_height())
def toggle_tags_view(self, show): def toggle_tags_view(self, show):
if show: if show:

2
src/calibre/gui2/viewer/main.py
View File

@ -309,7 +309,7 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
m = bm[1].split('#') m = bm[1].split('#')
if len(m) > 1: if len(m) > 1:
spine_index, m = int(m[0]), m[1] spine_index, m = int(m[0]), m[1]
if self.current_index == spine_index: if spine_index > -1 and self.current_index == spine_index:
self.view.goto_bookmark(m) self.view.goto_bookmark(m)
else: else:
self.pending_bookmark = bm self.pending_bookmark = bm